From 228292f576907f271bcdac918f4c5a433bd3c8c3 Mon Sep 17 00:00:00 2001 From: Jon Severinsson Date: Tue, 24 Aug 2010 12:43:51 +0200 Subject: [PATCH] r600: Partially revert e62e5b0 "r600: add support for draw_elements_base_vertex" This fixes fd.o bug #29652 --- src/mesa/drivers/dri/r600/r700_render.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c index e62e5b0..406cf01 100644 --- a/src/mesa/drivers/dri/r600/r700_render.c +++ b/src/mesa/drivers/dri/r600/r700_render.c @@ -989,17 +989,15 @@ static void r700DrawPrims(GLcontext *ctx, /* This check should get folded into just the places that * min/max index are really needed. */ - - if (!vbo_all_varyings_in_vbos(arrays)) { - if (!index_bounds_valid) + if (!index_bounds_valid) { vbo_get_minmax_index(ctx, prim, ib, &min_index, &max_index); - /* do we want to rebase, minimizes the - * amount of data to upload? */ - if (min_index) { + } + + if (min_index) { vbo_rebase_prims( ctx, arrays, prim, nr_prims, ib, min_index, max_index, r700DrawPrims ); return; - } } + /* Make an attempt at drawing */ retval = r700TryDrawPrims(ctx, arrays, prim, nr_prims, ib, min_index, max_index); -- 1.7.1