From 789df29fc31ef19f8198e26c84b9b79200a96bf1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 Jul 2024 11:18:02 -0400 Subject: [PATCH] egl/gbm: remove DRI_KOPPER remnants kopper struct member is still useful as a check, so replace it accordingly Reviewed-by: Adam Jackson Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 2 +- src/egl/drivers/dri2/egl_dri2.h | 2 +- src/egl/drivers/dri2/platform_drm.c | 1 - src/gbm/backends/dri/gbm_dri.c | 1 - src/gbm/backends/dri/gbm_driint.h | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 1718a6791ef..36a40b48452 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -625,7 +625,6 @@ static const struct dri_extension_match optional_core_extensions[] = { {__DRI2_BLOB, 1, offsetof(struct dri2_egl_display, blob), true}, {__DRI_MUTABLE_RENDER_BUFFER_DRIVER, 1, offsetof(struct dri2_egl_display, mutable_render_buffer), true}, - {__DRI_KOPPER, 1, offsetof(struct dri2_egl_display, kopper), true}, }; const __DRIextension ** @@ -659,6 +658,7 @@ dri2_load_driver_common(_EGLDisplay *disp, return EGL_FALSE; } dri2_dpy->driver_extensions = extensions; + dri2_dpy->kopper = disp->Options.Zink && !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false); return EGL_TRUE; } diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 501d1281294..6202c55bdc6 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -245,7 +245,6 @@ struct dri2_egl_display { const __DRIimageDriverExtension *image_driver; const __DRIdri2Extension *dri2; const __DRIswrastExtension *swrast; - const __DRIkopperExtension *kopper; const __DRI2flushExtension *flush; const __DRI2flushControlExtension *flush_control; const __DRItexBufferExtension *tex_buffer; @@ -271,6 +270,7 @@ struct dri2_egl_display { bool own_device; bool invalidate_available; + bool kopper; int min_swap_interval; int max_swap_interval; int default_swap_interval; diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index d9edca4e1f7..8995876ecea 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -647,7 +647,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->swrast = dri2_dpy->gbm_dri->swrast; - dri2_dpy->kopper = dri2_dpy->gbm_dri->kopper; dri2_dpy->driver_configs = dri2_dpy->gbm_dri->driver_configs; dri2_dpy->gbm_dri->validate_image = dri2_validate_egl_image; diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 3e5c214cfa0..754264f6aa4 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -242,7 +242,6 @@ static struct dri_extension_match gbm_dri_device_extensions[] = { static struct dri_extension_match gbm_swrast_device_extensions[] = { { __DRI_SWRAST, 5, offsetof(struct gbm_dri_device, swrast), false }, - { __DRI_KOPPER, 1, offsetof(struct gbm_dri_device, kopper), true }, }; const __DRIextension ** diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h index a24aaa85e3f..fadfeafce89 100644 --- a/src/gbm/backends/dri/gbm_driint.h +++ b/src/gbm/backends/dri/gbm_driint.h @@ -59,7 +59,6 @@ struct gbm_dri_device { const __DRIimageExtension *image; const __DRIimageDriverExtension *image_driver; const __DRIswrastExtension *swrast; - const __DRIkopperExtension *kopper; const __DRI2flushExtension *flush; const __DRIconfig **driver_configs;