diff options
| author | Marek Olšák <[email protected]> | 2018-02-07 01:31:33 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-02-24 23:08:28 +0100 |
| commit | 1d1df76d2b3b65f18002cec1957c6115b5bd12a5 (patch) | |
| tree | de4bcd8359e28e81b631010587e4300b6a1a5d95 /src | |
| parent | fca7dee9c6aa669764d8179e3064ea28b17d2835 (diff) | |
radeonsi: change si_descriptors::shader_userdata_offset type to short
We will want to use SH registers outside of user data SGPRs, like the GFX9
special SGPRs.
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 12 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index f28bd0ffb0a..65b0d3ac194 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -115,14 +115,14 @@ static void si_init_descriptor_list(uint32_t *desc_list, } static void si_init_descriptors(struct si_descriptors *desc, - unsigned shader_userdata_index, + short shader_userdata_rel_index, unsigned element_dw_size, unsigned num_elements) { desc->list = CALLOC(num_elements, element_dw_size * 4); desc->element_dw_size = element_dw_size; desc->num_elements = num_elements; - desc->shader_userdata_offset = shader_userdata_index * 4; + desc->shader_userdata_offset = shader_userdata_rel_index * 4; desc->slot_index_to_bind_directly = -1; } @@ -916,7 +916,7 @@ static void si_bind_sampler_states(struct pipe_context *ctx, static void si_init_buffer_resources(struct si_buffer_resources *buffers, struct si_descriptors *descs, unsigned num_buffers, - unsigned shader_userdata_index, + short shader_userdata_rel_index, enum radeon_bo_usage shader_usage, enum radeon_bo_usage shader_usage_constbuf, enum radeon_bo_priority priority, @@ -928,7 +928,7 @@ static void si_init_buffer_resources(struct si_buffer_resources *buffers, buffers->priority_constbuf = priority_constbuf; buffers->buffers = CALLOC(num_buffers, sizeof(struct pipe_resource*)); - si_init_descriptors(descs, shader_userdata_index, 4, num_buffers); + si_init_descriptors(descs, shader_userdata_rel_index, 4, num_buffers); } static void si_release_buffer_resources(struct si_buffer_resources *buffers, @@ -2132,12 +2132,12 @@ void si_emit_compute_shader_pointers(struct si_context *sctx) static void si_init_bindless_descriptors(struct si_context *sctx, struct si_descriptors *desc, - unsigned shader_userdata_index, + short shader_userdata_rel_index, unsigned num_elements) { MAYBE_UNUSED unsigned desc_slot; - si_init_descriptors(desc, shader_userdata_index, 16, num_elements); + si_init_descriptors(desc, shader_userdata_rel_index, 16, num_elements); sctx->bindless_descriptors.num_active_slots = num_elements; /* The first bindless descriptor is stored at slot 1, because 0 is not diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 5233be72462..02659a7a4f3 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -271,9 +271,9 @@ struct si_descriptors { uint32_t first_active_slot; uint32_t num_active_slots; - /* The SGPR index where the 64-bit pointer to the descriptor array will - * be stored. */ - ubyte shader_userdata_offset; + /* The SH register offset relative to USER_DATA*_0 where the pointer + * to the descriptor array will be stored. */ + short shader_userdata_offset; /* The size of one descriptor. */ ubyte element_dw_size; /* If there is only one slot enabled, bind it directly instead of |