From: Marek Olšák <maraeo@gmail.com>
Date: Mon, 26 Sep 2011 01:30:24 +0000 (+0200)
Subject: u_vbuf_mgr: fix uploading with a non-zero index bias
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=60a77cf316a90cb5be4f73495c2545b3d49e5ca1;p=mesa.git

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.
---

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. */