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

egl/gbm: delete DRI_IMAGE_DRIVER remnants

Browse source 
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30472>
This commit is contained in:
Mike Blumenkrantz 2024-07-26 15:43:43 -04:00 • committed by Marge Bot
parent ea1855caba
commit 027de039a3
5 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/egl/drivers/dri2/egl_dri2.c
View file

@ -585,8 +585,6 @@ const __DRIimageLookupExtension image_lookup_extension = {
};
static const struct dri_extension_match dri3_driver_extensions[] = {
{__DRI_IMAGE_DRIVER, 2, offsetof(struct dri2_egl_display, image_driver),
false},
{__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions),
true},
};
@ -743,7 +741,6 @@ dri2_setup_screen(_EGLDisplay *disp)
if ((api_mask & (1 << __DRI_API_GLES3)) && _eglIsApiValid(EGL_OPENGL_ES_API))
disp->ClientAPIs |= EGL_OPENGL_ES3_BIT_KHR;
assert(dri2_dpy->image_driver || dri2_dpy->dri2 || dri2_dpy->kopper || dri2_dpy->swrast);
disp->Extensions.KHR_create_context = EGL_TRUE;
disp->Extensions.KHR_create_context_no_error = EGL_TRUE;
disp->Extensions.KHR_no_config_context = EGL_TRUE;

1
src/egl/drivers/dri2/egl_dri2.h
View file

@ -242,7 +242,6 @@ struct dri2_egl_display {
__DRIscreen *dri_screen_display_gpu;
bool own_dri_screen;
const __DRIconfig **driver_configs;
const __DRIimageDriverExtension *image_driver;
const __DRIdri2Extension *dri2;
const __DRI2flushExtension *flush;
const __DRI2flushControlExtension *flush_control;

1
src/egl/drivers/dri2/platform_drm.c
View file

@ -645,7 +645,6 @@ dri2_initialize_drm(_EGLDisplay *disp)
}
dri2_dpy->dri_screen_render_gpu = dri2_dpy->gbm_dri->screen;
dri2_dpy->image_driver = dri2_dpy->gbm_dri->image_driver;
dri2_dpy->driver_configs = dri2_dpy->gbm_dri->driver_configs;
dri2_dpy->gbm_dri->validate_image = dri2_validate_egl_image;

18
src/gbm/backends/dri/gbm_dri.c
View file

@ -236,10 +236,6 @@ static struct dri_extension_match dri_core_extensions[] = {
{ __DRI_IMAGE, 6, offsetof(struct gbm_dri_device, image), false },
};
static struct dri_extension_match gbm_dri_device_extensions[] = {
{ __DRI_IMAGE_DRIVER, 2, offsetof(struct gbm_dri_device, image_driver), false },
};
const __DRIextension **
dri_loader_get_extensions(const char *driver_name);
@ -271,22 +267,8 @@ dri_screen_create_for_driver(struct gbm_dri_device *dri, char *driver_name, bool
goto fail;
}
bool bind_ok;
if (!swrast) {
bind_ok = loader_bind_extensions(dri, gbm_dri_device_extensions,
ARRAY_SIZE(gbm_dri_device_extensions),
extensions);
} else {
bind_ok = true;
}
dri->swrast = swrast;
if (!bind_ok) {
fprintf(stderr, "failed to bind extensions\n");
goto fail;
}
dri->driver_extensions = extensions;
dri->loader_extensions = gbm_dri_screen_extensions;
dri->screen = driCreateNewScreen3(0, swrast ? -1 : dri->base.v0.fd,

1
src/gbm/backends/dri/gbm_driint.h
View file

@ -58,7 +58,6 @@ struct gbm_dri_device {
mtx_t mutex;
const __DRIimageExtension *image;
const __DRIimageDriverExtension *image_driver;
const __DRI2flushExtension *flush;
const __DRIconfig **driver_configs;