diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
| commit | bc54f1bb89452467ca8b652e4b961444d9c4be8d (patch) | |
| tree | b5aac588bc7ec1506456eaf5967e9a7930b42fc0 /indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl | |
| parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Merge : pull from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl index bef72752da..da3b20012d 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskNonIndexedF.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 float minimum_alpha; @@ -50,6 +52,6 @@ void default_lighting_water() color = applyWaterFog(color); - gl_FragColor = color; + frag_color = color; } |