From 67ac9bf82216e1fe0c3972d9d3af3007ad937e10 Mon Sep 17 00:00:00 2001 From: Oliver McFadden Date: Fri, 25 May 2007 21:54:45 +0000 Subject: [PATCH] r300: Removed a (disabled and unneeded) assertion. The r300EmitVec functions don't touch the buf member so the assertion isn't needed here. --- src/mesa/drivers/dri/r300/r300_emit.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c index 2910344de5f..2f8c4abee50 100644 --- a/src/mesa/drivers/dri/r300/r300_emit.c +++ b/src/mesa/drivers/dri/r300/r300_emit.c @@ -182,22 +182,17 @@ static void r300EmitVec(GLcontext * ctx, { r300ContextPtr rmesa = R300_CONTEXT(ctx); - /* Gets triggered when playing with future_hw_tcl_on ... */ - //assert(!rvb->buf); - if (stride == 0) { r300AllocDmaRegion(rmesa, rvb, size * 4, 4); count = 1; rvb->aos_offset = GET_START(rvb); rvb->aos_stride = 0; } else { - r300AllocDmaRegion(rmesa, rvb, size * count * 4, 4); /* alignment? */ + r300AllocDmaRegion(rmesa, rvb, size * count * 4, 4); rvb->aos_offset = GET_START(rvb); rvb->aos_stride = size; } - /* Emit the data - */ switch (size) { case 1: r300EmitVec4(ctx, rvb, data, stride, count); -- 2.11.0