diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-26 15:43:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-26 15:43:42 -0500 |
| commit | 224217dae82ad5f5127c511de6c7237fa81f36bb (patch) | |
| tree | dcac313b4655fceac4f710e764fa6cf437475040 /indra/newview/app_settings/shaders/class1/interface/splattexturerectF.glsl | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | 302f4085a5f9fd7b5267fd573a8e15f890cfe573 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/splattexturerectF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/splattexturerectF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/splattexturerectF.glsl b/indra/newview/app_settings/shaders/class1/interface/splattexturerectF.glsl index a0bb255cfa..772bb374e8 100644 --- a/indra/newview/app_settings/shaders/class1/interface/splattexturerectF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/splattexturerectF.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 screenMap; @@ -36,5 +38,5 @@ VARYING vec2 vary_texcoord0; void main() { - gl_FragColor = texture2DRect(screenMap, vary_texcoord0.xy) * vertex_color; + frag_color = texture2DRect(screenMap, vary_texcoord0.xy) * vertex_color; } |