Applied patch by Aleric Inglewood for VWR-12984: Water flickers and disappears in patches, part 1

1 files changed, 19 insertions, 11 deletions

diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 61194c4..c08ad0d 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -552,41 +552,46 @@ extern LLCPUInfo gSysCPU;
 void LLGLManager::initExtensions()
 {
 #if LL_MESA_HEADLESS
-# if GL_ARB_multitexture
+# ifdef GL_ARB_multitexture
         mHasMultitexture = TRUE;
 # else
         mHasMultitexture = FALSE;
 # endif
-# if GL_ARB_texture_env_combine
-        mHasARBEnvCombine = TRUE;       
+# ifdef GL_ARB_texture_env_combine
+        mHasARBEnvCombine = TRUE;
 # else
         mHasARBEnvCombine = FALSE;
 # endif
-# if GL_ARB_texture_compression
+# ifdef GL_ARB_texture_compression
         mHasCompressedTextures = TRUE;
 # else
         mHasCompressedTextures = FALSE;
 # endif
-# if GL_ARB_vertex_buffer_object
+# ifdef GL_ARB_vertex_buffer_object
         mHasVertexBufferObject = TRUE;
 # else
         mHasVertexBufferObject = FALSE;
 # endif
-# if GL_EXT_framebuffer_object
+# ifdef GL_EXT_framebuffer_object
         mHasFramebufferObject = TRUE;
 # else
         mHasFramebufferObject = FALSE;
 # endif
-# if GL_EXT_framebuffer_multisample
+# ifdef GL_EXT_framebuffer_multisample
         mHasFramebufferMultisample = TRUE;
 # else
         mHasFramebufferMultisample = FALSE;
 # endif
-# if GL_ARB_draw_buffers
+# ifdef GL_ARB_draw_buffers
         mHasDrawBuffers = TRUE;
 #else
         mHasDrawBuffers = FALSE;
 # endif
+# if defined(GL_NV_depth_clamp) || defined(GL_ARB_depth_clamp)
+        mHasDepthClamp = TRUE;
+#else
+        mHasDepthClamp = FALSE;
+#endif
         mHasMipMapGeneration = FALSE;
         mHasSeparateSpecularColor = FALSE;
         mHasAnisotropic = FALSE;
@@ -612,6 +617,7 @@ void LLGLManager::initExtensions()
                 && ExtensionExists("GL_EXT_packed_depth_stencil", gGLHExts.mSysExts);
         mHasFramebufferMultisample = mHasFramebufferObject && ExtensionExists("GL_EXT_framebuffer_multisample", gGLHExts.mSysExts);
         mHasDrawBuffers = ExtensionExists("GL_ARB_draw_buffers", gGLHExts.mSysExts);
+        mHasDepthClamp = ExtensionExists("GL_ARB_depth_clamp", gGLHExts.mSysExts);
 #if !LL_DARWIN
         mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
 #endif
@@ -634,6 +640,7 @@ void LLGLManager::initExtensions()
                 mHasFramebufferObject = FALSE;
                 mHasFramebufferMultisample = FALSE;
                 mHasDrawBuffers = FALSE;
+                mHasDepthClamp = FALSE;
                 mHasMipMapGeneration = FALSE;
                 mHasSeparateSpecularColor = FALSE;
                 mHasAnisotropic = FALSE;
@@ -685,10 +692,11 @@ void LLGLManager::initExtensions()
                 if (strchr(blacklist,'q')) mHasFramebufferObject = FALSE;//S
                 if (strchr(blacklist,'r')) mHasDrawBuffers = FALSE;//S
                 if (strchr(blacklist,'s')) mHasFramebufferMultisample = FALSE;
+                if (strchr(blacklist,'t')) mHasDepthClamp = FALSE;
 
         }
 #endif // LL_LINUX || LL_SOLARIS
-        
+
         if (!mHasMultitexture)
         {
                 LL_INFOS("RenderInit") << "Couldn't initialize multitexturing" << LL_ENDL;
@@ -1773,7 +1781,7 @@ LLGLDepthTest::~LLGLDepthTest()
         }
 }
 
-LLGLClampToFarClip::LLGLClampToFarClip(glh::matrix4f P)
+LLGLSquashToFarClip::LLGLSquashToFarClip(glh::matrix4f P)
 {
         for (U32 i = 0; i < 4; i++)
         {
@@ -1786,7 +1794,7 @@ LLGLClampToFarClip::LLGLClampToFarClip(glh::matrix4f P)
         glMatrixMode(GL_MODELVIEW);
 }
 
-LLGLClampToFarClip::~LLGLClampToFarClip()
+LLGLSquashToFarClip::~LLGLSquashToFarClip()
 {
         glMatrixMode(GL_PROJECTION);
         glPopMatrix();