Second Life viewer sources 1.23.0-RC

1 files changed, 107 insertions, 25 deletions

diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index a9cf073..61194c4 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -64,7 +65,7 @@ LLMatrix4 gGLObliqueProjectionInverse;
 
 LLGLNamePool::pool_list_t LLGLNamePool::sInstances;
 
-#if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
+#if (LL_WINDOWS || LL_LINUX || LL_SOLARIS)  && !LL_MESA_HEADLESS
 // ATI prototypes
 // vertex blending prototypes
 PFNGLWEIGHTPOINTERARBPROC                       glWeightPointerARB = NULL;
@@ -132,6 +133,15 @@ PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT = NULL;
 PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC glGetFramebufferAttachmentParameterivEXT = NULL;
 PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT = NULL;
 
+// GL_EXT_framebuffer_multisample
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC glRenderbufferStorageMultisampleEXT = NULL;
+
+// GL_EXT_framebuffer_blit
+PFNGLBLITFRAMEBUFFEREXTPROC glBlitFramebufferEXT = NULL;
+
+// GL_ARB_draw_buffers
+PFNGLDRAWBUFFERSARBPROC glDrawBuffersARB = NULL;
+
 //shader object prototypes
 PFNGLDELETEOBJECTARBPROC glDeleteObjectARB = NULL;
 PFNGLGETHANDLEARBPROC glGetHandleARB = NULL;
@@ -174,7 +184,7 @@ PFNGLGETUNIFORMIVARBPROC glGetUniformivARB = NULL;
 PFNGLGETSHADERSOURCEARBPROC glGetShaderSourceARB = NULL;
 
 // vertex shader prototypes
-#if LL_LINUX
+#if LL_LINUX || LL_SOLARIS
 PFNGLVERTEXATTRIB1DARBPROC glVertexAttrib1dARB = NULL;
 PFNGLVERTEXATTRIB1DVARBPROC glVertexAttrib1dvARB = NULL;
 PFNGLVERTEXATTRIB1FARBPROC glVertexAttrib1fARB = NULL;
@@ -193,7 +203,7 @@ PFNGLVERTEXATTRIB3FARBPROC glVertexAttrib3fARB = NULL;
 PFNGLVERTEXATTRIB3FVARBPROC glVertexAttrib3fvARB = NULL;
 PFNGLVERTEXATTRIB3SARBPROC glVertexAttrib3sARB = NULL;
 PFNGLVERTEXATTRIB3SVARBPROC glVertexAttrib3svARB = NULL;
-#endif // LL_LINUX
+#endif // LL_LINUX || LL_SOLARIS
 PFNGLVERTEXATTRIB4NBVARBPROC glVertexAttrib4nbvARB = NULL;
 PFNGLVERTEXATTRIB4NIVARBPROC glVertexAttrib4nivARB = NULL;
 PFNGLVERTEXATTRIB4NSVARBPROC glVertexAttrib4nsvARB = NULL;
@@ -201,7 +211,7 @@ PFNGLVERTEXATTRIB4NUBARBPROC glVertexAttrib4nubARB = NULL;
 PFNGLVERTEXATTRIB4NUBVARBPROC glVertexAttrib4nubvARB = NULL;
 PFNGLVERTEXATTRIB4NUIVARBPROC glVertexAttrib4nuivARB = NULL;
 PFNGLVERTEXATTRIB4NUSVARBPROC glVertexAttrib4nusvARB = NULL;
-#if LL_LINUX
+#if LL_LINUX  || LL_SOLARIS
 PFNGLVERTEXATTRIB4BVARBPROC glVertexAttrib4bvARB = NULL;
 PFNGLVERTEXATTRIB4DARBPROC glVertexAttrib4dARB = NULL;
 PFNGLVERTEXATTRIB4DVARBPROC glVertexAttrib4dvARB = NULL;
@@ -239,7 +249,7 @@ PFNGLGETVERTEXATTRIBFVARBPROC glGetVertexAttribfvARB = NULL;
 PFNGLGETVERTEXATTRIBIVARBPROC glGetVertexAttribivARB = NULL;
 PFNGLGETVERTEXATTRIBPOINTERVARBPROC glGetVertexAttribPointervARB = NULL;
 PFNGLISPROGRAMARBPROC glIsProgramARB = NULL;
-#endif // LL_LINUX
+#endif // LL_LINUX || LL_SOLARIS
 PFNGLBINDATTRIBLOCATIONARBPROC glBindAttribLocationARB = NULL;
 PFNGLGETACTIVEATTRIBARBPROC glGetActiveAttribARB = NULL;
 PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB = NULL;
