From: Ian Romanick Date: Tue, 1 Jun 2004 16:38:56 +0000 (+0000) Subject: Replace all occurances of XF86DRIClipRect (and related typedefs) with X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fabe2b9ba38e95bd21a35b265bfc403fa3cb2883;p=mesa.git Replace all occurances of XF86DRIClipRect (and related typedefs) with drm_clip_rect_t. --- diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index 14b3751484e..aaf2da8153c 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -48,6 +48,7 @@ #include #include +#include /** * \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); /**