Mesa (10.4): util/primconvert: Avoid point arithmetic; apply offset on all cases.

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: be59440b53fde5637cddf68a9333ea8f1af80f77
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=be59440b53fde5637cddf68a9333ea8f1af80f77

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri Dec  5 14:15:02 2014 +0000

util/primconvert: Avoid point arithmetic; apply offset on all cases.

Matches what u_vbuf_get_minmax_index() does.

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit f9098f09720d9b751e8529b2648971ee7d576b37)

---

 src/gallium/auxiliary/indices/u_primconvert.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/indices/u_primconvert.c b/src/gallium/auxiliary/indices/u_primconvert.c
index 4632781..eba1f9e 100644
--- a/src/gallium/auxiliary/indices/u_primconvert.c
+++ b/src/gallium/auxiliary/indices/u_primconvert.c
@@ -137,8 +137,9 @@ util_primconvert_draw_vbo(struct primconvert_context *pc,
       src = ib->user_buffer;
       if (!src) {
          src = pipe_buffer_map(pc->pipe, ib->buffer,
-                               PIPE_TRANSFER_READ, &src_transfer) + ib->offset;
+                               PIPE_TRANSFER_READ, &src_transfer);
       }
+      src = (const uint8_t *)src + ib->offset;
    }
    else {
       u_index_generator(pc->primtypes_mask,