diff options
author | Brad Linden <brad@lindenlab.com> | 2024-06-17 16:02:57 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-06-17 16:02:57 -0700 |
commit | d0dfffe659b24f5a6bfadc5cc612869e1f08bb93 (patch) | |
tree | 8df3c672aba2f1aca8e9861bcf7626bd8116b107 /indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl | |
parent | 5e60392c273f0c9c5efa765a05414c618381780a (diff) | |
parent | 375555012f92c1b836f2d122754f9facd050be62 (diff) |
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl index 3ea2248bec..ab0e4fd4d8 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl @@ -50,7 +50,6 @@ SOFTWARE. uniform sampler2D normalMap; uniform sampler2D depthMap; -uniform sampler2D emissiveRect; uniform sampler2D projectionMap; // rgba uniform sampler2D brdfLut; |