From: Brian Paul <brianp@vmware.com>
Date: Tue, 30 Aug 2011 15:49:00 +0000 (-0600)
Subject: tnl: fix regression in bind_indices()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d9e242c3e28046e9c8ae1760533f92841d0cfaf;p=mesa.git

tnl: fix regression in bind_indices()

Commit 2ea1ff38164d95f8291ef2e5dfe2cb13936a60f2 caused the regression.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=40413
---

diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index 283ab695485..03424d7a494 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -372,7 +372,8 @@ static void bind_indices( struct gl_context *ctx,
 				       GL_MAP_READ_BIT, ib->obj);
       assert(ib->obj->Pointer);
    } else {
-      ptr = ib->ptr;
+      /* user-space elements, or buffer already mapped */
+      ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr);
    }
 
    if (ib->type == GL_UNSIGNED_INT && VB->Primitive[0].basevertex == 0) {