Mesa (master): r300g: Remove VAP_CNTL_STATUS from invariant state.
Corbin Simpson
csimpson at kemper.freedesktop.org
Wed Jul 8 19:01:50 UTC 2009
Module: Mesa
Branch: master
Commit: 67a43b2cfcc5ca4ce56fce0a2239048535add0f2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=67a43b2cfcc5ca4ce56fce0a2239048535add0f2
Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date: Wed Jul 8 11:59:56 2009 -0700
r300g: Remove VAP_CNTL_STATUS from invariant state.
Seriously.
---
src/gallium/drivers/r300/r300_state_invariant.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_state_invariant.c b/src/gallium/drivers/r300/r300_state_invariant.c
index 63a0c95..9f534b8 100644
--- a/src/gallium/drivers/r300/r300_state_invariant.c
+++ b/src/gallium/drivers/r300/r300_state_invariant.c
@@ -72,7 +72,7 @@ void r300_emit_invariant_state(struct r300_context* r300)
END_CS;
/* XXX unsorted stuff from surface_fill */
- BEGIN_CS(77 + (caps->has_tcl ? 5 : 0));
+ BEGIN_CS(75 + (caps->has_tcl ? 5 : 0));
/* Flush PVS. */
OUT_CS_REG(R300_VAP_PVS_STATE_FLUSH_REG, 0x0);
@@ -80,17 +80,12 @@ void r300_emit_invariant_state(struct r300_context* r300)
R300_VPORT_X_OFFSET_ENA | R300_VPORT_Y_SCALE_ENA |
R300_VPORT_Y_OFFSET_ENA | R300_VPORT_Z_SCALE_ENA |
R300_VPORT_Z_OFFSET_ENA | R300_VTX_W0_FMT);
- /* XXX endian */
if (caps->has_tcl) {
- OUT_CS_REG(R300_VAP_CNTL_STATUS, R300_VC_NO_SWAP);
OUT_CS_REG_SEQ(R300_VAP_GB_VERT_CLIP_ADJ, 4);
OUT_CS_32F(1.0);
OUT_CS_32F(1.0);
OUT_CS_32F(1.0);
OUT_CS_32F(1.0);
- } else {
- OUT_CS_REG(R300_VAP_CNTL_STATUS, R300_VC_NO_SWAP |
- R300_VAP_TCL_BYPASS);
}
/* XXX point tex stuffing */
OUT_CS_REG_SEQ(R300_GA_POINT_S0, 1);
More information about the mesa-commit
mailing list