fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dri: delete dri_screen::extensions

Browse source 
no longer used

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524>
This commit is contained in:
Mike Blumenkrantz 2024-07-30 14:41:13 -04:00 • committed by Marge Bot
parent 1724716ed1
commit d4ab6e15aa
4 changed files with 0 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/frontends/dri/dri_screen.h
View file

@ -63,8 +63,6 @@ struct dri_screen
int max_gl_es1_version;
int max_gl_es2_version;
const __DRIextension **extensions;
const __DRIswrastLoaderExtension *swrast_loader;
const __DRIkopperLoaderExtension *kopper_loader;

3
src/gallium/frontends/dri/dri_util.c
View file

@ -104,7 +104,6 @@ driCreateNewScreen3(int scrn, int fd,
const __DRIextension **driver_extensions,
const __DRIconfig ***driver_configs, bool driver_name_is_inferred, void *data)
{
static const __DRIextension *emptyExtensionList[] = { NULL };
struct dri_screen *screen;
const __DRImesaCoreExtension *mesa = NULL;
@ -128,8 +127,6 @@ driCreateNewScreen3(int scrn, int fd,
screen->loaderPrivate = data;
/* This will be filled in by mesa->initScreen(). */
screen->extensions = emptyExtensionList;
screen->fd = fd;
screen->myNum = scrn;

46
src/gallium/frontends/dri/drisw.c
View file

@ -586,43 +586,12 @@ drisw_update_tex_buffer(struct dri_drawable *drawable,
pipe_texture_unmap(pipe, transfer);
}
static __DRIimageExtension driSWImageExtension = {
.base = { __DRI_IMAGE, 6 },
.createImageFromRenderbuffer = dri_create_image_from_renderbuffer,
.createImageFromTexture = dri2_create_from_texture,
.destroyImage = dri2_destroy_image,
};
extern const __DRIimageExtension driVkImageExtension;
static const __DRIrobustnessExtension dri2Robustness = {
.base = { __DRI2_ROBUSTNESS, 1 }
};
/*
* Backend function for init_screen.
*/
static const __DRIextension *drisw_screen_extensions[] = {
&driSWImageExtension.base,
&driTexBufferExtension.base,
&dri2GalliumConfigQueryExtension.base,
&dri2FenceExtension.base,
&dri2FlushControlExtension.base,
NULL
};
static const __DRIextension *drisw_robust_screen_extensions[] = {
&driSWImageExtension.base,
&driTexBufferExtension.base,
&dri2GalliumConfigQueryExtension.base,
&dri2FenceExtension.base,
&dri2Robustness.base,
&dri2FlushControlExtension.base,
NULL
};
static const struct drisw_loader_funcs drisw_lf = {
.get_image = drisw_get_image,
.put_image = drisw_put_image,
@ -688,21 +657,6 @@ drisw_init_screen(struct dri_screen *screen, bool driver_name_is_inferred)
if (!configs)
goto fail;
if (pscreen->get_param(pscreen, PIPE_CAP_DEVICE_RESET_STATUS_QUERY)) {
screen->extensions = drisw_robust_screen_extensions;
}
else
screen->extensions = drisw_screen_extensions;
#ifdef HAVE_LIBDRM
int dmabuf_cap = pscreen->get_param(pscreen, PIPE_CAP_DMABUF);
if (pscreen->resource_create_with_modifiers && (dmabuf_cap & DRM_PRIME_CAP_EXPORT))
screen->extensions[0] = &driVkImageExtension.base;
else if (pscreen->resource_create_with_modifiers && dmabuf_cap) {
driSWImageExtension.createImageFromDmaBufs = driVkImageExtension.createImageFromDmaBufs;
}
#endif
screen->create_drawable = drisw_create_drawable;
return configs;

40
src/gallium/frontends/dri/kopper.c
View file

@ -60,44 +60,8 @@ static struct dri_drawable *
kopper_create_drawable(struct dri_screen *screen, const struct gl_config *visual,
bool isPixmap, void *loaderPrivate);
static const __DRI2flushExtension driVkFlushExtension = {
.base = { __DRI2_FLUSH, 4 },
.flush = dri_flush_drawable,
.invalidate = dri_invalidate_drawable,
.flush_with_flags = dri_flush,
};
static const __DRIrobustnessExtension dri2Robustness = {
.base = { __DRI2_ROBUSTNESS, 1 }
};
const __DRIkopperExtension driKopperExtension;
static const __DRIextension *drivk_screen_extensions[] = {
&driTexBufferExtension.base,
&dri2GalliumConfigQueryExtension.base,
&dri2FenceExtension.base,
&dri2Robustness.base,
&driVkImageExtension.base,
&dri2FlushControlExtension.base,
&driVkFlushExtension.base,
&driKopperExtension.base,
NULL
};
static const __DRIextension *drivk_sw_screen_extensions[] = {
&driTexBufferExtension.base,
&dri2GalliumConfigQueryExtension.base,
&dri2FenceExtension.base,
&dri2Robustness.base,
&driVkImageExtensionSw.base,
&dri2FlushControlExtension.base,
&driVkFlushExtension.base,
NULL
};
static const __DRIconfig **
kopper_init_screen(struct dri_screen *screen, bool driver_name_is_inferred)
{
@ -135,10 +99,6 @@ kopper_init_screen(struct dri_screen *screen, bool driver_name_is_inferred)
assert(pscreen->get_param(pscreen, PIPE_CAP_DEVICE_RESET_STATUS_QUERY));
screen->is_sw = zink_kopper_is_cpu(pscreen);
if (screen->has_dmabuf)
screen->extensions = drivk_screen_extensions;
else
screen->extensions = drivk_sw_screen_extensions;
screen->create_drawable = kopper_create_drawable;