diff options
author | Oz Linden <oz@lindenlab.com> | 2012-04-03 11:28:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-04-03 11:28:56 -0400 |
commit | fa6add3fcd300b21142e3381f35851b3404ee02a (patch) | |
tree | b61b7264e152b2e356393ed9a7fcc7e73a1c6ba7 /indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl | |
parent | caa780e49740e8e9d707ad8ba6a302be8d4d20d9 (diff) | |
parent | 224217dae82ad5f5127c511de6c7237fa81f36bb (diff) |
merge changes for drtvwr-132
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl index 60d4dae99f..f400eb7a5b 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl @@ -26,7 +26,9 @@ #extension GL_ARB_texture_rectangle : enable #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif uniform sampler2DRect depthMap; @@ -111,6 +113,6 @@ void main() col /= defined_weight.xyxx; col.y *= col.y; - gl_FragColor = col; + frag_color = col; } |