Mesa (master): radeonsi: Bump MAX_DRAW_CS_DWORDS.
Michel Dänzer
daenzer at kemper.freedesktop.org
Wed May 16 16:55:57 UTC 2012
Module: Mesa
Branch: master
Commit: 0201c7d0af8424a8b8fd44243e3487898c11f96e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0201c7d0af8424a8b8fd44243e3487898c11f96e
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue May 15 17:14:12 2012 +0200
radeonsi: Bump MAX_DRAW_CS_DWORDS.
I missed this when updating si_context_draw().
---
.../drivers/radeonsi/evergreen_hw_context.c | 2 +-
src/gallium/drivers/radeonsi/r600_hw_context.c | 2 +-
.../drivers/radeonsi/r600_hw_context_priv.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/evergreen_hw_context.c b/src/gallium/drivers/radeonsi/evergreen_hw_context.c
index 0ac9928..4cf6a9e 100644
--- 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 2ba77b7..c0b85ba 100644
--- 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 7d5394e..f5ad4ab 100644
--- 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)
More information about the mesa-commit
mailing list