Backed out changeset: 5fe5ad059c05

4 files changed, 1 insertions, 46 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl
index 7e83389f6e..3c026796c8 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl
@@ -26,13 +26,6 @@
 uniform mat3 normal_matrix;
 uniform mat4 texture_matrix0;
 uniform mat4 modelview_projection_matrix;
-uniform bool invert_tex_y = false;
-const mat4 invTexM = mat4(
-  1, 0, 0, 0,
-  0,-1, 0, 0,
-  0, 0, 1, 0,
-  0, 0, 0, 1
-); 
 
 ATTRIBUTE vec3 position;
 ATTRIBUTE vec4 diffuse_color;
@@ -51,10 +44,6 @@ void main()
 	//transform vertex
 	gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); 
 	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
-  if(invert_tex_y) 
-	{
-		vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy;
-	}
 	
 	passTextureIndex();
 	vary_normal = normalize(normal_matrix * normal);
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
index 2595712882..8e899e3e0f 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl
@@ -26,13 +26,6 @@
 uniform mat4 texture_matrix0;
 uniform mat4 modelview_matrix;
 uniform mat4 modelview_projection_matrix;
-uniform bool invert_tex_y = false;
-const mat4 invTexM = mat4(
-  1, 0, 0, 0,
-  0,-1, 0, 0,
-  0, 0, 1, 0,
-  0, 0, 0, 1
-);
 
 
 ATTRIBUTE vec3 position;
@@ -69,10 +62,6 @@ void main()
 #endif
 
 	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
-  if(invert_tex_y) 
-	{
-		vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy;
-	}
 	
 	calcAtmospherics(pos.xyz);
 
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
index a8efcd9857..fc20d3270e 100644
--- a/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
@@ -26,14 +26,6 @@
 uniform mat4 texture_matrix0;
 uniform mat4 modelview_matrix;
 uniform mat4 modelview_projection_matrix;
-
-uniform bool invert_tex_y = false;
-const mat4 invTexM = mat4(
-  1, 0, 0, 0,
-  0,-1, 0, 0,
-  0, 0, 1, 0,
-  0, 0, 0, 1
-);
  
 ATTRIBUTE vec3 position;
 void passTextureIndex();
@@ -57,11 +49,6 @@ void main()
 	vec4 pos = (modelview_matrix * vert);
 	gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
 	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
-  
-  if(invert_tex_y) 
-	{
-		vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy;
-	}
 	
 	calcAtmospherics(pos.xyz);
 
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
index c744dc1397..37a20383e2 100644
--- a/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
@@ -27,13 +27,6 @@ uniform mat3 normal_matrix;
 uniform mat4 texture_matrix0;
 uniform mat4 modelview_matrix;
 uniform mat4 modelview_projection_matrix;
-uniform bool invert_tex_y = false;
-const mat4 invTexM = mat4(
-  1, 0, 0, 0,
-  0,-1, 0, 0,
-  0, 0, 1, 0,
-  0, 0, 0, 1
-); 
 
 ATTRIBUTE vec3 position;
 void passTextureIndex();
@@ -58,10 +51,7 @@ void main()
 	gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
 	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0, 0, 1)).xy;
 	
-	if(invert_tex_y) 
-	{
-		vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy;
-	}
+	
 	
 	vec3 norm = normalize(normal_matrix * normal);