diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-08 12:14:08 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-08 12:14:08 -0700 |
commit | fd8b34e44b9acce23b2c2405ce9f1ad22b71b5b5 (patch) | |
tree | 2f8b5863565ad4d8d32f07a0f6eb569a9ef1463b /indra/newview | |
parent | f1340d91a8117ccbbef87fd2ece27f89c2d4e4e1 (diff) |
NORSPEC-156 move gamma correction to vert shader
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 2 | ||||
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl | 4 |
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 100755 --- 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 100755 --- 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; } |