Mesa (radeon-rewrite): r300: r300EmitArrays should never fail

[Alex Deucher]

Module: Mesa
Branch: radeon-rewrite
Commit: 621f65ab86f94f7a228e5f96061a8e3451f15db0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=621f65ab86f94f7a228e5f96061a8e3451f15db0

Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Wed May 13 22:33:27 2009 +0200

r300: r300EmitArrays should never fail

---

 src/mesa/drivers/dri/r300/r300_emit.c   |    9 ++-------
 src/mesa/drivers/dri/r300/r300_emit.h   |    2 +-
 src/mesa/drivers/dri/r300/r300_render.c |    3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index 20b77bc..45e7074 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -196,9 +196,8 @@ GLuint r300VAPOutputCntl1(GLcontext * ctx, GLuint OutputsWritten)
 
 /* Emit vertex data to GART memory
  * Route inputs to the vertex processor
- * This function should never return R300_FALLBACK_TCL when using software tcl.
  */
-int r300EmitArrays(GLcontext * ctx)
+void r300EmitArrays(GLcontext * ctx)
 {
 	r300ContextPtr rmesa = R300_CONTEXT(ctx);
 	TNLcontext *tnl = TNL_CONTEXT(ctx);
@@ -284,9 +283,7 @@ int r300EmitArrays(GLcontext * ctx)
 		}
 	}
 
-	if (nr > R300_MAX_AOS_ARRAYS) {
-		return R300_FALLBACK_TCL;
-	}
+	assert(nr <= R300_MAX_AOS_ARRAYS);
 
 	for (i = 0; i < nr; i++) {
 		int ci;
@@ -341,8 +338,6 @@ int r300EmitArrays(GLcontext * ctx)
 	    r300VAPOutputCntl1(ctx, OutputsWritten);
 
 	rmesa->radeon.tcl.aos_count = nr;
-
-	return R300_FALLBACK_NONE;
 }
 
 void r300EmitCacheFlush(r300ContextPtr rmesa)
diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h
index 80c22d5..e6485e9 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.h
+++ b/src/mesa/drivers/dri/r300/r300_emit.h
@@ -216,7 +216,7 @@ void static INLINE cp_wait(radeonContextPtr radeon, unsigned char flags)
 	}
 }
 
-extern int r300EmitArrays(GLcontext * ctx);
+extern void r300EmitArrays(GLcontext * ctx);
 
 extern int r300PrimitiveType(r300ContextPtr rmesa, int prim);
 extern int r300NumVerts(r300ContextPtr rmesa, int num_verts, int prim);
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 93fdc57..4d2d9e7 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -390,8 +390,7 @@ static GLboolean r300RunRender(GLcontext * ctx,
 		fprintf(stderr, "%s\n", __FUNCTION__);
 
 	r300UpdateShaders(rmesa);
-	if (r300EmitArrays(ctx))
-		return GL_TRUE;
+	r300EmitArrays(ctx);
 
 	r300UpdateShaderStates(rmesa);