diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-30 21:37:10 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-30 21:37:10 +0100 |
| commit | d452fd77eff53c031c74301dd44a35edce6da95b (patch) | |
| tree | 936fd9d063b898b4081f95a4db11be6c7df5cb0b /indra/newview/lldrawpoolwater.cpp | |
| parent | 6dd9dd3ab63cb0daa7682a400ff0408fd894ba77 (diff) | |
MAINT-9007
fix management of water plane and fog Ks shader uniforms
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 913a85affd..7f1601e604 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -619,17 +619,11 @@ void LLDrawPoolWater::shade() } } - S32 screentex = shader->enableTexture(LLShaderMgr::WATER_SCREENTEX); - - if (screentex > -1) - { - shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR, 1, pwater->getWaterFogColor().mV); - shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, pwater->getWaterFogDensity()); - gPipeline.mWaterDis.bindTexture(0, screentex); - } - - stop_glerror(); + shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR, 1, pwater->getWaterFogColor().mV); + shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, pwater->getWaterFogDensity()); + // bind reflection texture from RenderTarget + S32 screentex = shader->enableTexture(LLShaderMgr::WATER_SCREENTEX); gGL.getTexUnit(screentex)->bind(&gPipeline.mWaterDis); if (mVertexShaderLevel == 1) |