diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
| commit | 1300f77fdd48d90d09a05058ffdf10df93092391 (patch) | |
| tree | 1cefd5cb64be5ae614b4930dcd0a55cf4fc06109 /indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl | |
| parent | 8199cc997aeaccc72b5bd5389ded8afc7b9c379c (diff) | |
| parent | aa0a0542a10ba6faeca34afd6e323b505493d8dc (diff) | |
Merged with viewer-beta
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl index c66a6e5b48..59520bb99f 100644 --- a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.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 diffuseRect; @@ -38,5 +40,5 @@ void main() { vec3 col = texture2DRect(diffuseRect, vary_tc*screen_res).rgb; - gl_FragColor = vec4(col.rgb, dot(col.rgb, vec3(0.299, 0.587, 0.144))); + frag_color = vec4(col.rgb, dot(col.rgb, vec3(0.299, 0.587, 0.144))); } |