From 4cd4b9f70d0ce24cd6e531a6f369bd8fcf786611 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 25 Jul 2024 13:27:05 -0400 Subject: [PATCH] glx: stop binding DRI_INTEROP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no longer useful since innermost functions return errors correctly Reviewed-by: Marek Olšák Reviewed-by: Adam Jackson Part-of: --- src/glx/dri2_glx.c | 8 +------- src/glx/dri2_priv.h | 1 - src/glx/dri3_glx.c | 4 +--- src/glx/dri3_priv.h | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 6f573849b38..8bca3e9f831 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -866,11 +866,6 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv, "GLX_EXT_create_context_es2_profile"); } - static const struct dri_extension_match exts[] = { - { __DRI2_INTEROP, 1, offsetof(struct dri2_screen, interop), true }, - }; - loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions); - /* Extensions where we don't care about the extension struct */ for (i = 0; extensions[i]; i++) { if (strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0) @@ -882,8 +877,7 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv, __glXEnableDirectExtension(&psc->base, "GLX_ARB_context_flush_control"); __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer"); - if (psc->interop) - __glXEnableDirectExtension(&psc->base, "GLX_MESA_gl_interop"); + __glXEnableDirectExtension(&psc->base, "GLX_MESA_gl_interop"); } static char * diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h index 72a7a031e42..0468b237657 100644 --- a/src/glx/dri2_priv.h +++ b/src/glx/dri2_priv.h @@ -45,7 +45,6 @@ struct dri2_screen { __DRIscreen *driScreen; __GLXDRIscreen vtable; - const __DRI2interopExtension *interop; const __DRIconfig **driver_configs; char *driverName; diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 348d518e1f7..f1c59a1c9c5 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -696,7 +696,6 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv, static const struct dri_extension_match exts[] = { { __DRI_IMAGE, 1, offsetof(struct dri3_screen, image), true }, - { __DRI2_INTEROP, 1, offsetof(struct dri3_screen, interop), true }, }; loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions); @@ -716,8 +715,7 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv, __glXEnableDirectExtension(&psc->base, "GLX_ARB_context_flush_control"); __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer"); - if (psc->interop) - __glXEnableDirectExtension(&psc->base, "GLX_MESA_gl_interop"); + __glXEnableDirectExtension(&psc->base, "GLX_MESA_gl_interop"); } static char * diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h index 69828879b1b..b7e38ea2c85 100644 --- a/src/glx/dri3_priv.h +++ b/src/glx/dri3_priv.h @@ -80,7 +80,6 @@ struct dri3_screen { __DRIscreen *driScreenRenderGPU; const __DRIimageExtension *image; - const __DRI2interopExtension *interop; const __DRIconfig **driver_configs; /* fd of the GPU used for rendering. */