diff options
| author | Don Kjer <don@lindenlab.com> | 2012-05-29 20:41:10 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-05-29 20:41:10 +0000 |
| commit | 2d3790b2396534de096244bf7b7660ec5ec3a139 (patch) | |
| tree | 1cbe6616b0f1ef728370b73ad453857caf2eb53e /indra/newview/app_settings/shaders/class1/lighting/lightNonIndexedF.glsl | |
| parent | 2a62ca5b96d08ad2f24e8a60e161657a7222aba6 (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Merge ssh://hg@bitbucket.org/lindenlab/viewer-release -> viewer-eventapi-fixes
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; } |