r300g: Disable MSPOS registers for glisse's CS security checker.

These will come back in someday, when we can properly use them.

diff --git a/src/gallium/drivers/r300/r300_state_invariant.c b/src/gallium/drivers/r300/r300_state_invariant.c
index e438114010c784f8dd02b3f2e2f28ead745294e0..63a0c959180de89727ded0141957fad80cf8eace 100644 (file)
--- a/src/gallium/drivers/r300/r300_state_invariant.c
+++ b/src/gallium/drivers/r300/r300_state_invariant.c
@@ -34,14 +34,17 @@ void r300_emit_invariant_state(struct r300_context* r300)
     struct r300_capabilities* caps = r300_screen(r300->context.screen)->caps;
     CS_LOCALS(r300);
 
-    BEGIN_CS(26 + (caps->has_tcl ? 2: 0));
+    BEGIN_CS(22 + (caps->has_tcl ? 2: 0));
 
     /*** Graphics Backend (GB) ***/
     /* Various GB enables */
     OUT_CS_REG(R300_GB_ENABLE, 0x0);
-    /* Subpixel multisampling for AA */
-    OUT_CS_REG(R300_GB_MSPOS0, 0x66666666);
-    OUT_CS_REG(R300_GB_MSPOS1, 0x6666666);
+    /* Subpixel multisampling for AA
+     * These are commented out because glisse's CS checker doesn't like them.
+     * I presume these will be re-enabled later.
+     * OUT_CS_REG(R300_GB_MSPOS0, 0x66666666);
+     * OUT_CS_REG(R300_GB_MSPOS1, 0x6666666);
+     */
     /* Source of fog depth */
     OUT_CS_REG(R300_GB_SELECT, R300_GB_FOG_SELECT_1_1_W);
     /* AA enable */