Water Exclusion Surfaces (#3517)

* #3455 Add support for water exclusion surfaces

1 files changed, 28 insertions, 20 deletions

diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 53d6e528b6..c27f5ef486 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -236,6 +236,8 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass)
             gGL.getTexUnit(bumpTex2)->bind(tex_b);
         }
 
+        shader->bindTexture(LLShaderMgr::WATER_EXCLUSIONTEX, &gPipeline.mWaterExclusionMask);
+
         // bind reflection texture from RenderTarget
         S32 screentex = shader->enableTexture(LLShaderMgr::WATER_SCREENTEX);
 
@@ -307,30 +309,11 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass)
 
         LLGLDisable cullface(GL_CULL_FACE);
 
-        LLVOWater* water = nullptr;
-        for (LLFace* const& face : mDrawFace)
-        {
-            if (!face) continue;
-            water = static_cast<LLVOWater*>(face->getViewerObject());
-            if (!water) continue;
-
-            if ((bool)edge == (bool)water->getIsEdgePatch())
-            {
-                face->renderIndexed();
-
-                // Note non-void water being drawn, updates required
-                if (!edge)  // SL-16461 remove !LLPipeline::sUseOcclusion check
-                {
-                    sNeedsReflectionUpdate = true;
-                    sNeedsDistortionUpdate = true;
-                }
-            }
-        }
+        pushWaterPlanes(edge);
 
         shader->disableTexture(LLShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);
         shader->disableTexture(LLShaderMgr::WATER_SCREENTEX);
         shader->disableTexture(LLShaderMgr::BUMP_MAP);
-        shader->disableTexture(LLShaderMgr::WATER_REFTEX);
 
         // clean up
         gPipeline.unbindDeferredShader(*shader);
@@ -345,6 +328,31 @@ void LLDrawPoolWater::renderPostDeferred(S32 pass)
     gGL.setColorMask(true, false);
 }
 
+void LLDrawPoolWater::pushWaterPlanes(int pass)
+{
+    LLVOWater* water = nullptr;
+    for (LLFace* const& face : mDrawFace)
+    {
+        if (!face)
+            continue;
+        water = static_cast<LLVOWater*>(face->getViewerObject());
+        if (!water)
+            continue;
+
+        if ((bool)pass == (bool)water->getIsEdgePatch())
+        {
+            face->renderIndexed();
+
+            // Note non-void water being drawn, updates required
+            if (!pass) // SL-16461 remove !LLPipeline::sUseOcclusion check
+            {
+                sNeedsReflectionUpdate = true;
+                sNeedsDistortionUpdate = true;
+            }
+        }
+    }
+}
+
 LLViewerTexture *LLDrawPoolWater::getDebugTexture()
 {
     return LLViewerTextureManager::getFetchedTexture(IMG_SMOKE);