diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-03 11:06:33 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-03 11:06:33 -0700 |
| commit | 36a0a58487063152d8aacdeb22060025fe0021c7 (patch) | |
| tree | 58a59dee2b88e1e51391987b157a37b3c8cd710b /indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl | |
| parent | 8b5b0ace9bfb83540fbc73376b639180d6d63a3b (diff) | |
| parent | fa6add3fcd300b21142e3381f35851b3404ee02a (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl index c981e9eba2..777c8b45bb 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl @@ -24,7 +24,9 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif VARYING vec4 vertex_color; @@ -50,6 +52,6 @@ void fullbright_shiny_lighting() color.a = max(color.a, vertex_color.a); - gl_FragColor = color; + frag_color = color; } |