r300: Use the defined values when writing to R300_VAP_INPUT_CNTL_[01].

You can verify this is correct with the following code.

  assert (0x00000001 == R300_INPUT_CNTL_0_COLOR);

  assert (0x00000405 ==
	  (R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR |
	   R300_INPUT_CNTL_TC0));

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index d2cc97d213e344a9de81fb4596148c9440c71ccb..9e741b3ecd40a1ccd36b6522f9ce9745b17c0a53 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -210,10 +210,12 @@ static void r300EmitClearState(GLcontext * ctx)
        reg_start(R300_VAP_INPUT_ROUTE_1_0, 0);
        e32(0xF688F688);
 
+       /* R300_VAP_INPUT_CNTL_0, R300_VAP_INPUT_CNTL_1 */
        R300_STATECHANGE(r300, vic);
        reg_start(R300_VAP_INPUT_CNTL_0, 1);
-       e32(0x00000001);
-       e32(0x00000405);
+       e32(R300_INPUT_CNTL_0_COLOR);
+       e32(R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR | R300_INPUT_CNTL_TC0);
+
 
        if (!has_tcl) {
                R300_STATECHANGE(r300, vte);