diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 19:40:09 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-26 19:40:09 +0300 |
| commit | 231dea378babc0ee9806f0fcd68283e79f81d2eb (patch) | |
| tree | d4e42cf3ea6c212ffb1e2958f6cb6568ac5bdd0a /indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl | |
| parent | e77134ea898cd19fdba716e46324b2945ef6826f (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge branch 'master' into DRTVWR-486
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; |