Undo indexOffset change (I think, git???)

2 files changed, 5 insertions, 4 deletions

diff --git a/src/mesa/pipe/softpipe/sp_draw_arrays.c b/src/mesa/pipe/softpipe/sp_draw_arrays.c
index 64a4fbe333e..d5cd6beae89 100644
--- a/src/mesa/pipe/softpipe/sp_draw_arrays.c
+++ b/src/mesa/pipe/softpipe/sp_draw_arrays.c
@@ -75,7 +75,7 @@ boolean
 softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
                      unsigned start, unsigned count)
 {
-   return softpipe_draw_elements(pipe, NULL, 0, mode, start, count);
+   return softpipe_draw_elements(pipe, NULL, 0, 0, mode, start, count);
 }
 
 
@@ -90,7 +90,7 @@ softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
 boolean
 softpipe_draw_elements(struct pipe_context *pipe,
                        struct pipe_buffer_handle *indexBuffer,
-                       unsigned indexSize,
+                       unsigned indexSize, unsigned indexOffset,
                        unsigned mode, unsigned start, unsigned count)
 {
    struct softpipe_context *sp = softpipe_context(pipe);
@@ -130,9 +130,10 @@ softpipe_draw_elements(struct pipe_context *pipe,
    }
    /* Map index buffer, if present */
    if (indexBuffer) {
-      void *mapped_indexes
+      ubyte *mapped_indexes
          = pipe->winsys->buffer_map(pipe->winsys, indexBuffer,
                                     PIPE_BUFFER_FLAG_READ);
+      mapped_indexes += indexOffset;
       draw_set_mapped_element_buffer(draw, indexSize, mapped_indexes);
    }
    else {
diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/mesa/pipe/softpipe/sp_state.h
index c194f0ea0db..8747f34cdd9 100644
--- a/src/mesa/pipe/softpipe/sp_state.h
+++ b/src/mesa/pipe/softpipe/sp_state.h
@@ -131,7 +131,7 @@ boolean softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
 
 boolean softpipe_draw_elements(struct pipe_context *pipe,
 			       struct pipe_buffer_handle *indexBuffer,
-			       unsigned indexSize,
+			       unsigned indexSize, unsigned indexOffset,
 			       unsigned mode, unsigned start, unsigned count);