gallium: pipe/p_inlines.h -> util/u_inlines.h

[mesa.git] / src / gallium / drivers / i965 / brw_draw.c

diff --git a/src/gallium/drivers/i965/brw_draw.c b/src/gallium/drivers/i965/brw_draw.c
index 4498773dd8681f28381284c4ce72f182b95b492c..9bad61ef72eae82bf0233b53a717cdd728c652f1 100644 (file)
--- a/src/gallium/drivers/i965/brw_draw.c
+++ b/src/gallium/drivers/i965/brw_draw.c
@@ -26,6 +26,7 @@
  **************************************************************************/
 
 
+#include "util/u_inlines.h"
 #include "util/u_prim.h"
 #include "util/u_upload_mgr.h"
 
@@ -34,7 +35,6 @@
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_debug.h"
-#include "brw_screen.h"
 
 #include "brw_batchbuffer.h"
 
@@ -108,7 +108,7 @@ static int brw_emit_prim(struct brw_context *brw,
       prim_packet.start_vert_location += brw->ib.start_vertex_offset;
    prim_packet.instance_count = 1;
    prim_packet.start_instance_location = 0;
-   prim_packet.base_vert_location = 0; // prim->basevertex; XXX: add this to gallium
+   prim_packet.base_vert_location = 0; /* prim->basevertex; XXX: add this to gallium */
 
 
    /* If we're set to always flush, do it before and after the primitive emit.
@@ -176,7 +176,7 @@ try_draw_range_elements(struct brw_context *brw,
 }
 
 
-static boolean
+static void
 brw_draw_range_elements(struct pipe_context *pipe,
                        struct pipe_buffer *index_buffer,
                        unsigned index_size,
@@ -228,29 +228,27 @@ brw_draw_range_elements(struct pipe_context *pipe,
       ret = try_draw_range_elements(brw, index_buffer, hw_prim, start, count );
       assert(ret == 0);
    }
-
-   return TRUE;
 }
 
-static boolean
+static void
 brw_draw_elements(struct pipe_context *pipe,
                  struct pipe_buffer *index_buffer,
                  unsigned index_size,
                  unsigned mode, 
                  unsigned start, unsigned count)
 {
-   return brw_draw_range_elements( pipe, index_buffer,
-                                  index_size,
-                                  0, 0xffffffff,
-                                  mode, 
-                                  start, count );
+   brw_draw_range_elements( pipe, index_buffer,
+                            index_size,
+                            0, 0xffffffff,
+                            mode, 
+                            start, count );
 }
 
-static boolean
+static void
 brw_draw_arrays(struct pipe_context *pipe, unsigned mode,
                      unsigned start, unsigned count)
 {
-   return brw_draw_elements(pipe, NULL, 0, mode, start, count);
+   brw_draw_elements(pipe, NULL, 0, mode, start, count);
 }