diff options
| author | Rye Mutt <rye@alchemyviewer.org> | 2024-08-01 15:50:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-01 22:50:23 +0300 |
| commit | 212b1edd2d4d8ce570331ec6e8e4f87e4f162e34 (patch) | |
| tree | 26678e2c681d23e551919018deecb000479e384c /indra/newview | |
| parent | 86668633c30c711b44dd5a16f98b9ac056f706b5 (diff) | |
Fix trying to bind to non-existent texunit sampler during water draw (#2128)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 0d4eaab488..53d6e528b6 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -241,8 +241,6 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass) F32 screenRes[] = { 1.f / gGLViewport[2], 1.f / gGLViewport[3] }; - S32 diffTex = shader->enableTexture(LLShaderMgr::DIFFUSE_MAP); - shader->uniform2fv(LLShaderMgr::DEFERRED_SCREEN_RES, 1, screenRes); shader->uniform1f(LLShaderMgr::BLEND_FACTOR, blend_factor); @@ -316,8 +314,6 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass) water = static_cast<LLVOWater*>(face->getViewerObject()); if (!water) continue; - gGL.getTexUnit(diffTex)->bind(face->getTexture()); - if ((bool)edge == (bool)water->getIsEdgePatch()) { face->renderIndexed(); @@ -334,7 +330,6 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass) shader->disableTexture(LLShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP); shader->disableTexture(LLShaderMgr::WATER_SCREENTEX); shader->disableTexture(LLShaderMgr::BUMP_MAP); - shader->disableTexture(LLShaderMgr::DIFFUSE_MAP); shader->disableTexture(LLShaderMgr::WATER_REFTEX); // clean up |