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/state_tracker/st_manager.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/state_tracker/st_manager.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_manager.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c index 9c2b4d24e..098e6c02c 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.c +++ b/mesalib/src/mesa/state_tracker/st_manager.c @@ -626,8 +626,12 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi, return NULL; } - if (attribs->flags & ST_CONTEXT_FLAG_DEBUG) + st->ctx->Debug.DebugOutput = GL_FALSE; + if (attribs->flags & ST_CONTEXT_FLAG_DEBUG){ st->ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_DEBUG_BIT; + st->ctx->Debug.DebugOutput = GL_TRUE; + } + if (attribs->flags & ST_CONTEXT_FLAG_FORWARD_COMPATIBLE) st->ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT; |