diff options
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/dri_client/Makefile | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/dri_client/dri_util.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/dri_client/dri_util.h | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/dri_client/xf86dri.h | 14 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i810/server/i810_dri.h | 2 |
5 files changed, 11 insertions, 18 deletions
diff --git a/src/mesa/drivers/dri/dri_client/Makefile b/src/mesa/drivers/dri/dri_client/Makefile index a6071586eb8..48ec3cce4e4 100644 --- a/src/mesa/drivers/dri/dri_client/Makefile +++ b/src/mesa/drivers/dri/dri_client/Makefile @@ -21,6 +21,7 @@ OBJECTS = $(C_SOURCES:.c=.o) INCLUDES = \ -I$(TOP)/include \ + -I$(DRM_SOURCE_PATH)/shared \ -I$(TOP)/include/GL/internal \ -I$(TOP)/src/mesa \ -I$(TOP)/src/mesa/main \ diff --git a/src/mesa/drivers/dri/dri_client/dri_util.c b/src/mesa/drivers/dri/dri_client/dri_util.c index 08f3fee1819..03d92c02f2e 100644 --- a/src/mesa/drivers/dri/dri_client/dri_util.c +++ b/src/mesa/drivers/dri/dri_client/dri_util.c @@ -36,9 +36,9 @@ #include <Xext.h> #include <extutil.h> #include <stdio.h> +#include "dri_util.h" #include "xf86dri.h" #include "sarea.h" -#include "dri_util.h" #include "glcontextmodes.h" /*#define DRI_NEW_INTERFACE_ONLY*/ diff --git a/src/mesa/drivers/dri/dri_client/dri_util.h b/src/mesa/drivers/dri/dri_client/dri_util.h index 4764bbbc665..5c198810f72 100644 --- a/src/mesa/drivers/dri/dri_client/dri_util.h +++ b/src/mesa/drivers/dri/dri_client/dri_util.h @@ -57,7 +57,7 @@ #include "glxclient.h" /* for GLXDrawable */ /* temporary */ /* typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator); */ -#include "xf86dri.h" /* for XF86DRIClipRectPtr */ +#include "drm.h" /* for drm_clip_rect_t */ #include "sarea.h" /* for XF86DRISAREAPtr */ #include "GL/internal/glcore.h" /* for __GLcontextModes */ @@ -257,9 +257,9 @@ struct __DRIswapInfoRec { typedef Bool (GetDrawableInfo)( Display *dpy, int scrn, Drawable draw, unsigned int * index, unsigned int * stamp, int * x, int * y, int * width, int * height, - int * numClipRects, XF86DRIClipRectPtr * pClipRects, + int * numClipRects, drm_clip_rect_t * pClipRects, int * backX, int * backY, - int * numBackClipRects, XF86DRIClipRectPtr * pBackClipRects ); + int * numBackClipRects, drm_clip_rect_t * pBackClipRects ); /** @@ -324,7 +324,7 @@ struct __DRIdrawablePrivateRec { int w; int h; int numClipRects; - XF86DRIClipRectPtr pClipRects; + drm_clip_rect_t *pClipRects; /*@}*/ /** @@ -337,7 +337,7 @@ struct __DRIdrawablePrivateRec { int backY; int backClipRectType; int numBackClipRects; - XF86DRIClipRectPtr pBackClipRects; + drm_clip_rect_t *pBackClipRects; /*@}*/ /** diff --git a/src/mesa/drivers/dri/dri_client/xf86dri.h b/src/mesa/drivers/dri/dri_client/xf86dri.h index 013f5b32d5d..d76c7b6a792 100644 --- a/src/mesa/drivers/dri/dri_client/xf86dri.h +++ b/src/mesa/drivers/dri/dri_client/xf86dri.h @@ -39,6 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define _XF86DRI_H_ #include <X11/Xfuncproto.h> +#include "drm.h" #include <xf86drm.h> #define X_XF86DRIQueryVersion 0 @@ -62,15 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XF86DRIOperationNotSupported 1 #define XF86DRINumberErrors (XF86DRIOperationNotSupported + 1) -/* Warning : Do not change XF86DRIClipRect without changing the kernel - * structure! */ -typedef struct _XF86DRIClipRect { - unsigned short x1; /* Upper left: inclusive */ - unsigned short y1; - unsigned short x2; /* Lower right: exclusive */ - unsigned short y2; -} XF86DRIClipRectRec, *XF86DRIClipRectPtr; - #ifndef _XF86DRI_SERVER_ _XFUNCPROTOBEGIN @@ -192,11 +184,11 @@ Bool XF86DRIGetDrawableInfo( int* /* W */, int* /* H */, int* /* numClipRects */, - XF86DRIClipRectPtr*,/* pClipRects */ + drm_clip_rect_t*, /* pClipRects */ int* /* backX */, int* /* backY */, int* /* numBackClipRects */, - XF86DRIClipRectPtr* /* pBackClipRects */ + drm_clip_rect_t* /* pBackClipRects */ #endif ); diff --git a/src/mesa/drivers/dri/i810/server/i810_dri.h b/src/mesa/drivers/dri/i810/server/i810_dri.h index cfca20a95b8..2931988c879 100644 --- a/src/mesa/drivers/dri/i810/server/i810_dri.h +++ b/src/mesa/drivers/dri/i810/server/i810_dri.h @@ -78,7 +78,7 @@ typedef struct { unsigned int dirty; unsigned int nbox; - XF86DRIClipRectRec boxes[I810_NR_SAREA_CLIPRECTS]; + drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS]; /* Maintain an LRU of contiguous regions of texture space. If * you think you own a region of texture memory, and it has an |