Fix shader compilation errors. Pulling bits and pieces out of massive set of unstaged changes never ends well..

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

@@ -38,6 +38,8 @@ uniform sampler2D specularMap;
 
 VARYING vec2 vary_texcoord0;
 
+vec3 linear_to_srgb(vec3 cs);
+
 void main() 
 {
 	vec4 col = texture2D(diffuseMap, vary_texcoord0.xy);

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

@@ -32,8 +32,7 @@ uniform float emissive_brightness;
 
 vec2 encode_normal(vec3 n);
 vec3 decode_normal(vec2 enc);
-vec3 encode_diffuse(vec3 color);
-vec4 srgb_to_linear(vec4 cs);
+vec3 srgb_to_linear(vec3 cs);
 vec3 linear_to_srgb(vec3 cl);
 
 #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND)