diff options
| author | Brian Paul <[email protected]> | 2017-03-01 14:52:46 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2017-03-02 10:11:19 -0700 |
| commit | 69fb8f3caee3e4e732dcf4b18a4fc2668e96c632 (patch) | |
| tree | 6b5609c5f20fb6f9ed5359cd59c19869996c0189 | |
| parent | a9ff377d401419aaa100e9257bda94e6d7e87c7f (diff) | |
svga: s/unsigned/pipe_prim_type/
And add some default switch cases to silence compiler warnings.
Reviewed-by: Charmaine Lee <[email protected]>
| -rw-r--r-- | src/gallium/drivers/svga/svga_context.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_pipe_draw.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_state_framebuffer.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_swtnl_state.c | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_context.h b/src/gallium/drivers/svga/svga_context.h index 02aa666154c..40966e9b52e 100644 --- a/src/gallium/drivers/svga/svga_context.h +++ b/src/gallium/drivers/svga/svga_context.h @@ -293,7 +293,7 @@ struct svga_state unsigned num_samplers[PIPE_SHADER_TYPES]; unsigned num_sampler_views[PIPE_SHADER_TYPES]; unsigned num_vertex_buffers; - unsigned reduced_prim; + enum pipe_prim_type reduced_prim; struct { unsigned flag_1d; diff --git a/src/gallium/drivers/svga/svga_pipe_draw.c b/src/gallium/drivers/svga/svga_pipe_draw.c index b9637b25b34..30524a0e3ec 100644 --- a/src/gallium/drivers/svga/svga_pipe_draw.c +++ b/src/gallium/drivers/svga/svga_pipe_draw.c @@ -182,7 +182,7 @@ static void svga_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) { struct svga_context *svga = svga_context( pipe ); - unsigned reduced_prim = u_reduced_prim( info->mode ); + enum pipe_prim_type reduced_prim = u_reduced_prim( info->mode ); unsigned count = info->count; enum pipe_error ret = 0; boolean needed_swtnl; diff --git a/src/gallium/drivers/svga/svga_state_framebuffer.c b/src/gallium/drivers/svga/svga_state_framebuffer.c index b1362a98168..8584c5d42b6 100644 --- a/src/gallium/drivers/svga/svga_state_framebuffer.c +++ b/src/gallium/drivers/svga/svga_state_framebuffer.c @@ -525,6 +525,9 @@ emit_viewport( struct svga_context *svga, adjust_x = -0.5; adjust_y = -0.5; break; + default: + /* nothing */ + break; } } diff --git a/src/gallium/drivers/svga/svga_swtnl_state.c b/src/gallium/drivers/svga/svga_swtnl_state.c index db41f3cdab0..71faf3a610e 100644 --- a/src/gallium/drivers/svga/svga_swtnl_state.c +++ b/src/gallium/drivers/svga/svga_swtnl_state.c @@ -84,6 +84,9 @@ static void set_draw_viewport( struct svga_context *svga ) adjx += SVGA_TRIANGLE_ADJ_X; adjy += SVGA_TRIANGLE_ADJ_Y; break; + default: + /* nothing */ + break; } } |