Refactor api/validation/render_pipeline/*

Issue #4178
Issue #4181

Author: greggman

src/webgpu/api/validation/render_pipeline/depth_stencil_state.spec.ts

@@ -11,8 +11,10 @@ import {
 } from '../../../capability_info.js';
 import {
   kAllTextureFormats,
-  kTextureFormatInfo,
   kDepthStencilFormats,
+  isDepthOrStencilTextureFormat,
+  isDepthTextureFormat,
+  isStencilTextureFormat,
 } from '../../../format_info.js';
 import { getFragmentShaderCodeWithOutput } from '../../../util/shader.js';
 
@@ -27,21 +29,15 @@ g.test('format')
       .combine('isAsync', [false, true])
       .combine('format', kAllTextureFormats)
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    const info = kTextureFormatInfo[format];
-    t.skipIfTextureFormatNotSupportedDeprecated(format);
-    t.selectDeviceOrSkipTestCase(info.feature);
-  })
   .fn(t => {
     const { isAsync, format } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
 
     const descriptor = t.getDescriptor({
       depthStencil: { format, depthWriteEnabled: false, depthCompare: 'always' },
     });
 
-    t.doCreateRenderPipelineTest(isAsync, !!info.depth || !!info.stencil, descriptor);
+    t.doCreateRenderPipelineTest(isAsync, isDepthOrStencilTextureFormat(format), descriptor);
   });
 
 g.test('depthCompare_optional')
@@ -59,12 +55,6 @@ g.test('depthCompare_optional')
       .combine('stencilFrontDepthFailOp', ['keep', 'zero'] as const)
       .combine('stencilBackDepthFailOp', ['keep', 'zero'] as const)
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    const info = kTextureFormatInfo[format];
-    t.skipIfTextureFormatNotSupportedDeprecated(format);
-    t.selectDeviceOrSkipTestCase(info.feature);
-  })
   .fn(t => {
     const {
       isAsync,
@@ -74,7 +64,7 @@ g.test('depthCompare_optional')
       stencilFrontDepthFailOp,
       stencilBackDepthFailOp,
     } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
     const descriptor = t.getDescriptor({
       depthStencil: {
         format,
@@ -90,12 +80,12 @@ g.test('depthCompare_optional')
     const stencilStateIsDefault = depthFailOpsAreKeep;
     let success = true;
     if (depthWriteEnabled || (depthCompare && depthCompare !== 'always')) {
-      if (!info.depth) success = false;
+      if (!isDepthTextureFormat(format)) success = false;
     }
     if (!stencilStateIsDefault) {
-      if (!info.stencil) success = false;
+      if (!isStencilTextureFormat(format)) success = false;
     }
-    if (info.depth) {
+    if (isDepthTextureFormat(format)) {
       if (depthWriteEnabled === undefined) success = false;
       if (depthWriteEnabled || !depthFailOpsAreKeep) {
         if (depthCompare === undefined) success = false;
@@ -110,20 +100,14 @@ g.test('depthWriteEnabled_optional')
     `The depthWriteEnabled in depthStencilState is optional for stencil-only formats but required for formats with a depth.`
   )
   .params(u => u.combine('isAsync', [false, true]).combine('format', kDepthStencilFormats))
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    const info = kTextureFormatInfo[format];
-    t.skipIfTextureFormatNotSupportedDeprecated(format);
-    t.selectDeviceOrSkipTestCase(info.feature);
-  })
   .fn(t => {
     const { isAsync, format } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
     const descriptor = t.getDescriptor({
       depthStencil: { format, depthCompare: 'always', depthWriteEnabled: undefined },
     });
 
-    t.doCreateRenderPipelineTest(isAsync, !info.depth, descriptor);
+    t.doCreateRenderPipelineTest(isAsync, !isDepthTextureFormat(format), descriptor);
   });
 
 g.test('depth_test')
@@ -136,21 +120,20 @@ g.test('depth_test')
       .combine('format', kDepthStencilFormats)
       .combine('depthCompare', kCompareFunctions)
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    const info = kTextureFormatInfo[format];
-    t.selectDeviceOrSkipTestCase(info.feature);
-  })
   .fn(t => {
     const { isAsync, format, depthCompare } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
 
     const descriptor = t.getDescriptor({
       depthStencil: { format, depthCompare, depthWriteEnabled: false },
     });
 
     const depthTestEnabled = depthCompare !== undefined && depthCompare !== 'always';
-    t.doCreateRenderPipelineTest(isAsync, !depthTestEnabled || !!info.depth, descriptor);
+    t.doCreateRenderPipelineTest(
+      isAsync,
+      !depthTestEnabled || isDepthTextureFormat(format),
+      descriptor
+    );
   });
 
 g.test('depth_write')
@@ -163,35 +146,28 @@ g.test('depth_write')
       .combine('format', kDepthStencilFormats)
       .combine('depthWriteEnabled', [false, true])
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    const info = kTextureFormatInfo[format];
-    t.selectDeviceOrSkipTestCase(info.feature);
-  })
   .fn(t => {
     const { isAsync, format, depthWriteEnabled } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
 
     const descriptor = t.getDescriptor({
       depthStencil: { format, depthWriteEnabled, depthCompare: 'always' },
     });
-    t.doCreateRenderPipelineTest(isAsync, !depthWriteEnabled || !!info.depth, descriptor);
+    t.doCreateRenderPipelineTest(
+      isAsync,
+      !depthWriteEnabled || isDepthTextureFormat(format),
+      descriptor
+    );
   });
 
 g.test('depth_write,frag_depth')
   .desc(`Depth aspect must be contained in the format if frag_depth is written in fragment stage.`)
   .params(u =>
     u.combine('isAsync', [false, true]).combine('format', [undefined, ...kDepthStencilFormats])
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    if (format !== undefined) {
-      const info = kTextureFormatInfo[format];
-      t.selectDeviceOrSkipTestCase(info.feature);
-    }
-  })
   .fn(t => {
     const { isAsync, format } = t.params;
+    t.skipIfTextureFormatNotSupported(format);
 
     const descriptor = t.getDescriptor({
       // Keep one color target so that the pipeline is still valid with no depth stencil target.
@@ -205,7 +181,7 @@ g.test('depth_write,frag_depth')
       ),
     });
 
-    const hasDepth = format ? !!kTextureFormatInfo[format].depth : false;
+    const hasDepth = format ? isDepthTextureFormat(format) : false;
     t.doCreateRenderPipelineTest(isAsync, hasDepth, descriptor);
   });
 
@@ -265,14 +241,9 @@ g.test('stencil_test')
       .combine('face', ['front', 'back'] as const)
       .combine('compare', [undefined, ...kCompareFunctions])
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    const info = kTextureFormatInfo[format];
-    t.selectDeviceOrSkipTestCase(info.feature);
-  })
   .fn(t => {
     const { isAsync, format, face, compare } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
 
     let descriptor: GPURenderPipelineDescriptor;
     if (face === 'front') {
@@ -296,7 +267,11 @@ g.test('stencil_test')
     }
 
     const stencilTestEnabled = compare !== undefined && compare !== 'always';
-    t.doCreateRenderPipelineTest(isAsync, !stencilTestEnabled || !!info.stencil, descriptor);
+    t.doCreateRenderPipelineTest(
+      isAsync,
+      !stencilTestEnabled || isStencilTextureFormat(format),
+      descriptor
+    );
   });
 
 g.test('stencil_write')
@@ -317,14 +292,9 @@ g.test('stencil_write')
       ] as const)
       .combine('op', [undefined, ...kStencilOperations])
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    const info = kTextureFormatInfo[format];
-    t.selectDeviceOrSkipTestCase(info.feature);
-  })
   .fn(t => {
     const { isAsync, format, faceAndOpType, op } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
 
     const common = {
       format,
@@ -357,5 +327,9 @@ g.test('stencil_write')
     const descriptor = t.getDescriptor({ depthStencil });
 
     const stencilWriteEnabled = op !== undefined && op !== 'keep';
-    t.doCreateRenderPipelineTest(isAsync, !stencilWriteEnabled || !!info.stencil, descriptor);
+    t.doCreateRenderPipelineTest(
+      isAsync,
+      !stencilWriteEnabled || isStencilTextureFormat(format),
+      descriptor
+    );
   });

src/webgpu/api/validation/render_pipeline/misc.spec.ts

@@ -84,9 +84,7 @@ g.test('pipeline_layout,device_mismatch')
     'Tests createRenderPipeline(Async) cannot be called with a pipeline layout created from another device'
   )
   .paramsSubcasesOnly(u => u.combine('isAsync', [true, false]).combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { isAsync, mismatched } = t.params;
 

src/webgpu/api/validation/render_pipeline/overrides.spec.ts

@@ -442,10 +442,8 @@ clarity on whether values like f16.positive.last_f64_castable would be valid. Se
         },
       ] as const)
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceOrSkipTestCase({ requiredFeatures: ['shader-f16'] });
-  })
   .fn(t => {
+    t.skipIfDeviceDoesNotHaveFeature('shader-f16');
     const { isAsync, vertexConstants, _success } = t.params;
 
     t.doCreateRenderPipelineTest(isAsync, _success, {
@@ -485,9 +483,6 @@ TODO(#2060): Tighten the cases around the valid/invalid boundary once we have WG
 clarity on whether values like f16.positive.last_f64_castable would be valid. See issue.
 `
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceOrSkipTestCase({ requiredFeatures: ['shader-f16'] });
-  })
   .params(u =>
     u //
       .combine('isAsync', [true, false])
@@ -515,6 +510,7 @@ clarity on whether values like f16.positive.last_f64_castable would be valid. Se
       ] as const)
   )
   .fn(t => {
+    t.skipIfDeviceDoesNotHaveFeature('shader-f16');
     const { isAsync, fragmentConstants, _success } = t.params;
 
     const descriptor = t.getDescriptor({

src/webgpu/api/validation/render_pipeline/resource_compatibility.spec.ts

@@ -4,7 +4,6 @@ Tests for resource compatibility between pipeline layout and shader modules
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { keysOf } from '../../../../common/util/data_tables.js';
-import { MaxLimitsTestMixin } from '../../../gpu_test.js';
 import {
   kAPIResources,
   getWGSLShaderForResource,
@@ -14,7 +13,7 @@ import {
 
 import { CreateRenderPipelineValidationTest } from './common.js';
 
-export const g = makeTestGroup(MaxLimitsTestMixin(CreateRenderPipelineValidationTest));
+export const g = makeTestGroup(CreateRenderPipelineValidationTest);
 
 g.test('resource_compatibility')
   .desc(
@@ -84,7 +83,7 @@ g.test('resource_compatibility')
         'Storage textures can not be used in fragment shaders because maxStorageTexturesInFragmentStage === 0'
       );
     }
-    t.skipIfTextureViewDimensionNotSupportedDeprecated(wgslResource.texture?.viewDimension);
+    t.skipIfTextureViewDimensionNotSupported(wgslResource.texture?.viewDimension);
     const emptyVS = `
 @vertex
 fn main() -> @builtin(position) vec4f {

src/webgpu/api/validation/render_pipeline/shader_module.spec.ts

@@ -28,9 +28,7 @@ g.test('device_mismatch')
       { vertex_mismatched: false, fragment_mismatched: true, _success: false },
     ])
   )
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { isAsync, vertex_mismatched, fragment_mismatched, _success } = t.params;
 

src/webgpu/api/validation/render_pipeline/vertex_state.spec.ts

@@ -8,7 +8,7 @@ import {
   makeValueTestVariant,
 } from '../../../../common/util/util.js';
 import { kVertexFormats, kVertexFormatInfo } from '../../../capability_info.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
 const VERTEX_SHADER_CODE_WITH_NO_INPUT = `
   @vertex fn main() -> @builtin(position) vec4<f32> {
@@ -55,7 +55,7 @@ function addTestAttributes(
   }
 }
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   getDescriptor(
     buffers: Iterable<GPUVertexBufferLayout>,
     vertexShaderCode: string