From ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 1 May 2014 16:56:41 +0200 Subject: xkeyboard-config libxcb xserver mesa git update 1 May 2014 xserver commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1 libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 xkeyboard-config commit 5274a69ee85fb6c425c33c631fa8ea1310a8f097 mesa commit a773fdc64da8ba88d8c7f8e383c45248b0c3aa19 --- mesalib/src/mesa/main/getstring.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'mesalib/src/mesa/main/getstring.c') diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c index b0bd3190b..431d60b03 100644 --- a/mesalib/src/mesa/main/getstring.c +++ b/mesalib/src/mesa/main/getstring.c @@ -253,22 +253,11 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params ) *params = (GLvoid *) ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Ptr; break; case GL_DEBUG_CALLBACK_FUNCTION_ARB: - if (!_mesa_is_desktop_gl(ctx)) { - goto invalid_pname; - } - else { - struct gl_debug_state *debug = _mesa_get_debug_state(ctx); - *params = debug ? (void *) debug->Callback : NULL; - } - break; case GL_DEBUG_CALLBACK_USER_PARAM_ARB: - if (!_mesa_is_desktop_gl(ctx)) { + if (!_mesa_is_desktop_gl(ctx)) goto invalid_pname; - } - else { - struct gl_debug_state *debug = _mesa_get_debug_state(ctx); - *params = debug ? (void *) debug->CallbackData : NULL; - } + else + *params = _mesa_get_debug_state_ptr(ctx, pname); break; default: goto invalid_pname; -- cgit v1.2.3