From 318aa8409983f3292b4919196df2ca42f4de6a16 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Wed, 2 Jun 2004 17:37:09 +0000
Subject: XF86DRIDestroyContext, XF86DRICreateDrawable, and
 XF86DRIDestroyDrawable are all called directly from DRI drivers using the new
 interface.  Therefore, prototypes, using available datatypes, must be
 available in dri_interface.h.  Since the prototypes are available there,
 xf86dri.h is no longer needed for DRI_NEW_INTERFACE_ONLY builds.

---
 include/GL/internal/dri_interface.h | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'include/GL')

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);
 /*@}*/
 
 
-- 
cgit v1.2.3