gallium: draw_arrays/elements_instanced() are of type void.

diff --git a/src/gallium/drivers/softpipe/sp_draw_arrays.c b/src/gallium/drivers/softpipe/sp_draw_arrays.c
index 87312ae1510c5c26c292e728c86a0b01bd3bb81d..b3ece9d8ed3bcbf8d92ed5a915a507936602457e 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_draw_arrays.c
+++ b/src/gallium/drivers/softpipe/sp_draw_arrays.c
@@ -172,7 +172,7 @@ softpipe_draw_elements(struct pipe_context *pipe,
                                                  1);
 }
 
-boolean
+void
 softpipe_draw_arrays_instanced(struct pipe_context *pipe,
                                unsigned mode,
                                unsigned start,
@@ -180,19 +180,19 @@ softpipe_draw_arrays_instanced(struct pipe_context *pipe,
                                unsigned startInstance,
                                unsigned instanceCount)
 {
-   return softpipe_draw_range_elements_instanced(pipe,
-                                                 NULL,
-                                                 0,
-                                                 0,
-                                                 0xffffffff,
-                                                 mode,
-                                                 start,
-                                                 count,
-                                                 startInstance,
-                                                 instanceCount);
+   softpipe_draw_range_elements_instanced(pipe,
+                                          NULL,
+                                          0,
+                                          0,
+                                          0xffffffff,
+                                          mode,
+                                          start,
+                                          count,
+                                          startInstance,
+                                          instanceCount);
 }
 
-boolean
+void
 softpipe_draw_elements_instanced(struct pipe_context *pipe,
                                  struct pipe_buffer *indexBuffer,
                                  unsigned indexSize,
@@ -202,16 +202,16 @@ softpipe_draw_elements_instanced(struct pipe_context *pipe,
                                  unsigned startInstance,
                                  unsigned instanceCount)
 {
-   return softpipe_draw_range_elements_instanced(pipe,
-                                                 indexBuffer,
-                                                 indexSize,
-                                                 0,
-                                                 0xffffffff,
-                                                 mode,
-                                                 start,
-                                                 count,
-                                                 startInstance,
-                                                 instanceCount);
+   softpipe_draw_range_elements_instanced(pipe,
+                                          indexBuffer,
+                                          indexSize,
+                                          0,
+                                          0xffffffff,
+                                          mode,
+                                          start,
+                                          count,
+                                          startInstance,
+                                          instanceCount);
 }
 
 static boolean

diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index f8886565e929607cfe816dbb6aa9fdfe925b97e9..3153d6e6a49a5f41b822f89d034dca3804030ca4 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -199,7 +199,7 @@ softpipe_draw_range_elements(struct pipe_context *pipe,
                              unsigned max_index,
                              unsigned mode, unsigned start, unsigned count);
 
-boolean
+void
 softpipe_draw_arrays_instanced(struct pipe_context *pipe,
                                unsigned mode,
                                unsigned start,
@@ -207,7 +207,7 @@ softpipe_draw_arrays_instanced(struct pipe_context *pipe,
                                unsigned startInstance,
                                unsigned instanceCount);
 
-boolean
+void
 softpipe_draw_elements_instanced(struct pipe_context *pipe,
                                  struct pipe_buffer *indexBuffer,
                                  unsigned indexSize,

diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index 6394e095d357ed656caa6c4d9cfc5f6fc8d0977b..f2242d206947c5f78e8df20f774dec81963ffac1 100644 (file)
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -69,21 +69,21 @@ struct pipe_context {
                             unsigned indexSize,
                             unsigned mode, unsigned start, unsigned count);
 
-   boolean (*draw_arrays_instanced)(struct pipe_context *pipe,
-                                    unsigned mode,
-                                    unsigned start,
-                                    unsigned count,
-                                    unsigned startInstance,
-                                    unsigned instanceCount);
-
-   boolean (*draw_elements_instanced)(struct pipe_context *pipe,
-                                      struct pipe_buffer *indexBuffer,
-                                      unsigned indexSize,
-                                      unsigned mode,
-                                      unsigned start,
-                                      unsigned count,
-                                      unsigned startInstance,
-                                      unsigned instanceCount);
+   void (*draw_arrays_instanced)(struct pipe_context *pipe,
+                                 unsigned mode,
+                                 unsigned start,
+                                 unsigned count,
+                                 unsigned startInstance,
+                                 unsigned instanceCount);
+
+   void (*draw_elements_instanced)(struct pipe_context *pipe,
+                                   struct pipe_buffer *indexBuffer,
+                                   unsigned indexSize,
+                                   unsigned mode,
+                                   unsigned start,
+                                   unsigned count,
+                                   unsigned startInstance,
+                                   unsigned instanceCount);
 
    /* XXX: this is (probably) a temporary entrypoint, as the range
     * information should be available from the vertex_buffer state.