st/mesa: allow forward-compatible contexts and set Const.ContextFlags
Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
@@ -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;
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user