Mesa (master): turnip: remove unused IR3_DP_LOCAL_GROUP_SIZE_* from cs params
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jan 13 10:14:43 UTC 2021
Module: Mesa
Branch: master
Commit: a6ae7b242160ab867b1eda3c3fb4f75020129338
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a6ae7b242160ab867b1eda3c3fb4f75020129338
Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date: Tue Jan 12 21:59:09 2021 +0200
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 at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8444>
---
src/freedreno/vulkan/tu_cmd_buffer.c | 7 +++----
1 file 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) |
More information about the mesa-commit
mailing list