summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-08 12:01:38 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-08 12:01:38 -0700
commitf1340d91a8117ccbbef87fd2ece27f89c2d4e4e1 (patch)
tree10b4ae6c0a813d0b36c15c431d8a05a14e912bd7 /indra
parent7b1acb186a7025b0464c21c88c0956439c98f3d2 (diff)
NORSPEC-156 modify fullbrightF colorspace conversion to eliminate delta with non-deferred fullbright look
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
index b91aaf80fb..4dfd13d406 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
@@ -42,12 +42,9 @@ void main()
{
float shadow = 1.0;
- vec4 color = diffuseLookup(vary_texcoord0.xy)*vertex_color;
- color.rgb = pow(color.rgb, vec3(2.2));
+ vec4 color = diffuseLookup(vary_texcoord0.xy)*pow(vertex_color.rgb,vec3(2.2f,2.2f,2.2f));
color.rgb = fullbrightAtmosTransport(color.rgb);
-
color.rgb = fullbrightScaleSoftClip(color.rgb);
-
frag_color = color;
}