From 76757c211d96d78320b08a3528b856c545dcf262 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 25 Jul 2024 08:55:59 -0400 Subject: [PATCH] glx: delete DRI_TEX_BUFFER handling this is always available Reviewed-by: Adam Jackson Part-of: --- src/glx/dri2_glx.c | 4 +--- src/glx/dri2_priv.h | 1 - src/glx/dri3_glx.c | 17 +++++++---------- src/glx/dri3_priv.h | 1 - src/glx/drisw_glx.c | 10 +--------- src/glx/drisw_priv.h | 1 - 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index dc619c4ec99..ee7117f08af 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -878,7 +878,6 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv, } static const struct dri_extension_match exts[] = { - { __DRI_TEX_BUFFER, 1, offsetof(struct dri2_screen, texBuffer), true }, { __DRI2_FLUSH, 1, offsetof(struct dri2_screen, f), true }, { __DRI2_CONFIG_QUERY, 1, offsetof(struct dri2_screen, config), true }, { __DRI2_THROTTLE, 1, offsetof(struct dri2_screen, throttle), true }, @@ -898,8 +897,7 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv, "GLX_ARB_context_flush_control"); } - if (psc->texBuffer) - __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap"); + __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap"); if (psc->rendererQuery) __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer"); diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h index 65dce99f209..354cf6048ab 100644 --- a/src/glx/dri2_priv.h +++ b/src/glx/dri2_priv.h @@ -47,7 +47,6 @@ struct dri2_screen { const __DRI2flushExtension *f; const __DRI2configQueryExtension *config; - const __DRItexBufferExtension *texBuffer; const __DRI2throttleExtension *throttle; const __DRI2rendererQueryExtension *rendererQuery; const __DRI2interopExtension *interop; diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 4e835a7d1a9..54334865d56 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -710,17 +710,14 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv, }; loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions); - for (i = 0; extensions[i]; i++) { - /* when on a different gpu than the server, the server pixmaps - * can have a tiling mode we can't read. Thus we can't create - * a texture from them. - */ - if (psc->fd_render_gpu == psc->fd_display_gpu && - (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0)) { - psc->texBuffer = (__DRItexBufferExtension *) extensions[i]; - __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap"); - } + /* when on a different gpu than the server, the server pixmaps + * can have a tiling mode we can't read. Thus we can't create + * a texture from them. + */ + if (psc->fd_render_gpu == psc->fd_display_gpu) + __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap"); + for (i = 0; extensions[i]; i++) { if (strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0) __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_robustness"); diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h index 0c0af2c2a3b..1e13bdfd721 100644 --- a/src/glx/dri3_priv.h +++ b/src/glx/dri3_priv.h @@ -82,7 +82,6 @@ struct dri3_screen { const __DRIimageExtension *image; const __DRI2flushExtension *f; const __DRI2configQueryExtension *config; - const __DRItexBufferExtension *texBuffer; const __DRI2rendererQueryExtension *rendererQuery; const __DRI2interopExtension *interop; const __DRIconfig **driver_configs; diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index a82c6c4d00e..f09e2144ca1 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -480,14 +480,8 @@ drisw_bind_tex_image(__GLXDRIdrawable *base, { struct glx_context *gc = __glXGetCurrentContext(); struct drisw_drawable *pdraw = (struct drisw_drawable *) base; - struct drisw_screen *psc; if (pdraw != NULL) { - psc = (struct drisw_screen *) base->psc; - - if (!psc->texBuffer) - return; - dri_set_tex_buffer2(gc->driContext, pdraw->base.textureTarget, pdraw->base.textureFormat, @@ -801,7 +795,6 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions) /* FIXME: Figure out what other extensions can be ported here from dri2. */ static const struct dri_extension_match exts[] = { - { __DRI_TEX_BUFFER, 1, offsetof(struct drisw_screen, texBuffer), true }, { __DRI2_RENDERER_QUERY, 1, offsetof(struct drisw_screen, rendererQuery), true }, { __DRI2_FLUSH, 1, offsetof(struct drisw_screen, f), true }, { __DRI2_CONFIG_QUERY, 1, offsetof(struct drisw_screen, config), true }, @@ -820,8 +813,7 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions) } } - if (psc->texBuffer) - __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap"); + __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap"); if (psc->rendererQuery) { __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer"); diff --git a/src/glx/drisw_priv.h b/src/glx/drisw_priv.h index d0f803096f9..9d3bb1fad9e 100644 --- a/src/glx/drisw_priv.h +++ b/src/glx/drisw_priv.h @@ -41,7 +41,6 @@ struct drisw_screen __GLXDRIscreen vtable; const __DRI2flushExtension *f; const __DRI2configQueryExtension *config; - const __DRItexBufferExtension *texBuffer; const __DRI2rendererQueryExtension *rendererQuery; const __DRIconfig **driver_configs;