Lazy shader update. attribute -> ATTRIBUTE, varying -> VARYING. Moved some shader preprocessor stuff from llviewershadermgr.cpp to llshadermgr.cpp to match LL (although it looks more messy)

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

@@ -7,7 +7,7 @@
  
 
 
-attribute vec4 weight;  //1
+ATTRIBUTE vec4 weight;  //1
 
 uniform vec4 matrixPalette[45];
 

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

@@ -7,7 +7,7 @@
 
 
 
-attribute vec4 object_weight;  
+ATTRIBUTE vec4 object_weight;  
 
 uniform mat4 matrixPalette[32];
 

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

@@ -20,11 +20,11 @@ uniform vec2 screen_res;
 vec3 atmosLighting(vec3 light);
 vec3 scaleSoftClip(vec3 light);
 
-varying vec3 vary_ambient;
-varying vec3 vary_directional;
-varying vec3 vary_fragcoord;
-varying vec3 vary_position;
-varying vec3 vary_pointlight_col;
+VARYING vec3 vary_ambient;
+VARYING vec3 vary_directional;
+VARYING vec3 vary_fragcoord;
+VARYING vec3 vary_position;
+VARYING vec3 vary_pointlight_col;
 
 uniform mat4 inv_proj;
 

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

@@ -20,11 +20,11 @@ uniform vec2 screen_res;
 vec3 atmosLighting(vec3 light);
 vec3 scaleSoftClip(vec3 light);
 
-varying vec3 vary_ambient;
-varying vec3 vary_directional;
-varying vec3 vary_fragcoord;
-varying vec3 vary_position;
-varying vec3 vary_pointlight_col;
+VARYING vec3 vary_ambient;
+VARYING vec3 vary_directional;
+VARYING vec3 vary_fragcoord;
+VARYING vec3 vary_position;
+VARYING vec3 vary_pointlight_col;
 
 uniform mat4 inv_proj;
 

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

@@ -18,12 +18,12 @@ vec3 atmosAffectDirectionalLight(float lightIntensity);
 vec3 scaleDownLight(vec3 light);
 vec3 scaleUpLight(vec3 light);
 
-varying vec3 vary_position;
-varying vec3 vary_ambient;
-varying vec3 vary_directional;
-varying vec3 vary_normal;
-varying vec3 vary_fragcoord;
-varying vec3 vary_pointlight_col;
+VARYING vec3 vary_position;
+VARYING vec3 vary_ambient;
+VARYING vec3 vary_directional;
+VARYING vec3 vary_normal;
+VARYING vec3 vary_fragcoord;
+VARYING vec3 vary_pointlight_col;
 
 uniform float near_clip;
 

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

@@ -17,13 +17,13 @@ vec3 atmosAffectDirectionalLight(float lightIntensity);
 vec3 scaleDownLight(vec3 light);
 vec3 scaleUpLight(vec3 light);
 
-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;
-varying float vary_texture_index;
+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;
+VARYING float vary_texture_index;
 
 uniform float near_clip;
 uniform float shadow_offset;

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

@@ -19,11 +19,11 @@ vec3 atmosAffectDirectionalLight(float lightIntensity);
 vec3 scaleDownLight(vec3 light);
 vec3 scaleUpLight(vec3 light);
 
-varying vec3 vary_position;
-varying vec3 vary_ambient;
-varying vec3 vary_directional;
-varying vec3 vary_fragcoord;
-varying vec3 vary_pointlight_col;
+VARYING vec3 vary_position;
+VARYING vec3 vary_ambient;
+VARYING vec3 vary_directional;
+VARYING vec3 vary_fragcoord;
+VARYING vec3 vary_pointlight_col;
 
 uniform float near_clip;
 

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

