summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2004-06-01 16:38:56 +0000
committerIan Romanick <idr@us.ibm.com>2004-06-01 16:38:56 +0000
commitfabe2b9ba38e95bd21a35b265bfc403fa3cb2883 (patch)
tree20aeb25159eacb09821185988e0eace9010be5a2 /include
parenta249ad756f72835c5894e389150207b98532e114 (diff)
Replace all occurances of XF86DRIClipRect (and related typedefs) with
drm_clip_rect_t.
Diffstat (limited to 'include')
-rw-r--r--include/GL/internal/dri_interface.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 14b3751484..aaf2da8153 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -48,6 +48,7 @@
#include <GL/internal/glcore.h>
#include <xf86drm.h>
+#include <drm.h>
/**
* \name DRI interface structures
@@ -64,7 +65,6 @@ typedef struct __DRIdriverRec __DRIdriver;
typedef struct __DRIframebufferRec __DRIframebuffer;
typedef struct __DRIversionRec __DRIversion;
typedef unsigned long __DRIid;
-struct _XF86DRIClipRect;
/*@}*/
@@ -89,7 +89,7 @@ typedef int (* PFNGLXGETINTERNALVERSIONPROC) ( void );
*
* \sa __glXWindowExists, glXGetProcAddress
*/
-typedef Bool (* PFNGLXWINDOWEXISTSPROC) (Display *dpy, GLXDrawable draw);
+typedef Bool (* PFNGLXWINDOWEXISTSPROC) (Display *dpy, __DRIid draw);
/**
* Type of a pointer to \c __glXGetUST, as returned by \c glXGetProcAddress.
@@ -144,11 +144,11 @@ typedef void (* PFNGLXSCRENABLEEXTENSIONPROC) ( void *psc, const char * name );
* \sa __glXGetDrawableInfo, glXGetProcAddress
*/
typedef Bool (* PFNGLXGETDRAWABLEINFOPROC) ( Display *dpy, int scrn,
- Drawable draw, unsigned int * index, unsigned int * stamp,
+ __DRIid draw, unsigned int * index, unsigned int * stamp,
int * x, int * y, int * width, int * height,
- int * numClipRects, struct _XF86DRIClipRect ** pClipRects,
+ int * numClipRects, drm_clip_rect_t ** pClipRects,
int * backX, int * backY,
- int * numBackClipRects, struct _XF86DRIClipRect ** pBackClipRects );
+ int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );
/*@}*/
@@ -260,13 +260,13 @@ struct __DRIscreenRec {
* drawable dependent methods.
*/
void *(*createNewDrawable)(Display *dpy, const __GLcontextModes *modes,
- GLXDrawable draw, __DRIdrawable *pdraw,
+ __DRIid draw, __DRIdrawable *pdraw,
int renderType, const int *attrs);
/**
* Method to return a pointer to the DRI drawable data.
*/
- __DRIdrawable *(*getDrawable)(Display *dpy, GLXDrawable draw,
+ __DRIdrawable *(*getDrawable)(Display *dpy, __DRIid draw,
void *drawablePrivate);
/**