Mesa (main): radv: Fix task shader info.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 063a61a8409a97e115249f0ed33b69700d3fdd4a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=063a61a8409a97e115249f0ed33b69700d3fdd4a

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Fri May 13 16:12:46 2022 +0200

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 at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16500>

---

 src/amd/vulkan/radv_pipeline.c | 20 ++++++++++----------
 1 file 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