diff options
author | Graham Linden <graham@lindenlab.com> | 2013-07-21 14:28:54 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-07-21 14:28:54 -0700 |
commit | caefe0e74cf553de41c6c8748dd2ea5ef4d82c06 (patch) | |
tree | 55cdae8ef9376823851babf5a654361cd6e4ff33 /indra/newview/lldrawpoolalpha.cpp | |
parent | 94abe75dea90ee91dd044161d8587279b0bfae13 (diff) |
NORSPEC-311 fix alpha / opaque lighting diffs
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
-rwxr-xr-x | indra/newview/lldrawpoolalpha.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index e53c783161..973e263572 100755 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -93,11 +93,21 @@ void LLDrawPoolAlpha::beginPostDeferredPass(S32 pass) if (pass == 0) { - simple_shader = &gDeferredAlphaProgram; - fullbright_shader = &gObjectFullbrightProgram; + if (LLPipeline::sUnderWaterRender) + { + simple_shader = &gDeferredAlphaWaterProgram; + fullbright_shader = &gDeferredFullbrightWaterProgram; + } + else + { + simple_shader = &gDeferredAlphaProgram; + fullbright_shader = &gDeferredFullbrightProgram; + } + fullbright_shader->bind(); fullbright_shader->uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f); fullbright_shader->unbind(); + //prime simple shader (loads shadow relevant uniforms) gPipeline.bindDeferredShader(*simple_shader); } |