Module: Mesa
Branch: master
Commit: ae70cd1f027bdfc7f500d78b6c5333e6b35d3ee8
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae70cd1f027bdfc7f500d78b6c5333e6b35d3ee8

Author: Marek Olšák <[email protected]>
Date:   Thu Nov 19 21:07:20 2009 +0100

r300g: remove variant states from emit_state_invariant

---

 src/gallium/drivers/r300/r300_state_invariant.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_state_invariant.c 
b/src/gallium/drivers/r300/r300_state_invariant.c
index c07e6ae..46d1cb3 100644
--- a/src/gallium/drivers/r300/r300_state_invariant.c
+++ b/src/gallium/drivers/r300/r300_state_invariant.c
@@ -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 */

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to