From 0ae7349e06e625203c65d5c739ad103c340eb9f2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 Jul 2024 09:27:42 -0400 Subject: [PATCH] egl/gbm: delete remnants of DRI_CORE Reviewed-by: Adam Jackson Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 3 --- src/egl/drivers/dri2/egl_dri2.h | 1 - src/egl/drivers/dri2/platform_drm.c | 1 - src/gbm/backends/dri/gbm_dri.c | 2 -- src/gbm/backends/dri/gbm_driint.h | 1 - 5 files changed, 8 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 446b433170f..b186cc277a0 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -585,7 +585,6 @@ const __DRIimageLookupExtension image_lookup_extension = { }; static const struct dri_extension_match dri3_driver_extensions[] = { - {__DRI_CORE, 1, offsetof(struct dri2_egl_display, core), false}, {__DRI_MESA, 2, offsetof(struct dri2_egl_display, mesa), false}, {__DRI_IMAGE_DRIVER, 2, offsetof(struct dri2_egl_display, image_driver), false}, @@ -594,7 +593,6 @@ static const struct dri_extension_match dri3_driver_extensions[] = { }; static const struct dri_extension_match dri2_driver_extensions[] = { - {__DRI_CORE, 1, offsetof(struct dri2_egl_display, core), false}, {__DRI_MESA, 2, offsetof(struct dri2_egl_display, mesa), false}, {__DRI_DRI2, 5, offsetof(struct dri2_egl_display, dri2), false}, {__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions), @@ -608,7 +606,6 @@ static const struct dri_extension_match dri2_core_extensions[] = { }; static const struct dri_extension_match swrast_driver_extensions[] = { - {__DRI_CORE, 1, offsetof(struct dri2_egl_display, core), false}, {__DRI_MESA, 2, offsetof(struct dri2_egl_display, mesa), false}, {__DRI_SWRAST, 5, offsetof(struct dri2_egl_display, swrast), false}, {__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions), diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 7547f6ebd48..b14e6d2f036 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -242,7 +242,6 @@ struct dri2_egl_display { __DRIscreen *dri_screen_display_gpu; bool own_dri_screen; const __DRIconfig **driver_configs; - const __DRIcoreExtension *core; const __DRImesaCoreExtension *mesa; const __DRIimageDriverExtension *image_driver; const __DRIdri2Extension *dri2; diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index c0eb005f355..fb03c0f4a4d 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -645,7 +645,6 @@ dri2_initialize_drm(_EGLDisplay *disp) } dri2_dpy->dri_screen_render_gpu = dri2_dpy->gbm_dri->screen; - dri2_dpy->core = dri2_dpy->gbm_dri->core; dri2_dpy->image_driver = dri2_dpy->gbm_dri->image_driver; dri2_dpy->swrast = dri2_dpy->gbm_dri->swrast; dri2_dpy->kopper = dri2_dpy->gbm_dri->kopper; diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 1546eebd77d..6bccedf544b 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -237,13 +237,11 @@ static struct dri_extension_match dri_core_extensions[] = { }; static struct dri_extension_match gbm_dri_device_extensions[] = { - { __DRI_CORE, 1, offsetof(struct gbm_dri_device, core), false }, { __DRI_MESA, 2, offsetof(struct gbm_dri_device, mesa), false }, { __DRI_IMAGE_DRIVER, 2, offsetof(struct gbm_dri_device, image_driver), false }, }; static struct dri_extension_match gbm_swrast_device_extensions[] = { - { __DRI_CORE, 1, offsetof(struct gbm_dri_device, core), false }, { __DRI_MESA, 2, offsetof(struct gbm_dri_device, mesa), false }, { __DRI_SWRAST, 5, offsetof(struct gbm_dri_device, swrast), false }, { __DRI_KOPPER, 1, offsetof(struct gbm_dri_device, kopper), true }, diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h index 03fd90a91c7..646f6f61173 100644 --- a/src/gbm/backends/dri/gbm_driint.h +++ b/src/gbm/backends/dri/gbm_driint.h @@ -56,7 +56,6 @@ struct gbm_dri_device { __DRIcontext *context; mtx_t mutex; - const __DRIcoreExtension *core; const __DRImesaCoreExtension *mesa; const __DRIimageExtension *image; const __DRIimageDriverExtension *image_driver;