diff options
author | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
commit | 19e0cc93a8af661dbac47552474a704ade600c74 (patch) | |
tree | 5d7e539a4c98607a189c6e472732b75608379abb /indra/newview/app_settings/shaders/class1/interface/debugF.glsl | |
parent | ee1124e1c02b1a8be0cc8d2cbce1083dca3b40a2 (diff) | |
parent | 3ccda1f2855ae9e5b3f519236e9b4f233d542d1a (diff) |
DRTVWR-139: merge back 3.3.1-beta2 fixes
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/debugF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/debugF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/debugF.glsl b/indra/newview/app_settings/shaders/class1/interface/debugF.glsl index 6bcc97ba18..67c6baddbb 100644 --- a/indra/newview/app_settings/shaders/class1/interface/debugF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/debugF.glsl @@ -24,12 +24,14 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif uniform vec4 color; void main() { - gl_FragColor = color; + frag_color = color; } |