summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-08 12:14:08 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-08 12:14:08 -0700
commit8f5fc2d4c19dfaadc8113d17c219e3316e42d5bc (patch)
treebb3759ae6b6548af0f2296e13e502f392dfbbffa /indra/newview
parent5c6d52f260900a483b7c9d8421ed5619b897d026 (diff)
NORSPEC-156 move gamma correction to vert shader
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl2
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
index 4dfd13d406..bb28f02aab 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
@@ -42,7 +42,7 @@ void main()
{
float shadow = 1.0;
- vec4 color = diffuseLookup(vary_texcoord0.xy)*pow(vertex_color.rgb,vec3(2.2f,2.2f,2.2f));
+ vec4 color = diffuseLookup(vary_texcoord0.xy)* vertex_color;
color.rgb = fullbrightAtmosTransport(color.rgb);
color.rgb = fullbrightScaleSoftClip(color.rgb);
frag_color = color;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
index 2e6982d101..dd56a8c2b0 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
@@ -58,7 +58,7 @@ void main()
calcAtmospherics(pos.xyz);
- vertex_color = diffuse_color;
-
+ vertex_color.rgb = pow(diffuse_color, vec3(2.2f,2.2f,2.2f));
+ vertex_color.a = diffuse_color.a;
}