summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/GL/internal/dri_interface.h19
-rw-r--r--src/mesa/drivers/dri/common/dri_util.c6
-rw-r--r--src/mesa/drivers/dri/dri_client/xf86dri.h213
3 files changed, 15 insertions, 223 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 977a8228594..be0496f6bc0 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -39,13 +39,9 @@
#define DRI_INTERFACE_H
#ifndef DRI_NEW_INTERFACE_ONLY
-/* FIXME: With a small amount of work, these two includes can be removed. */
-#include <X11/Xlib.h>
-#include <GL/glx.h>
-#endif
-
-#ifndef DRI_NEW_INTERFACE_ONLY
-#include <GL/glxint.h>
+# include <X11/X.h>
+# include <GL/glx.h>
+# include "GL/glxint.h"
#endif
#include <GL/internal/glcore.h>
@@ -152,6 +148,15 @@ typedef Bool (* PFNGLXGETDRAWABLEINFOPROC) ( __DRInativeDisplay *dpy, int scrn,
int * numClipRects, drm_clip_rect_t ** pClipRects,
int * backX, int * backY,
int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );
+
+extern Bool XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
+ __DRIid context_id );
+
+extern Bool XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
+ __DRIid drawable, drm_drawable_t *hHWDrawable );
+
+extern Bool XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen,
+ __DRIid drawable);
/*@}*/
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 6b251c1cd6b..8af4c0a50a3 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -37,12 +37,12 @@
#include <extutil.h>
#include <stdio.h>
#include "dri_util.h"
-#include "xf86dri.h"
+#ifndef DRI_NEW_INTERFACE_ONLY
+# include "xf86dri.h"
+#endif /* DRI_NEW_INTERFACE_ONLY */
#include "sarea.h"
#include "glcontextmodes.h"
-/*#define DRI_NEW_INTERFACE_ONLY*/
-
#ifndef GLX_OML_sync_control
typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (__DRInativeDisplay *dpy, __DRIid drawable, int32_t *numerator, int32_t *denominator);
#endif
diff --git a/src/mesa/drivers/dri/dri_client/xf86dri.h b/src/mesa/drivers/dri/dri_client/xf86dri.h
deleted file mode 100644
index d76c7b6a792..00000000000
--- a/src/mesa/drivers/dri/dri_client/xf86dri.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.8 2002/10/30 12:51:25 alanh Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- * Kevin E. Martin <[email protected]>
- * Jens Owen <[email protected]>
- * Rickard E. (Rik) Faith <[email protected]>
- *
- */
-
-#ifndef _XF86DRI_H_
-#define _XF86DRI_H_
-
-#include <X11/Xfuncproto.h>
-#include "drm.h"
-#include <xf86drm.h>
-
-#define X_XF86DRIQueryVersion 0
-#define X_XF86DRIQueryDirectRenderingCapable 1
-#define X_XF86DRIOpenConnection 2
-#define X_XF86DRICloseConnection 3
-#define X_XF86DRIGetClientDriverName 4
-#define X_XF86DRICreateContext 5
-#define X_XF86DRIDestroyContext 6
-#define X_XF86DRICreateDrawable 7
-#define X_XF86DRIDestroyDrawable 8
-#define X_XF86DRIGetDrawableInfo 9
-#define X_XF86DRIGetDeviceInfo 10
-#define X_XF86DRIAuthConnection 11
-#define X_XF86DRIOpenFullScreen 12 /* Deprecated */
-#define X_XF86DRICloseFullScreen 13 /* Deprecated */
-
-#define XF86DRINumberEvents 0
-
-#define XF86DRIClientNotLocal 0
-#define XF86DRIOperationNotSupported 1
-#define XF86DRINumberErrors (XF86DRIOperationNotSupported + 1)
-
-#ifndef _XF86DRI_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XF86DRIQueryExtension(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int* /* event_base */,
- int* /* error_base */
-#endif
-);
-
-Bool XF86DRIQueryVersion(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */,
- int* /* patchVersion */
-#endif
-);
-
-Bool XF86DRIQueryDirectRenderingCapable(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- Bool* /* isCapable */
-#endif
-);
-
-Bool XF86DRIOpenConnection(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- drmHandlePtr /* hSAREA */,
- char** /* busIDString */
-#endif
-);
-
-Bool XF86DRIAuthConnection(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- drmMagic /* magic */
-#endif
-);
-
-Bool XF86DRICloseConnection(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */
-#endif
-);
-
-Bool XF86DRIGetClientDriverName(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- int* /* ddxDriverMajorVersion */,
- int* /* ddxDriverMinorVersion */,
- int* /* ddxDriverPatchVersion */,
- char** /* clientDriverName */
-#endif
-);
-
-Bool XF86DRICreateContext(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- Visual* /* visual */,
- XID* /* ptr to returned context id */,
- drmContextPtr /* hHWContext */
-#endif
-);
-
-Bool XF86DRICreateContextWithConfig(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- int /* visual ID / fbconfig ID */,
- XID* /* ptr to returned context id */,
- drmContextPtr /* hHWContext */
-#endif
-);
-
-Bool XF86DRIDestroyContext(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- XID /* context id */
-#endif
-);
-
-Bool XF86DRICreateDrawable(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- Drawable /* drawable */,
- drmDrawablePtr /* hHWDrawable */
-#endif
-);
-
-Bool XF86DRIDestroyDrawable(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- Drawable /* drawable */
-#endif
-);
-
-Bool XF86DRIGetDrawableInfo(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- Drawable /* drawable */,
- unsigned int* /* index */,
- unsigned int* /* stamp */,
- int* /* X */,
- int* /* Y */,
- int* /* W */,
- int* /* H */,
- int* /* numClipRects */,
- drm_clip_rect_t*, /* pClipRects */
- int* /* backX */,
- int* /* backY */,
- int* /* numBackClipRects */,
- drm_clip_rect_t* /* pBackClipRects */
-#endif
-);
-
-Bool XF86DRIGetDeviceInfo(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- int /* screen */,
- drmHandlePtr /* hFrameBuffer */,
- int* /* fbOrigin */,
- int* /* fbSize */,
- int* /* fbStride */,
- int* /* devPrivateSize */,
- void** /* pDevPrivate */
-#endif
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XF86DRI_SERVER_ */
-
-#endif /* _XF86DRI_H_ */
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 20:21:14 +0000