I noticed there are two conflicting definitions for this in
programs/Xserver/hw/xfree86/drivers/ati/r128_common.h. One of them used
to be in programs/Xserver/hw/xfree86/os-support/xf86drmR128.h, the other
one was introduced with the drmCommand stuff.
Does this fix look good?
--
Earthling Michel D�nzer (MrCooper)/ Debian GNU/Linux (powerpc) developer
XFree86 and DRI project member / CS student, Free Software enthusiast
Index: lib/GL/mesa/src/drv/r128/r128_ioctl.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c,v
retrieving revision 1.16
diff -u -r1.16 r128_ioctl.c
--- lib/GL/mesa/src/drv/r128/r128_ioctl.c 9 Apr 2002 21:54:51 -0000 1.16
+++ lib/GL/mesa/src/drv/r128/r128_ioctl.c 25 May 2002 20:19:39 -0000
@@ -419,23 +419,23 @@
}
if ( mask & DD_FRONT_LEFT_BIT ) {
- flags |= DRM_R128_FRONT;
+ flags |= DRM_R128_FRONT_BUFFER;
mask &= ~DD_FRONT_LEFT_BIT;
}
if ( mask & DD_BACK_LEFT_BIT ) {
- flags |= DRM_R128_BACK;
+ flags |= DRM_R128_BACK_BUFFER;
mask &= ~DD_BACK_LEFT_BIT;
}
if ( ( mask & DD_DEPTH_BIT ) && ctx->Depth.Mask ) {
- flags |= DRM_R128_DEPTH;
+ flags |= DRM_R128_DEPTH_BUFFER;
mask &= ~DD_DEPTH_BIT;
}
#if 0
/* FIXME: Add stencil support */
if ( mask & DD_STENCIL_BIT ) {
- flags |= DRM_R128_DEPTH;
+ flags |= DRM_R128_DEPTH_BUFFER;
mask &= ~DD_STENCIL_BIT;
}
#endif
Index: programs/Xserver/hw/xfree86/drivers/ati/r128_common.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_common.h,v
retrieving revision 1.2
diff -u -r1.2 r128_common.h
--- programs/Xserver/hw/xfree86/drivers/ati/r128_common.h 9 Apr 2002 21:54:52 -0000 1.2
+++ programs/Xserver/hw/xfree86/drivers/ati/r128_common.h 25 May 2002 20:19:39 -0000
@@ -67,9 +67,9 @@
#define DRM_R128_FULLSCREEN 0x10
#define DRM_R128_CLEAR2 0x11
-#define DRM_R128_FRONT 0x1
-#define DRM_R128_BACK 0x2
-#define DRM_R128_DEPTH 0x4
+#define DRM_R128_FRONT_BUFFER 0x1
+#define DRM_R128_BACK_BUFFER 0x2
+#define DRM_R128_DEPTH_BUFFER 0x4
typedef struct {
enum {
