From ce6bb9538489b420d5f0827779912d7241dfa6c6 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 2 Jul 2013 16:50:35 -0700
Subject: NORSPEC-293 nix gamma correction in fullbrightF causing this visual
disparity
---
.../app_settings/shaders/class1/deferred/fullbrightF.glsl | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
index dc1dead656..5bdb3115d9 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
@@ -45,19 +45,21 @@ vec3 fullbrightScaleSoftClip(vec3 light);
void main()
{
#if HAS_DIFFUSE_LOOKUP
- vec4 color = diffuseLookup(vary_texcoord0.xy)*vertex_color;
+ vec4 color = diffuseLookup(vary_texcoord0.xy);
#else
- vec4 color = texture2D(diffuseMap, vary_texcoord0.xy)*vertex_color;
+ vec4 color = texture2D(diffuseMap, vary_texcoord0.xy);
#endif
color.rgb = pow(color.rgb,vec3(2.2f,2.2f,2.2f));
-
- color.rgb = fullbrightAtmosTransport(color.rgb);
+ color.rgb *= vertex_color.rgb;
+ color.rgb = fullbrightAtmosTransport(color.rgb);
color.rgb = fullbrightScaleSoftClip(color.rgb);
- color.rgb = pow(color.rgb, vec3(1.0/2.2));
+ // NORSPEC-293
+ //color.rgb = pow(color.rgb, vec3(1.0/2.2));
- frag_color = color;
+ frag_color.rgb = color.rgb;
+ frag_color.a = color.a;
}
--
cgit v1.2.3