1 files changed, 31 insertions, 15 deletions

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 1bc5e79835..17fa8f14a9 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -76,7 +76,7 @@ static const std::string HEADLESS_VERSION_STRING("1.0");
 
 llofstream gFailLog;
 
-#if GL_ARB_debug_output
+#if GL_ARB_debug_output || GL_KHR_debug
 
 #ifndef APIENTRY
 #define APIENTRY
@@ -99,9 +99,9 @@ void APIENTRY gl_debug_callback(GLenum source,
     }*/
 
     if (gGLManager.mIsDisabled &&
-        severity == GL_DEBUG_SEVERITY_HIGH_ARB &&
-        source == GL_DEBUG_SOURCE_API_ARB &&
-        type == GL_DEBUG_TYPE_ERROR_ARB &&
+        severity == GL_DEBUG_SEVERITY_HIGH &&
+        source == GL_DEBUG_SOURCE_API &&
+        type == GL_DEBUG_TYPE_ERROR &&
         id == GL_INVALID_VALUE)
     {
         // Suppress messages about deleting already deleted objects called from LLViewerWindow::stopGL()
@@ -161,7 +161,11 @@ void APIENTRY gl_debug_callback(GLenum source,
     if (ubo != 0)
     {
         glGetBufferParameteriv(GL_UNIFORM_BUFFER, GL_BUFFER_SIZE, &ubo_size);
+#if GL_EXT_buffer_storage
+        glGetBufferParameteriv(GL_UNIFORM_BUFFER, GL_BUFFER_IMMUTABLE_STORAGE_EXT, &ubo_immutable);
+#else
         glGetBufferParameteriv(GL_UNIFORM_BUFFER, GL_BUFFER_IMMUTABLE_STORAGE, &ubo_immutable);
+#endif
     }
 
     // No needs to halt when is called from LLViewerWindow::stopGL()
@@ -215,8 +219,6 @@ LLMatrix4 gGLObliqueProjectionInverse;
 
 std::list<LLGLUpdate*> LLGLUpdate::sGLQ;
 
-#if (LL_WINDOWS || LL_LINUX)  && !LL_MESA_HEADLESS
-
 #if LL_WINDOWS
 // WGL_ARB_create_context
 PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB = nullptr;
@@ -236,7 +238,7 @@ PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC             wglBlitContextFramebufferAMD = n
 PFNWGLSWAPINTERVALEXTPROC    wglSwapIntervalEXT = nullptr;
 PFNWGLGETSWAPINTERVALEXTPROC wglGetSwapIntervalEXT = nullptr;
 
-#endif
+/*
 
 // GL_VERSION_1_2
 //PFNGLDRAWRANGEELEMENTSPROC  glDrawRangeElements = nullptr;
@@ -982,6 +984,7 @@ PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC    glMultiDrawArraysIndirectCount = nullpt
 PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC  glMultiDrawElementsIndirectCount = nullptr;
 PFNGLPOLYGONOFFSETCLAMPPROC              glPolygonOffsetClamp = nullptr;
 
+*/
 #endif
 
 LLGLManager gGLManager;
@@ -1136,6 +1139,7 @@ bool LLGLManager::initGL()
 #endif
     }
 
+#if GL_VERSION_1_3
     if (mGLVersion >= 2.1f && LLImageGL::sCompressTextures)
     { //use texture compression
         glHint(GL_TEXTURE_COMPRESSION_HINT, GL_NICEST);
@@ -1144,6 +1148,7 @@ bool LLGLManager::initGL()
     { //GL version is < 3.0, always disable texture compression
         LLImageGL::sCompressTextures = false;
     }
+#endif
 
     // Trailing space necessary to keep "nVidia Corpor_ati_on" cards
     // from being recognized as ATI.
@@ -1160,7 +1165,7 @@ bool LLGLManager::initGL()
         mIsNVIDIA = true;
     }
     else if (mGLVendor.find("INTEL") != std::string::npos
-#if LL_LINUX
+#if LL_LINUX || __FreeBSD__
          // The Mesa-based drivers put this in the Renderer string,
          // not the Vendor string.
          || mGLRenderer.find("INTEL") != std::string::npos
@@ -1254,10 +1259,12 @@ bool LLGLManager::initGL()
     }
 
     glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &mNumTextureImageUnits);
+#if GL_VERSION_3_2
     glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &mMaxColorTextureSamples);
     glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &mMaxDepthTextureSamples);
     glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &mMaxIntegerSamples);
     glGetIntegerv(GL_MAX_SAMPLE_MASK_WORDS, &mMaxSampleMaskWords);
+#endif
     glGetIntegerv(GL_MAX_SAMPLES, &mMaxSamples);
     glGetIntegerv(GL_MAX_VARYING_VECTORS, &mMaxVaryingVectors);
     glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &mMaxUniformBlockSize);
