From 70f47505a2e5d4cf949b7c2650f3d9f6559bacb3 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 7 Aug 2012 11:26:19 -0700 Subject: dri: Pass API_OPENGL_CORE through to the drivers This forces the drivers to do at least some validation of context API and version before creating the context. In r100 and r200 drivers, this means that they don't do any post-hoc validation. v2: Actually reject compatibility profile 3.2+ contexts. Thanks Ken. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/radeon/radeon_context.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri/radeon') diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 34c392ef8b7..e17c7860b1f 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -178,9 +178,22 @@ r100CreateContext( gl_api api, int i; int tcl_mode, fthrottle_mode; - /* API and flag filtering is handled in dri2CreateContextAttribs. + switch (api) { + case API_OPENGL: + if (major_version > 1 || minor_version > 3) { + *error = __DRI_CTX_ERROR_BAD_VERSION; + return GL_FALSE; + } + break; + case API_OPENGLES: + break; + default: + *error = __DRI_CTX_ERROR_BAD_API; + return GL_FALSE; + } + + /* Flag filtering is handled in dri2CreateContextAttribs. */ - (void) api; (void) flags; assert(glVisual); @@ -402,11 +415,6 @@ r100CreateContext( gl_api api, } _mesa_compute_version(ctx); - if (ctx->Version < major_version * 10 + minor_version) { - radeonDestroyContext(driContextPriv); - *error = __DRI_CTX_ERROR_BAD_VERSION; - return GL_FALSE; - } *error = __DRI_CTX_ERROR_SUCCESS; return GL_TRUE; -- cgit v1.2.3