diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-04 16:28:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-04 16:28:48 +0200 |
| commit | b602729f06a62d29e136cf2aeca9544471371e0d (patch) | |
| tree | 403d96659d5726e26edafb2bbb3c1198e783e3a0 /mesalib/src/mesa/main/enable.c | |
| parent | caffc15f0b9e35698a6039fa3df2fa6a588608e6 (diff) | |
| parent | b828531d8b6da75a258d12f97df0f4e49f75ab98 (diff) | |
| download | vcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.tar.gz vcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.tar.bz2 vcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig xkeyboard-config git update 4 Sep 2013
Diffstat (limited to 'mesalib/src/mesa/main/enable.c')
| -rw-r--r-- | mesalib/src/mesa/main/enable.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c index 21e593117..5e2fd80d2 100644 --- a/mesalib/src/mesa/main/enable.c +++ b/mesalib/src/mesa/main/enable.c @@ -364,6 +364,11 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) FLUSH_VERTICES(ctx, _NEW_DEPTH); ctx->Depth.Test = state; break; + case GL_DEBUG_OUTPUT: + if (!_mesa_is_desktop_gl(ctx)) + goto invalid_enum_error; + ctx->Debug.DebugOutput = state; + break; case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB: if (!_mesa_is_desktop_gl(ctx)) goto invalid_enum_error; @@ -1201,6 +1206,10 @@ _mesa_IsEnabled( GLenum cap ) return ctx->Light.ColorMaterialEnabled; case GL_CULL_FACE: return ctx->Polygon.CullFlag; + case GL_DEBUG_OUTPUT: + if (!_mesa_is_desktop_gl(ctx)) + goto invalid_enum_error; + return ctx->Debug.DebugOutput; case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB: if (!_mesa_is_desktop_gl(ctx)) goto invalid_enum_error; |