diff options
| author | Marek Olšák <[email protected]> | 2017-10-07 21:53:10 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-10-17 22:03:03 +0200 |
| commit | 69325fa88ddf425ac208c49b9e9e331d61b9cb5c (patch) | |
| tree | d36ce82c5a8240e401993232455c908eb03c0f7a /src/gallium | |
| parent | 79c2e7388c7fae877fd2cf90d9ea1730992ef34c (diff) | |
radeonsi: generalize the SI_VS_SHADER_POINTER_MASK macro
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_blit.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 03aa4f7737f..fd8559ac98c 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -95,7 +95,7 @@ static void si_blitter_end(struct pipe_context *ctx) /* Restore shader pointers because the VS blit shader changed all * non-global VS user SGPRs. */ - sctx->shader_pointers_dirty |= SI_VS_SHADER_POINTER_MASK; + sctx->shader_pointers_dirty |= SI_DESCS_SHADER_MASK(VERTEX); sctx->vertex_buffer_pointer_dirty = true; si_mark_atom_dirty(sctx, &sctx->shader_pointers.atom); } diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 8122ddb392e..bc7e7b3e426 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -247,9 +247,9 @@ enum { #define SI_NUM_DESCS (SI_DESCS_FIRST_SHADER + \ SI_NUM_SHADERS * SI_NUM_SHADER_DESCS) -#define SI_VS_SHADER_POINTER_MASK \ +#define SI_DESCS_SHADER_MASK(name) \ u_bit_consecutive(SI_DESCS_FIRST_SHADER + \ - PIPE_SHADER_VERTEX * SI_NUM_SHADER_DESCS, \ + PIPE_SHADER_##name * SI_NUM_SHADER_DESCS, \ SI_NUM_SHADER_DESCS) /* This represents descriptors in memory, such as buffer resources, diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 9468fde5236..ed48eddf419 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -1544,7 +1544,7 @@ void si_draw_rectangle(struct blitter_context *blitter, info.instance_count = num_instances; /* Don't set per-stage shader pointers for VS. */ - sctx->shader_pointers_dirty &= ~SI_VS_SHADER_POINTER_MASK; + sctx->shader_pointers_dirty &= ~SI_DESCS_SHADER_MASK(VERTEX); sctx->vertex_buffer_pointer_dirty = false; si_draw_vbo(pipe, &info); |