diff options
| author | Timur Kristóf <timur.kristof@gmail.com> | 2022-05-13 16:12:46 +0200 |
|---|---|---|
| committer | Timur Kristóf <timur.kristof@gmail.com> | 2022-05-16 15:28:15 +0200 |
| commit | 063a61a8409a97e115249f0ed33b69700d3fdd4a (patch) | |
| tree | b57bb68835f153f9f03e37e3d66fcdf0f16031dd | |
| parent | 3382af7f6a7508d2f1f698a39f9761a88c5e863a (diff) | |
radv: Fix task shader info.
This is in the wrong place thanks to a rebase mistake.
Fixes: 101a7321c4002eec9019f2e25d40d931f74e90b9
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16500>
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 76ccce25ef9..e86b777b857 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -3447,6 +3447,16 @@ radv_fill_shader_info(struct radv_pipeline *pipeline, ac_compute_cs_workgroup_size( stages[MESA_SHADER_COMPUTE].nir->info.workgroup_size, false, UINT32_MAX); } + + if (stages[MESA_SHADER_TASK].nir) { + /* Task/mesh I/O uses the task ring buffers. */ + stages[MESA_SHADER_TASK].info.cs.uses_task_rings = true; + stages[MESA_SHADER_MESH].info.cs.uses_task_rings = true; + + stages[MESA_SHADER_TASK].info.workgroup_size = + ac_compute_cs_workgroup_size( + stages[MESA_SHADER_TASK].nir->info.workgroup_size, false, UINT32_MAX); + } } static void @@ -3502,16 +3512,6 @@ radv_declare_pipeline_args(struct radv_device *device, struct radv_pipeline_stag stages[i].info.user_sgprs_locs = stages[i].args.user_sgprs_locs; stages[i].info.inline_push_constant_mask = stages[i].args.ac.inline_push_const_mask; } - - if (stages[MESA_SHADER_TASK].nir) { - /* Task/mesh I/O uses the task ring buffers. */ - stages[MESA_SHADER_TASK].info.cs.uses_task_rings = true; - stages[MESA_SHADER_MESH].info.cs.uses_task_rings = true; - - stages[MESA_SHADER_TASK].info.workgroup_size = - ac_compute_cs_workgroup_size( - stages[MESA_SHADER_TASK].nir->info.workgroup_size, false, UINT32_MAX); - } } static void |