1 files changed, 3 insertions, 30 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/srgb.glsl b/indra/newview/app_settings/shaders/class1/deferred/srgb.glsl
index d532835bf1..587f3d5a94 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/srgb.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/srgb.glsl
@@ -23,51 +23,24 @@
  * $/LicenseInfo$
  */
 
-// OLD_SELECT work-around missing mix(vec3,vec,bvec3) in older GLSL versions (*cough* MAC *cough*)
-
 vec3 srgb_to_linear(vec3 cs)
 {
-	
-/*       {  cs / 12.92,                 cs <= 0.04045
-    cl = {
-         {  ((cs + 0.055)/1.055)^2.4,   cs >  0.04045*/
-
 	vec3 low_range = cs / vec3(12.92);
 	vec3 high_range = pow((cs+vec3(0.055))/vec3(1.055), vec3(2.4));
 
 	bvec3 lte = lessThanEqual(cs,vec3(0.04045));
-#ifdef OLD_SELECT
-	vec3 result;
-	result.r = lte.r ? low_range.r : high_range.r;
-	result.g = lte.g ? low_range.g : high_range.g;
-	result.b = lte.b ? low_range.b : high_range.b;
-    return result;
-#else
-	return mix(high_range, low_range, lessThanEqual(cs,vec3(0.04045)));
-#endif
+	return mix(high_range, low_range, lte);
+
 }
 
 vec3 linear_to_srgb(vec3 cl)
 {
-	    /*  {  0.0,                          0         <= cl
-            {  12.92 * c,                    0         <  cl < 0.0031308
-    cs =    {  1.055 * cl^0.41666 - 0.055,   0.0031308 <= cl < 1
-            {  1.0,                                       cl >= 1*/
-
 	cl = clamp(cl, vec3(0), vec3(1));
 	vec3 low_range  = cl * 12.92;
 	vec3 high_range = 1.055 * pow(cl, vec3(0.41666)) - 0.055;
 
 	bvec3 lt = lessThan(cl,vec3(0.0031308));
+	return mix(high_range, low_range, lt);
 
-#ifdef OLD_SELECT
-	vec3 result;
-	result.r = lt.r ? low_range.r : high_range.r;
-	result.g = lt.g ? low_range.g : high_range.g;
-	result.b = lt.b ? low_range.b : high_range.b;
-    return result;
-#else
-	return mix(high_range, low_range, lessThan(cl,vec3(0.0031308)));
-#endif
 }