From 7dded1ad880014aabfe295bf53e4112b686682fe Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 25 Jul 2024 13:36:55 -0400 Subject: [PATCH] glx: simplify DRI_IMAGE checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this is guaranteed to be present and work and stuff Reviewed-by: Marek Olšák Reviewed-by: Adam Jackson Part-of: --- src/glx/dri3_glx.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index f1c59a1c9c5..cb7ce3328a7 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -353,8 +353,7 @@ dri3_create_drawable(struct glx_screen *base, XID xDrawable, pdraw->base.psc = &psc->base; #ifdef HAVE_DRI3_MODIFIERS - if (base->display->has_multibuffer && psc->image && psc->image->base.version >= 15) - has_multibuffer = true; + has_multibuffer = base->display->has_multibuffer; #endif (void) __glXInitialize(psc->base.dpy); @@ -836,21 +835,6 @@ dri3_create_screen(int screen, struct glx_display * priv, bool driver_name_is_in dri3_bind_extensions(psc, priv, driverName); - if (!psc->image || !psc->image->createImageFromDmaBufs) { - ErrorMessageF("Version 7 or imageFromDmaBufs image extension not found\n"); - goto handle_error; - } - - if (psc->fd_render_gpu != psc->fd_display_gpu && psc->image->base.version < 9) { - ErrorMessageF("Different GPU, but image extension version 9 or later not found\n"); - goto handle_error; - } - - if (psc->fd_render_gpu != psc->fd_display_gpu && !psc->image->blitImage) { - ErrorMessageF("Different GPU, but blitImage not implemented for this driver\n"); - goto handle_error; - } - psc->loader_dri3_ext.image = psc->image; configs = driConvertConfigs(psc->base.configs, driver_configs);