Refactor api/validation/(encoding|query_set|render_pass|shader_module) (gpuweb#4276)

Issue gpuweb#4178
Issue gpuweb#4181

Author: greggman

src/webgpu/api/validation/encoding/createRenderBundleEncoder.spec.ts

@@ -14,7 +14,7 @@ import {
   isTextureFormatColorRenderable,
   kAllTextureFormats,
   kDepthStencilFormats,
-  kRenderableColorTextureFormats,
+  kPossibleColorRenderableTextureFormats,
 } from '../../../format_info.js';
 import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
@@ -56,7 +56,7 @@ g.test('attachment_state,limits,maxColorAttachmentBytesPerSample,aligned')
   )
   .params(u =>
     u
-      .combine('format', kRenderableColorTextureFormats)
+      .combine('format', kPossibleColorRenderableTextureFormats)
       .beginSubcases()
       .combine(
         'colorFormatCount',

src/webgpu/api/validation/query_set/create.spec.ts

@@ -4,9 +4,9 @@ Tests for validation in createQuerySet.
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { kQueryTypes, kMaxQueryCount } from '../../../capability_info.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
-export const g = makeTestGroup(ValidationTest);
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('count')
   .desc(
@@ -22,11 +22,9 @@ Tests that create query set with the count for all query types:
       .beginSubcases()
       .combine('count', [0, kMaxQueryCount, kMaxQueryCount + 1])
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceForQueryTypeOrSkipTestCase(t.params.type);
-  })
   .fn(t => {
     const { type, count } = t.params;
+    t.skipIfDeviceDoesNotSupportQueryType(type);
 
     t.expectValidationError(() => {
       t.createQuerySetTracked({ type, count });

src/webgpu/api/validation/query_set/destroy.spec.ts

@@ -3,9 +3,9 @@ Destroying a query set more than once is allowed.
 `;
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
-export const g = makeTestGroup(ValidationTest);
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('twice').fn(t => {
   const qset = t.createQuerySetTracked({ type: 'occlusion', count: 1 });

src/webgpu/api/validation/render_pass/attachment_compatibility.spec.ts

@@ -8,14 +8,15 @@ import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { range } from '../../../../common/util/util.js';
 import { getDefaultLimits, kTextureSampleCounts } from '../../../capability_info.js';
 import {
-  kRegularTextureFormats,
   kSizedDepthStencilFormats,
   kUnsizedDepthStencilFormats,
-  kTextureFormatInfo,
   filterFormatsByFeature,
   getFeaturesForFormats,
+  isDepthTextureFormat,
+  isStencilTextureFormat,
+  kPossibleColorRenderableTextureFormats,
 } from '../../../format_info.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
 // MAINTENANCE_TODO: This should be changed to kMaxColorAttachmentsToTest
 // when this is made a MaxLimitTest (see above).
@@ -89,7 +90,7 @@ const kFeaturesForDepthStencilAttachmentFormats = getFeaturesForFormats([
   ...kUnsizedDepthStencilFormats,
 ]);
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   createAttachmentTextureView(format: GPUTextureFormat, sampleCount?: number) {
     return this.createTextureTracked({
       // Size matching the "arbitrary" size used by ValidationTest helpers.
@@ -121,12 +122,12 @@ class F extends ValidationTest {
     const attachment: GPURenderPassDepthStencilAttachment = {
       view: this.createAttachmentTextureView(format, sampleCount),
     };
-    if (kTextureFormatInfo[format].depth) {
+    if (isDepthTextureFormat(format)) {
       attachment.depthClearValue = 0;
       attachment.depthLoadOp = 'clear';
       attachment.depthStoreOp = 'discard';
     }
-    if (kTextureFormatInfo[format].stencil) {
+    if (isStencilTextureFormat(format)) {
       attachment.stencilClearValue = 1;
       attachment.stencilLoadOp = 'clear';
       attachment.stencilStoreOp = 'discard';
@@ -167,21 +168,17 @@ class F extends ValidationTest {
 
 export const g = makeTestGroup(F);
 
-const kColorAttachmentFormats = kRegularTextureFormats.filter(
-  format => !!kTextureFormatInfo[format].colorRender
-);
-
 g.test('render_pass_and_bundle,color_format')
   .desc('Test that color attachment formats in render passes and bundles must match.')
   .paramsSubcasesOnly(u =>
     u //
-      .combine('passFormat', kColorAttachmentFormats)
-      .combine('bundleFormat', kColorAttachmentFormats)
+      .combine('passFormat', kPossibleColorRenderableTextureFormats)
+      .combine('bundleFormat', kPossibleColorRenderableTextureFormats)
   )
   .fn(t => {
     const { passFormat, bundleFormat } = t.params;
-
-    t.skipIfTextureFormatNotSupportedDeprecated(passFormat, bundleFormat);
+    t.skipIfTextureFormatNotSupported(passFormat, bundleFormat);
+    t.skipIfTextureFormatNotUsableAsRenderAttachment(passFormat, bundleFormat);
 
     const bundleEncoder = t.device.createRenderBundleEncoder({
       colorFormats: [bundleFormat],
@@ -301,12 +298,9 @@ g.test('render_pass_and_bundle,depth_format')
         filterFormatsByFeature(bundleFeature, kDepthStencilAttachmentFormats)
       )
   )
-  .beforeAllSubcases(t => {
-    const { passFeature, bundleFeature } = t.params;
-    t.selectDeviceOrSkipTestCase([passFeature, bundleFeature]);
-  })
   .fn(t => {
     const { passFormat, bundleFormat } = t.params;
+    t.skipIfTextureFormatNotSupported(passFormat, bundleFormat);
 
     const bundleEncoder = t.device.createRenderBundleEncoder({
       colorFormats: ['rgba8unorm'],
@@ -351,9 +345,7 @@ g.test('render_pass_and_bundle,sample_count')
 g.test('render_pass_and_bundle,device_mismatch')
   .desc('Test that render passes cannot be called with bundles created from another device.')
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { mismatched } = t.params;
     const sourceDevice = mismatched ? t.mismatchedDevice : t.device;
@@ -383,13 +375,13 @@ Test that color attachment formats in render passes or bundles match the pipelin
     u
       .combine('encoderType', ['render pass', 'render bundle'] as const)
       .beginSubcases()
-      .combine('encoderFormat', kColorAttachmentFormats)
-      .combine('pipelineFormat', kColorAttachmentFormats)
+      .combine('encoderFormat', kPossibleColorRenderableTextureFormats)
+      .combine('pipelineFormat', kPossibleColorRenderableTextureFormats)
   )
   .fn(t => {
     const { encoderType, encoderFormat, pipelineFormat } = t.params;
-
-    t.skipIfTextureFormatNotSupportedDeprecated(encoderFormat, pipelineFormat);
+    t.skipIfTextureFormatNotSupported(encoderFormat, pipelineFormat);
+    t.skipIfTextureFormatNotUsableAsRenderAttachment(encoderFormat, pipelineFormat);
 
     const pipeline = t.createRenderPipeline([{ format: pipelineFormat, writeMask: 0 }]);
 
@@ -506,12 +498,9 @@ Test that the depth attachment format in render passes or bundles match the pipe
         filterFormatsByFeature(pipelineFormatFeature, kDepthStencilAttachmentFormats)
       )
   )
-  .beforeAllSubcases(t => {
-    const { encoderFormatFeature, pipelineFormatFeature } = t.params;
-    t.selectDeviceOrSkipTestCase([encoderFormatFeature, pipelineFormatFeature]);
-  })
   .fn(t => {
     const { encoderType, encoderFormat, pipelineFormat } = t.params;
+    t.skipIfTextureFormatNotSupported(encoderFormat, pipelineFormat);
 
     const pipeline = t.createRenderPipeline(
       [{ format: 'rgba8unorm', writeMask: 0 }],
@@ -554,16 +543,15 @@ Test that the depth stencil read only state in render passes or bundles is compa
       .combine('cullMode', ['none', 'front', 'back'] as const)
       .filter(p => {
         if (p.format) {
-          const depthStencilInfo = kTextureFormatInfo[p.format];
           // If the format has no depth aspect, the depthReadOnly, depthWriteEnabled of the pipeline must not be true
           // in order to create a valid render pipeline.
-          if (!depthStencilInfo.depth && p.depthWriteEnabled) {
+          if (!isDepthTextureFormat(p.format) && p.depthWriteEnabled) {
             return false;
           }
           // If the format has no stencil aspect, the stencil state operation must be 'keep'
           // in order to create a valid render pipeline.
           if (
-            !depthStencilInfo.stencil &&
+            !isStencilTextureFormat(p.format) &&
             (p.stencilFront.failOp !== 'keep' || p.stencilBack.failOp !== 'keep')
           ) {
             return false;
@@ -573,9 +561,6 @@ Test that the depth stencil read only state in render passes or bundles is compa
         return true;
       })
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceForTextureFormatOrSkipTestCase(t.params.format);
-  })
   .fn(t => {
     const {
       encoderType,
@@ -588,6 +573,7 @@ Test that the depth stencil read only state in render passes or bundles is compa
       stencilFront,
       stencilBack,
     } = t.params;
+    t.skipIfTextureFormatNotSupported(format);
 
     const pipeline = t.createRenderPipeline(
       [{ format: 'rgba8unorm', writeMask: 0 }],

src/webgpu/api/validation/render_pass/resolve.spec.ts

@@ -4,11 +4,11 @@ Validation tests for render pass resolve.
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { GPUConst } from '../../../constants.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
 const kNumColorAttachments = 4;
 
-export const g = makeTestGroup(ValidationTest);
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('resolve_attachment')
   .desc(

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

@@ -16,9 +16,9 @@ TODO:
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { kDefaultVertexShaderCode, getShaderWithEntryPoint } from '../../../util/shader.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
-export const g = makeTestGroup(ValidationTest);
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 const kEntryPointTestCases = [
   { shaderModuleEntryPoint: 'main', stageEntryPoint: 'main' },

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

@@ -3,9 +3,9 @@ This tests overrides numeric identifiers should not conflict.
 `;
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
-export const g = makeTestGroup(ValidationTest);
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('id_conflict')
   .desc(