From d21a309c6c00122b0562284d78fce5138fa2ad30 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 25 May 2016 16:52:34 -0600 Subject: [PATCH] svga: s/unsigned/enum pipe_prim_type/ for primitive type variables Proper enum types were only added recently. Reviewed-by: Roland Scheidegger --- src/gallium/drivers/svga/svga_draw.h | 4 ++-- src/gallium/drivers/svga/svga_draw_arrays.c | 6 +++--- src/gallium/drivers/svga/svga_draw_elements.c | 6 +++--- src/gallium/drivers/svga/svga_draw_private.h | 5 +++-- src/gallium/drivers/svga/svga_pipe_draw.c | 4 ++-- src/gallium/drivers/svga/svga_swtnl_backend.c | 2 +- src/gallium/drivers/svga/svga_swtnl_private.h | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/gallium/drivers/svga/svga_draw.h b/src/gallium/drivers/svga/svga_draw.h index af8ecab..baefcd9 100644 --- a/src/gallium/drivers/svga/svga_draw.h +++ b/src/gallium/drivers/svga/svga_draw.h @@ -59,7 +59,7 @@ svga_hwtnl_vertex_buffers(struct svga_hwtnl *hwtnl, enum pipe_error svga_hwtnl_draw_arrays(struct svga_hwtnl *hwtnl, - unsigned prim, unsigned start, unsigned count, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, unsigned instance_count); enum pipe_error @@ -69,7 +69,7 @@ svga_hwtnl_draw_range_elements(struct svga_hwtnl *hwtnl, int index_bias, unsigned min_index, unsigned max_index, - unsigned prim, unsigned start, unsigned count, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, unsigned instance_count); boolean diff --git a/src/gallium/drivers/svga/svga_draw_arrays.c b/src/gallium/drivers/svga/svga_draw_arrays.c index 43d7a97..4bd1a33 100644 --- a/src/gallium/drivers/svga/svga_draw_arrays.c +++ b/src/gallium/drivers/svga/svga_draw_arrays.c @@ -90,7 +90,7 @@ compare(unsigned cached_nr, unsigned nr, unsigned type) static enum pipe_error retrieve_or_generate_indices(struct svga_hwtnl *hwtnl, - unsigned prim, + enum pipe_prim_type prim, unsigned gen_type, unsigned gen_nr, unsigned gen_size, @@ -170,7 +170,7 @@ retrieve_or_generate_indices(struct svga_hwtnl *hwtnl, static enum pipe_error simple_draw_arrays(struct svga_hwtnl *hwtnl, - unsigned prim, unsigned start, unsigned count, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, unsigned instance_count) { SVGA3dPrimitiveRange range; @@ -202,7 +202,7 @@ simple_draw_arrays(struct svga_hwtnl *hwtnl, enum pipe_error svga_hwtnl_draw_arrays(struct svga_hwtnl *hwtnl, - unsigned prim, unsigned start, unsigned count, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, unsigned instance_count) { unsigned gen_prim, gen_size, gen_nr; diff --git a/src/gallium/drivers/svga/svga_draw_elements.c b/src/gallium/drivers/svga/svga_draw_elements.c index b74c745..6eb5067 100644 --- a/src/gallium/drivers/svga/svga_draw_elements.c +++ b/src/gallium/drivers/svga/svga_draw_elements.c @@ -39,7 +39,7 @@ static enum pipe_error translate_indices(struct svga_hwtnl *hwtnl, struct pipe_resource *src, - unsigned offset, unsigned prim, unsigned nr, + unsigned offset, enum pipe_prim_type prim, unsigned nr, unsigned index_size, u_translate_func translate, struct pipe_resource **out_buf) { @@ -98,7 +98,7 @@ svga_hwtnl_simple_draw_range_elements(struct svga_hwtnl *hwtnl, struct pipe_resource *index_buffer, unsigned index_size, int index_bias, unsigned min_index, unsigned max_index, - unsigned prim, unsigned start, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, unsigned instance_count) @@ -130,7 +130,7 @@ svga_hwtnl_draw_range_elements(struct svga_hwtnl *hwtnl, struct pipe_resource *index_buffer, unsigned index_size, int index_bias, unsigned min_index, unsigned max_index, - unsigned prim, unsigned start, unsigned count, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, unsigned instance_count) { unsigned gen_prim, gen_size, gen_nr; diff --git a/src/gallium/drivers/svga/svga_draw_private.h b/src/gallium/drivers/svga/svga_draw_private.h index da5d60e..38e5e66 100644 --- a/src/gallium/drivers/svga/svga_draw_private.h +++ b/src/gallium/drivers/svga/svga_draw_private.h @@ -189,7 +189,8 @@ struct svga_hwtnl { * triangles? */ static inline boolean -svga_need_unfilled_fallback(const struct svga_hwtnl *hwtnl, unsigned prim) +svga_need_unfilled_fallback(const struct svga_hwtnl *hwtnl, + enum pipe_prim_type prim) { const struct svga_context *svga = hwtnl->svga; @@ -235,7 +236,7 @@ svga_hwtnl_simple_draw_range_elements( struct svga_hwtnl *hwtnl, int index_bias, unsigned min_index, unsigned max_index, - unsigned prim, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, diff --git a/src/gallium/drivers/svga/svga_pipe_draw.c b/src/gallium/drivers/svga/svga_pipe_draw.c index 50ebb53..c9bcf3a 100644 --- a/src/gallium/drivers/svga/svga_pipe_draw.c +++ b/src/gallium/drivers/svga/svga_pipe_draw.c @@ -50,7 +50,7 @@ retry_draw_range_elements( struct svga_context *svga, int index_bias, unsigned min_index, unsigned max_index, - unsigned prim, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, @@ -101,7 +101,7 @@ retry: static enum pipe_error retry_draw_arrays( struct svga_context *svga, - unsigned prim, unsigned start, unsigned count, + enum pipe_prim_type prim, unsigned start, unsigned count, unsigned start_instance, unsigned instance_count, boolean do_retry ) { diff --git a/src/gallium/drivers/svga/svga_swtnl_backend.c b/src/gallium/drivers/svga/svga_swtnl_backend.c index 4bdb21a..82fb11d 100644 --- a/src/gallium/drivers/svga/svga_swtnl_backend.c +++ b/src/gallium/drivers/svga/svga_swtnl_backend.c @@ -181,7 +181,7 @@ svga_vbuf_render_unmap_vertices( struct vbuf_render *render, static void svga_vbuf_render_set_primitive( struct vbuf_render *render, - unsigned prim ) + enum pipe_prim_type prim ) { struct svga_vbuf_render *svga_render = svga_vbuf_render(render); svga_render->prim = prim; diff --git a/src/gallium/drivers/svga/svga_swtnl_private.h b/src/gallium/drivers/svga/svga_swtnl_private.h index 0a226ab..489b3bc 100644 --- a/src/gallium/drivers/svga/svga_swtnl_private.h +++ b/src/gallium/drivers/svga/svga_swtnl_private.h @@ -45,7 +45,7 @@ struct svga_vbuf_render { SVGA3dElementLayoutId layout_id; /**< current element layout id */ - unsigned prim; + enum pipe_prim_type prim; struct pipe_resource *vbuf; struct pipe_resource *ibuf; -- 2.7.4