From 0847140e71146eb6a49d47548ef330591112280a Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 28 Nov 2022 11:19:07 -0800 Subject: [PATCH] egl: Bump __DRI_CONFIG_OPTIONS min version to 2. The only implementer in tree is v2. Reviewed-by: Adam Jackson Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 57b3d698767..01047605807 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -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);