diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
| commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
| tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /mesalib/src/mesa/main/enable.c | |
| parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'mesalib/src/mesa/main/enable.c')
| -rw-r--r-- | mesalib/src/mesa/main/enable.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c index 515dda952..2f0216b01 100644 --- a/mesalib/src/mesa/main/enable.c +++ b/mesalib/src/mesa/main/enable.c @@ -348,6 +348,9 @@ _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_SYNCHRONOUS_ARB: + ctx->Debug.SyncOutput = state; + break; case GL_DITHER: if (ctx->Color.DitherFlag == state) return; @@ -1114,6 +1117,8 @@ _mesa_IsEnabled( GLenum cap ) return ctx->Light.ColorMaterialEnabled; case GL_CULL_FACE: return ctx->Polygon.CullFlag; + case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB: + return ctx->Debug.SyncOutput; case GL_DEPTH_TEST: return ctx->Depth.Test; case GL_DITHER: |