diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 17:29:56 -0700 |
| commit | ac6f0304c51b6b8c8e4414ff1bc254be78f0845d (patch) | |
| tree | 0b211c8c84ff92e6cdbeeb8d0197314e4821a60c /indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl | |
| parent | 1aba6c119ef05a4cfd91325c8455dc8c60098746 (diff) | |
| parent | cdb57cb299097b203581a6ef99840350831c321c (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl index 9f1a358b53..0aca768021 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.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; @@ -43,6 +45,6 @@ void default_lighting() color.rgb = scaleSoftClip(color.rgb); - gl_FragColor = color; + frag_color = color; } |