@@ -248,10 +258,12 @@ PFNGLGETATTRIBLOCATIONARBPROC glGetAttribLocationARB = NULL;
 PFNWGLSWAPINTERVALEXTPROC                       wglSwapIntervalEXT = NULL;
 #endif
 
-#if LL_LINUX
-PFNGLCOLORTABLEEXTPROC glColorTableEXT = NULL;
-#endif // LL_LINUX
-
+#if LL_LINUX_NV_GL_HEADERS
+// linux nvidia headers.  these define these differently to mesa's.  ugh.
+PFNGLACTIVETEXTUREARBPROC glActiveTextureARB = NULL;
+PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB = NULL;
+PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements = NULL;
+#endif // LL_LINUX_NV_GL_HEADERS
 #endif
 
 LLGLManager gGLManager;
@@ -265,6 +277,7 @@ LLGLManager::LLGLManager() :
         mHasMipMapGeneration(FALSE),
         mHasCompressedTextures(FALSE),
         mHasFramebufferObject(FALSE),
+        mHasFramebufferMultisample(FALSE),
 
         mHasVertexBufferObject(FALSE),
         mHasPBuffer(FALSE),
@@ -489,7 +502,7 @@ std::string LLGLManager::getGLInfoString()
         info_str += std::string("GL_RENDERER    ") + ll_safe_string((const char *)glGetString(GL_RENDERER)) + std::string("\n");
         info_str += std::string("GL_VERSION     ") + ll_safe_string((const char *)glGetString(GL_VERSION)) + std::string("\n");
 
-#if !LL_MESA_HEADLESS
+#if !LL_MESA_HEADLESS 
         all_exts = (const char *)gGLHExts.mSysExts;
         LLStringUtil::replaceChar(all_exts, ' ', '\n');
         info_str += std::string("GL_EXTENSIONS:\n") + all_exts + std::string("\n");
@@ -564,6 +577,16 @@ void LLGLManager::initExtensions()
 # else
         mHasFramebufferObject = FALSE;
 # endif
+# if GL_EXT_framebuffer_multisample
+        mHasFramebufferMultisample = TRUE;
+# else
+        mHasFramebufferMultisample = FALSE;
+# endif
+# if GL_ARB_draw_buffers
+        mHasDrawBuffers = TRUE;
+#else
+        mHasDrawBuffers = FALSE;
+# endif
         mHasMipMapGeneration = FALSE;
         mHasSeparateSpecularColor = FALSE;
         mHasAnisotropic = FALSE;
@@ -587,6 +610,8 @@ void LLGLManager::initExtensions()
         // mask out FBO support when packed_depth_stencil isn't there 'cause we need it for LLRenderTarget -Brad
         mHasFramebufferObject = ExtensionExists("GL_EXT_framebuffer_object", gGLHExts.mSysExts)
                 && 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);
 #if !LL_DARWIN
         mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
 #endif
@@ -596,7 +621,8 @@ void LLGLManager::initExtensions()
         mHasFragmentShader = ExtensionExists("GL_ARB_fragment_shader", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
 #endif
 
-#if LL_LINUX
+#if LL_LINUX || LL_SOLARIS
+        llinfos << "initExtensions() checking shell variables to adjust features..." << llendl;
         // Our extension support for the Linux Client is very young with some
         // potential driver gotchas, so offer a semi-secret way to turn it off.
         if (getenv("LL_GL_NOEXT"))      /* Flawfinder: ignore */
@@ -606,6 +632,8 @@ void LLGLManager::initExtensions()
                 mHasCompressedTextures = FALSE;
                 mHasVertexBufferObject = FALSE;
                 mHasFramebufferObject = FALSE;
+                mHasFramebufferMultisample = FALSE;
+                mHasDrawBuffers = FALSE;
                 mHasMipMapGeneration = FALSE;
                 mHasSeparateSpecularColor = FALSE;
                 mHasAnisotropic = FALSE;
@@ -655,8 +683,11 @@ void LLGLManager::initExtensions()
                 if (strchr(blacklist,'o')) mHasFragmentShader = FALSE;//S
                 if (strchr(blacklist,'p')) mHasPointParameters = FALSE;//S
                 if (strchr(blacklist,'q')) mHasFramebufferObject = FALSE;//S
+                if (strchr(blacklist,'r')) mHasDrawBuffers = FALSE;//S
+                if (strchr(blacklist,'s')) mHasFramebufferMultisample = FALSE;
+
         }
