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.glsl8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
index 69bcca88b5..e2fd52b8ad 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
@@ -41,7 +41,7 @@ uniform sampler2DShadow shadowMap2;
uniform sampler2DShadow shadowMap3;
uniform sampler2DRect depthMap;
-#if INDEX_MODE != INDEXED
+#if !INDEX_MODE || INDEX_MODE_NO_COLOR
uniform sampler2D diffuseMap;
#endif
@@ -62,7 +62,7 @@ VARYING vec2 vary_texcoord2;
VARYING vec3 vary_norm;
VARYING mat3 vary_rotation;
-#if INDEX_MODE != NON_INDEXED_NO_COLOR
+#if !INDEX_MODE_NO_COLOR
VARYING vec4 vertex_color;
#endif
@@ -210,13 +210,13 @@ void main()
}
vec4 diff;
-#if INDEX_MODE == INDEXED
+#if INDEX_MODE
diff = diffuseLookup(vary_texcoord0.xy);
#else
diff = texture2D(diffuseMap,vary_texcoord0.xy);
#endif
-#if INDEX_MODE == NON_INDEXED_NO_COLOR
+#if INDEX_MODE_NO_COLOR
float vertex_color_alpha = 1.0;
#else
float vertex_color_alpha = vertex_color.a;