fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 20:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dri: Validate more of the context version in validate_context_version

Browse source 
There's two kinds of "bad version" you might encounter here, either the
combination does not name a defined version (like 1.7) or it names
something the driver can't do (like asking r300 to do 4.0). EGL does not
distinguish these cases, but GLX calls them BadMatch and GLXBadFBConfig
respectively.

Since api_mask is the set of driver supported APIs, and we can only
support defined APIs, don't check it early in driCreateContextAttribs,
just let it fall out from validate_context_version.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12006>
This commit is contained in:
Adam Jackson 2021-07-22 16:28:31 -04:00 • committed by Marge Bot
parent 9c76682d80
commit dd67c079a0
1 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/gallium/frontends/dri/dri_util.c
View file

@ -391,43 +391,53 @@ driIndexConfigAttrib(const __DRIconfig *config, int index,
return GL_FALSE; return GL_FALSE;
} }
static bool static int
validate_context_version(struct dri_screen *screen, validate_context_version(struct dri_screen *screen,
int mesa_api, int mesa_api,
unsigned major_version, unsigned major_version,
unsigned minor_version, unsigned minor_version)
unsigned *dri_ctx_error)
{ {
unsigned req_version = 10 * major_version + minor_version; unsigned req_version = 10 * major_version + minor_version;
unsigned max_version = 0; unsigned max_version = 0;
switch (mesa_api) { if (major_version == 0 || major_version > 4)
case API_OPENGL_COMPAT: return __DRI_CTX_ERROR_BAD_API;
if (mesa_api == API_OPENGL_COMPAT) {
if ((major_version == 4 && minor_version > 6) ||
(major_version == 3 && minor_version > 3) ||
(major_version == 2 && minor_version > 1) ||
(major_version == 1 && minor_version > 5))
return __DRI_CTX_ERROR_BAD_API;
max_version = screen->max_gl_compat_version; max_version = screen->max_gl_compat_version;
break; } else if (mesa_api == API_OPENGLES) {
case API_OPENGL_CORE: if (major_version > 1 || minor_version > 1)
max_version = screen->max_gl_core_version; return __DRI_CTX_ERROR_BAD_API;
break;
case API_OPENGLES:
max_version = screen->max_gl_es1_version; max_version = screen->max_gl_es1_version;
break; } else if (mesa_api == API_OPENGLES2) {
case API_OPENGLES2: if ((major_version > 3) ||
(major_version == 3 && minor_version > 2) ||
(major_version == 2 && minor_version > 0) ||
(major_version < 2))
return __DRI_CTX_ERROR_BAD_API;
max_version = screen->max_gl_es2_version; max_version = screen->max_gl_es2_version;
break; } else if (mesa_api == API_OPENGL_CORE) {
default: if ((major_version == 4 && minor_version > 6) ||
max_version = 0; (major_version == 3 && minor_version > 3) ||
break; (major_version < 3))
return __DRI_CTX_ERROR_BAD_API;
max_version = screen->max_gl_core_version;
} else {
return __DRI_CTX_ERROR_BAD_API;
} }
if (max_version == 0) { if (max_version == 0)
*dri_ctx_error = __DRI_CTX_ERROR_BAD_API; return __DRI_CTX_ERROR_BAD_VERSION;
return false;
} else if (req_version > max_version) {
*dri_ctx_error = __DRI_CTX_ERROR_BAD_VERSION;
return false;
}
return true; if (req_version > max_version)
return __DRI_CTX_ERROR_BAD_VERSION;
return __DRI_CTX_ERROR_SUCCESS;
} }
/*****************************************************************/ /*****************************************************************/
@ -457,11 +467,6 @@ driCreateContextAttribs(__DRIscreen *psp, int api,
assert((num_attribs == 0) || (attribs != NULL)); assert((num_attribs == 0) || (attribs != NULL));
if (!(screen->api_mask & (1 << api))) {
*error = __DRI_CTX_ERROR_BAD_API;
return NULL;
}
switch (api) { switch (api) {
case __DRI_API_OPENGL: case __DRI_API_OPENGL:
mesa_api = API_OPENGL_COMPAT; mesa_api = API_OPENGL_COMPAT;
@ -613,10 +618,10 @@ driCreateContextAttribs(__DRIscreen *psp, int api,
return NULL; return NULL;
} }
if (!validate_context_version(screen, mesa_api, *error = validate_context_version(screen, mesa_api,
ctx_config.major_version, ctx_config.major_version,
ctx_config.minor_version, ctx_config.minor_version);
error)) if (*error != __DRI_CTX_ERROR_SUCCESS)
return NULL; return NULL;
struct dri_context *ctx = dri_create_context(screen, mesa_api, struct dri_context *ctx = dri_create_context(screen, mesa_api,