mesa: Branch 'master'

[Oliver McFadden]

 src/mesa/drivers/dri/r300/r300_ioctl.c  |    2 +-
 src/mesa/drivers/dri/r300/r300_reg.h    |    4 ++++
 src/mesa/drivers/dri/r300/r300_render.c |    4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
diff-tree 0c750ca98de5a08c0fe4c513a741c78b7bab80e3 (from 708d836e6b785764692c485e6cdf42f2b50fcf86)
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Tue Mar 13 00:48:17 2007 +0000

    Guess another unknown register used for R300 pacification.

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 6fa34ee..41114a8 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -165,7 +165,7 @@ static void r300ClearBuffer(r300ContextP
 	e32(0x0000000a);
 	  
 
-	reg_start(0x4f18,0);
+	reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
 	e32(0x00000003);
 	cp_wait(rmesa, R300_WAIT_3D | R300_WAIT_3D_CLEAN);
 }
diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h
index 7bc832c..be357ab 100644
--- a/src/mesa/drivers/dri/r300/r300_reg.h
+++ b/src/mesa/drivers/dri/r300/r300_reg.h
@@ -1395,6 +1395,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /* gap */
 
+#define R300_RB3D_ZCACHE_CTLSTAT            0x4F18 /* GUESS */
+
+/* gap */
+
 #define R300_RB3D_DEPTHOFFSET               0x4F20
 #define R300_RB3D_DEPTHPITCH                0x4F24
 #       define R300_DEPTHPITCH_MASK              0x00001FF8 /* GUESS */
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 211c451..7a850b1 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -346,7 +346,7 @@ GLboolean r300_run_vb_render(GLcontext *
 	reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
 	e32(0x0000000a);
 
-	reg_start(0x4f18,0);
+	reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
 	e32(0x00000003);
 	
 	r300EmitState(rmesa);
@@ -362,7 +362,7 @@ GLboolean r300_run_vb_render(GLcontext *
 	reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
 	e32(0x0000000a/*0x2*/);
 
-	reg_start(0x4f18,0);
+	reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
 	e32(0x00000003/*0x1*/);
 
 #ifdef USER_BUFFERS