From 60a77cf316a90cb5be4f73495c2545b3d49e5ca1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 26 Sep 2011 03:30:24 +0200 Subject: [PATCH] u_vbuf_mgr: fix uploading with a non-zero index bias Also don't rely on pipe_draw_info being set correctly. NOTE: This is a candidate for the 7.11 branch. --- src/gallium/auxiliary/util/u_vbuf_mgr.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gallium/auxiliary/util/u_vbuf_mgr.c b/src/gallium/auxiliary/util/u_vbuf_mgr.c index 282efdbfe9a..6c2d1ed6400 100644 --- a/src/gallium/auxiliary/util/u_vbuf_mgr.c +++ b/src/gallium/auxiliary/util/u_vbuf_mgr.c @@ -628,11 +628,18 @@ u_vbuf_draw_begin(struct u_vbuf_mgr *mgrb, u_vbuf_compute_max_index(mgr); - min_index = info->min_index - info->index_bias; - if (info->max_index == ~0) { - max_index = mgr->b.max_index; + if (info->indexed) { + min_index = info->min_index; + if (info->max_index == ~0) { + max_index = mgr->b.max_index; + } else { + max_index = MIN2(info->max_index, mgr->b.max_index); + } + min_index += info->index_bias; + max_index += info->index_bias; } else { - max_index = MIN2(info->max_index - info->index_bias, mgr->b.max_index); + min_index = info->start; + max_index = info->start + info->count - 1; } /* Translate vertices with non-native layouts or formats. */ -- 2.30.2