diff options
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl index b5bbbb5c73..fa8aa5c7fe 100644 --- a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl @@ -23,24 +23,16 @@ * $/LicenseInfo$ */ -#extension GL_ARB_texture_rectangle : enable - /*[EXTRA_CODE_HERE]*/ -#ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_color; -#else -#define frag_color gl_FragColor -#endif -uniform sampler2D glowMap; -uniform sampler2DRect screenMap; +uniform sampler2D diffuseRect; +uniform sampler2D emissiveRect; -VARYING vec2 vary_texcoord0; -VARYING vec2 vary_texcoord1; +in vec2 tc; void main() { - frag_color = texture2D(glowMap, vary_texcoord0.xy) + - texture2DRect(screenMap, vary_texcoord1.xy); + frag_color = texture(diffuseRect, tc) + texture(emissiveRect, tc); } |