diff options
author | Danylo Piliaiev <dpiliaiev@igalia.com> | 2021-01-12 21:59:09 +0200 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-01-13 09:55:47 +0000 |
commit | a6ae7b242160ab867b1eda3c3fb4f75020129338 (patch) | |
tree | 1ee3ebbb24795a3072622060478669b9e20f97ef /src | |
parent | 8ecace073ea68e3819ea7c5637bd479067e1420b (diff) |
turnip: remove unused IR3_DP_LOCAL_GROUP_SIZE_* from cs params
In Turnip local group size is lowered in NIR via
nir_lower_compute_system_values.
Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8444>
Diffstat (limited to 'src')
-rw-r--r-- | src/freedreno/vulkan/tu_cmd_buffer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index e3afe782ce9..b89248dae7f 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -3799,17 +3799,16 @@ tu_emit_compute_driver_params(struct tu_cs *cs, struct tu_pipeline *pipeline, return; if (!info->indirect) { - uint32_t driver_params[IR3_DP_CS_COUNT] = { + uint32_t driver_params[4] = { [IR3_DP_NUM_WORK_GROUPS_X] = info->blocks[0], [IR3_DP_NUM_WORK_GROUPS_Y] = info->blocks[1], [IR3_DP_NUM_WORK_GROUPS_Z] = info->blocks[2], - [IR3_DP_LOCAL_GROUP_SIZE_X] = pipeline->compute.local_size[0], - [IR3_DP_LOCAL_GROUP_SIZE_Y] = pipeline->compute.local_size[1], - [IR3_DP_LOCAL_GROUP_SIZE_Z] = pipeline->compute.local_size[2], }; uint32_t num_consts = MIN2(const_state->num_driver_params, (link->constlen - offset) * 4); + assert(num_consts <= ARRAY_SIZE(driver_params)); + /* push constants */ tu_cs_emit_pkt7(cs, tu6_stage2opcode(type), 3 + num_consts); tu_cs_emit(cs, CP_LOAD_STATE6_0_DST_OFF(offset) | |