radeonsi: Bump MAX_DRAW_CS_DWORDS.

I missed this when updating si_context_draw().

diff --git a/src/gallium/drivers/radeonsi/evergreen_hw_context.c b/src/gallium/drivers/radeonsi/evergreen_hw_context.c
index 0ac99283e4d6fbfc1277686e6b0e60deafcdb391..4cf6a9e5253f78dbf5f93201b5d6d2bfe01f438c 100644 (file)
--- a/src/gallium/drivers/radeonsi/evergreen_hw_context.c
+++ b/src/gallium/drivers/radeonsi/evergreen_hw_context.c
@@ -481,7 +481,7 @@ void si_context_draw(struct r600_context *ctx, const struct r600_draw *draw)
                ndwords += 6;
 
        /* when increasing ndwords, bump the max limit too */
-       assert(ndwords <= R600_MAX_DRAW_CS_DWORDS);
+       assert(ndwords <= SI_MAX_DRAW_CS_DWORDS);
 
        /* queries need some special values
         * (this is non-zero if any query is active) */

diff --git a/src/gallium/drivers/radeonsi/r600_hw_context.c b/src/gallium/drivers/radeonsi/r600_hw_context.c
index 2ba77b736a6b6e902360c347e711aed154e2c359..c0b85ba6d2055ef9f8b3c5ff7fb8ce956aa433c6 100644 (file)
--- a/src/gallium/drivers/radeonsi/r600_hw_context.c
+++ b/src/gallium/drivers/radeonsi/r600_hw_context.c
@@ -317,7 +317,7 @@ void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw,
                num_dw += ctx->pm4_dirty_cdwords;
 
                /* The upper-bound of how much a draw command would take. */
-               num_dw += R600_MAX_DRAW_CS_DWORDS;
+               num_dw += SI_MAX_DRAW_CS_DWORDS;
        }
 
        /* Count in queries_suspend. */

diff --git a/src/gallium/drivers/radeonsi/r600_hw_context_priv.h b/src/gallium/drivers/radeonsi/r600_hw_context_priv.h
index 7d5394e9f58b614619cb5b0f83ef497c43c7a7d2..f5ad4abceeb3bb91f9ce3990f0e190513309b52e 100644 (file)
--- a/src/gallium/drivers/radeonsi/r600_hw_context_priv.h
+++ b/src/gallium/drivers/radeonsi/r600_hw_context_priv.h
@@ -30,7 +30,7 @@
 #include "util/u_hash_table.h"
 #include "os/os_thread.h"
 
-#define R600_MAX_DRAW_CS_DWORDS 17
+#define SI_MAX_DRAW_CS_DWORDS 18
 
 #define PKT_COUNT_C                     0xC000FFFF
 #define PKT_COUNT_S(x)                  (((x) & 0x3FFF) << 16)