Since XF86DRIDestroyContext, XF86DRICreateDrawable, and

XF86DRIDestroyDrawable are directly called by drivers using the new
DRI interface, convert them to types available in the driver.  The
prototypes will also be duplicated in dri_interface.h so that drivers
do not need xf86dri.h anymore.

2 files changed, 17 insertions, 17 deletions

diff --git a/xc/lib/GL/glx/XF86dri.c b/xc/lib/GL/glx/XF86dri.c
index be43c2973..2e2e26cd0 100644
--- a/xc/lib/GL/glx/XF86dri.c
+++ b/xc/lib/GL/glx/XF86dri.c
@@ -370,11 +370,10 @@ Bool XF86DRICreateContext(dpy, screen, visual, context, hHWContext)
 					   context, hHWContext );
 }
 
-Bool XF86DRIDestroyContext(dpy, screen, context)
-    Display* dpy;
-    int screen;
-    XID context;
+Bool XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, 
+    __DRIid context )
 {
+    Display * const dpy = (Display *) ndpy;
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIDestroyContextReq *req;
 
@@ -393,12 +392,10 @@ Bool XF86DRIDestroyContext(dpy, screen, context)
     return True;
 }
 
-Bool XF86DRICreateDrawable(dpy, screen, drawable, hHWDrawable)
-    Display* dpy;
-    int screen;
-    Drawable drawable;
-    drm_drawable_t * hHWDrawable;
+Bool XF86DRICreateDrawable( __DRInativeDisplay * ndpy, int screen, 
+    __DRIid drawable, drm_drawable_t * hHWDrawable )
 {
+    Display * const dpy = (Display *) ndpy;
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRICreateDrawableReply rep;
     xXF86DRICreateDrawableReq *req;
@@ -425,11 +422,10 @@ Bool XF86DRICreateDrawable(dpy, screen, drawable, hHWDrawable)
     return True;
 }
 
-Bool XF86DRIDestroyDrawable(dpy, screen, drawable)
-    Display* dpy;
-    int screen;
-    Drawable drawable;
+Bool XF86DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
+    __DRIid drawable )
 {
+    Display * const dpy = (Display *) ndpy;
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIDestroyDrawableReq *req;
 
diff --git a/xc/lib/GL/glx/xf86dri.h b/xc/lib/GL/glx/xf86dri.h
index 2c7be46b1..134a2ff94 100644
--- a/xc/lib/GL/glx/xf86dri.h
+++ b/xc/lib/GL/glx/xf86dri.h
@@ -65,6 +65,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifndef _XF86DRI_SERVER_
 
+#include <GL/internal/dri_interface.h>
+
 _XFUNCPROTOBEGIN
 
 Bool XF86DRIQueryExtension( Display *dpy, int *event_base, int *error_base );
@@ -92,12 +94,14 @@ Bool XF86DRICreateContext( Display *dpy, int screen, Visual *visual,
 Bool XF86DRICreateContextWithConfig( Display *dpy, int screen, int configID,
     XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
 
-Bool XF86DRIDestroyContext( Display *dpy, int screen, XID context_id );
+extern Bool XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
+    __DRIid context_id );
 
-Bool XF86DRICreateDrawable( Display *dpy, int screen, Drawable drawable,
-    drm_drawable_t *hHWDrawable );
+extern Bool XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
+    __DRIid drawable, drm_drawable_t *hHWDrawable );
 
-Bool XF86DRIDestroyDrawable( Display *dpy, int screen, Drawable drawable );
+extern Bool XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, 
+    __DRIid drawable);
 
 Bool XF86DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable,
     unsigned int *index, unsigned int *stamp,