diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-02-10 20:04:19 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-02-10 20:04:19 -0600 |
| commit | 3710c6110d65d3a604f7b419cd764cf5b9b98600 (patch) | |
| tree | 544b689c3c084976b05a69a34726524e6e68f214 /indra/newview/app_settings/shaders/class1/avatar | |
| parent | e0582d4bc71e2f367b4cf4a6f0b808451620b52f (diff) | |
SH-2908 Rework indexed texture rendering to use a uvec4 instead of a float for texture indices in the data stream. Also rework gl_FragColor overrides to not collide with some odd driver implementations.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/avatar')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl index 3e4d438ed3..54e2f04459 100644 --- a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl @@ -24,7 +24,9 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor; #endif VARYING vec4 vertex_color; @@ -34,5 +36,5 @@ uniform sampler2D diffuseMap; void main() { - gl_FragColor = vec4(vertex_color.rgb, texture2D(diffuseMap, vary_texcoord0.xy).a); + frag_color = vec4(vertex_color.rgb, texture2D(diffuseMap, vary_texcoord0.xy).a); } |