Merge branch 'gallium-index-bias'

2 files changed, 7 insertions, 7 deletions

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 4f4368ac9e4..a3620359dbf 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -676,7 +676,7 @@ st_draw_vbo(GLcontext *ctx,
          for (i = 0; i < nr_prims; i++) {
             prim = translate_prim( ctx, prims[i].mode );
 
-            pipe->draw_range_elements(pipe, indexBuf, indexSize,
+            pipe->draw_range_elements(pipe, indexBuf, indexSize, 0,
                                       min_index, max_index, prim,
                                       prims[i].start + indexOffset, prims[i].count);
          }
@@ -686,12 +686,12 @@ st_draw_vbo(GLcontext *ctx,
             prim = translate_prim( ctx, prims[i].mode );
             
             if (prims[i].num_instances == 1) {
-               pipe->draw_elements(pipe, indexBuf, indexSize, prim,
+               pipe->draw_elements(pipe, indexBuf, indexSize, 0, prim,
                                    prims[i].start + indexOffset,
                                    prims[i].count);
             }
             else {
-               pipe->draw_elements_instanced(pipe, indexBuf, indexSize, prim,
+               pipe->draw_elements_instanced(pipe, indexBuf, indexSize, 0, prim,
                                              prims[i].start + indexOffset,
                                              prims[i].count,
                                              0, prims[i].num_instances);
diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c
index ce96b01d9b3..0889f1a522d 100644
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -229,16 +229,16 @@ st_feedback_draw_vbo(GLcontext *ctx,
          map = pipe_buffer_map(pipe, index_buffer_handle,
                                PIPE_TRANSFER_READ, &ib_transfer);
 
-         draw_set_mapped_element_buffer(draw, indexSize, map);
+         draw_set_mapped_element_buffer(draw, indexSize, 0, map);
       }
       else {
-         draw_set_mapped_element_buffer(draw, indexSize, (void *) ib->ptr);
+         draw_set_mapped_element_buffer(draw, indexSize, 0, (void *) ib->ptr);
 	 ib_transfer = NULL;
       }
    }
    else {
       /* no index/element buffer */
-      draw_set_mapped_element_buffer(draw, 0, NULL);
+      draw_set_mapped_element_buffer(draw, 0, 0, NULL);
    }
 
 
@@ -275,7 +275,7 @@ st_feedback_draw_vbo(GLcontext *ctx,
    }
    if (index_buffer_handle) {
       pipe_buffer_unmap(pipe, index_buffer_handle, ib_transfer);
-      draw_set_mapped_element_buffer(draw, 0, NULL);
+      draw_set_mapped_element_buffer(draw, 0, 0, NULL);
    }
 }