diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-26 16:12:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 16:12:33 -0400 |
commit | dbac37dcb50bf44255c2b622d418bb4339f1afca (patch) | |
tree | acffbcb5984696e507243f939f6b9c5a951b755b /indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl | |
parent | 790dfda43472da75d17a848eb91e2dcecb2b96e7 (diff) | |
parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) |
merge latest viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl b/indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl index 85f819f4c2..db130e456c 100644 --- a/indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/occlusionF.glsl @@ -24,10 +24,12 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif void main() { - gl_FragColor = vec4(1,1,1,1); + frag_color = vec4(1,1,1,1); } |