summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl12
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
index df6eb04a62..3a31908a3e 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
@@ -39,7 +39,6 @@ uniform sampler2DShadow shadowMap0;
uniform sampler2DShadow shadowMap1;
uniform sampler2DShadow shadowMap2;
uniform sampler2DShadow shadowMap3;
-uniform sampler2DRect depthMap;
#if INDEX_MODE != INDEXED
uniform sampler2D diffuseMap;
@@ -77,10 +76,6 @@ uniform vec3 light_direction[8];
uniform vec3 light_attenuation[8];
uniform vec3 light_diffuse[8];
-uniform sampler2D bumpMap;
-uniform samplerCube environmentMap;
-uniform mat3 env_mat;
-
uniform vec4 specular_color;
vec3 calcDirectionalLight(vec3 n, vec3 l)
@@ -210,7 +205,6 @@ void main()
}
#if INDEX_MODE == INDEXED
-
vec4 diff = diffuseLookup(vary_texcoord0.xy);
#else
vec4 diff = texture2D(diffuseMap,vary_texcoord0.xy);
@@ -223,11 +217,7 @@ void main()
#endif
vec3 normal = vary_norm;
- normal = texture2D(bumpMap, vary_texcoord1.xy).xyz * 2 - 1;
- normal = vec3(dot(normal.xyz, vary_rotation[0]),
- dot(normal.xyz, vary_rotation[1]),
- dot(normal.xyz, vary_rotation[2]));
-
+
vec3 l = light_position[0].xyz;
vec3 dlight = calcDirectionalLight(normal, l);
dlight = dlight * vary_directional.rgb * vary_pointlight_col;