From ce48b9d8cf0722f011e12f5bdc09b6e441625813 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Wed, 24 Apr 2013 10:33:38 -0700 Subject: Fix mismerge that lost Geenz colorspace conversion of diffuse in alphaV --- indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index a8efd3e95b..ae3769c786 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -182,7 +182,12 @@ void main() //vec4 color = calcLighting(pos.xyz, norm, diffuse_color, vec4(0.)); vec4 col = vec4(0.0, 0.0, 0.0, diffuse_color.a); - vary_pointlight_col = diffuse_color.rgb; + vec3 diff = pow(diffuse_color.rgb, vec3(2.2)); + + + + vary_pointlight_col = diff; + col.rgb = vec3(0,0,0); -- cgit v1.2.3 From 4ae48c225b1bb82a5667757fea53ff5c0646a5c4 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Wed, 24 Apr 2013 10:37:29 -0700 Subject: Correct fix to include affect on ambient term and make work on Mac nV --- indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index ae3769c786..77d02b36ff 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -194,11 +194,11 @@ void main() // Add windlight lights col.rgb = atmosAmbient(col.rgb); - vary_ambient = col.rgb*diffuse_color.rgb; + vary_ambient = col.rgb*diff.rgb; vary_directional.rgb = atmosAffectDirectionalLight(1.0f); - col.rgb = col.rgb*diffuse_color.rgb; + col.rgb = col.rgb*diff.rgb; #ifdef USE_VERTEX_COLOR vertex_color = col; -- cgit v1.2.3