fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

main: Don't restrict several KHR_debug enum to desktop GL

Browse source 
In preparation for supporting GL_KHR_debug in OpenGL ES

v2: add a missing hunk in _mesa_IsEnabled (Emil)

Signed-off-by: Boyan Ding <boyan.j.ding@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Boyan Ding 2015-11-08 17:56:40 +08:00 • committed by Emil Velikov
parent af27236854
commit ab7294668c
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/main/enable.c
View file

@ -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)
@ -1225,10 +1222,7 @@ _mesa_IsEnabled( GLenum cap )
return ctx->Polygon.CullFlag;
case GL_DEBUG_OUTPUT:
case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
else
return (GLboolean) _mesa_get_debug_state_int(ctx, cap);
return (GLboolean) _mesa_get_debug_state_int(ctx, cap);
case GL_DEPTH_TEST:
return ctx->Depth.Test;
case GL_DITHER:

5
src/mesa/main/getstring.c
View file

@ -274,10 +274,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;