address review comments

Author: shrekshao

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

@@ -206,15 +206,17 @@ g.test('texture_binding_must_have_correct_usage')
       })
   )
   .beforeAllSubcases(t => {
-    t.skipIf(
-      t.isCompatibility,
-      "The test requires 'r32float' renderable and multisampled support which compat mode doesn't guarantee."
-    );
+    t.selectDeviceForRenderableColorFormatOrSkipTestCase(kTestFormat);
   })
   .fn(t => {
     const { entry, usage } = t.params;
     const info = texBindingTypeInfo(entry);
 
+    t.skipIf(
+      t.isCompatibility && info.resource === 'sampledTexMS',
+      "The test requires 'r32float' multisampled support which compat mode doesn't guarantee."
+    );
+
     const bindGroupLayout = t.device.createBindGroupLayout({
       entries: [{ binding: 0, visibility: GPUShaderStage.COMPUTE, ...entry }],
     });

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

@@ -16,7 +16,6 @@ import {
   viewCompatible,
   textureDimensionAndFormatCompatible,
   isTextureFormatUsableAsStorageFormat,
-  is32Float,
 } from '../../format_info.js';
 import { maxMipLevelCount } from '../../util/texture/base.js';
 
@@ -362,10 +361,9 @@ g.test('sampleCount,valid_sampleCount_with_other_parameter_varies')
     const { dimension, sampleCount, format, mipLevelCount, arrayLayerCount, usage } = t.params;
     const { blockWidth, blockHeight } = kTextureFormatInfo[format];
 
-    t.skipIf(
-      sampleCount === 4 && t.isCompatibility && (format === 'rgba16float' || is32Float(format)),
-      'Multisample support for this format is not guaranteed in comapt mode'
-    );
+    if (sampleCount > 1) {
+      t.skipIfMultisampleNotSupportedForFormat(format);
+    }
 
     const size =
       dimension === '1d'

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

@@ -11,7 +11,6 @@ import { getDefaultLimits, kQueryTypes } from '../../../capability_info.js';
 import { GPUConst } from '../../../constants.js';
 import {
   computeBytesPerSampleFromFormats,
-  is32Float,
   kDepthStencilFormats,
   kRenderableColorTextureFormats,
   kTextureFormatInfo,
@@ -1175,11 +1174,8 @@ g.test('resolveTarget,format_supports_resolve')
   .beforeAllSubcases(t => {
     const { format } = t.params;
     t.skipIfTextureFormatNotSupported(format);
+    t.skipIfMultisampleNotSupportedForFormat(format);
     t.selectDeviceForRenderableColorFormatOrSkipTestCase(format);
-    t.skipIf(
-      t.isCompatibility && (format === 'rgba16float' || is32Float(format)),
-      'Multisample support for this format is not guaranteed in comapt mode'
-    );
   })
   .fn(t => {
     const { format } = t.params;

src/webgpu/gpu_test.ts

@@ -34,6 +34,7 @@ import {
   isTextureFormatUsableAsStorageFormat,
   is32Float,
   is16Float,
+  isMultisampledTextureFormat,
 } from './format_info.js';
 import { checkElementsEqual, checkElementsBetween } from './util/check_contents.js';
 import { CommandBufferMaker, EncoderType } from './util/command_buffer_maker.js';
@@ -288,6 +289,26 @@ export class GPUTestSubcaseBatchState extends SubcaseBatchState {
     }
   }
 
+  skipIfMultisampleNotSupportedForFormat(...formats: (GPUTextureFormat | undefined)[]) {
+    if (this.isCompatibility) {
+      for (const format of formats) {
+        if (format === undefined) continue;
+        if (format === 'rgba16float' || is32Float(format)) {
+          this.skip(
+            `texture format '${format} is not guaranteed to be multisampled support in compat mode`
+          );
+        }
+      }
+    }
+
+    for (const format of formats) {
+      if (format === undefined) continue;
+      if (!isMultisampledTextureFormat(format)) {
+        this.skip(`texture format '${format} is not supported to be multisampled`);
+      }
+    }
+  }
+
   getFloatTextureFormatColorRenderableFeatures(...formats: (GPUTextureFormat | undefined)[]) {
     const requiredFeatures: GPUFeatureName[] = [];
     if (this.isCompatibility) {
@@ -543,6 +564,26 @@ export class GPUTestBase extends Fixture<GPUTestSubcaseBatchState> {
     }
   }
 
+  skipIfMultisampleNotSupportedForFormat(...formats: (GPUTextureFormat | undefined)[]) {
+    if (this.isCompatibility) {
+      for (const format of formats) {
+        if (format === undefined) continue;
+        if (format === 'rgba16float' || is32Float(format)) {
+          this.skip(
+            `texture format '${format} is not guaranteed to be multisampled support in compat mode`
+          );
+        }
+      }
+    }
+
+    for (const format of formats) {
+      if (format === undefined) continue;
+      if (!isMultisampledTextureFormat(format)) {
+        this.skip(`texture format '${format} is not supported to be multisampled`);
+      }
+    }
+  }
+
   skipIfTextureViewDimensionNotSupported(...dimensions: (GPUTextureViewDimension | undefined)[]) {
     if (this.isCompatibility) {
       for (const dimension of dimensions) {