Refactor float32_blendable.spec.ts (#4283)

Issue #4178
Issue #4181

Author: greggman

src/webgpu/api/validation/render_pipeline/common.ts

@@ -1,15 +1,69 @@
-import { ColorTextureFormat, kTextureFormatInfo } from '../../../format_info.js';
+import { ColorTextureFormat, getTextureFormatType } from '../../../format_info.js';
 import {
   getFragmentShaderCodeWithOutput,
   getPlainTypeInfo,
   kDefaultVertexShaderCode,
 } from '../../../util/shader.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
 export type ColorTargetState = GPUColorTargetState & { format: ColorTextureFormat };
 
 const values = [0, 1, 0, 1];
-export class CreateRenderPipelineValidationTest extends ValidationTest {
+export function getDescriptorForCreateRenderPipelineValidationTest(
+  device: GPUDevice,
+  options: {
+    primitive?: GPUPrimitiveState;
+    targets?: ColorTargetState[];
+    multisample?: GPUMultisampleState;
+    depthStencil?: GPUDepthStencilState;
+    fragmentShaderCode?: string;
+    noFragment?: boolean;
+    fragmentConstants?: Record<string, GPUPipelineConstantValue>;
+  } = {}
+): GPURenderPipelineDescriptor {
+  const {
+    primitive = {},
+    targets = [{ format: 'rgba8unorm' }] as const,
+    multisample = {},
+    depthStencil,
+    fragmentShaderCode = getFragmentShaderCodeWithOutput([
+      {
+        values,
+        plainType: getPlainTypeInfo(
+          getTextureFormatType(targets[0] ? targets[0].format : 'rgba8unorm')
+        ),
+        componentCount: 4,
+      },
+    ]),
+    noFragment = false,
+    fragmentConstants = {},
+  } = options;
+
+  return {
+    vertex: {
+      module: device.createShaderModule({
+        code: kDefaultVertexShaderCode,
+      }),
+      entryPoint: 'main',
+    },
+    fragment: noFragment
+      ? undefined
+      : {
+          module: device.createShaderModule({
+            code: fragmentShaderCode,
+          }),
+          entryPoint: 'main',
+          targets,
+          constants: fragmentConstants,
+        },
+    layout: device.createPipelineLayout({ bindGroupLayouts: [] }),
+    primitive,
+    multisample,
+    depthStencil,
+  };
+}
+
+export class CreateRenderPipelineValidationTest extends AllFeaturesMaxLimitsValidationTest {
   getDescriptor(
     options: {
       primitive?: GPUPrimitiveState;
@@ -21,46 +75,7 @@ export class CreateRenderPipelineValidationTest extends ValidationTest {
       fragmentConstants?: Record<string, GPUPipelineConstantValue>;
     } = {}
   ): GPURenderPipelineDescriptor {
-    const {
-      primitive = {},
-      targets = [{ format: 'rgba8unorm' }] as const,
-      multisample = {},
-      depthStencil,
-      fragmentShaderCode = getFragmentShaderCodeWithOutput([
-        {
-          values,
-          plainType: getPlainTypeInfo(
-            kTextureFormatInfo[targets[0] ? targets[0].format : 'rgba8unorm'].color.type
-          ),
-          componentCount: 4,
-        },
-      ]),
-      noFragment = false,
-      fragmentConstants = {},
-    } = options;
-
-    return {
-      vertex: {
-        module: this.device.createShaderModule({
-          code: kDefaultVertexShaderCode,
-        }),
-        entryPoint: 'main',
-      },
-      fragment: noFragment
-        ? undefined
-        : {
-            module: this.device.createShaderModule({
-              code: fragmentShaderCode,
-            }),
-            entryPoint: 'main',
-            targets,
-            constants: fragmentConstants,
-          },
-      layout: this.getPipelineLayout(),
-      primitive,
-      multisample,
-      depthStencil,
-    };
+    return getDescriptorForCreateRenderPipelineValidationTest(this.device, options);
   }
 
   getPipelineLayout(): GPUPipelineLayout {

src/webgpu/api/validation/render_pipeline/float32_blendable.spec.ts

@@ -4,10 +4,11 @@ Tests for capabilities added by float32-blendable flag.
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { ColorTextureFormat } from '../../../format_info.js';
+import { UniqueFeaturesAndLimitsValidationTest } from '../validation_test.js';
 
-import { CreateRenderPipelineValidationTest } from './common.js';
+import { getDescriptorForCreateRenderPipelineValidationTest } from './common.js';
 
-export const g = makeTestGroup(CreateRenderPipelineValidationTest);
+export const g = makeTestGroup(UniqueFeaturesAndLimitsValidationTest);
 
 const kFloat32Formats: ColorTextureFormat[] = ['r32float', 'rg32float', 'rgba32float'];
 
@@ -33,8 +34,7 @@ pipeline that uses blending with any float32-format attachment.
   })
   .fn(t => {
     const { isAsync, enabled, hasBlend, format } = t.params;
-
-    const descriptor = t.getDescriptor({
+    const descriptor = getDescriptorForCreateRenderPipelineValidationTest(t.device, {
       targets: [
         {
           format,