[Mesa-dev] [PATCH 1/2] main: Don't restrict several KHR_debug enum to desktop GL

Boyan Ding boyan.j.ding at gmail.com
Wed Nov 4 07:25:56 PST 2015


In preparation for supporting GL_KHR_debug in OpenGL ES

Signed-off-by: Boyan Ding <boyan.j.ding at gmail.com>
---
 src/mesa/main/enable.c    | 5 +----
 src/mesa/main/getstring.c | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 42f6799..33000fd 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -369,10 +369,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          break;
       case GL_DEBUG_OUTPUT:
       case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB:
-         if (!_mesa_is_desktop_gl(ctx))
-            goto invalid_enum_error;
-         else
-            _mesa_set_debug_state_int(ctx, cap, state);
+         _mesa_set_debug_state_int(ctx, cap, state);
          break;
       case GL_DITHER:
          if (ctx->Color.DitherFlag == state)
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 9873fdb..2bca88c 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -268,10 +268,7 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
          break;
       case GL_DEBUG_CALLBACK_FUNCTION_ARB:
       case GL_DEBUG_CALLBACK_USER_PARAM_ARB:
-         if (!_mesa_is_desktop_gl(ctx))
-            goto invalid_pname;
-         else
-            *params = _mesa_get_debug_state_ptr(ctx, pname);
+         *params = _mesa_get_debug_state_ptr(ctx, pname);
          break;
       default:
          goto invalid_pname;
-- 
2.6.2



More information about the mesa-dev mailing list