diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
commit | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (patch) | |
tree | 60dd4f9462ba11a4cb7503c64fa1dd2a23373a67 /indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl | |
parent | 1eeb4c85a120b23b853aabb8e6cf984b03dbc17f (diff) | |
parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) |
DRTVWR-538: Merge branch 'master' into c++17
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl index 5d7a28c359..1b7a1cc6ec 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl @@ -191,10 +191,6 @@ void main() float da = dot(norm, lv); vec3 diff_tex = texture2DRect(diffuseRect, frag.xy).rgb; - // SL-12005 Projector light pops as we get closer, more objectionable than being in wrong color space. - // We can't switch to linear here unless we do it everywhere* - // *gbuffer IS sRGB, convert to linear since this shader outputs linear - diff_tex.rgb = srgb_to_linear(diff_tex.rgb); vec4 spec = texture2DRect(specularRect, frag.xy); |