Added #version string to many shaders. Added a few to-be-implemented shader files

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void default_lighting();
 
 void main() 

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 attribute vec4 weight;  //1
 
 uniform vec4 matrixPalette[45];

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

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

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void default_lighting();
 
 void main() 

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#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

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

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 mat4 getSkinnedTransform();
 
 void main()

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2D diffuseMap;
@@ -25,7 +27,6 @@ varying vec3 vary_pointlight_col;
 
 uniform mat4 inv_proj;
 
-
 vec4 getPosition(vec2 pos_screen)
 {
 	float depth = texture2DRect(depthMap, pos_screen.xy).a;

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

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

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

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

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

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

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

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

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 mat4 getSkinnedTransform();
 
 attribute vec4 weight;

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 mat4 getSkinnedTransform();
 
 attribute vec4 weight;

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect depthMap;

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 varying vec2 vary_fragcoord;
 uniform vec2 screen_res;
 

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

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

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 varying vec3 vary_mat0;
 varying vec3 vary_mat1;
 varying vec3 vary_mat2;

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

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

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 varying vec3 vary_normal;
 
 void main()

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2D diffuseMap;

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void calcAtmospherics(vec3 inPositionEye);
 
 vec3 atmosAmbient(vec3 light);

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect depthMap;

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 varying vec2 vary_fragcoord;
 
 uniform vec2 screen_res;

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 uniform sampler2D diffuseMap;
 uniform sampler2D normalMap;
 uniform sampler2D specularMap;
@@ -12,7 +14,7 @@ uniform sampler2D specularMap;
 void main() 
 {
 	vec4 col = texture2D(diffuseMap, gl_TexCoord[0].xy);
-	gl_FragData[0] = vec4(col.rgb, col.a <= 0.5 ? 0.0 : 0.005);
+	gl_FragData[0] = vec4(col.rgb, col.a * 0.005);
 	gl_FragData[1] = texture2D(specularMap, gl_TexCoord[0].xy);
 	gl_FragData[2] = vec4(texture2D(normalMap, gl_TexCoord[0].xy).xyz, 0.0);
 }

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void main()
 {
 	//transform vertex

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
 
+#version 120
+
 uniform sampler2DRect diffuseMap;
 
 varying vec2 vary_fragcoord;

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

@@ -5,6 +5,9 @@
  * $/LicenseInfo$
  */
 
+#version 120
+
+
 varying vec2 vary_fragcoord;
 
 uniform vec2 screen_res;

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

@@ -5,6 +5,8 @@
  * $License$
  */
 
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect depthMap;

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

@@ -0,0 +1,20 @@
+/** 
+ * @file multiPointLightV.glsl
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
+ */
+
+#version 120
+
+varying vec4 vary_fragcoord;
+
+void main()
+{
+	//transform vertex
+	vec4 pos = gl_ModelViewProjectionMatrix * gl_Vertex;
+	vary_fragcoord = pos;
+
+	gl_Position = pos;
+	gl_FrontColor = gl_Color;
+}

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+ #version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect diffuseRect;

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

@@ -5,6 +5,8 @@
  * $License$
  */
 
+#version 120
+
 varying vec4 vary_light;
 varying vec4 vary_fragcoord;
 

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect diffuseRect;

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

@@ -0,0 +1,24 @@
+/** 
+ * @file postDeferredF.glsl
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
+ */
+ 
+#version 120
+
+#extension GL_ARB_texture_rectangle : enable
+
+uniform sampler2DRect diffuseRect;
+uniform sampler2D bloomMap;
+
+uniform vec2 screen_res;
+varying vec2 vary_fragcoord;
+
+void main() 
+{
+	vec4 diff = texture2DRect(diffuseRect, vary_fragcoord.xy);
+	
+	vec4 bloom = texture2D(bloomMap, vary_fragcoord.xy/screen_res);
+	gl_FragColor = diff + bloom;
+}

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 varying vec2 vary_fragcoord;
 uniform vec2 screen_res;
 

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 uniform sampler2DRect depthMap;
 uniform sampler2DRect normalMap;
 uniform sampler2DRect giLightMap;

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 varying vec2 vary_fragcoord;
 uniform vec2 screen_res;
 

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

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

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 varying vec4 post_pos;
 
 void main()

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect diffuseRect;

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 uniform vec2 screen_res;
 
 varying vec4 vary_light;

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 //class 1, no shadow, no SSAO, should never be called
 
 #extension GL_ARB_texture_rectangle : enable

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 //class 1 -- no shadow, SSAO only
@@ -13,8 +15,6 @@ uniform sampler2DRect depthMap;
 uniform sampler2DRect normalMap;
 uniform sampler2D noiseMap;
 
-uniform sampler2D		lightFunc;
-
 
 // Inputs
 uniform mat4 shadow_matrix[6];

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 varying vec4 vary_light;
 varying vec2 vary_fragcoord;
 

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

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

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 varying vec3 vary_normal;
 
 vec4 texgen_object(vec4  vpos, vec4 tc, mat4 mat, vec4 tp0, vec4 tp1)

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

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

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 varying vec3 vary_normal;
 
 void main()

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

@@ -5,7 +5,10 @@
  * $License$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
+
 vec3 scaleSoftClip(vec3 inColor);
 vec3 atmosTransport(vec3 inColor);
 

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

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void calcAtmospherics(vec3 inPositionEye);
 
 uniform vec2 d1;

indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect diffuseMap;

indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl

@@ -5,6 +5,7 @@
  * $License$
  */
 
+#version 120
 
 void main() 
 {

indra/newview/app_settings/shaders/class1/effects/glowV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 uniform vec2 glowDelta;
 
 void main() 

indra/newview/app_settings/shaders/class1/environment/terrainF.glsl

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

indra/newview/app_settings/shaders/class1/environment/terrainV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 
 vec4 texgen_object(vec4  vpos, vec4 tc, mat4 mat, vec4 tp0, vec4 tp1)

indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 // this class1 shader is just a copy of terrainF
 
 uniform sampler2D detail0;

indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl

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

indra/newview/app_settings/shaders/class1/environment/waterF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 vec3 scaleSoftClip(vec3 inColor);
 vec3 atmosTransport(vec3 inColor);
 vec3 applyWaterFog(vec4 inColor);

indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 vec4 applyWaterFog(vec4 color)
 {
 	// GL_EXP2 Fog

indra/newview/app_settings/shaders/class1/environment/waterV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void calcAtmospherics(vec3 inPositionEye);
 
 uniform vec2 d1;

indra/newview/app_settings/shaders/class1/interface/highlightF.glsl

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

indra/newview/app_settings/shaders/class1/interface/highlightV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void main()
 {
 	//transform vertex

indra/newview/app_settings/shaders/class1/lighting/lightF.glsl

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

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightF.glsl

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

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl

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

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl

@@ -0,0 +1,17 @@
+/** 
+ * @file lightFullbrightShinyWaterF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+ 
+#version 120
+
+uniform sampler2D diffuseMap;
+uniform samplerCube environmentMap;
+
+void fullbright_shiny_lighting_water() 
+{
+	gl_FragColor = texture2D(diffuseMap, gl_TexCoord[0].xy);
+}

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl

@@ -6,6 +6,8 @@
  */
 
  
+#version 120
+
 uniform sampler2D diffuseMap;
 
 void fullbright_lighting_water()

indra/newview/app_settings/shaders/class1/lighting/lightFuncSpecularV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 float calcDirectionalLight(vec3 n, vec3 l)
 {
 	float a = max(dot(n,l),0.0);

indra/newview/app_settings/shaders/class1/lighting/lightFuncV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 
 float calcDirectionalLight(vec3 n, vec3 l)
 {

indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl

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

indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl

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

indra/newview/app_settings/shaders/class1/lighting/lightSpecularV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 float calcDirectionalLight(vec3 n, vec3 l);
 
 // Same as non-specular lighting in lightV.glsl

indra/newview/app_settings/shaders/class1/lighting/lightV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 float calcDirectionalLight(vec3 n, vec3 l);
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseLight)

indra/newview/app_settings/shaders/class1/lighting/lightWaterF.glsl

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

indra/newview/app_settings/shaders/class1/lighting/sumLightsSpecularV.glsl

@@ -4,6 +4,9 @@
  * Copyright (c) 2005-$CurrentYear$, Linden Research, Inc.
  * $License$
  */
+  
+#version 120
+
 float calcDirectionalLightSpecular(inout vec4 specular, vec3 view, vec3 n, vec3 l, vec3 lightCol, float da);
 vec3 atmosAmbient(vec3 light);
 vec3 atmosAffectDirectionalLight(float lightIntensity);

indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 float calcDirectionalLight(vec3 n, vec3 l);
 
 vec3 atmosAmbient(vec3 light);

indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void fullbright_lighting();
 
 void main() 

indra/newview/app_settings/shaders/class1/objects/fullbrightShinyF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void fullbright_shiny_lighting();
 
 void main() 

indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void calcAtmospherics(vec3 inPositionEye);
 
 uniform vec4 origin;

indra/newview/app_settings/shaders/class1/objects/fullbrightShinyWaterF.glsl

@@ -0,0 +1,15 @@
+/** 
+ * @file fullbrightShinyWaterF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+ 
+#version 120
+
+void fullbright_shiny_lighting_water();
+
+void main() 
+{
+	fullbright_shiny_lighting_water();
+}

indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void calcAtmospherics(vec3 inPositionEye);
 
 void main()

indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void fullbright_lighting_water();
 
 void main() 

indra/newview/app_settings/shaders/class1/objects/shinyF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void shiny_lighting();
 
 void main() 

indra/newview/app_settings/shaders/class1/objects/shinyV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void calcAtmospherics(vec3 inPositionEye);
 
 uniform vec4 origin;

indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void shiny_lighting_water();
 
 void main() 

indra/newview/app_settings/shaders/class1/objects/simpleF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void default_lighting();
 
 void main() 

indra/newview/app_settings/shaders/class1/objects/simpleV.glsl

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

indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void default_lighting_water();
 
 void main() 

indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 vec3 atmosLighting(vec3 light)
 {
 	/* stub function for fallback compatibility on class1 hardware */

indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 vec3 atmosAmbient(vec3 light)
 {
 	return gl_LightModel.ambient.rgb + light;

indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 void setPositionEye(vec3 v);
 
 void calcAtmospherics(vec3 inPositionEye)

indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 varying vec3 vary_PositionEye;
 
 vec3 getPositionEye()

indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 varying vec3 vary_PositionEye;
 
 

indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 uniform vec4 gamma;
 
 /// Soft clips the light with a gamma correction

indra/newview/app_settings/shaders/class1/windlight/transportF.glsl

@@ -5,6 +5,8 @@
  * $License$
  */
  
+#version 120
+
 vec3 atmosTransport(vec3 light)
 {
 	/* stub function for fallback compatibility on class1 hardware */

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

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

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2D diffuseMap;
@@ -26,7 +28,6 @@ varying vec3 vary_ambient;
 varying vec3 vary_directional;
 varying vec3 vary_fragcoord;
 varying vec3 vary_position;
-varying vec3 vary_light;
 varying vec3 vary_pointlight_col;
 
 uniform float shadow_bias;

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

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 void calcAtmospherics(vec3 inPositionEye);
 
@@ -19,7 +21,6 @@ varying vec3 vary_ambient;
 varying vec3 vary_directional;
 varying vec3 vary_fragcoord;
 varying vec3 vary_position;
-varying vec3 vary_light;
 varying vec3 vary_pointlight_col;
 
 uniform float near_clip;
@@ -67,12 +68,11 @@ void main()
 	calcAtmospherics(pos.xyz);
 
 	//vec4 color = calcLighting(pos.xyz, norm, gl_Color, vec4(0.));
-	
 	vec4 col = vec4(0.0, 0.0, 0.0, gl_Color.a);
 
 	// Collect normal lights
 	col.rgb += gl_LightSource[2].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[2].position, gl_LightSource[2].spotDirection.xyz, gl_LightSource[2].linearAttenuation, gl_LightSource[2].quadraticAttenuation, gl_LightSource[2].specular.a);
-	col.rgb += gl_LightSource[3].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[3].position, gl_LightSource[3].spotDirection.xyz, gl_LightSource[3].linearAttenuation, gl_LightSource[3].quadraticAttenuation, gl_LightSource[3].specular.a);
+	col.rgb += gl_LightSource[3].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[3].position, gl_LightSource[3].spotDirection.xyz, gl_LightSource[3].linearAttenuation, gl_LightSource[3].quadraticAttenuation ,gl_LightSource[3].specular.a);
 	col.rgb += gl_LightSource[4].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[4].position, gl_LightSource[4].spotDirection.xyz, gl_LightSource[4].linearAttenuation, gl_LightSource[4].quadraticAttenuation, gl_LightSource[4].specular.a);
 	col.rgb += gl_LightSource[5].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[5].position, gl_LightSource[5].spotDirection.xyz, gl_LightSource[5].linearAttenuation, gl_LightSource[5].quadraticAttenuation, gl_LightSource[5].specular.a);
 	col.rgb += gl_LightSource[6].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[6].position, gl_LightSource[6].spotDirection.xyz, gl_LightSource[6].linearAttenuation, gl_LightSource[6].quadraticAttenuation, gl_LightSource[6].specular.a);
@@ -85,8 +85,6 @@ void main()
 	// Add windlight lights
 	col.rgb = atmosAmbient(vec3(0.));
 	
-	vary_light = gl_LightSource[0].position.xyz;
-	
 	vary_ambient = col.rgb*gl_Color.rgb;
 	vary_directional.rgb = gl_Color.rgb*atmosAffectDirectionalLight(max(calcDirectionalLight(norm, gl_LightSource[0].position.xyz), (1.0-gl_Color.a)*(1.0-gl_Color.a)));
 	

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

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

indra/newview/app_settings/shaders/class2/deferred/edgeF.glsl

@@ -5,6 +5,8 @@
  * $/LicenseInfo$
  */
  
+#version 120
+
 #extension GL_ARB_texture_rectangle : enable
 
 uniform sampler2DRect depthMap;