R300: fix rebase conflicts

diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index 5d6be48f7649361ec822a1077b1212c4b15a9e6e..3f9d9da3998f42344729a217a3fe87caf2cd38b2 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -402,7 +402,7 @@ void r300InitCmdBuf(r300ContextPtr r300)
                ALLOC_STATE(ri, always, R300_RI_CMDSIZE, 0);
                r300->hw.ri.cmd[R300_RI_CMD_0] = cmdpacket0(R300_RS_IP_0, 8);
                ALLOC_STATE(rr, variable, R300_RR_CMDSIZE, 0);
-               r300->hw.rr.cmd[R300_RR_CMD_0] = cmdpacket0(R300_RS_ROUTE_0, 1);
+               r300->hw.rr.cmd[R300_RR_CMD_0] = cmdpacket0(R300_RS_INST_0, 1);
        }
        ALLOC_STATE(sc_hyperz, always, 3, 0);
        r300->hw.sc_hyperz.cmd[0] = cmdpacket0(R300_SC_HYPERZ, 2);

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 530c3711d9e39a91cf8e69ef33c70970a4bc1e78..d38ee9003d27345013871b6a4c127f28ad8987fb 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -305,8 +305,8 @@ static void r300EmitClearState(GLcontext * ctx)
                e32(0x0);
 
                R300_STATECHANGE(r300, rr);
-               reg_start(R300_RS_ROUTE_0, 0);
-               e32(R300_RS_ROUTE_0_COLOR);
+               reg_start(R300_RS_INST_0, 0);
+               e32(R500_RS_INST_COL_CN_WRITE);
        } else {
          
                R300_STATECHANGE(r300, ri);