SL-10566 part the fourth

Fix water rendering causing distortion map update very frame.

Reduce binds in alpha draw pool for HUD atmo suppression (may regress HUD lighting weirdness).

Add ability to retrieve current user clip plane so it can be saved/restored around water map gen.

Leave render type masks as is after reflection map render to get detail filtering applied to distortion map again.

Re-enable occlusion in distortion map rendering.

1 files changed, 15 insertions, 9 deletions

diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index f5a41fd5f6..5760a28049 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -619,9 +619,6 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li
 	{		
 		LLGLDisable cullface(GL_CULL_FACE);
 
-        sNeedsReflectionUpdate = TRUE;			
-        sNeedsDistortionUpdate = TRUE;
-
         if (edge)
         {
             for (std::vector<LLFace*>::iterator iter = mDrawFace.begin(); iter != mDrawFace.end(); iter++)
@@ -632,10 +629,14 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li
                     LLVOWater* water = (LLVOWater*) face->getViewerObject();
 			        gGL.getTexUnit(diffTex)->bind(face->getTexture());
 
-                    bool edge_patch = water && water->getIsEdgePatch();
-                    if (edge_patch)
+                    if (water)
                     {
-                        face->renderIndexed();
+                        bool edge_patch = water->getIsEdgePatch();
+                        if (edge_patch)
+                        {
+                            sNeedsReflectionUpdate = TRUE;
+                            face->renderIndexed();
+                        }
                     }
                 }
 		    }
@@ -650,10 +651,15 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li
                     LLVOWater* water = (LLVOWater*) face->getViewerObject();
 			        gGL.getTexUnit(diffTex)->bind(face->getTexture());
 
-                    bool edge_patch = water && water->getIsEdgePatch();
-                    if (!edge_patch)
+                    if (water)
                     {
-                        face->renderIndexed();
+                        bool edge_patch = water->getIsEdgePatch();
+                        if (!edge_patch)
+                        {
+                            sNeedsReflectionUpdate = TRUE;
+                            sNeedsDistortionUpdate = TRUE;
+                            face->renderIndexed();
+                        }
                     }
                 }
 		    }