-#endif // LL_LINUX
+#endif // LL_LINUX || LL_SOLARIS
         
         if (!mHasMultitexture)
         {
@@ -719,7 +750,7 @@ void LLGLManager::initExtensions()
         glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, (GLint*) &mGLMaxVertexRange);
         glGetIntegerv(GL_MAX_ELEMENTS_INDICES, (GLint*) &mGLMaxIndexRange);
         
-#if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
+#if (LL_WINDOWS || LL_LINUX || LL_SOLARIS) && !LL_MESA_HEADLESS
         LL_DEBUGS("RenderInit") << "GL Probe: Getting symbols" << LL_ENDL;
         if (mHasVertexBufferObject)
         {
@@ -744,6 +775,7 @@ void LLGLManager::initExtensions()
         }
         if (mHasFramebufferObject)
         {
+                llinfos << "initExtensions() FramebufferObject-related procs..." << llendl;
                 glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glIsRenderbufferEXT");
                 glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glBindRenderbufferEXT");
                 glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteRenderbuffersEXT");
@@ -762,18 +794,33 @@ void LLGLManager::initExtensions()
                 glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGetFramebufferAttachmentParameterivEXT");
                 glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenerateMipmapEXT");
         }
-#if !LL_LINUX
-        // This is expected to be a static symbol on Linux GL implementations
+        if (mHasFramebufferMultisample)
+        {
+                glRenderbufferStorageMultisampleEXT = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glRenderbufferStorageMultisampleEXT");
+                glBlitFramebufferEXT = (PFNGLBLITFRAMEBUFFEREXTPROC) GLH_EXT_GET_PROC_ADDRESS("glBlitFramebufferEXT");
+        }
+        if (mHasDrawBuffers)
+        {
+                glDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDrawBuffersARB");
+        }
+#if (!LL_LINUX && !LL_SOLARIS) || LL_LINUX_NV_GL_HEADERS
+        // This is expected to be a static symbol on Linux GL implementations, except if we use the nvidia headers - bah
         glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawRangeElements");
         if (!glDrawRangeElements)
         {
                 mGLMaxVertexRange = 0;
                 mGLMaxIndexRange = 0;
         }
-#endif // !LL_LINUX
+#endif // !LL_LINUX || LL_LINUX_NV_GL_HEADERS
+#if LL_LINUX_NV_GL_HEADERS
+        // nvidia headers are critically different from mesa-esque
+        glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glActiveTextureARB");
+        glClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glClientActiveTextureARB");
+#endif // LL_LINUX_NV_GL_HEADERS
 
         if (mHasOcclusionQuery)
         {
+                llinfos << "initExtensions() OcclusionQuery-related procs..." << llendl;
                 glGenQueriesARB = (PFNGLGENQUERIESARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenQueriesARB");
                 glDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteQueriesARB");
                 glIsQueryARB = (PFNGLISQUERYARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsQueryARB");
@@ -785,6 +832,7 @@ void LLGLManager::initExtensions()
         }
         if (mHasPointParameters)
         {
+                llinfos << "initExtensions() PointParameters-related procs..." << llendl;
                 glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfARB");
                 glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfvARB");
         }
@@ -832,6 +880,7 @@ void LLGLManager::initExtensions()
         }
         if (mHasVertexShader)
         {
+                llinfos << "initExtensions() VertexShader-related procs..." << llendl;
                 glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetAttribLocationARB");
                 glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC) GLH_EXT_GET_PROC_ADDRESS("glBindAttribLocationARB");
                 glGetActiveAttribARB = (PFNGLGETACTIVEATTRIBARBPROC) GLH_EXT_GET_PROC_ADDRESS("glGetActiveAttribARB");
@@ -944,7 +993,7 @@ void assert_glerror()
                 {
                         // gluErrorString returns NULL for some extensions' error codes.
                         // you'll probably have to grep for the number in glext.h.
-                        LL_WARNS("RenderState") << "GL Error: UNKNOWN 0x" << std::hex << error << LL_ENDL;
+                        LL_WARNS("RenderState") << "GL Error: UNKNOWN 0x" << std::hex << error << std::dec << LL_ENDL;
                 }
                 error = glGetError();
 #endif
@@ -980,12 +1029,14 @@ void LLGLState::initClass()
 {
         sStateMap[GL_DITHER] = GL_TRUE;
         // sStateMap[GL_TEXTURE_2D] = GL_TRUE;
-
+        
         //make sure multisample defaults to disabled
         sStateMap[GL_MULTISAMPLE_ARB] = GL_FALSE;
         glDisable(GL_MULTISAMPLE_ARB);
 
-        //default vertex arrays to enabled.
+        sStateMap[GL_MULTISAMPLE_ARB] = GL_FALSE;
+        glDisable(GL_MULTISAMPLE_ARB);
+
         glEnableClientState(GL_VERTEX_ARRAY);
 }
 
@@ -1038,7 +1089,7 @@ void LLGLState::checkStates(const std::string& msg)
         
         if (src != GL_SRC_ALPHA || dst != GL_ONE_MINUS_SRC_ALPHA)
         {
-                LL_GL_ERRS << "Blend function corrupted: " << std::hex << src << " " << std::hex << dst << "  " << msg << LL_ENDL;
+                LL_GL_ERRS << "Blend function corrupted: " << std::hex << src << " " << std::hex << dst << "  " << msg << std::dec << LL_ENDL;
         }
         
         for (std::map<LLGLenum, LLGLboolean>::iterator iter = sStateMap.begin();
@@ -1077,7 +1128,7 @@ void LLGLState::checkTextureChannels(const std::string& msg)
                 if (tex_env_mode != GL_MODULATE)
                 {
                         error = TRUE;
-                        LL_WARNS("RenderState") << "GL_TEXTURE_ENV_MODE invalid: " << std::hex << tex_env_mode << LL_ENDL;
+                        LL_WARNS("RenderState") << "GL_TEXTURE_ENV_MODE invalid: " << std::hex << tex_env_mode << std::dec << LL_ENDL;
                 }
         }
 
@@ -1093,7 +1144,8 @@ void LLGLState::checkTextureChannels(const std::string& msg)
                 "GL_TEXTURE_GEN_S",
                 "GL_TEXTURE_GEN_T",
                 "GL_TEXTURE_GEN_Q",
-                "GL_TEXTURE_GEN_R"
+                "GL_TEXTURE_GEN_R",
+                "GL_TEXTURE_RECTANGLE_ARB"
         };
 
         static GLint value[] =
