Merge pull request #269 from linebender/fix_fail

Partially revert uniform load of bump.failed
linebender · Jan 31, 2023 · 872fc5c · 872fc5c
2 parents 6a18424 + 27e6fdd
commit 872fc5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/shader/coarse.wgsl b/shader/coarse.wgsl
@@ -148,15 +148,14 @@ fn main(
     // Exit early if prior stages failed, as we can't run this stage.
     // We need to check only prior stages, as if this stage has failed in another workgroup, 
     // we still want to know this workgroup's memory requirement.   
+#ifdef have_uniform
     if local_id.x == 0u {
         // Reuse sh_part_count to hold failed flag, shmem is tight
         sh_part_count[0] = atomicLoad(&bump.failed);
     }
-#ifdef have_uniform
     let failed = workgroupUniformLoad(&sh_part_count[0]);
 #else
-    workgroupBarrier();
-    let failed = sh_part_count[0];
+    let failed = atomicLoad(&bump.failed);
 #endif
     if (failed & (STAGE_BINNING | STAGE_TILE_ALLOC | STAGE_PATH_COARSE)) != 0u {
         return;

diff --git a/shader/tile_alloc.wgsl b/shader/tile_alloc.wgsl
@@ -29,7 +29,9 @@ let WG_SIZE = 256u;
 
 var<workgroup> sh_tile_count: array<u32, WG_SIZE>;
 var<workgroup> sh_tile_offset: u32;
+#ifdef have_uniform
 var<workgroup> sh_atomic_failed: u32;
+#endif
 
 @compute @workgroup_size(256)
 fn main(
@@ -39,14 +41,13 @@ fn main(
     // Exit early if prior stages failed, as we can't run this stage.
     // We need to check only prior stages, as if this stage has failed in another workgroup, 
     // we still want to know this workgroup's memory requirement.
+#ifdef have_uniform
     if local_id.x == 0u {
         sh_atomic_failed = atomicLoad(&bump.failed);
     }
-#ifdef have_uniform
     let failed = workgroupUniformLoad(&sh_atomic_failed);
 #else
-    workgroupBarrier();
-    let failed = sh_atomic_failed;
+    let failed = atomicLoad(&bump.failed);
 #endif
     if (failed & STAGE_BINNING) != 0u {
         return;