r300: r300EmitArrays should never fail

diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index 20b77bc9aea0a95d2b91bac21861599d220065db..45e7074002e9e0583edd6f678869575eb6e1c80d 100644 (file)
--- 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 80c22d5e9abd135c6205522b85afc792bb608b52..e6485e9bd75bbd80704e4aed9b641e86f7b860e1 100644 (file)
--- 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 93fdc575885e2b32f0f5778a3db422187ad47b15..4d2d9e761d42bed1de0cee8016bf8892dbe25fed 100644 (file)
--- 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);