Refactor api/validation/create* (#4275)

Issue #4178
Issue #4181

Author: greggman

src/webgpu/api/validation/createBindGroup.spec.ts

@@ -368,7 +368,7 @@ g.test('texture_must_have_correct_dimension')
       dimension: getTextureDimensionFromView(dimension),
     });
 
-    t.skipIfTextureViewDimensionNotSupportedDeprecated(viewDimension, dimension);
+    t.skipIfTextureViewDimensionNotSupported(viewDimension, dimension);
     if (t.isCompatibility && texture.dimension === '2d') {
       if (depthOrArrayLayers === 1) {
         t.skipIf(
@@ -661,9 +661,7 @@ g.test('bind_group_layout,device_mismatch')
     'Tests createBindGroup cannot be called with a bind group layout created from another device'
   )
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.usesMismatchedDevice();
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const mismatched = t.params.mismatched;
 
@@ -721,9 +719,7 @@ g.test('binding_resources,device_mismatch')
       ])
       .combine('visibilityMask', [kAllShaderStages, GPUConst.ShaderStage.COMPUTE] as const)
   )
-  .beforeAllSubcases(t => {
-    t.usesMismatchedDevice();
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { entry, resource0Mismatched, resource1Mismatched, visibilityMask } = t.params;
 
@@ -1131,9 +1127,7 @@ g.test('buffer,effective_buffer_binding_size')
 g.test('sampler,device_mismatch')
   .desc(`Tests createBindGroup cannot be called with a sampler created from another device.`)
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.usesMismatchedDevice();
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { mismatched } = t.params;
 

src/webgpu/api/validation/createBindGroupLayout.spec.ts

@@ -19,10 +19,13 @@ import {
   BGLEntry,
   getBindingLimitForBindingType,
 } from '../../capability_info.js';
-import { kAllTextureFormats, kTextureFormatInfo } from '../../format_info.js';
-import { MaxLimitsTestMixin } from '../../gpu_test.js';
+import {
+  isTextureFormatUsableAsReadWriteStorageTexture,
+  isTextureFormatUsableAsStorageFormat,
+  kAllTextureFormats,
+} from '../../format_info.js';
 
-import { ValidationTest } from './validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from './validation_test.js';
 
 function clone<T extends GPUBindGroupLayoutDescriptor>(descriptor: T): T {
   return JSON.parse(JSON.stringify(descriptor));
@@ -74,7 +77,7 @@ function isValidBGLEntryForStages(device: GPUDevice, visibility: number, entry:
     : true;
 }
 
-export const g = makeTestGroup(MaxLimitsTestMixin(ValidationTest));
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('duplicate_bindings')
   .desc('Test that uniqueness of binding numbers across entries is enforced.')
@@ -505,16 +508,16 @@ g.test('storage_texture,formats')
       .combine('format', kAllTextureFormats) //
       .combine('access', kStorageTextureAccessValues)
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceForTextureFormatOrSkipTestCase(t.params.format);
-    t.skipIfTextureFormatNotUsableAsStorageTextureDeprecated(t.params.format);
-  })
   .fn(t => {
     const { format, access } = t.params;
-    const info = kTextureFormatInfo[format];
+    t.skipIfTextureFormatNotSupported(format);
+    t.skipIfTextureFormatNotUsableAsStorageTexture(format);
 
     const success =
-      info.color?.storage && !(access === 'read-write' && !info.color?.readWriteStorage);
+      isTextureFormatUsableAsStorageFormat(t.device, format) &&
+      !(
+        access === 'read-write' && !isTextureFormatUsableAsReadWriteStorageTexture(t.device, format)
+      );
 
     t.expectValidationError(() => {
       t.device.createBindGroupLayout({

src/webgpu/api/validation/createPipelineLayout.spec.ts

@@ -12,15 +12,14 @@ import {
   kBufferBindingTypes,
 } from '../../capability_info.js';
 import { GPUConst } from '../../constants.js';
-import { MaxLimitsTestMixin } from '../../gpu_test.js';
 
-import { ValidationTest } from './validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from './validation_test.js';
 
 function clone<T extends GPUBindGroupLayoutDescriptor>(descriptor: T): T {
   return JSON.parse(JSON.stringify(descriptor));
 }
 
-export const g = makeTestGroup(MaxLimitsTestMixin(ValidationTest));
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('number_of_dynamic_buffers_exceeds_the_maximum_value')
   .desc(
@@ -145,9 +144,7 @@ g.test('bind_group_layouts,device_mismatch')
     { layout0Mismatched: true, layout1Mismatched: false },
     { layout0Mismatched: false, layout1Mismatched: true },
   ])
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { layout0Mismatched, layout1Mismatched } = t.params;
 

src/webgpu/api/validation/createSampler.spec.ts

@@ -4,9 +4,9 @@ createSampler validation tests.
 
 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('lodMinAndMaxClamp')
   .desc('test different combinations of min and max clamp values')