From: Corbin Simpson Date: Sat, 13 Mar 2010 01:58:59 +0000 (-0800) Subject: Revert "st/mesa: Always recalculate invalid index bounds." X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ecfcb1466a36b6f4389a97abcc76908e68feb4fe;p=mesa.git Revert "st/mesa: Always recalculate invalid index bounds." This reverts commit 50876ddaaff72a324ac45e255985e0f84e108594. Per ML discussion. --- diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index c473815c419..7f45e3f5484 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -542,9 +542,9 @@ st_draw_vbo(GLcontext *ctx, assert(ctx->NewState == 0x0); /* Gallium probably doesn't want this in some cases. */ - if (index_bounds_valid != GL_TRUE) { - vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index); - } + if (!index_bounds_valid) + if (!vbo_all_varyings_in_vbos(arrays)) + vbo_get_minmax_index(ctx, prims, ib, &min_index, &max_index); /* sanity check for pointer arithmetic below */ assert(sizeof(arrays[0]->Ptr[0]) == 1);