diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-17 16:50:03 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-17 16:50:03 -0700 |
| commit | 8ed49bb828dc785684bd2c9764e34aa53d077c93 (patch) | |
| tree | 28228de78efc52e390500024049f83629a79ffa4 /indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl | |
| parent | 83f3fd0dd68092b2f8917342ac45f31d322674c5 (diff) | |
Simplify ifdefs in alpha shaders for Mac
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl index 5f2961c90e..7c71e605c7 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl @@ -34,7 +34,7 @@ uniform mat4 modelview_matrix; uniform mat4 modelview_projection_matrix; ATTRIBUTE vec3 position; -#if INDEX_MODE == INDEXED +#if INDEX_MODE void passTextureIndex(); #endif ATTRIBUTE vec3 normal; @@ -67,7 +67,7 @@ VARYING vec3 vary_fragcoord; VARYING vec3 vary_position; VARYING vec3 vary_pointlight_col; -#if INDEX_MODE != NON_INDEXED_NO_COLOR +#if !INDEX_MODE_NO_COLOR VARYING vec4 vertex_color; #endif @@ -162,7 +162,7 @@ void main() #endif vary_texcoord1 = (texture_matrix0 * vec4(texcoord1,0,1)).xy; vary_texcoord2 = (texture_matrix0 * vec4(texcoord2,0,1)).xy; -#if INDEX_MODE == INDEXED +#if INDEX_MODE passTextureIndex(); vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; #else @@ -198,7 +198,7 @@ void main() col.rgb = col.rgb*diffuse_color.rgb; -#if INDEX_MODE != NON_INDEXED_NO_COLOR +#if !INDEX_MODE_NO_COLOR vertex_color = col; #endif |