diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-19 16:21:18 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-19 16:21:18 -0500 |
| commit | f19f43c74606e1f158cdabe9e783f9c82386b7b7 (patch) | |
| tree | 64c1a6d7d1d8a1ae0b30baf6bd519d8140136971 /indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl | |
| parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) | |
| parent | 4ec72ed0a61157dd5fcc1bc4cc91054664ee75b5 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl index b8963e1dec..f67703b839 100644 --- a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl @@ -22,14 +22,21 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ - + +#ifdef DEFINE_GL_FRAGCOLOR +out vec4 gl_FragColor; +#endif + #extension GL_ARB_texture_rectangle : enable uniform sampler2D glowMap; uniform sampler2DRect screenMap; +VARYING vec2 vary_texcoord0; +VARYING vec2 vary_texcoord1; + void main() { - gl_FragColor = texture2D(glowMap, gl_TexCoord[0].xy) + - texture2DRect(screenMap, gl_TexCoord[1].xy); + gl_FragColor = texture2D(glowMap, vary_texcoord0.xy) + + texture2DRect(screenMap, vary_texcoord1.xy); } |