mesa: Branch 'master'

[Oliver McFadden]

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

New commits:
diff-tree cd6660475646defb6311491028dfe50202709b59 (from 0c750ca98de5a08c0fe4c513a741c78b7bab80e3)
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Tue Mar 13 01:31:38 2007 +0000

    Corrected values written to R300_RB3D_DSTCACHE_CTLSTAT to either
    R300_RB3D_DSTCACHE_02 or R300_RB3D_DSTCACHE_0A, rather than hexadecimal values.

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 41114a8..bb16cd1 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -162,7 +162,7 @@ static void r300ClearBuffer(r300ContextP
 	cmd2[8].u = r300PackFloat32(ctx->Color.ClearColor[3]);
 
 	reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
-	e32(0x0000000a);
+	e32(R300_RB3D_DSTCACHE_0A);
 	  
 
 	reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 7a850b1..87d370e 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -344,7 +344,7 @@ GLboolean r300_run_vb_render(GLcontext *
 	r300UpdateShaderStates(rmesa);
 	
 	reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
-	e32(0x0000000a);
+	e32(R300_RB3D_DSTCACHE_0A);
 
 	reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
 	e32(0x00000003);
@@ -360,7 +360,7 @@ GLboolean r300_run_vb_render(GLcontext *
 	}
 
 	reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
-	e32(0x0000000a/*0x2*/);
+	e32(R300_RB3D_DSTCACHE_0A /*R300_RB3D_DSTCACHE_02*/);
 
 	reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
 	e32(0x00000003/*0x1*/);
diff --git a/src/mesa/drivers/dri/r300/radeon_mm.c b/src/mesa/drivers/dri/r300/radeon_mm.c
index 32ed1f4..065f288 100644
--- a/src/mesa/drivers/dri/r300/radeon_mm.c
+++ b/src/mesa/drivers/dri/r300/radeon_mm.c
@@ -284,7 +284,7 @@ static void emit_lin_cp(r300ContextPtr r
 	}
 	
 	reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
-	e32(0x0000000a);
+	e32(R300_RB3D_DSTCACHE_0A);
 	
 	reg_start(0x342c,0);
 	e32(0x00000005);