@@ -1268,7 +1275,7 @@ bool LLGLManager::initGL()
 
     if (mGLVersion >= 4.59f)
     {
-        glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY, &mMaxAnisotropy);
+        glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &mMaxAnisotropy);
     }
 
     initGLStates();
@@ -1408,6 +1415,9 @@ void LLGLManager::shutdownGL()
 
 void LLGLManager::initExtensions()
 {
+#if LL_LINUX
+    glh_init_extensions("");
+#endif
 #if LL_DARWIN
     GLint num_extensions = 0;
     std::string all_extensions{""};
@@ -1438,10 +1448,10 @@ void LLGLManager::initExtensions()
 
     mInited = true;
 
-#if (LL_WINDOWS || LL_LINUX) && !LL_MESA_HEADLESS
+/*
+#if LL_WINDOWS
     LL_DEBUGS("RenderInit") << "GL Probe: Getting symbols" << LL_ENDL;
 
-#if LL_WINDOWS
     // WGL_AMD_gpu_association
     wglGetGPUIDsAMD = (PFNWGLGETGPUIDSAMDPROC)GLH_EXT_GET_PROC_ADDRESS("wglGetGPUIDsAMD");
     wglGetGPUInfoAMD = (PFNWGLGETGPUINFOAMDPROC)GLH_EXT_GET_PROC_ADDRESS("wglGetGPUInfoAMD");
@@ -1459,8 +1469,6 @@ void LLGLManager::initExtensions()
 
     // WGL_ARB_create_context
     wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)GLH_EXT_GET_PROC_ADDRESS("wglCreateContextAttribsARB");
-#endif
-
 
     // Load entire OpenGL API through GetProcAddress, leaving sections beyond mGLVersion unloaded
 
@@ -2278,6 +2286,7 @@ void LLGLManager::initExtensions()
     glPolygonOffsetClamp = (PFNGLPOLYGONOFFSETCLAMPPROC)GLH_EXT_GET_PROC_ADDRESS("glPolygonOffsetClamp");
 
 #endif
+*/
 }
 
 void rotate_quat(LLQuaternion& rotation)
@@ -2304,12 +2313,14 @@ void log_glerror()
     error = glGetError();
     while (LL_UNLIKELY(error))
     {
+#if GLU_VERSION_1_1
         GLubyte const * gl_error_msg = gluErrorString(error);
         if (NULL != gl_error_msg)
         {
             LL_WARNS() << "GL Error: " << error << " GL Error String: " << gl_error_msg << LL_ENDL ;
         }
         else
+#endif // GLU_VERSION_1_1
         {
             // gluErrorString returns NULL for some extensions' error codes.
             // you'll probably have to grep for the number in glext.h.
@@ -2328,6 +2339,7 @@ void do_assert_glerror()
     if (LL_UNLIKELY(error))
     {
         quit = true;
+#if GLU_VERSION_1_1
         GLubyte const * gl_error_msg = gluErrorString(error);
         if (NULL != gl_error_msg)
         {
@@ -2340,6 +2352,7 @@ void do_assert_glerror()
             }
         }
         else
+#endif // GLU_VERSION_1_1
         {
             // gluErrorString returns NULL for some extensions' error codes.
             // you'll probably have to grep for the number in glext.h.
@@ -2414,8 +2427,10 @@ void LLGLState::initClass()
     // sStateMap[GL_TEXTURE_2D] = GL_TRUE;
 
     //make sure multisample defaults to disabled
+#if GL_EXT_multisample || GL_EXT_multisampled_compatibility
     sStateMap[GL_MULTISAMPLE] = GL_FALSE;
     glDisable(GL_MULTISAMPLE);
+#endif
 }
 
 //static
@@ -2430,6 +2445,7 @@ void LLGLState::restoreGL()
 void LLGLState::resetTextureStates()
 {
     gGL.flush();
+#if GL_VERSION_1_3
     GLint maxTextureUnits;
 
     glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &maxTextureUnits);
@@ -2439,6 +2455,7 @@ void LLGLState::resetTextureStates()
         glClientActiveTexture(GL_TEXTURE0+j);
         j == 0 ? gGL.getTexUnit(j)->enable(LLTexUnit::TT_TEXTURE) : gGL.getTexUnit(j)->disable();
     }
+#endif
 }
 
 void LLGLState::dumpStates()
@@ -2588,6 +2605,7 @@ void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor
     {
         return;
     }
+    LL_INFOS() << "GL: "  << version << LL_ENDL;
 
     version_string->assign(version);
 
@@ -2963,5 +2981,3 @@ extern "C"
     __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
 }
 #endif
-
-