summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/dri_client
diff options
context:
space:
mode:
authorDave Airlie <airliedfreedesktop.org>2004-05-03 06:49:40 +0000
committerDave Airlie <airliedfreedesktop.org>2004-05-03 06:49:40 +0000
commitf7423f462882ce96725e84cf7f28cee2c45f801b (patch)
tree8ff805b36629e78b45954b04f05586efa76028be /src/mesa/drivers/dri/dri_client
parent79518b6f37cc5feca1931de558dc8033d2c643a7 (diff)
fix up build for solo/dri
Diffstat (limited to 'src/mesa/drivers/dri/dri_client')
-rw-r--r--src/mesa/drivers/dri/dri_client/Makefile1
-rw-r--r--src/mesa/drivers/dri/dri_client/dri_util.c2
-rw-r--r--src/mesa/drivers/dri/dri_client/dri_util.h10
-rw-r--r--src/mesa/drivers/dri/dri_client/xf86dri.h14
4 files changed, 10 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/dri_client/Makefile b/src/mesa/drivers/dri/dri_client/Makefile
index a6071586eb..48ec3cce4e 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 08f3fee181..03d92c02f2 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 4764bbbc66..5c198810f7 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 013f5b32d5..d76c7b6a79 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
);