Compat: refactor depth_clip_clamp for 0 storage buffers (#4096)

gpuweb · Dec 18, 2024 · bdee22a · bdee22a
1 parent 2fdc883
commit bdee22a
Showing 1 changed file with 29 additions and 13 deletions.
diff --git a/src/webgpu/api/operation/rendering/depth_clip_clamp.spec.ts b/src/webgpu/api/operation/rendering/depth_clip_clamp.spec.ts
@@ -6,14 +6,14 @@ depth ranges as well.
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { assert } from '../../../../common/util/util.js';
 import { kDepthStencilFormats, kTextureFormatInfo } from '../../../format_info.js';
-import { GPUTest } from '../../../gpu_test.js';
+import { GPUTest, MaxLimitsTestMixin } from '../../../gpu_test.js';
 import {
   checkElementsBetween,
   checkElementsPassPredicate,
   CheckElementsSupplementalTableRows,
 } from '../../../util/check_contents.js';
 
-export const g = makeTestGroup(GPUTest);
+export const g = makeTestGroup(MaxLimitsTestMixin(GPUTest));
 
 g.test('depth_clamp_and_clip')
   .desc(
@@ -55,6 +55,10 @@ have unexpected values then get drawn to the color buffer, which is later checke
     const info = kTextureFormatInfo[format];
     assert(!!info.depth);
 
+    const hasStorageBuffers = t.isCompatibility
+      ? t.device.limits.maxStorageBuffersInFragmentStage! > 0
+      : true;
+
     /** Number of depth values to test for both vertex output and frag_depth output. */
     const kNumDepthValues = 8;
     /** Test every combination of vertex output and frag_depth output. */
@@ -111,7 +115,13 @@ have unexpected values then get drawn to the color buffer, which is later checke
       @group(0) @binding(0) var <storage, read_write> output: Output;
 
       fn checkZ(vf: VFTest) {
-        output.fragInputZDiff[vf.vertexIndex] = vf.pos.z - expectedFragPosZ(vf.vertexIndex);
+        ${
+          hasStorageBuffers
+            ? `
+          output.fragInputZDiff[vf.vertexIndex] = vf.pos.z - expectedFragPosZ(vf.vertexIndex);
+        `
+            : ''
+        }
       }
 
       @fragment
@@ -246,10 +256,12 @@ have unexpected values then get drawn to the color buffer, which is later checke
       size: 4 * kNumTestPoints,
       usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC,
     });
-    const testBindGroup = t.device.createBindGroup({
-      layout: testPipeline.getBindGroupLayout(0),
-      entries: [{ binding: 0, resource: { buffer: fragInputZFailedBuffer } }],
-    });
+    const testBindGroup = hasStorageBuffers
+      ? t.device.createBindGroup({
+          layout: testPipeline.getBindGroupLayout(0),
+          entries: [{ binding: 0, resource: { buffer: fragInputZFailedBuffer } }],
+        })
+      : undefined;
 
     const enc = t.device.createCommandEncoder();
     {
@@ -266,7 +278,9 @@ have unexpected values then get drawn to the color buffer, which is later checke
         },
       });
       pass.setPipeline(testPipeline);
-      pass.setBindGroup(0, testBindGroup);
+      if (hasStorageBuffers) {
+        pass.setBindGroup(0, testBindGroup);
+      }
       pass.setViewport(0, 0, kNumTestPoints, 1, kViewportMinDepth, kViewportMaxDepth);
       pass.draw(kNumTestPoints);
       pass.end();
@@ -314,11 +328,13 @@ have unexpected values then get drawn to the color buffer, which is later checke
     }
     t.device.queue.submit([enc.finish()]);
 
-    t.expectGPUBufferValuesPassCheck(
-      fragInputZFailedBuffer,
-      a => checkElementsBetween(a, [() => -1e-5, () => 1e-5]),
-      { type: Float32Array, typedLength: kNumTestPoints }
-    );
+    if (hasStorageBuffers) {
+      t.expectGPUBufferValuesPassCheck(
+        fragInputZFailedBuffer,
+        a => checkElementsBetween(a, [() => -1e-5, () => 1e-5]),
+        { type: Float32Array, typedLength: kNumTestPoints }
+      );
+    }
 
     const kCheckPassedValue = 0;
     const predicatePrinter: CheckElementsSupplementalTableRows = [