From: Marek Olšák <maraeo@gmail.com>
Date: Thu, 10 Nov 2011 16:52:36 +0000 (+0100)
Subject: r600g: turn some CS overflow checks into assertions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6a490149d9b8b77ead81b4227f2860ec22095217;p=mesa.git

r600g: turn some CS overflow checks into assertions

They're not really exhaustive and not so useful either.
---

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index 5eb6332afba..96e8d181189 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -1156,12 +1156,7 @@ void evergreen_context_draw(struct r600_context *ctx, const struct r600_draw *dr
 	}
 
 	r600_need_cs_space(ctx, 0, TRUE);
-
-	/* at this point everything is flushed and ctx->pm4_cdwords = 0 */
-	if (unlikely((ctx->pm4_dirty_cdwords + ndwords) > RADEON_MAX_CMDBUF_DWORDS)) {
-		R600_ERR("context is too big to be scheduled\n");
-		return;
-	}
+	assert(ctx->pm4_cdwords + ctx->pm4_dirty_cdwords + ndwords < RADEON_MAX_CMDBUF_DWORDS);
 
 	/* enough room to copy packet */
 	LIST_FOR_EACH_ENTRY_SAFE(dirty_block, next_block, &ctx->dirty,list) {
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index eb80fa94503..3a0cde39462 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -1460,12 +1460,7 @@ void r600_context_draw(struct r600_context *ctx, const struct r600_draw *draw)
 	}
 
 	r600_need_cs_space(ctx, 0, TRUE);
-
-	/* at this point everything is flushed and ctx->pm4_cdwords = 0 */
-	if (unlikely((ctx->pm4_dirty_cdwords + ndwords) > RADEON_MAX_CMDBUF_DWORDS)) {
-		R600_ERR("context is too big to be scheduled\n");
-		return;
-	}
+	assert(ctx->pm4_cdwords + ctx->pm4_dirty_cdwords + ndwords < RADEON_MAX_CMDBUF_DWORDS);
 
 	/* enough room to copy packet */
 	LIST_FOR_EACH_ENTRY_SAFE(dirty_block, next_block, &ctx->dirty, list) {