Cleaning deprecated gamma functions in shaders

This commit is a complement to cleaning deprecated gamma functions in shaders

6 files changed, 2 insertions, 10 deletions

diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl
index 5d619c1b82..ffc5d86d9d 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl
@@ -28,7 +28,6 @@ out vec4 frag_color;
 uniform float minimum_alpha;
 
 vec3 atmosLighting(vec3 light);
-//vec3 scaleSoftClip(vec3 light);
 
 in vec4 vertex_color;
 in vec2 vary_texcoord0;
@@ -45,7 +44,6 @@ void default_lighting()
     color *= vertex_color;
 
     color.rgb = atmosLighting(color.rgb);
-    //color.rgb = scaleSoftClip(color.rgb);
 
     frag_color = max(color, vec4(0));
 }
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
index 7f36e928f7..0519ae1090 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl
@@ -30,7 +30,6 @@ uniform float minimum_alpha;
 uniform sampler2D diffuseMap;
 
 vec3 atmosLighting(vec3 light);
-//vec3 scaleSoftClip(vec3 light);
 
 in vec4 vertex_color;
 in vec2 vary_texcoord0;
@@ -48,7 +47,6 @@ void default_lighting()
 
     color.rgb = atmosLighting(color.rgb);
 
-    //color.rgb = scaleSoftClip(color.rgb);
 
     frag_color = max(color, vec4(0));
 }
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
index 032743ef21..2d43ef60be 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
@@ -29,7 +29,6 @@ in vec4 vertex_color;
 in vec2 vary_texcoord0;
 
 vec3 atmosLighting(vec3 light);
-//vec3 scaleSoftClip(vec3 light);
 
 void default_lighting()
 {
@@ -37,7 +36,6 @@ void default_lighting()
 
     color.rgb = atmosLighting(color.rgb);
 
-    //color.rgb = scaleSoftClip(color.rgb);
 
     frag_color = max(color, vec4(0));
 }
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl
index 95200444b9..83c36dea6d 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl
@@ -31,7 +31,7 @@ in vec2 vary_texcoord0;
 uniform sampler2D diffuseMap;
 
 vec3 atmosLighting(vec3 light);
-vec3 scaleSoftClip(vec3 light);
+//vec3 scaleSoftClip(vec3 light);
 
 void default_lighting()
 {
@@ -39,7 +39,7 @@ void default_lighting()
 
     color.rgb = atmosLighting(color.rgb);
 
-    color.rgb = scaleSoftClip(color.rgb);
+    //color.rgb = scaleSoftClip(color.rgb);
 
     frag_color = max(color, vec4(0));
 }
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index a892ff9cdc..6fc1747089 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -25,7 +25,6 @@
 
 vec3 getAdditiveColor();
 vec3 getAtmosAttenuation();
-vec3 scaleSoftClipFrag(vec3 light);
 
 vec3 srgb_to_linear(vec3 col);
 vec3 linear_to_srgb(vec3 col);
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index 6cec65ad83..2b42d757cb 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -64,7 +64,6 @@ vec4 getPositionWithDepth(vec2 pos_screen, float depth);
 
 void calcAtmosphericVarsLinear(vec3 inPositionEye, vec3 norm, vec3 light_dir, out vec3 sunlit, out vec3 amblit, out vec3 atten, out vec3 additive);
 vec3  atmosFragLightingLinear(vec3 l, vec3 additive, vec3 atten);
-vec3  scaleSoftClipFragLinear(vec3 l);
 
 // reflection probe interface
 void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv,