dri: delete __DRIdri2Extension interface

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524>
This commit is contained in:
Mike Blumenkrantz 2024-07-30 12:52:25 -04:00 committed by Marge Bot
parent afe6309449
commit b53620b2b3
5 changed files with 0 additions and 93 deletions

View file

@ -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
};

View file

@ -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 },

View file

@ -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;

View file

@ -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,

View file

@ -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