Merge

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
index 0b943d2527..cbc19bbba3 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
@@ -40,10 +40,12 @@ VARYING vec2 vary_fragcoord;
 
 uniform float display_gamma;
 
+vec3 linear_to_srgb(vec3 cl);
+
 void main() 
 {
-    vec4 diff = texture2DRect(diffuseRect, vary_fragcoord);
-    diff.rgb = pow(diff.rgb, vec3(display_gamma));
-    frag_color = diff;
+	vec4 diff = texture2DRect(diffuseRect, vary_fragcoord);
+	diff.rgb = linear_to_srgb(diff.rgb);
+	frag_color = diff;
 }