From 546d71044a4e2a2c2cdd20fb02949b4052fc4ac7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 25 Jul 2024 14:16:06 -0400 Subject: [PATCH] loader/dri: delete DRI_IMAGE remnants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Adam Jackson Part-of: --- src/egl/drivers/dri2/platform_x11.c | 1 - src/glx/dri3_glx.c | 2 -- src/loader_dri3/loader_dri3_helper.h | 1 - 3 files changed, 4 deletions(-) diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index f393b1980a0..825b293d18f 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1928,7 +1928,6 @@ dri2_initialize_x11_dri3(_EGLDisplay *disp) dri2_dpy->screen); dri2_dpy->loader_dri3_ext.image_driver = dri2_dpy->image_driver; - dri2_dpy->loader_dri3_ext.image = dri2_dpy->image; /* Fill vtbl last to prevent accidentally calling virtual function during * initialization. diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index cb7ce3328a7..006e87a9eb9 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -835,8 +835,6 @@ dri3_create_screen(int screen, struct glx_display * priv, bool driver_name_is_in dri3_bind_extensions(psc, priv, driverName); - psc->loader_dri3_ext.image = psc->image; - configs = driConvertConfigs(psc->base.configs, driver_configs); visuals = driConvertConfigs(psc->base.visuals, driver_configs); diff --git a/src/loader_dri3/loader_dri3_helper.h b/src/loader_dri3/loader_dri3_helper.h index fe09a444bfa..cca3b23eefb 100644 --- a/src/loader_dri3/loader_dri3_helper.h +++ b/src/loader_dri3/loader_dri3_helper.h @@ -96,7 +96,6 @@ loader_dri3_pixmap_buf_id(enum loader_dri3_buffer_type buffer_type) struct loader_dri3_extensions { const __DRIimageDriverExtension *image_driver; - const __DRIimageExtension *image; }; struct loader_dri3_drawable;