From: Mathias Gottschlag <mathias-go@web.de>
Date: Tue, 21 Apr 2009 15:52:30 +0000 (-0600)
Subject: r300-gallium: Fix CS size mismatch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8fff1f9f17a2488aa45e875104353814bf59da2;p=mesa.git

r300-gallium: Fix CS size mismatch

This fixes some warnings which appear because the driver assumes a wrong
cs size (13 vs 16 register writes in some cases).
---

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index a3d83376b66..417d5f6307d 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -340,7 +340,11 @@ void r300_emit_vertex_shader(struct r300_context* r300,
         return;
     }
 
-    BEGIN_CS(13 + (vs->instruction_count * 4) + (constants->count * 4));
+    if (constants->count) {
+        BEGIN_CS(16 + (vs->instruction_count * 4) + (constants->count * 4));
+    } else {
+        BEGIN_CS(13 + (vs->instruction_count * 4) + (constants->count * 4));
+    }
 
     OUT_CS_REG(R300_VAP_PVS_CODE_CNTL_0, R300_PVS_FIRST_INST(0) |
             R300_PVS_LAST_INST(vs->instruction_count - 1));