Refactor render_pass_descriptor tests for texture formats.

Issue gpuweb#4181

Author: greggman

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

@@ -13,15 +13,18 @@ import {
   computeBytesPerSampleFromFormats,
   kDepthStencilFormats,
   kRenderableColorTextureFormats,
-  kTextureFormatInfo,
+  isTextureFormatColorRenderable,
+  isDepthTextureFormat,
+  isStencilTextureFormat,
+  isTextureFormatResolvable,
 } 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).
 const kMaxColorAttachments = getDefaultLimits('core').maxColorAttachments.default;
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   createTestTexture(
     options: {
       format?: GPUTextureFormat;
@@ -214,7 +217,6 @@ g.test('color_attachments,limits,maxColorAttachmentBytesPerSample,aligned')
   })
   .fn(t => {
     const { format, attachmentCount } = t.params;
-    const info = kTextureFormatInfo[format];
 
     t.skipIf(
       attachmentCount > t.device.limits.maxColorAttachments,
@@ -227,7 +229,7 @@ g.test('color_attachments,limits,maxColorAttachmentBytesPerSample,aligned')
       colorAttachments.push(t.getColorAttachment(colorTexture));
     }
     const shouldError =
-      info.colorRender === undefined ||
+      isTextureFormatColorRenderable(t.device, format) === undefined ||
       computeBytesPerSampleFromFormats(range(attachmentCount, () => format)) >
         t.device.limits.maxColorAttachmentBytesPerSample;
 
@@ -1049,10 +1051,6 @@ g.test('depth_stencil_attachment,loadOp_storeOp_match_depthReadOnly_stencilReadO
       .combine('stencilLoadOp', [undefined, 'clear', 'load'] as GPULoadOp[])
       .combine('stencilStoreOp', [undefined, 'discard', 'store'] as GPUStoreOp[])
   )
-  .beforeAllSubcases(t => {
-    const info = kTextureFormatInfo[t.params.format as GPUTextureFormat];
-    t.selectDeviceOrSkipTestCase(info.feature);
-  })
   .fn(t => {
     const {
       format,
@@ -1064,6 +1062,8 @@ g.test('depth_stencil_attachment,loadOp_storeOp_match_depthReadOnly_stencilReadO
       stencilStoreOp,
     } = t.params;
 
+    t.skipIfTextureFormatNotSupported(format);
+
     const depthAttachment = t.createTextureTracked({
       format,
       size: { width: 1, height: 1, depthOrArrayLayers: 1 },
@@ -1092,11 +1092,10 @@ g.test('depth_stencil_attachment,loadOp_storeOp_match_depthReadOnly_stencilReadO
     const pass = encoder.beginRenderPass(renderPassDescriptor);
     pass.end();
 
-    const info = kTextureFormatInfo[format];
     const hasDepthSettings = !!depthLoadOp && !!depthStoreOp && !depthReadOnly;
     const hasStencilSettings = !!stencilLoadOp && !!stencilStoreOp && !stencilReadOnly;
-    const hasDepth = info.depth;
-    const hasStencil = info.stencil;
+    const hasDepth = isDepthTextureFormat(format);
+    const hasStencil = isStencilTextureFormat(format);
 
     const goodAspectSettingsPresent =
       (hasDepthSettings ? hasDepth : true) && (hasStencilSettings ? hasStencil : true);
@@ -1162,27 +1161,19 @@ g.test('resolveTarget,format_supports_resolve')
   if and only if they support 'resolve'.
   `
   )
-  .params(u =>
-    u
-      .combine('format', kRenderableColorTextureFormats)
-      .filter(t => kTextureFormatInfo[t.format].multisample)
-  )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    t.skipIfTextureFormatNotSupportedDeprecated(format);
-    t.skipIfMultisampleNotSupportedForFormatDeprecated(format);
-  })
+  .params(u => u.combine('format', kRenderableColorTextureFormats))
   .fn(t => {
     const { format } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
+    t.skipIfMultisampleNotSupportedForFormat(format);
 
     const multisampledColorTexture = t.createTestTexture({ format, sampleCount: 4 });
     const resolveTarget = t.createTestTexture({ format });
 
     const colorAttachment = t.getColorAttachment(multisampledColorTexture);
     colorAttachment.resolveTarget = resolveTarget.createView();
 
-    t.tryRenderPass(!!info.colorRender?.resolve, {
+    t.tryRenderPass(isTextureFormatResolvable(t.device, format), {
       colorAttachments: [colorAttachment],
     });
   });
@@ -1198,10 +1189,8 @@ g.test('timestampWrites,query_set_type')
     u //
       .combine('queryType', kQueryTypes)
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceOrSkipTestCase(['timestamp-query']);
-  })
   .fn(t => {
+    t.skipIfDeviceDoesNotSupportQueryType('timestamp');
     const { queryType } = t.params;
 
     const timestampWrites = {
@@ -1231,10 +1220,8 @@ g.test('timestampWrite,query_index')
       .combine('beginningOfPassWriteIndex', [undefined, 0, 1, 2, 3] as const)
       .combine('endOfPassWriteIndex', [undefined, 0, 1, 2, 3] as const)
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceOrSkipTestCase(['timestamp-query']);
-  })
   .fn(t => {
+    t.skipIfDeviceDoesNotSupportQueryType('timestamp');
     const { beginningOfPassWriteIndex, endOfPassWriteIndex } = t.params;
 
     const querySetCount = 2;
@@ -1262,13 +1249,9 @@ g.test('timestampWrite,query_index')
 g.test('occlusionQuerySet,query_set_type')
   .desc(`Test that occlusionQuerySet must have type 'occlusion'.`)
   .params(u => u.combine('queryType', kQueryTypes))
-  .beforeAllSubcases(t => {
-    if (t.params.queryType === 'timestamp') {
-      t.selectDeviceOrSkipTestCase(['timestamp-query']);
-    }
-  })
   .fn(t => {
     const { queryType } = t.params;
+    t.skipIfDeviceDoesNotSupportQueryType(queryType);
 
     const querySet = t.createQuerySetTracked({
       type: queryType,

src/webgpu/gpu_test.ts

@@ -35,6 +35,7 @@ import {
   isTextureFormatUsableAsStorageFormatDeprecated,
   isMultisampledTextureFormatDeprecated,
   isTextureFormatUsableAsStorageFormat,
+  isTextureFormatMultisampled,
 } from './format_info.js';
 import { checkElementsEqual, checkElementsBetween } from './util/check_contents.js';
 import { CommandBufferMaker, EncoderType } from './util/command_buffer_maker.js';
@@ -523,6 +524,26 @@ export class GPUTestBase extends Fixture<GPUTestSubcaseBatchState> {
     }
   }
 
+  /**
+   * Skips test if device does not have feature.
+   * Note: Try to use one of the more specific skipIf tests if possible.
+   */
+  skipIfDeviceDoesNotHaveFeature(feature: GPUFeatureName) {
+    this.skipIf(!this.device.features.has(feature), `device does not have feature: '${feature}'`);
+  }
+
+  /**
+   * Skips test if device des not support query type.
+   */
+  skipIfDeviceDoesNotSupportQueryType(...types: GPUQueryType[]) {
+    for (const type of types) {
+      const feature = kQueryTypeInfo[type].feature;
+      if (feature) {
+        this.skipIfDeviceDoesNotHaveFeature(feature);
+      }
+    }
+  }
+
   /**
    * Skips test if any format is not supported.
    */
@@ -544,6 +565,15 @@ export class GPUTestBase extends Fixture<GPUTestSubcaseBatchState> {
     }
   }
 
+  skipIfMultisampleNotSupportedForFormat(...formats: (GPUTextureFormat | undefined)[]) {
+    for (const format of formats) {
+      if (format === undefined) continue;
+      if (!isTextureFormatMultisampled(this.device, format)) {
+        this.skip(`texture format '${format}' is not supported to be multisampled`);
+      }
+    }
+  }
+
   /** @deprecated */
   skipIfTextureViewDimensionNotSupportedDeprecated(
     ...dimensions: (GPUTextureViewDimension | undefined)[]