r300: Renamed the CACHE_CTLSTAT values to include UNKNOWN in the name; not

enough information is known about them to be sure as to what the values mean.

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index f0741f978d4b97968ddc56eaee68d428f80834d9..f674fea7c9e9d19099b8daa6d93ddc664605c71a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -162,11 +162,11 @@ static void r300ClearBuffer(r300ContextPtr r300, int flags, int buffer)
        cmd2[8].u = r300PackFloat32(ctx->Color.ClearColor[3]);
 
        reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
-       e32(R300_RB3D_DSTCACHE_0A);
+       e32(R300_RB3D_DSTCACHE_UNKNOWN_0A);
          
 
        reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
-       e32(R300_RB3D_ZCACHE_CTLSTAT_03);
+       e32(R300_RB3D_ZCACHE_UNKNOWN_03);
        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 f9accadf61ce6e4b2f9529eb5512c36bb216913f..3de15752b164aa5addffbd831f786b0fa508b656 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_reg.h
+++ b/src/mesa/drivers/dri/r300/r300_reg.h
@@ -1324,8 +1324,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Set to 0A before 3D operations, set to 02 afterwards.
  */
 #define R300_RB3D_DSTCACHE_CTLSTAT          0x4E4C
-#       define R300_RB3D_DSTCACHE_02             0x00000002
-#       define R300_RB3D_DSTCACHE_0A             0x0000000A
+#       define R300_RB3D_DSTCACHE_UNKNOWN_02             0x00000002
+#       define R300_RB3D_DSTCACHE_UNKNOWN_0A             0x0000000A
 
 /* gap */
 /* There seems to be no "write only" setting, so use Z-test = ALWAYS
@@ -1397,8 +1397,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* gap */
 
 #define R300_RB3D_ZCACHE_CTLSTAT            0x4F18 /* GUESS */
-#       define R300_RB3D_ZCACHE_CTLSTAT_01  0x1
-#       define R300_RB3D_ZCACHE_CTLSTAT_03  0x3
+#       define R300_RB3D_ZCACHE_UNKNOWN_01  0x1
+#       define R300_RB3D_ZCACHE_UNKNOWN_03  0x3
 
 /* gap */
 

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 659ec3ff54c01703db3ceed79c13d62ce1853140..0864558e8dc16e5a344dff6c1c69a517d544242d 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -344,10 +344,10 @@ GLboolean r300_run_vb_render(GLcontext *ctx,
        r300UpdateShaderStates(rmesa);
        
        reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
-       e32(R300_RB3D_DSTCACHE_0A);
+       e32(R300_RB3D_DSTCACHE_UNKNOWN_0A);
 
        reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
-       e32(R300_RB3D_ZCACHE_CTLSTAT_03);
+       e32(R300_RB3D_ZCACHE_UNKNOWN_03);
        
        r300EmitState(rmesa);
        
@@ -360,10 +360,10 @@ GLboolean r300_run_vb_render(GLcontext *ctx,
        }
 
        reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
-       e32(R300_RB3D_DSTCACHE_0A /*R300_RB3D_DSTCACHE_02*/);
+       e32(R300_RB3D_DSTCACHE_UNKNOWN_0A /*R300_RB3D_DSTCACHE_UNKNOWN_02*/);
 
        reg_start(R300_RB3D_ZCACHE_CTLSTAT,0);
-       e32(R300_RB3D_ZCACHE_CTLSTAT_03 /*R300_RB3D_ZCACHE_CTLSTAT_01*/);
+       e32(R300_RB3D_ZCACHE_UNKNOWN_03 /*R300_RB3D_ZCACHE_UNKNOWN_01*/);
 
 #ifdef USER_BUFFERS
        r300UseArrays(ctx);

diff --git a/src/mesa/drivers/dri/r300/radeon_mm.c b/src/mesa/drivers/dri/r300/radeon_mm.c
index 065f288e4ca06c0a2418c0868df0fb39f5ec070c..1502dac8fc3af662520af96be40dfda4163f94dd 100644 (file)
--- 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 rmesa, unsigned long dst, unsigned long s
        }
        
        reg_start(R300_RB3D_DSTCACHE_CTLSTAT,0);
-       e32(R300_RB3D_DSTCACHE_0A);
+       e32(R300_RB3D_DSTCACHE_UNKNOWN_0A);
        
        reg_start(0x342c,0);
        e32(0x00000005);