fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx: delete DRI_TEX_BUFFER handling

Browse source 
this is always available

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30400>
This commit is contained in:
Mike Blumenkrantz 2024-07-25 08:55:59 -04:00 • committed by Marge Bot
parent c4f7853131
commit 76757c211d
6 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glx/dri2_glx.c
View file

@ -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");

1
src/glx/dri2_priv.h
View file

@ -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;

17
src/glx/dri3_glx.c
View file

@ -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");

1
src/glx/dri3_priv.h
View file

@ -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;

10
src/glx/drisw_glx.c
View file

@ -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");

1
src/glx/drisw_priv.h
View file

@ -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;