From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Thu, 5 Mar 2009 18:46:10 +0000 (-0800)
Subject: r300-gallium: Use only one CS section for vertex_format.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3b168df48302b5bbd2323685623adee240d03a4;p=mesa.git

r300-gallium: Use only one CS section for vertex_format.
---

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index 91fac62cbe6..e910e9c8271 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -260,16 +260,14 @@ void r300_emit_vertex_format_state(struct r300_context* r300)
     CS_LOCALS(r300);
     int i;
 
-    BEGIN_CS(6);
+    BEGIN_CS(24);
     OUT_CS_REG_SEQ(R300_VAP_VTX_STATE_CNTL, 2);
     OUT_CS(r300->vertex_info.vinfo.hwfmt[0]);
     OUT_CS(r300->vertex_info.vinfo.hwfmt[1]);
     OUT_CS_REG_SEQ(R300_VAP_OUTPUT_VTX_FMT_0, 2);
     OUT_CS(r300->vertex_info.vinfo.hwfmt[2]);
     OUT_CS(r300->vertex_info.vinfo.hwfmt[3]);
-    END_CS;
 
-    BEGIN_CS(18);
     OUT_CS_REG_SEQ(R300_VAP_PROG_STREAM_CNTL_0, 8);
     for (i = 0; i < 8; i++) {
         OUT_CS(r300->vertex_info.vap_prog_stream_cntl[i]);