@@ -1105,7 +1157,8 @@ void LLGLState::checkTextureChannels(const std::string& msg)
                 GL_TEXTURE_GEN_S,
                 GL_TEXTURE_GEN_T,
                 GL_TEXTURE_GEN_Q,
-                GL_TEXTURE_GEN_R
+                GL_TEXTURE_GEN_R,
+                GL_TEXTURE_RECTANGLE_ARB
         };
 
         GLint stackDepth = 0;
@@ -1133,7 +1186,7 @@ void LLGLState::checkTextureChannels(const std::string& msg)
                         LL_WARNS("RenderState") << "Texture matrix in channel " << i << " corrupt." << LL_ENDL;
                 }
 
-                for (S32 j = (i == 0 ? 1 : 0); j < 8; j++)
+                for (S32 j = (i == 0 ? 1 : 0); j < 9; j++)
                 {
                         if (glIsEnabled(value[j]))
                         {
@@ -1141,6 +1194,18 @@ void LLGLState::checkTextureChannels(const std::string& msg)
                                 LL_WARNS("RenderState") << "Texture channel " << i << " still has " << label[j] << " enabled." << LL_ENDL;
                         }
                 }
+
+                glh::matrix4f mat;
+                glh::matrix4f identity;
+                identity.identity();
+
+                glGetFloatv(GL_TEXTURE_MATRIX, mat.m);
+
+                if (mat != identity)
+                {
+                        error = TRUE;
+                        LL_WARNS("RenderState") << "Texture matrix " << i << " is not identity." << LL_ENDL;
+                }
         }
 
         gGL.getTexUnit(0)->activate();
@@ -1262,6 +1327,22 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask)
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
         gGL.getTexUnit(0)->activate();
 
+        if (gGLManager.mHasVertexShader)
+        {       //make sure vertex attribs are all disabled
+                GLint count;
+                glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &count);
+                for (GLint i = 0; i < count; i++)
+                {
+                        GLint enabled;
+                        glGetVertexAttribivARB((GLuint) i, GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB, &enabled);
+                        if (enabled)
+                        {
+                                error = TRUE;
+                                LL_WARNS("RenderState") << "GL still has vertex attrib array " << i << " enabled." << LL_ENDL;
+                        }
+                }
+        }
+
         if (error)
         {
                 LL_GL_ERRS << "GL client array corruption detected.  " << msg << LL_ENDL;
@@ -1647,6 +1728,7 @@ void LLGLNamePool::cleanupPools()
 LLGLDepthTest::LLGLDepthTest(GLboolean depth_enabled, GLboolean write_enabled, GLenum depth_func)
 : mPrevDepthEnabled(sDepthEnabled), mPrevDepthFunc(sDepthFunc), mPrevWriteEnabled(sWriteEnabled)
 {
+        stop_glerror();
         if (depth_enabled != sDepthEnabled)
         {
                 gGL.flush();