diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-26 23:31:03 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-26 23:31:03 +0100 |
| commit | 71a0d3e9597415a86185d7683710252326da7b7a (patch) | |
| tree | aaabe2bdfac18159803f47acf6a8857bbb6f5c16 /indra/newview/lldrawpoolwater.cpp | |
| parent | 3cd2a35f9db411616ad15b89c8af366c0ccf00c9 (diff) | |
Fix OSX bug from OLD_SELECT GLSL work-around define not being used with automatically linked feature shaders.
Add LL_RELEASE_FOR_DOWNLOAD ifdef around launcher nag.
Fix OSX 10.14 SDK compile issue from unused var in scroll list.
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 6e3145ee06..088a6bb4e8 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -564,13 +564,15 @@ void LLDrawPoolWater::shade() shader = &gWaterProgram; } + shader->bind(); + if (deferred_render) { - gPipeline.bindDeferredShader(*shader); - } - else - { - shader->bind(); + if (shader->getUniformLocation(LLShaderMgr::DEFERRED_NORM_MATRIX) >= 0) + { + glh::matrix4f norm_mat = get_current_modelview().inverse().transpose(); + shader->uniformMatrix4fv(LLShaderMgr::DEFERRED_NORM_MATRIX, 1, FALSE, norm_mat.m); + } } sTime = (F32)LLFrameTimer::getElapsedSeconds() * 0.5f; @@ -718,14 +720,7 @@ void LLDrawPoolWater::shade() shader->disableTexture(LLShaderMgr::WATER_REFTEX); shader->disableTexture(LLShaderMgr::WATER_SCREENDEPTH); - if (deferred_render) - { - gPipeline.unbindDeferredShader(*shader); - } - else - { - shader->unbind(); - } + shader->unbind(); gGL.getTexUnit(0)->activate(); gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE); |