r300g: remove variant states from emit_state_invariant
authorMarek Olšák <maraeo@gmail.com>
Thu, 19 Nov 2009 20:07:20 +0000 (21:07 +0100)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 20 Nov 2009 23:08:52 +0000 (15:08 -0800)
src/gallium/drivers/r300/r300_state_invariant.c

index c07e6ae676d962c61039975ecf5eb0ab847b8fc9..46d1cb39b54d9663c8e0c9669a60654478d0f6cf 100644 (file)
@@ -84,7 +84,7 @@ void r300_emit_invariant_state(struct r300_context* r300)
     END_CS;
 
     /* XXX unsorted stuff from surface_fill */
-    BEGIN_CS(60 + (caps->has_tcl ? 5 : 0) + (caps->is_r500 ? 4 : 0));
+    BEGIN_CS(56 + (caps->has_tcl ? 5 : 0) + (caps->is_r500 ? 4 : 0));
     /* Flush PVS. */
     OUT_CS_REG(R300_VAP_PVS_STATE_FLUSH_REG, 0x0);
 
@@ -135,8 +135,6 @@ void r300_emit_invariant_state(struct r300_context* r300)
     OUT_CS_REG(R300_ZB_DEPTHCLEARVALUE, 0x00000000);
     OUT_CS_REG(R300_ZB_HIZ_OFFSET, 0x00000000);
     OUT_CS_REG(R300_ZB_HIZ_PITCH, 0x00000000);
-    OUT_CS_REG(R300_VAP_VTX_STATE_CNTL, 0x1);
-    OUT_CS_REG(R300_VAP_VSM_VTX_ASSM, 0x405);
     OUT_CS_REG(R300_SE_VTE_CNTL, 0x0000043F);
 
     /* XXX */