summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
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
commit5c6d52f260900a483b7c9d8421ed5619b897d026 (patch)
tree86c1e6238253ec2fa259390cf54e4e10c00c98f3 /indra/newview/app_settings
parent21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff)
NORSPEC-156 modify fullbrightF colorspace conversion to eliminate delta with non-deferred fullbright look
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/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 100644
--- 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;
}