Don't access DrawIndex in mesh shader when task shader is active.

VVL didn't complain, but seems to fix GPU hang on RADV.
Themaister · Feb 26, 2024 · 45ea111 · 45ea111
1 parent 34fc5a2
commit 45ea111
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/tests/assets/shaders/meshlet_debug.mesh b/tests/assets/shaders/meshlet_debug.mesh
@@ -83,7 +83,10 @@ const uint STRIDE = 4; // TODO: Spec constant or push constant
 
 void main()
 {
-    uint compacted_meshlet_index = meshlet_get_meshlet_index() + 0x8000 * gl_DrawIDARB;
+    uint compacted_meshlet_index = meshlet_get_meshlet_index();
+#ifndef MESHLET_RENDER_TASK_HIERARCHICAL
+    compacted_meshlet_index += 0x8000 * gl_DrawIDARB;
+#endif
 
 #if defined(MESHLET_RENDER_TASK_HIERARCHICAL) && !MESHLET_RENDER_TASK_HIERARCHICAL
     CompactedDrawInfo task = mesh_payload.info;

diff --git a/tests/assets/shaders/meshlet_debug_plain.mesh b/tests/assets/shaders/meshlet_debug_plain.mesh
@@ -110,7 +110,10 @@ mediump vec4 unpack_bgr10a2(uint v)
 
 void main()
 {
-    uint compacted_meshlet_index = meshlet_get_meshlet_index() + 0x8000 * gl_DrawIDARB;
+    uint compacted_meshlet_index = meshlet_get_meshlet_index();
+#ifndef MESHLET_RENDER_TASK_HIERARCHICAL
+    compacted_meshlet_index += 0x8000 * gl_DrawIDARB;
+#endif
 
 #if defined(MESHLET_RENDER_TASK_HIERARCHICAL) && !MESHLET_RENDER_TASK_HIERARCHICAL
     CompactedDrawInfo task = mesh_payload.info;