[xserver-commit] xserver/hw/kdrive/ati ati_drawtmp.h,1.1.2.3,1.1.2.4 r128_blendtmp.h,1.1.2.3,1.1.2.4

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/ati
In directory pdx:/home/anholt/xserver-dri/hw/kdrive/ati

Modified Files:
      Tag: dri-0-1-branch
	ati_drawtmp.h r128_blendtmp.h 
Log Message:
- Disable libdrm verbosity.  It isn't important enough yet to make
  a run-time flag for it.
- Fix the (void)atic; tricks to quiet unused variable warnings in
  ATI template files.  Mixing statements and variable defines works
  in newer compilers, but not pdx's.


Index: ati_drawtmp.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/Attic/ati_drawtmp.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- ati_drawtmp.h	28 Dec 2003 09:16:52 -0000	1.1.2.3
+++ ati_drawtmp.h	29 Dec 2003 05:10:55 -0000	1.1.2.4
@@ -25,15 +25,15 @@
 
 #ifdef USE_DMA
 #define TAG(x)		x##DMA
-#define LOCALS		(void)atic; \
-			RING_LOCALS
+#define LOCALS		RING_LOCALS; \
+			(void)atic
 #define BEGIN(x)	BEGIN_RING(x * 2)
 #define OUT_REG(reg, val) OUT_RING_REG(reg, val)
 #define END()		ADVANCE_RING()
 #else
 #define TAG(x)		x##MMIO
-#define LOCALS		(void)atis; \
-			char *mmio = atic->reg_base
+#define LOCALS		char *mmio = atic->reg_base; \
+			(void)atis
 #define BEGIN(x)	ATIWaitAvailMMIO(x)
 #define OUT_REG(reg, val) MMIO_OUT32((mmio), (reg), (val))
 #define END()

Index: r128_blendtmp.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/Attic/r128_blendtmp.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- r128_blendtmp.h	28 Dec 2003 09:16:52 -0000	1.1.2.3
+++ r128_blendtmp.h	29 Dec 2003 05:10:55 -0000	1.1.2.4
@@ -25,8 +25,8 @@
 
 #ifdef USE_DMA
 #define TAG(x)		x##DMA
-#define LOCALS		(void)atic; \
-			RING_LOCALS
+#define LOCALS		RING_LOCALS; \
+			(void)atic
 #define BEGIN(x)	BEGIN_RING(x * 2)
 #define OUT_REG(reg, val) OUT_RING_REG(reg, val)
 #define END()		ADVANCE_RING()