Mesa (main): ac/nir/taskmesh: Use 3 dimensional workgroup ID.

[GitLab Mirror]

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

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Thu May 26 13:36:14 2022 +0200

ac/nir/taskmesh: Use 3 dimensional workgroup ID.

For the sake of consistency, do not rely on a 1-dimensional
workgroup ID anymore.

Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16721>

---

 src/amd/common/ac_nir_lower_taskmesh_io_to_mem.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/amd/common/ac_nir_lower_taskmesh_io_to_mem.c b/src/amd/common/ac_nir_lower_taskmesh_io_to_mem.c
index 2ef11e3c05b..5bcb97a6ea7 100644
--- a/src/amd/common/ac_nir_lower_taskmesh_io_to_mem.c
+++ b/src/amd/common/ac_nir_lower_taskmesh_io_to_mem.c
@@ -147,8 +147,16 @@ task_workgroup_index(nir_builder *b,
 {
    nir_ssa_def *id = nir_load_workgroup_id(b, 32);
 
-   /* NV_mesh_shader: workgroups are always 1D, so index is the same as ID.x */
-   return nir_channel(b, id, 0);
+   nir_ssa_def *x = nir_channel(b, id, 0);
+   nir_ssa_def *y = nir_channel(b, id, 1);
+   nir_ssa_def *z = nir_channel(b, id, 2);
+
+   nir_ssa_def *grid_size = nir_load_num_workgroups(b, 32);
+   nir_ssa_def *grid_size_x = nir_channel(b, grid_size, 0);
+   nir_ssa_def *grid_size_y = nir_channel(b, grid_size, 1);
+
+   return nir_iadd(b, nir_imul(b, nir_imul(b, grid_size_x, grid_size_y), z),
+                      nir_iadd(b, nir_imul(b, grid_size_x, y), x));
 }
 
 static nir_ssa_def *