From 426f1cbea3ccb65861ddc0e8b1459446a25cbd52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 14 Nov 2022 20:48:38 -0500 Subject: [PATCH] dri: move private __DRIDriverVtableExtension out of dri_interface.h It's only used internally. Reviewed-by: Adam Jackson Part-of: --- include/GL/internal/dri_interface.h | 17 ----------------- src/gallium/frontends/dri/dri_util.h | 7 +++++++ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index 7f1f48243e1..b8b4d3e4a6f 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -1856,23 +1856,6 @@ typedef struct __DRIconfigOptionsExtensionRec { char *(*getXml)(const char *driver_name); } __DRIconfigOptionsExtension; -/** - * This extension provides a driver vtable to a set of common driver helper - * functions (driCoreExtension, driDRI2Extension) within the driver - * implementation, as opposed to having to pass them through a global - * variable. - * - * It is not intended to be public API to the actual loader, and the vtable - * layout may change at any time. - */ -#define __DRI_DRIVER_VTABLE "DRI_DriverVtable" -#define __DRI_DRIVER_VTABLE_VERSION 1 - -typedef struct __DRIDriverVtableExtensionRec { - __DRIextension base; - const struct __DriverAPIRec *vtable; -} __DRIDriverVtableExtension; - /** * Query renderer driver extension * diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h index 6e6bd76fba7..412fda87ea0 100644 --- a/src/gallium/frontends/dri/dri_util.h +++ b/src/gallium/frontends/dri/dri_util.h @@ -62,6 +62,13 @@ #include "util/xmlconfig.h" #include +#define __DRI_DRIVER_VTABLE "DRI_DriverVtable" + +typedef struct __DRIDriverVtableExtensionRec { + __DRIextension base; + const struct __DriverAPIRec *vtable; +} __DRIDriverVtableExtension; + struct __DRIconfigRec { struct gl_config modes; };