Refactor createBindGroup validation test for texture formats (gpuweb#…

…4193)

Issue gpuweb#4181

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

@@ -24,11 +24,11 @@ import {
   texBindingTypeInfo,
 } from '../../capability_info.js';
 import { GPUConst } from '../../constants.js';
-import { kAllTextureFormats, kTextureFormatInfo } from '../../format_info.js';
-import { kResourceStates, MaxLimitsTestMixin } from '../../gpu_test.js';
+import { kPossibleStorageTextureFormats } from '../../format_info.js';
+import { kResourceStates } from '../../gpu_test.js';
 import { getTextureDimensionFromView } from '../../util/texture/base.js';
 
-import { ValidationTest } from './validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from './validation_test.js';
 
 const kTestFormat: GPUTextureFormat = 'r32float';
 
@@ -37,7 +37,7 @@ function clone<T extends GPUTextureDescriptor>(descriptor: T): T {
 }
 
 function skipIfResourceNotSupportedInStages(
-  t: ValidationTest,
+  t: AllFeaturesMaxLimitsValidationTest,
   entry: BGLEntry,
   visibility: number
 ) {
@@ -69,9 +69,7 @@ function skipIfResourceNotSupportedInStages(
   }
 }
 
-export const g = makeTestGroup(MaxLimitsTestMixin(ValidationTest));
-
-const kStorageTextureFormats = kAllTextureFormats.filter(f => kTextureFormatInfo[f].color?.storage);
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('binding_count_mismatch')
   .desc('Test that the number of entries must match the number of entries in the BindGroupLayout.')
@@ -871,15 +869,12 @@ g.test('storage_texture,format')
   )
   .params(u =>
     u //
-      .combine('storageTextureFormat', kStorageTextureFormats)
-      .combine('resourceFormat', kStorageTextureFormats)
+      .combine('storageTextureFormat', kPossibleStorageTextureFormats)
+      .combine('resourceFormat', kPossibleStorageTextureFormats)
   )
-  .beforeAllSubcases(t => {
-    const { storageTextureFormat, resourceFormat } = t.params;
-    t.skipIfTextureFormatNotUsableAsStorageTextureDeprecated(storageTextureFormat, resourceFormat);
-  })
   .fn(t => {
     const { storageTextureFormat, resourceFormat } = t.params;
+    t.skipIfTextureFormatNotUsableAsStorageTexture(storageTextureFormat, resourceFormat);
 
     const bindGroupLayout = t.device.createBindGroupLayout({
       entries: [

src/webgpu/api/validation/validation_test.ts

@@ -436,11 +436,6 @@ class ValidationTestImpl extends GPUTest {
   }
 }
 
-/**
- * Deprecated base fixture for WebGPU validation tests
- * @deprecated use AllFeaturesMaxLimitsValidationTest or UniqueFeaturesAndLimitsValidationTest
- */
-
 /**
  * Base fixture for WebGPU validation tests.
  */

src/webgpu/format_info.ts

@@ -1393,7 +1393,7 @@ const kASTCTextureFormatInfo = formatTableWithDefaults({
   },
 } as const);
 
-// Definitions for use locally. To access the table entries, use `kTextureFormatInfo`.
+// Definitions for use locally.
 
 // MAINTENANCE_TODO: Consider generating the exports below programmatically by filtering the big list, instead
 // of using these local constants? Requires some type magic though.
@@ -1544,6 +1544,13 @@ const kTextureFormatInfo_TypeCheck: {
   readonly [F in GPUTextureFormat]: TextureFormatInfo_TypeCheck;
 } = kTextureFormatInfo;
 
+// Texture formats that may possibly be used as a storage texture.
+// Some may require certain features to be enabled.
+export const kPossibleStorageTextureFormats = [
+  ...kAllTextureFormats.filter(f => kTextureFormatInfo[f].color?.storage),
+  'bgra8unorm',
+] as const;
+
 /** Valid GPUTextureFormats for `copyExternalImageToTexture`, by spec. */
 export const kValidTextureFormatsForCopyE2T = [
   'r8unorm',