diff options
| author | Marek Olšák <[email protected]> | 2012-11-28 20:38:22 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-11-29 01:07:26 +0100 |
| commit | aa46cc2879846c7f4e11dfb0a83063863bce6997 (patch) | |
| tree | f1a2eefb8b23ab5c7e1ab02bf3992d92204ff17e | |
| parent | 249f86e3f88d667437130a2badfe139d3144fcc9 (diff) | |
st/mesa: allow forward-compatible contexts and set Const.ContextFlags
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/gallium/include/state_tracker/st_api.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_manager.c | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h index 3a11cd47aae..85de1c2af85 100644 --- a/src/gallium/include/state_tracker/st_api.h +++ b/src/gallium/include/state_tracker/st_api.h @@ -250,8 +250,7 @@ struct st_context_attribs * The profile and minimal version to support. * * The valid profiles and versions are rendering API dependent. The latest - * version satisfying the request should be returned, unless the - * ST_CONTEXT_FLAG_FORWARD_COMPATIBLE bit is set. + * version satisfying the request should be returned. */ enum st_profile_type profile; int major, minor; diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 999e916e92d..5576a0d6cb3 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -646,16 +646,18 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi, return NULL; } + if (attribs->flags & ST_CONTEXT_FLAG_DEBUG) + st->ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_DEBUG_BIT; + if (attribs->flags & ST_CONTEXT_FLAG_FORWARD_COMPATIBLE) + st->ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT; + /* need to perform version check */ if (attribs->major > 1 || attribs->minor > 0) { _mesa_compute_version(st->ctx); - /* Is the actual version less than the requested version? Mesa can't - * yet enforce the added restrictions of a forward-looking context, so - * fail that too. + /* Is the actual version less than the requested version? */ - if (st->ctx->Version < attribs->major * 10 + attribs->minor - || (attribs->flags & ~ST_CONTEXT_FLAG_DEBUG) != 0) { + if (st->ctx->Version < attribs->major * 10 + attribs->minor) { *error = ST_CONTEXT_ERROR_BAD_VERSION; st_destroy_context(st); return NULL; |