@@ -9,7 +9,7 @@
 
 uniform sampler2D diffuseMap;
 
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 void main() 
 {

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

@@ -9,7 +9,7 @@
 
 uniform sampler2D diffuseMap;
 
-varying vec4 post_pos;
+VARYING vec4 post_pos;
 
 void main() 
 {

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

@@ -9,9 +9,9 @@
 
 mat4 getSkinnedTransform();
 
-attribute vec4 weight;
+ATTRIBUTE vec4 weight;
 
-varying vec4 post_pos;
+VARYING vec4 post_pos;
 
 void main()
 {

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

@@ -9,9 +9,9 @@
 
 mat4 getSkinnedTransform();
 
-attribute vec4 weight;
+ATTRIBUTE vec4 weight;
 
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 void main()
 {

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

@@ -19,7 +19,7 @@ uniform vec2 delta;
 uniform vec3 kern[4];
 uniform float kern_scale;
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 
 uniform mat4 inv_proj;
 uniform vec2 screen_res;

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 uniform vec2 screen_res;
 
 void main()

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

@@ -10,9 +10,9 @@
 uniform sampler2D diffuseMap;
 uniform sampler2D bumpMap;
 
-varying vec3 vary_mat0;
-varying vec3 vary_mat1;
-varying vec3 vary_mat2;
+VARYING vec3 vary_mat0;
+VARYING vec3 vary_mat1;
+VARYING vec3 vary_mat2;
 
 void main() 
 {

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

@@ -7,9 +7,9 @@
 
 
 
-varying vec3 vary_mat0;
-varying vec3 vary_mat1;
-varying vec3 vary_mat2;
+VARYING vec3 vary_mat0;
+VARYING vec3 vary_mat1;
+VARYING vec3 vary_mat2;
 
 mat4 getObjectSkinnedTransform();
 

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

@@ -7,9 +7,9 @@
  
 
 
-varying vec3 vary_mat0;
-varying vec3 vary_mat1;
-varying vec3 vary_mat2;
+VARYING vec3 vary_mat0;
+VARYING vec3 vary_mat1;
+VARYING vec3 vary_mat2;
 
 void main()
 {

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

@@ -11,9 +11,9 @@
 // The fragment shader for the sky
 /////////////////////////////////////////////////////////////////////////
 
-varying vec4 vary_CloudColorSun;
-varying vec4 vary_CloudColorAmbient;
-varying float vary_CloudDensity;
+VARYING vec4 vary_CloudColorSun;
+VARYING vec4 vary_CloudColorAmbient;
+VARYING float vary_CloudDensity;
 
 uniform sampler2D cloud_noise_texture;
 uniform vec4 cloud_pos_density1;

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

@@ -12,9 +12,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // Output parameters
-varying vec4 vary_CloudColorSun;
-varying vec4 vary_CloudColorAmbient;
-varying float vary_CloudDensity;
+VARYING vec4 vary_CloudColorSun;
+VARYING vec4 vary_CloudColorAmbient;
+VARYING float vary_CloudDensity;
 
 // Inputs
 uniform vec3 camPosLocal;

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

@@ -10,7 +10,7 @@ uniform float minimum_alpha;
 
 uniform sampler2D diffuseMap;
 
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 void main() 
 {

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

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 uniform float minimum_alpha;
 

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

@@ -9,7 +9,7 @@
 
 uniform sampler2D diffuseMap;
 
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 void main() 
 {

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

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 void main() 
 {

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

@@ -7,7 +7,7 @@
 
 
 
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 mat4 getObjectSkinnedTransform();
 

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

@@ -7,8 +7,8 @@
  
 
 
-varying vec3 vary_normal;
-varying float vary_texture_index;
+VARYING vec3 vary_normal;
+VARYING float vary_texture_index;
 
 void main()
 {

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

@@ -14,7 +14,7 @@ vec3 atmosAffectDirectionalLight(float lightIntensity);
 vec3 scaleDownLight(vec3 light);
 vec3 scaleUpLight(vec3 light);
 
-varying float vary_texture_index;
+VARYING float vary_texture_index;
 
 void main()
 {

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

@@ -20,7 +20,7 @@ uniform sampler2D		depthGIMap;
 uniform sampler2D		lightFunc;
 
 // Inputs
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 
 uniform vec2 screen_res;
 

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 
 uniform vec2 screen_res;
 

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

@@ -9,7 +9,7 @@
 
 uniform sampler2DRect diffuseMap;
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 
 void main() 
 {

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

@@ -8,7 +8,7 @@
 
 
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 
 uniform vec2 screen_res;
 

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

@@ -27,7 +27,7 @@ uniform int light_count;
 uniform vec4 light[MAX_LIGHT_COUNT];
 uniform vec4 light_col[MAX_LIGHT_COUNT];
 
-varying vec4 vary_fragcoord;
+VARYING vec4 vary_fragcoord;
 uniform vec2 screen_res;
 
 uniform float far_z;

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

@@ -7,7 +7,7 @@
 
 
 
-varying vec4 vary_fragcoord;
+VARYING vec4 vary_fragcoord;
 
 void main()
 {

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

@@ -37,9 +37,9 @@ uniform float sun_wash;
 uniform int proj_shadow_idx;
 uniform float shadow_fade;
 
-varying vec4 vary_light;
+VARYING vec4 vary_light;
 
-varying vec4 vary_fragcoord;
+VARYING vec4 vary_fragcoord;
 uniform vec2 screen_res;
 
 uniform mat4 inv_proj;

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

@@ -20,9 +20,9 @@ uniform sampler2DRect depthMap;
 uniform vec3 env_mat[3];
 uniform float sun_wash;
 
-varying vec4 vary_light;
+VARYING vec4 vary_light;
 
-varying vec4 vary_fragcoord;
+VARYING vec4 vary_fragcoord;
 uniform vec2 screen_res;
 
 uniform mat4 inv_proj;

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

@@ -7,8 +7,8 @@
 
 
 
-varying vec4 vary_light;
-varying vec4 vary_fragcoord;
+VARYING vec4 vary_light;
+VARYING vec4 vary_fragcoord;
 
 void main()
 {

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

@@ -25,7 +25,7 @@ uniform float magnification;
 uniform mat4 inv_proj;
 uniform vec2 screen_res;
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 
 float getDepth(vec2 pos_screen)
 {

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

@@ -13,7 +13,7 @@ uniform sampler2DRect diffuseRect;
 uniform sampler2D bloomMap;
 
 uniform vec2 screen_res;
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 
 void main() 
 {

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 uniform vec2 screen_res;
 
 void main()

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

@@ -20,7 +20,7 @@ uniform int kern_length;
 uniform float kern_scale;
 uniform vec3 blur_quad;
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 
 uniform mat4 inv_proj;
 uniform vec2 screen_res;

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
 uniform vec2 screen_res;
 
 void main()

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

@@ -9,7 +9,7 @@ uniform float minimum_alpha;
 
 uniform sampler2D diffuseMap;
 
-varying vec4 post_pos;
+VARYING vec4 post_pos;
 
 void main() 
 {

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec4 post_pos;
+VARYING vec4 post_pos;
 
 void main()
 {

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec4 post_pos;
+VARYING vec4 post_pos;
 
 void main() 
 {

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec4 post_pos;
+VARYING vec4 post_pos;
 
 void main()
 {

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

@@ -11,7 +11,7 @@
 // The fragment shader for the sky
 /////////////////////////////////////////////////////////////////////////
 
-varying vec4 vary_HazeColor;
+VARYING vec4 vary_HazeColor;
 
 uniform sampler2D cloud_noise_texture;
 uniform vec4 gamma;

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

@@ -12,7 +12,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // Output parameters
-varying vec4 vary_HazeColor;
+VARYING vec4 vary_HazeColor;
 
 // Inputs
 uniform vec3 camPosLocal;

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

@@ -45,8 +45,8 @@ uniform vec3 env_mat[3];
 //uniform vec4 shadow_clip;
 uniform mat3 ssao_effect_mat;
 
-varying vec4 vary_light;
-varying vec2 vary_fragcoord;
+VARYING vec4 vary_light;
+VARYING vec2 vary_fragcoord;
 
 vec3 vary_PositionEye;
 

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

@@ -40,8 +40,8 @@ uniform vec3 env_mat[3];
 //uniform vec4 shadow_clip;
 uniform mat3 ssao_effect_mat;
 
-varying vec4 vary_light;
-varying vec2 vary_fragcoord;
+VARYING vec4 vary_light;
+VARYING vec2 vary_fragcoord;
 
 vec3 vary_PositionEye;
 

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

@@ -9,8 +9,8 @@
 
 uniform vec2 screen_res;
 
-varying vec4 vary_light;
-varying vec2 vary_fragcoord;
+VARYING vec4 vary_light;
+VARYING vec2 vary_fragcoord;
 void main()
 {
 	//transform vertex

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

@@ -32,9 +32,9 @@ uniform float far_clip;
 uniform vec3 proj_origin; //origin of projection to be used for angular attenuation
 uniform float sun_wash;
 
-varying vec4 vary_light;
+VARYING vec4 vary_light;
 
-varying vec4 vary_fragcoord;
+VARYING vec4 vary_fragcoord;
 uniform vec2 screen_res;
 
 uniform mat4 inv_proj;

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

@@ -24,8 +24,8 @@ uniform float ssao_max_radius;
 uniform float ssao_factor;
 uniform float ssao_factor_inv;
 
-varying vec2 vary_fragcoord;
-varying vec4 vary_light;
+VARYING vec2 vary_fragcoord;
+VARYING vec4 vary_light;
 
 uniform mat4 inv_proj;
 uniform vec2 screen_res;

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

@@ -7,8 +7,8 @@
  
 
 
-varying vec4 vary_light;
-varying vec2 vary_fragcoord;
+VARYING vec4 vary_light;
+VARYING vec2 vary_fragcoord;
 
 uniform vec2 screen_res;
 

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

@@ -13,7 +13,7 @@ uniform sampler2D detail_2;
 uniform sampler2D detail_3;
 uniform sampler2D alpha_ramp;
 
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 void main()
 {

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec3 vary_normal;
+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

@@ -9,7 +9,7 @@
 
 uniform sampler2D diffuseMap;
 
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 void main() 
 {

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec3 vary_normal;
+VARYING vec3 vary_normal;
 
 void main()
 {

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

@@ -40,10 +40,10 @@ uniform vec2 screen_res;
 uniform mat4 norm_mat; //region space to screen space
 
 //bigWave is (refCoord.w, view.w);
-varying vec4 refCoord;
-varying vec4 littleWave;
-varying vec4 view;
-varying vec4 vary_position;
+VARYING vec4 refCoord;
+VARYING vec4 littleWave;
+VARYING vec4 view;
+VARYING vec4 vary_position;
 
 void main() 
 {

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

@@ -15,11 +15,11 @@ uniform float time;
 uniform vec3 eyeVec;
 uniform float waterHeight;
 
-varying vec4 refCoord;
-varying vec4 littleWave;
-varying vec4 view;
+VARYING vec4 refCoord;
+VARYING vec4 littleWave;
+VARYING vec4 view;
 
-varying vec4 vary_position;
+VARYING vec4 vary_position;
 
 float wave(vec2 v, float t, float f, vec2 d, float s) 
 {

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

@@ -15,9 +15,9 @@ uniform float refScale;
 uniform vec4 waterFogColor;
 
 //bigWave is (refCoord.w, view.w);
-varying vec4 refCoord;
-varying vec4 littleWave;
-varying vec4 view;
+VARYING vec4 refCoord;
+VARYING vec4 littleWave;
+VARYING vec4 view;
 
 void main() 
 {

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

@@ -32,9 +32,9 @@ uniform float blurMultiplier;
 uniform vec4 fogCol;
 
 //bigWave is (refCoord.w, view.w);
-varying vec4 refCoord;
-varying vec4 littleWave;
-varying vec4 view;
+VARYING vec4 refCoord;
+VARYING vec4 littleWave;
+VARYING vec4 view;
 
 void main() 
 {

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

@@ -15,9 +15,9 @@ uniform float time;
 uniform vec3 eyeVec;
 uniform float waterHeight;
 
-varying vec4 refCoord;
-varying vec4 littleWave;
-varying vec4 view;
+VARYING vec4 refCoord;
+VARYING vec4 littleWave;
+VARYING vec4 view;
 
 float wave(vec2 v, float t, float f, vec2 d, float s) 
 {

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec3 vary_PositionEye;
+VARYING vec3 vary_PositionEye;
 
 vec3 getPositionEye()
 {

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

@@ -7,7 +7,7 @@
  
 
 
-varying vec3 vary_PositionEye;
+VARYING vec3 vary_PositionEye;
 
 
 vec3 getPositionEye()