draw: use u_assembled_prim() instead of u_assembled_primitive()

The latter function is also removed as a result of the change.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Acked-by: Zack Rusin <zackr@vmware.com>

diff --git a/src/gallium/auxiliary/draw/draw_prim_assembler.c b/src/gallium/auxiliary/draw/draw_prim_assembler.c
index 4da24a6e7dc44f0596a2ff6395df282362cc187e..9bedeeadb44596cbb2902744c534ac74f4454d0c 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_prim_assembler.c
+++ b/src/gallium/auxiliary/draw/draw_prim_assembler.c
@@ -180,7 +180,7 @@ draw_prim_assembler_run(struct draw_context *draw,
 {
    struct draw_assembler asmblr;
    unsigned start, i;
-   unsigned assembled_prim = u_assembled_primitive(input_prims->prim);
+   unsigned assembled_prim = u_assembled_prim(input_prims->prim);
    unsigned max_primitives = u_decomposed_prims_for_vertices(
       input_prims->prim, input_prims->count);
    unsigned max_verts = u_vertices_per_prim(assembled_prim) * max_primitives;
@@ -194,7 +194,7 @@ draw_prim_assembler_run(struct draw_context *draw,
    output_prims->linear = TRUE;
    output_prims->elts = NULL;
    output_prims->start = 0;
-   output_prims->prim = u_assembled_primitive(input_prims->prim);
+   output_prims->prim = u_assembled_prim(input_prims->prim);
    output_prims->flags = 0x0;
    output_prims->primitive_lengths = MALLOC(sizeof(unsigned));
    output_prims->primitive_lengths[0] = 0;

diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
index 8d66c885436ea3bf27fa4ed82692f806c88592d8..400511cee4afc77c87c7eb14e286a9009478738c 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
@@ -71,7 +71,7 @@ static void fetch_pipeline_prepare( struct draw_pt_middle_end *middle,
    unsigned instance_id_index = ~0;
 
    const unsigned gs_out_prim = (gs ? gs->output_primitive :
-                                 u_assembled_primitive(prim));
+                                 u_assembled_prim(prim));
 
    /* Add one to num_outputs because the pipeline occasionally tags on
     * an additional texcoord, eg for AA lines.

diff --git a/src/gallium/auxiliary/util/u_prim.h b/src/gallium/auxiliary/util/u_prim.h
index 9f1cd79bfd233906c8737ed01369654a4bbad8fc..7948dae38f712e251fc22e2fcf3810ef20144256 100644 (file)
--- a/src/gallium/auxiliary/util/u_prim.h
+++ b/src/gallium/auxiliary/util/u_prim.h
@@ -273,14 +273,6 @@ u_decomposed_prims_for_vertices(int primitive, int vertices)
    }
 }
 
-static INLINE unsigned
-u_assembled_primitive(unsigned prim)
-{
-   return u_assembled_prim(prim);
-}
-      
-      
-
 const char *u_prim_name( unsigned pipe_prim );
 
 #endif