libgui|Cleanup: Removed ARB_debug_output

This extension wasn't in use and seems to be subtly differently defined on different platforms.
skyjake · Feb 26, 2014 · c5cf015 · c5cf015
1 parent 1158298
commit c5cf015
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 44 deletions.
diff --git a/doomsday/libgui/include/de/gui/glentrypoints.h b/doomsday/libgui/include/de/gui/glentrypoints.h
@@ -122,11 +122,6 @@ LIBGUI_EXTERN_C PFNGLVERTEXATTRIBPOINTERPROC      glVertexAttribPointer;
 
 // Extensions:
 
-#ifdef GL_ARB_debug_output
-LIBGUI_EXTERN_C PFNGLDEBUGMESSAGECONTROLARBPROC   glDebugMessageControlARB;
-LIBGUI_EXTERN_C PFNGLDEBUGMESSAGECALLBACKARBPROC  glDebugMessageCallbackARB;
-#endif
-
 LIBGUI_EXTERN_C PFNGLBLITFRAMEBUFFEREXTPROC                         glBlitFramebufferEXT;
 LIBGUI_EXTERN_C PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC          glRenderbufferStorageMultisampleEXT;
 

diff --git a/doomsday/libgui/include/de/gui/glinfo.h b/doomsday/libgui/include/de/gui/glinfo.h
@@ -31,7 +31,6 @@ class LIBGUI_PUBLIC GLInfo
     /// Extension availability bits.
     struct Extensions
     {
-        duint32 ARB_debug_output : 1;
         duint32 ARB_framebuffer_object : 1;
         duint32 ARB_texture_env_combine : 1;
         duint32 ARB_texture_non_power_of_two : 1;

diff --git a/doomsday/libgui/src/glentrypoints.cpp b/doomsday/libgui/src/glentrypoints.cpp
@@ -99,11 +99,6 @@ PFNGLVERTEXATTRIBPOINTERPROC      glVertexAttribPointer;
 
 // Extensions:
 
-#ifdef GL_ARB_debug_output
-PFNGLDEBUGMESSAGECONTROLARBPROC   glDebugMessageControlARB;
-PFNGLDEBUGMESSAGECALLBACKARBPROC  glDebugMessageCallbackARB;
-#endif
-
 PFNGLBLITFRAMEBUFFEREXTPROC                         glBlitFramebufferEXT;
 PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC          glRenderbufferStorageMultisampleEXT;
 
@@ -198,11 +193,6 @@ void getAllOpenGLEntryPoints()
 
     // Extensions:
 
-#ifdef GL_ARB_debug_output
-    GET_PROC_EXT(glDebugMessageControlARB);
-    GET_PROC_EXT(glDebugMessageCallbackARB);
-#endif
-
     GET_PROC_EXT(glBlitFramebufferEXT);
     GET_PROC_EXT(glRenderbufferStorageMultisampleEXT);
 

diff --git a/doomsday/libgui/src/glinfo.cpp b/doomsday/libgui/src/glinfo.cpp
@@ -30,25 +30,6 @@ namespace de {
 
 static GLInfo info;
 
-#ifdef WIN32
-#  define GL_CALL APIENTRY
-#else
-#  define GL_CALL
-#endif
-
-#ifdef GL_ARB_debug_output
-static void GL_CALL glDebugOut(GLenum source, GLenum type, GLuint id, GLenum severity,
-                               GLsizei length, GLchar const *message, GLvoid *userParam)
-{
-    DENG2_UNUSED(source);
-    DENG2_UNUSED(type);
-    DENG2_UNUSED(id);
-    DENG2_UNUSED(severity);
-    DENG2_UNUSED(userParam);
-    qWarning() << "[GL]" << String(message, length);
-}
-#endif
-
 DENG2_PIMPL_NOREF(GLInfo)
 {
     bool inited;
@@ -127,7 +108,6 @@ DENG2_PIMPL_NOREF(GLInfo)
         if(inited) return;
 
         // Extensions.
-        ext.ARB_debug_output               = query("GL_ARB_debug_output");
         ext.ARB_framebuffer_object         = query("GL_ARB_framebuffer_object");
         ext.ARB_texture_env_combine        = query("GL_ARB_texture_env_combine") || query("GL_EXT_texture_env_combine");
         ext.ARB_texture_non_power_of_two   = query("GL_ARB_texture_non_power_of_two");
@@ -172,14 +152,6 @@ DENG2_PIMPL_NOREF(GLInfo)
             LOG_GL_NOTE("Using requested maximum texture size of %i x %i") << lim.maxTexSize << lim.maxTexSize;
         }
 
-        if(CommandLine_Exists("-gldebug"))
-        {
-#ifdef GL_ARB_debug_output
-            /// @todo The GL context is not created with the debug output bit. -jk
-            glDebugMessageCallbackARB(glDebugOut, NULL);
-#endif
-        }
-
         inited = true;
     }
 };