diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-04-26 14:07:09 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-04-26 14:07:09 -0400 |
| commit | 0249a0d1e7564d06eadb8a23b0f058008dfd6068 (patch) | |
| tree | 3553c0ca29f860279fb363e1a62c00158a35dca3 /indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl | |
| parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
| parent | 6d3be57d334f02f4781dcaede9746976bd3643a4 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl index 1fdb90f792..0d8dab0a41 100644 --- a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl @@ -24,7 +24,9 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif uniform sampler2D diffuseMap; @@ -106,5 +108,5 @@ void main() vec4 fb = texture2D(screenTex, distort); - gl_FragColor = applyWaterFog(fb,view.xyz); + frag_color = applyWaterFog(fb,view.xyz); } |