From b53620b2b3eaf20416f4df016fe689d7d982220c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 30 Jul 2024 12:52:25 -0400 Subject: [PATCH] dri: delete __DRIdri2Extension interface 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/gallium/frontends/dri/dri2.c | 2 - src/gallium/frontends/dri/dri_util.c | 33 ----------------- src/gallium/frontends/dri/dri_util.h | 2 - src/gallium/frontends/dri/kopper.c | 1 - src/gallium/include/mesa_interface.h | 55 ---------------------------- 5 files changed, 93 deletions(-) diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index 3456ab22e6b..f123a7edc8d 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -2312,7 +2312,6 @@ const __DRIextension *galliumdrm_driver_extensions[] = { &driCoreExtension.base, &mesaCoreExtension.base, &driImageDriverExtension.base, - &driDRI2Extension.base, &gallium_config_options.base, NULL }; @@ -2329,7 +2328,6 @@ const __DRIextension *dri_swrast_kms_driver_extensions[] = { &driCoreExtension.base, &swkmsMesaCoreExtension.base, &driImageDriverExtension.base, - &swkmsDRI2Extension.base, &gallium_config_options.base, NULL }; diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c index eb3f40f1532..3e42267f3e7 100644 --- a/src/gallium/frontends/dri/dri_util.c +++ b/src/gallium/frontends/dri/dri_util.c @@ -996,39 +996,6 @@ const __DRIcoreExtension driCoreExtension = { .unbindContext = driUnbindContext }; -#if HAVE_DRI2 - -/** DRI2 interface */ -const __DRIdri2Extension driDRI2Extension = { - .base = { __DRI_DRI2, 5 }, - - .createNewScreen = dri2CreateNewScreen, - .createNewDrawable = driCreateNewDrawable, - .createNewContext = driCreateNewContext, - .getAPIMask = driGetAPIMask, - .createNewContextForAPI = driCreateNewContextForAPI, - .allocateBuffer = dri2AllocateBuffer, - .releaseBuffer = dri2ReleaseBuffer, - .createContextAttribs = driCreateContextAttribs, - .createNewScreen3 = driCreateNewScreen3, -}; - -const __DRIdri2Extension swkmsDRI2Extension = { - .base = { __DRI_DRI2, 5 }, - - .createNewScreen = swkmsCreateNewScreen, - .createNewDrawable = driCreateNewDrawable, - .createNewContext = driCreateNewContext, - .getAPIMask = driGetAPIMask, - .createNewContextForAPI = driCreateNewContextForAPI, - .allocateBuffer = dri2AllocateBuffer, - .releaseBuffer = dri2ReleaseBuffer, - .createContextAttribs = driCreateContextAttribs, - .createNewScreen3 = driCreateNewScreen3, -}; - -#endif - const __DRIswrastExtension driSWRastExtension = { .base = { __DRI_SWRAST, 5 }, diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h index 52a3e9d8218..dcaee366034 100644 --- a/src/gallium/frontends/dri/dri_util.h +++ b/src/gallium/frontends/dri/dri_util.h @@ -56,8 +56,6 @@ struct __DRIconfigRec { */ extern const __DRIcoreExtension driCoreExtension; extern const __DRIswrastExtension driSWRastExtension; -extern const __DRIdri2Extension driDRI2Extension; -extern const __DRIdri2Extension swkmsDRI2Extension; extern const __DRI2flushControlExtension dri2FlushControlExtension; extern const __DRI2configQueryExtension dri2GalliumConfigQueryExtension; diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index d65b2c05b0d..a4f486bf872 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -943,7 +943,6 @@ const __DRIextension *galliumvk_driver_extensions[] = { &driCoreExtension.base, &mesaCoreExtension.base, &driSWRastExtension.base, - &driDRI2Extension.base, &driImageDriverExtension.base, &driKopperExtension.base, &gallium_config_options.base, diff --git a/src/gallium/include/mesa_interface.h b/src/gallium/include/mesa_interface.h index b6f99db9172..439d08607f7 100644 --- a/src/gallium/include/mesa_interface.h +++ b/src/gallium/include/mesa_interface.h @@ -1118,61 +1118,6 @@ struct __DRIdri2LoaderExtensionRec { #define __DRI_CTX_ERROR_UNKNOWN_FLAG 6 /*@}*/ -struct __DRIdri2ExtensionRec { - __DRIextension base; - - __DRIscreen *(*createNewScreen)(int screen, int fd, - const __DRIextension **extensions, - const __DRIconfig ***driver_configs, - void *loaderPrivate); - - __DRIcreateNewDrawableFunc createNewDrawable; - __DRIcontext *(*createNewContext)(__DRIscreen *screen, - const __DRIconfig *config, - __DRIcontext *shared, - void *loaderPrivate); - - /* Since version 2 */ - __DRIgetAPIMaskFunc getAPIMask; - - __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen, - int api, - const __DRIconfig *config, - __DRIcontext *shared, - void *data); - - __DRIbuffer *(*allocateBuffer)(__DRIscreen *screen, - unsigned int attachment, - unsigned int format, - int width, - int height); - void (*releaseBuffer)(__DRIscreen *screen, - __DRIbuffer *buffer); - - /** - * Create a context for a particular API with a set of attributes - * - * \since version 3 - * - * \sa __DRIswrastExtensionRec::createContextAttribs - */ - __DRIcreateContextAttribsFunc createContextAttribs; - - /** - * createNewScreen with the driver's extension list passed in. - * - * \since version 4 - */ - __DRIcreateNewScreen2Func createNewScreen2; - - /** - * createNewScreen with the driver's extension list passed in and implicit load flag. - * - * \since version 5 - */ - __DRIcreateNewScreen3Func createNewScreen3; -}; - /** * This extension provides functionality to enable various EGLImage