Compat: Skip more tests for sample_* validation (gpuweb#3776)

greggman · Jun 3, 2024 · dc0e978 · dc0e978
1 parent 5c23d90
commit dc0e978
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/src/webgpu/api/validation/render_pipeline/inter_stage.spec.ts b/src/webgpu/api/validation/render_pipeline/inter_stage.spec.ts
@@ -335,12 +335,12 @@ g.test('max_components_count,input')
     }
 
     if (useExtraBuiltinInputs) {
-      inputs.push(
-        '@builtin(front_facing) front_facing_in: bool',
-        '@builtin(sample_mask) sample_mask_in: u32'
-      );
+      inputs.push('@builtin(front_facing) front_facing_in: bool');
       if (!t.isCompatibility) {
-        inputs.push('@builtin(sample_index) sample_index_in: u32');
+        inputs.push(
+          '@builtin(sample_mask) sample_mask_in: u32',
+          '@builtin(sample_index) sample_index_in: u32'
+        );
       }
     }
 

diff --git a/src/webgpu/shader/execution/shader_io/fragment_builtins.spec.ts b/src/webgpu/shader/execution/shader_io/fragment_builtins.spec.ts
@@ -1351,6 +1351,7 @@ g.test('inputs,sample_mask')
       interpolation: { type, sampling },
     } = t.params;
     t.skipIfInterpolationTypeOrSamplingNotSupported({ type, sampling });
+    t.skipIf(t.isCompatibility, 'sample_mask is not supported in compatibility mode');
   })
   .fn(async t => {
     const {

diff --git a/src/webgpu/shader/validation/shader_io/builtins.spec.ts b/src/webgpu/shader/validation/shader_io/builtins.spec.ts
@@ -76,6 +76,12 @@ g.test('stage_inout')
       .combine('target_io', ['in', 'out'] as const)
       .beginSubcases()
   )
+  .beforeAllSubcases(t => {
+    t.skipIf(
+      t.isCompatibility && ['sample_index', 'sample_mask'].includes(t.params.name),
+      'compatibility mode does not support sample_index or sample_mask'
+    );
+  })
   .fn(t => {
     const code = generateShader({
       attribute: `@builtin(${t.params.name})`,
@@ -108,6 +114,12 @@ g.test('type')
       .combine('target_type', kTestTypes)
       .combine('use_struct', [true, false] as const)
   )
+  .beforeAllSubcases(t => {
+    t.skipIf(
+      t.isCompatibility && ['sample_index', 'sample_mask'].includes(t.params.name),
+      'compatibility mode does not support sample_index or sample_mask'
+    );
+  })
   .fn(t => {
     let code = '';
 
@@ -146,10 +158,10 @@ g.test('nesting')
       .beginSubcases()
   )
   .fn(t => {
-    // Generate a struct that contains a sample_mask builtin, nested inside another struct.
+    // Generate a struct that contains a frag_depth builtin, nested inside another struct.
     let code = `
     struct Inner {
-      @builtin(sample_mask) value : u32
+      @builtin(frag_depth) value : f32
     };
     struct Outer {
       inner : Inner
@@ -182,6 +194,9 @@ g.test('duplicates')
       .combine('second', ['p2', 's1b', 's2b', 'rb'] as const)
       .beginSubcases()
   )
+  .beforeAllSubcases(t => {
+    t.skipIf(t.isCompatibility, 'compatibility mode does not support sample_mask');
+  })
   .fn(t => {
     const p1 =
       t.params.first === 'p1' ? '@builtin(sample_mask)' : '@location(1) @interpolate(flat)';

diff --git a/src/webgpu/shader/validation/uniformity/uniformity.spec.ts b/src/webgpu/shader/validation/uniformity/uniformity.spec.ts
@@ -268,6 +268,12 @@ const kFragmentBuiltinValues = [
 g.test('fragment_builtin_values')
   .desc(`Test uniformity of fragment built-in values`)
   .params(u => u.combineWithParams(kFragmentBuiltinValues).beginSubcases())
+  .beforeAllSubcases(t => {
+    t.skipIf(
+      t.isCompatibility && ['sample_index', 'sample_mask'].includes(t.params.builtin),
+      'compatibility mode does not support sample_index or sample_mask'
+    );
+  })
   .fn(t => {
     let cond = ``;
     switch (t.params.type) {