diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-09 20:59:18 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-09 20:59:18 +0000 |
| commit | b2d8d63890e3ba0a5fe303f8e2de7358e4f9fc23 (patch) | |
| tree | dcabab32289a313fa41cf0739ed86c266fc9be5f /indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl | |
| parent | e7203d9a783d8d0a5fad651237dcb968409cd574 (diff) | |
Fix warnings from shaders and include EXTRA_CODE_HERE sentinel in places using DEFINE_GL_FRAGCOLOR for consistency.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl index 5c088b3a3c..b5bbbb5c73 100644 --- a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl @@ -25,14 +25,14 @@ #extension GL_ARB_texture_rectangle : enable +/*[EXTRA_CODE_HERE]*/ + #ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_color; #else #define frag_color gl_FragColor #endif -/*[EXTRA_CODE_HERE]*/ - uniform sampler2D glowMap; uniform sampler2DRect screenMap; |