ATI compatibility pass

indra/llrender/llglslshader.cpp

@@ -704,6 +704,7 @@ void LLGLSLShader::uniformMatrix4fv(U32 index, U32 count, GLboolean transpose, c
 
 GLint LLGLSLShader::getUniformLocation(const string& uniform)
 {
+	GLint ret = -1;
 	if (mProgramObject > 0)
 	{
 		std::map<string, GLint>::iterator iter = mUniformMap.find(uniform);
@@ -718,11 +719,19 @@ GLint LLGLSLShader::getUniformLocation(const string& uniform)
 				}
 				stop_glerror();
 			}
-			return iter->second;
+			ret = iter->second;
 		}
 	}
 
-	return -1;
+	if (gDebugGL)
+	{
+		if (ret == -1 && ret != glGetUniformLocationARB(mProgramObject, uniform.c_str()))
+		{
+			llerrs << "Uniform map invalid." << llendl;
+		}
+	}
+
+	return ret;
 }
 
 GLint LLGLSLShader::getAttribLocation(U32 attrib)

indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 void default_lighting();
 

indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 attribute vec4 weight;  //1
 

indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 mat4 getSkinnedTransform();

indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 void default_lighting();
 

indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 vec4 calcLightingSpecular(vec3 pos, vec3 norm, vec4 color, inout vec4 specularColor, vec4 baseCol);
 void calcAtmospherics(vec3 inPositionEye);

indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 mat4 getSkinnedTransform();
 

indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/alphaSkinnedV.glsl

@@ -4,6 +4,8 @@
  * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
  * $License$
  */
+ 
+#version 120
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 mat4 getObjectSkinnedTransform();
@@ -22,6 +24,9 @@ varying vec3 vary_ambient;
 varying vec3 vary_directional;
 varying vec3 vary_normal;
 varying vec3 vary_light;
+varying vec3 vary_fragcoord;
+
+uniform float near_clip;
 
 void main()
 {
@@ -38,7 +43,8 @@ void main()
 	norm = gl_Vertex.xyz + gl_Normal.xyz;
 	norm = normalize(( trans*vec4(norm, 1.0) ).xyz-pos.xyz);
 	
-	gl_Position = gl_ProjectionMatrix * pos;
+	vec4 frag_pos = gl_ProjectionMatrix * pos;
+	gl_Position = frag_pos;
 	
 	vary_position = pos.xyz;
 	vary_normal = norm;	
@@ -70,6 +76,8 @@ void main()
 	gl_FrontColor = col;
 
 	gl_FogFragCoord = pos.z;
+	
+	vary_fragcoord.xyz = frag_pos.xyz + vec3(0,0,near_clip);
 }
 
 

indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
 
+#version 120
+
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 void calcAtmospherics(vec3 inPositionEye);
 

indra/newview/app_settings/shaders/class1/deferred/attachmentShadowF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
 
+#version 120
+
 uniform sampler2D diffuseMap;
 
 

indra/newview/app_settings/shaders/class1/deferred/avatarAlphaF.glsl

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
 
+#version 120
+
 uniform sampler2D diffuseMap;
 uniform sampler2DShadow shadowMap0;
 uniform sampler2DShadow shadowMap1;

indra/newview/app_settings/shaders/class1/deferred/avatarAlphaV.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 mat4 getSkinnedTransform();
@@ -21,6 +23,9 @@ varying vec3 vary_position;
 varying vec3 vary_ambient;
 varying vec3 vary_directional;
 varying vec3 vary_normal;
+varying vec3 vary_fragcoord;
+
+uniform float near_clip;
 
 void main()
 {
@@ -40,7 +45,9 @@ void main()
 	norm.z = dot(trans[2].xyz, gl_Normal);
 	norm = normalize(norm);
 		
-	gl_Position = gl_ProjectionMatrix * pos;
+	vec4 frag_pos = gl_ProjectionMatrix * pos;
+	gl_Position = frag_pos;
+	
 	vary_position = pos.xyz;
 	vary_normal = norm;	
 	
@@ -71,7 +78,8 @@ void main()
 	gl_FrontColor = col;
 
 	gl_FogFragCoord = pos.z;
-
+	
+	vary_fragcoord.xyz = frag_pos.xyz + vec3(0,0,near_clip);
 }
 
 

indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/avatarShadowF.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/avatarShadowV.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 mat4 getSkinnedTransform();
 

indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 mat4 getSkinnedTransform();
 

indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/blurLightV.glsl

@@ -4,6 +4,8 @@
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * $/LicenseInfo$
  */
+ 
+#version 120
 
 varying vec2 vary_fragcoord;
 uniform vec2 screen_res;