softpipe: Implement index bias.

diff --git a/src/gallium/drivers/softpipe/sp_draw_arrays.c b/src/gallium/drivers/softpipe/sp_draw_arrays.c
index 461c9a6c4d49aafd62961520b52dcc6e11314fc4..b30036e2303d85816ac8c44040ce71b69b26806d 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_draw_arrays.c
+++ b/src/gallium/drivers/softpipe/sp_draw_arrays.c
@@ -57,6 +57,7 @@ static void
 softpipe_draw_range_elements_instanced(struct pipe_context *pipe,
                                        struct pipe_resource *indexBuffer,
                                        unsigned indexSize,
+                                       int indexBias,
                                        unsigned minIndex,
                                        unsigned maxIndex,
                                        unsigned mode,
@@ -74,6 +75,7 @@ softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
                                           NULL,
                                           0,
                                           0,
+                                          0,
                                           0xffffffff,
                                           mode,
                                           start,
@@ -87,6 +89,7 @@ void
 softpipe_draw_range_elements(struct pipe_context *pipe,
                              struct pipe_resource *indexBuffer,
                              unsigned indexSize,
+                             int indexBias,
                              unsigned min_index,
                              unsigned max_index,
                              unsigned mode, unsigned start, unsigned count)
@@ -94,6 +97,7 @@ softpipe_draw_range_elements(struct pipe_context *pipe,
    softpipe_draw_range_elements_instanced(pipe,
                                           indexBuffer,
                                           indexSize,
+                                          indexBias,
                                           min_index,
                                           max_index,
                                           mode,
@@ -107,12 +111,13 @@ softpipe_draw_range_elements(struct pipe_context *pipe,
 void
 softpipe_draw_elements(struct pipe_context *pipe,
                        struct pipe_resource *indexBuffer,
-                       unsigned indexSize,
+                       unsigned indexSize, int indexBias,
                        unsigned mode, unsigned start, unsigned count)
 {
    softpipe_draw_range_elements_instanced(pipe,
                                           indexBuffer,
                                           indexSize,
+                                          indexBias,
                                           0,
                                           0xffffffff,
                                           mode,
@@ -134,6 +139,7 @@ softpipe_draw_arrays_instanced(struct pipe_context *pipe,
                                           NULL,
                                           0,
                                           0,
+                                          0,
                                           0xffffffff,
                                           mode,
                                           start,
@@ -146,6 +152,7 @@ void
 softpipe_draw_elements_instanced(struct pipe_context *pipe,
                                  struct pipe_resource *indexBuffer,
                                  unsigned indexSize,
+                                 int indexBias,
                                  unsigned mode,
                                  unsigned start,
                                  unsigned count,
@@ -155,6 +162,7 @@ softpipe_draw_elements_instanced(struct pipe_context *pipe,
    softpipe_draw_range_elements_instanced(pipe,
                                           indexBuffer,
                                           indexSize,
+                                          indexBias,
                                           0,
                                           0xffffffff,
                                           mode,
@@ -168,6 +176,7 @@ static void
 softpipe_draw_range_elements_instanced(struct pipe_context *pipe,
                                        struct pipe_resource *indexBuffer,
                                        unsigned indexSize,
+                                       int indexBias,
                                        unsigned minIndex,
                                        unsigned maxIndex,
                                        unsigned mode,
@@ -202,13 +211,14 @@ softpipe_draw_range_elements_instanced(struct pipe_context *pipe,
       void *mapped_indexes = softpipe_resource(indexBuffer)->data;
       draw_set_mapped_element_buffer_range(draw,
                                            indexSize,
+                                           indexBias,
                                            minIndex,
                                            maxIndex,
                                            mapped_indexes);
    } else {
       /* no index/element buffer */
       draw_set_mapped_element_buffer_range(draw,
-                                           0,
+                                           0, 0,
                                            start,
                                            start + count - 1,
                                            NULL);
@@ -222,7 +232,7 @@ softpipe_draw_range_elements_instanced(struct pipe_context *pipe,
       draw_set_mapped_vertex_buffer(draw, i, NULL);
    }
    if (indexBuffer) {
-      draw_set_mapped_element_buffer(draw, 0, NULL);
+      draw_set_mapped_element_buffer(draw, 0, 0, NULL);
    }
 
    /*

diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index 3c04c8bb07ec7ac8d5b38b2071087baa7b46047d..f97fc6eca8ffe028ee1e8c9ca4a2678dc040a8e1 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -211,12 +211,13 @@ void softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
 
 void softpipe_draw_elements(struct pipe_context *pipe,
                             struct pipe_resource *indexBuffer,
-                            unsigned indexSize,
+                            unsigned indexSize, int indexBias,
                             unsigned mode, unsigned start, unsigned count);
 void
 softpipe_draw_range_elements(struct pipe_context *pipe,
                              struct pipe_resource *indexBuffer,
                              unsigned indexSize,
+                             int indexBias,
                              unsigned min_index,
                              unsigned max_index,
                              unsigned mode, unsigned start, unsigned count);
@@ -233,6 +234,7 @@ void
 softpipe_draw_elements_instanced(struct pipe_context *pipe,
                                  struct pipe_resource *indexBuffer,
                                  unsigned indexSize,
+                                 int indexBias,
                                  unsigned mode,
                                  unsigned start,
                                  unsigned count,