diff options
author | Constantine Kharlamov <[email protected]> | 2017-04-02 20:33:04 +0300 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2017-04-04 22:15:47 +0200 |
commit | fa8bc90990212ac213355140e59a57df655efb73 (patch) | |
tree | f27c7c472183055cf712c23d00b9f18ad66c6cf2 /src/gallium/drivers/radeonsi | |
parent | ef62a7651cb8cbf54dab26305fb2cd5dcfcba9f7 (diff) |
r600g/radeonsi: use the correct types (taken from pipe_draw_info)
Note: si_shader.h has also "type" variable that should be changed to
"enum pipe_prim_type", however it triggers a bunch of warnings about
unhandled switches, so due not knowing the correct way to handle them, I
decided to leave it as is.
Signed-off-by: Constantine Kharlamov <[email protected]>
Signed-off-by: Marek Olšák <[email protected]>
Tested-by: Dieter Nützel <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.h | 2 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 92258990472..daf29325f76 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -348,7 +348,7 @@ struct si_context { int last_multi_vgt_param; int last_rast_prim; unsigned last_sc_line_stipple; - int current_rast_prim; /* primitive type after TES, GS */ + enum pipe_prim_type current_rast_prim; /* primitive type after TES, GS */ bool gs_tri_strip_adj_fix; /* Scratch buffer */ diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 1f219f8ae66..2c4e3715e45 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -468,7 +468,7 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx, static void si_emit_rasterizer_prim_state(struct si_context *sctx) { struct radeon_winsys_cs *cs = sctx->b.gfx.cs; - unsigned rast_prim = sctx->current_rast_prim; + enum pipe_prim_type rast_prim = sctx->current_rast_prim; struct si_state_rasterizer *rs = sctx->emitted.named.rasterizer; /* Skip this if not rendering lines. */ @@ -1091,7 +1091,8 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) struct si_state_rasterizer *rs = sctx->queued.named.rasterizer; const struct pipe_index_buffer *ib = &sctx->index_buffer; struct pipe_index_buffer ib_tmp; /* for index buffer uploads only */ - unsigned mask, dirty_tex_counter, rast_prim; + unsigned mask, dirty_tex_counter; + enum pipe_prim_type rast_prim; if (likely(!info->indirect)) { /* SI-CI treat instance_count==0 as instance_count==1. There is |