OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: Bump __DRI_CONFIG_OPTIONS min version to 2.

Browse Source 
The only implementer in tree is v2.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20044>
This commit is contained in:
Emma Anholt
2022-11-28 11:19:07 -08:00
committed by Marge Bot
parent d92dd4fb2f
commit 0847140e71
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -738,7 +738,7 @@ static const struct dri2_extension_match swrast_core_extensions[] = {
};
static const struct dri2_extension_match optional_driver_extensions[] = {
{ __DRI_CONFIG_OPTIONS, 1, offsetof(struct dri2_egl_display, configOptions) },
{ __DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions) },
{ NULL, 0, 0 }
};
@@ -876,14 +876,9 @@ static char *
dri2_query_driver_config(_EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display_lock(disp);
const __DRIconfigOptionsExtension *ext = dri2_dpy->configOptions;
char *ret;
if (ext->base.version >= 2) {
ret = ext->getXml(dri2_dpy->driver_name);
} else {
ret = strdup(ext->xml);
}
ret = dri2_dpy->configOptions->getXml(dri2_dpy->driver_name);
mtx_unlock(&dri2_dpy->lock);