commit 66988745f2b0cd03f997e02f3fb89f258db989a7
author Geoff Lang <geofflang@chromium.org> Tue Dec 22 19:39:19 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Tue Dec 22 19:39:40 2015 +0000
tree 1299f9292f1a7932126fb07c1a7c7479f72c6454
parent 6c521b7a70a53b1c9f7762e53e34b5a8146b0f7b

Revert "Implement GL_KHR_debug."

This reverts commit 6c521b7a70a53b1c9f7762e53e34b5a8146b0f7b.

Change-Id: I6ff981198e31f34d3e405edea6277ee75516d6ee
Reviewed-on: https://chromium-review.googlesource.com/319820
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/State.cpp

diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
index aaf4b68..e5feef4 100644
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -10,7 +10,6 @@
 
 #include "libANGLE/Context.h"
 #include "libANGLE/Caps.h"
-#include "libANGLE/Debug.h"
 #include "libANGLE/Framebuffer.h"
 #include "libANGLE/FramebufferAttachment.h"
 #include "libANGLE/Query.h"
@@ -79,10 +78,7 @@
     reset();
 }
 
-void State::initialize(const Caps &caps,
-                       const Extensions &extensions,
-                       GLuint clientVersion,
-                       bool debug)
+void State::initialize(const Caps &caps, GLuint clientVersion)
 {
     mMaxDrawBuffers = caps.maxDrawBuffers;
     mMaxCombinedTextureImageUnits = caps.maxCombinedTextureImageUnits;
@@ -189,9 +185,6 @@
     mDrawFramebuffer = NULL;
 
     mPrimitiveRestart = false;
-
-    mDebug.setOutputEnabled(debug);
-    mDebug.setMaxLoggedMessages(extensions.maxDebugLoggedMessages);
 }
 
 void State::reset()
@@ -588,12 +581,6 @@
       case GL_DITHER:                        setDither(enabled);                break;
       case GL_PRIMITIVE_RESTART_FIXED_INDEX: setPrimitiveRestart(enabled);      break;
       case GL_RASTERIZER_DISCARD:            setRasterizerDiscard(enabled);     break;
-      case GL_DEBUG_OUTPUT_SYNCHRONOUS:
-          mDebug.setOutputSynchronous(enabled);
-          break;
-      case GL_DEBUG_OUTPUT:
-          mDebug.setOutputEnabled(enabled);
-          break;
       default:                               UNREACHABLE();
     }
 }
@@ -613,10 +600,6 @@
       case GL_DITHER:                        return isDitherEnabled();
       case GL_PRIMITIVE_RESTART_FIXED_INDEX: return isPrimitiveRestartEnabled();
       case GL_RASTERIZER_DISCARD:            return isRasterizerDiscardEnabled();
-      case GL_DEBUG_OUTPUT_SYNCHRONOUS:
-          return mDebug.isOutputSynchronous();
-      case GL_DEBUG_OUTPUT:
-          return mDebug.isOutputEnabled();
       default:                               UNREACHABLE(); return false;
     }
 }
@@ -1288,16 +1271,6 @@
     return mUnpack;
 }
 
-const Debug &State::getDebug() const
-{
-    return mDebug;
-}
-
-Debug &State::getDebug()
-{
-    return mDebug;
-}
-
 void State::getBooleanv(GLenum pname, GLboolean *params)
 {
     switch (pname)
@@ -1327,12 +1300,6 @@
       case GL_RASTERIZER_DISCARD:
           *params = isRasterizerDiscardEnabled() ? GL_TRUE : GL_FALSE;
           break;
-      case GL_DEBUG_OUTPUT_SYNCHRONOUS:
-          *params = mDebug.isOutputSynchronous() ? GL_TRUE : GL_FALSE;
-          break;
-      case GL_DEBUG_OUTPUT:
-          *params = mDebug.isOutputEnabled() ? GL_TRUE : GL_FALSE;
-          break;
       default:
         UNREACHABLE();
         break;
@@ -1590,37 +1557,12 @@
       case GL_PIXEL_UNPACK_BUFFER_BINDING:
         *params = mUnpack.pixelBuffer.id();
         break;
-      case GL_DEBUG_LOGGED_MESSAGES:
-          *params = static_cast<GLint>(mDebug.getMessageCount());
-          break;
-      case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:
-          *params = static_cast<GLint>(mDebug.getNextMessageLength());
-          break;
-      case GL_DEBUG_GROUP_STACK_DEPTH:
-          *params = static_cast<GLint>(mDebug.getGroupStackDepth());
-          break;
       default:
         UNREACHABLE();
         break;
     }
 }
 
-void State::getPointerv(GLenum pname, void **params) const
-{
-    switch (pname)
-    {
-        case GL_DEBUG_CALLBACK_FUNCTION:
-            *params = reinterpret_cast<void *>(mDebug.getCallback());
-            break;
-        case GL_DEBUG_CALLBACK_USER_PARAM:
-            *params = const_cast<void *>(mDebug.getUserParam());
-            break;
-        default:
-            UNREACHABLE();
-            break;
-    }
-}
-
 bool State::getIndexedIntegerv(GLenum target, GLuint index, GLint *data)
 {
     switch (target)