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/interface/twotextureaddF.glsl | |
| parent | caa780e49740e8e9d707ad8ba6a302be8d4d20d9 (diff) | |
| parent | 224217dae82ad5f5127c511de6c7237fa81f36bb (diff) | |
merge changes for drtvwr-132
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/twotextureaddF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/twotextureaddF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/twotextureaddF.glsl b/indra/newview/app_settings/shaders/class1/interface/twotextureaddF.glsl index cdb48163dd..95679e93e7 100644 --- a/indra/newview/app_settings/shaders/class1/interface/twotextureaddF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/twotextureaddF.glsl @@ -24,7 +24,9 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif uniform sampler2D tex0; @@ -35,5 +37,5 @@ VARYING vec2 vary_texcoord1; void main() { - gl_FragColor = texture2D(tex0, vary_texcoord0.xy)+texture2D(tex1, vary_texcoord1.xy); + frag_color = texture2D(tex0, vary_texcoord0.xy)+texture2D(tex1, vary_texcoord1.xy); } |