Refactor api/validation/queue/* (#4279)

Issue #4178
Issue #4181

Author: greggman

src/webgpu/api/validation/queue/buffer_mapped.spec.ts

@@ -20,9 +20,9 @@ operations to ensure the mapping state is only considered when a command buffer
 `;
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   async runBufferDependencyTest(usage: number, callback: Function): Promise<void> {
     const bufferDesc = {
       size: 8,

src/webgpu/api/validation/queue/copyToTexture/CopyExternalImageToTexture.spec.ts

@@ -12,19 +12,15 @@ import {
 import { makeTestGroup } from '../../../../../common/framework/test_group.js';
 import { raceWithRejectOnTimeout, unreachable, assert } from '../../../../../common/util/util.js';
 import { kTextureUsages } from '../../../../capability_info.js';
-import {
-  kTextureFormatInfo,
-  kAllTextureFormats,
-  kValidTextureFormatsForCopyE2T,
-} from '../../../../format_info.js';
+import { kAllTextureFormats, kValidTextureFormatsForCopyE2T } from '../../../../format_info.js';
 import { kResourceStates } from '../../../../gpu_test.js';
 import {
   CanvasType,
   createCanvas,
   createOnscreenCanvas,
   createOffscreenCanvas,
 } from '../../../../util/create_elements.js';
-import { ValidationTest } from '../../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../../validation_test.js';
 
 const kDefaultBytesPerPixel = 4; // using 'bgra8unorm' or 'rgba8unorm'
 const kDefaultWidth = 32;
@@ -136,7 +132,7 @@ function generateCopySizeForDstOOB({ mipLevel, dstOrigin }: WithDstOriginMipLeve
   ];
 }
 
-class CopyExternalImageToTextureTest extends ValidationTest {
+class CopyExternalImageToTextureTest extends AllFeaturesMaxLimitsValidationTest {
   onlineCrossOriginUrl = 'https://raw.githubusercontent.com/gpuweb/gpuweb/main/logo/webgpu.png';
 
   getImageData(width: number, height: number): ImageData {
@@ -541,9 +537,7 @@ g.test('destination_texture,device_mismatch')
     'Tests copyExternalImageToTexture cannot be called with a destination texture created from another device'
   )
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(async t => {
     const { mismatched } = t.params;
     const sourceDevice = mismatched ? t.mismatchedDevice : t.device;
@@ -678,13 +672,9 @@ g.test('destination_texture,format')
         { width: 1, height: 1, depthOrArrayLayers: 1 },
       ])
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    t.skipIfTextureFormatNotSupportedDeprecated(format);
-    t.selectDeviceOrSkipTestCase(kTextureFormatInfo[format].feature);
-  })
   .fn(async t => {
     const { format, copySize } = t.params;
+    t.skipIfTextureFormatNotSupported(format);
 
     const imageBitmap = await t.createImageBitmap(t.getImageData(1, 1));
 

src/webgpu/api/validation/queue/destroyed/buffer.spec.ts

@@ -3,9 +3,9 @@ Tests using a destroyed buffer on a queue.
 `;
 
 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('writeBuffer')
   .desc(

src/webgpu/api/validation/queue/destroyed/query_set.spec.ts

@@ -3,9 +3,9 @@ Tests using a destroyed query set on a queue.
 `;
 
 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('beginOcclusionQuery')
   .desc(
@@ -34,8 +34,8 @@ Tests that use a destroyed query set in timestamp query on {non-pass, compute, r
   `
   )
   .params(u => u.beginSubcases().combine('querySetState', ['valid', 'destroyed'] as const))
-  .beforeAllSubcases(t => t.selectDeviceOrSkipTestCase('timestamp-query'))
   .fn(t => {
+    t.skipIfDeviceDoesNotSupportQueryType('timestamp');
     const querySet = t.createQuerySetWithState(t.params.querySetState, {
       type: 'timestamp',
       count: 2,

src/webgpu/api/validation/queue/destroyed/texture.spec.ts

@@ -4,9 +4,9 @@ Tests using a destroyed texture on a queue.
 
 import { makeTestGroup } from '../../../../../common/framework/test_group.js';
 import { unreachable } from '../../../../../common/util/util.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('writeTexture')
   .desc(

src/webgpu/api/validation/queue/submit.spec.ts

@@ -6,14 +6,14 @@ Note: buffer map state is tested in ./buffer_mapped.spec.ts.
 `;
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
 interface CommandBufferOptions {
   device?: GPUDevice;
   valid?: boolean;
 }
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   createCommandBuffer(options: CommandBufferOptions = {}): GPUCommandBuffer {
     const device = options.device ?? this.device;
 
@@ -48,9 +48,7 @@ g.test('command_buffer,device_mismatch')
     { cb0Mismatched: true, cb1Mismatched: false },
     { cb0Mismatched: false, cb1Mismatched: true },
   ])
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { cb0Mismatched, cb1Mismatched } = t.params;
     const mismatched = cb0Mismatched || cb1Mismatched;

src/webgpu/api/validation/queue/writeBuffer.spec.ts

@@ -13,9 +13,9 @@ import {
 import { Float16Array } from '../../../../external/petamoriken/float16/float16.js';
 import { GPUConst } from '../../../constants.js';
 import { kResourceStates } from '../../../gpu_test.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('buffer_state')
   .desc(
@@ -179,9 +179,7 @@ g.test('usages')
 g.test('buffer,device_mismatch')
   .desc('Tests writeBuffer cannot be called with a buffer 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;

src/webgpu/api/validation/queue/writeTexture.spec.ts

@@ -3,9 +3,9 @@ export const description = `Tests writeTexture validation.`;
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { GPUConst } from '../../../constants.js';
 import { kResourceStates } from '../../../gpu_test.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('texture_state')
   .desc(
@@ -87,9 +87,7 @@ g.test('sample_count')
 g.test('texture,device_mismatch')
   .desc('Tests writeTexture cannot be called with a texture 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;