Compat: remove select device for float16(32)-renderable features (#4166)

* Compat: remove select device for float16(32)-renderable features * rename skipIfMultisampleNotSupportedForFormat * update skipIfColorRenderableNotSupportedForFormat * fix * color renderable: select -> skip
gpuweb · Jan 29, 2025 · e9df678 · e9df678
1 parent c10aba7
commit e9df678
Show file tree

Hide file tree

Showing 28 changed files with 64 additions and 97 deletions.
diff --git a/src/webgpu/api/operation/render_pass/storeOp.spec.ts b/src/webgpu/api/operation/render_pass/storeOp.spec.ts
@@ -152,7 +152,7 @@ g.test('render_pass_store_op,color_attachment_only')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.colorFormat);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.colorFormat);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.colorFormat);
   })
   .fn(t => {
     const colorAttachment = t.createTextureTracked({

diff --git a/src/webgpu/api/operation/render_pipeline/overrides.spec.ts b/src/webgpu/api/operation/render_pipeline/overrides.spec.ts
@@ -192,7 +192,7 @@ g.test('precision')
       ])
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(kPrecisionTestFormat);
+    t.skipIfColorRenderableNotSupportedForFormat(kPrecisionTestFormat);
   })
   .fn(async t => {
     const format = kPrecisionTestFormat;

diff --git a/src/webgpu/api/operation/render_pipeline/pipeline_output_targets.spec.ts b/src/webgpu/api/operation/render_pipeline/pipeline_output_targets.spec.ts
@@ -58,7 +58,7 @@ g.test('color,attachments')
   .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {
@@ -161,7 +161,7 @@ g.test('color,component_count')
   .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {

diff --git a/src/webgpu/api/operation/rendering/color_target_state.spec.ts b/src/webgpu/api/operation/rendering/color_target_state.spec.ts
@@ -209,7 +209,7 @@ g.test('blending,GPUBlendComponent')
     ) {
       t.selectDeviceOrSkipTestCase('dual-source-blending');
     }
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(kBlendingGPUBlendComponentFormat);
+    t.skipIfColorRenderableNotSupportedForFormat(kBlendingGPUBlendComponentFormat);
   })
   .fn(t => {
     const textureFormat: GPUTextureFormat = kBlendingGPUBlendComponentFormat;
@@ -395,7 +395,7 @@ g.test('blending,formats')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
   })
   .fn(t => {
     const { format } = t.params;
@@ -801,7 +801,7 @@ g.test('blending,clamping')
       .combine('dstValue', [0.2, 0.4])
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
   })
   .fn(t => {
     const { format, srcValue, dstValue } = t.params;

diff --git a/src/webgpu/api/operation/resource_init/texture_zero.spec.ts b/src/webgpu/api/operation/resource_init/texture_zero.spec.ts
@@ -43,7 +43,7 @@ g.test('uninitialized_texture_is_zero')
   .params(kTestParams)
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
     t.selectDeviceOrSkipTestCase(kTextureFormatInfo[t.params.format].feature);
   })
   .fn(t => {

diff --git a/src/webgpu/api/operation/sampling/filter_mode.spec.ts b/src/webgpu/api/operation/sampling/filter_mode.spec.ts
@@ -481,7 +481,7 @@ g.test('magFilter,nearest')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
     if (kTextureFormatInfo[t.params.format].color.type === 'unfilterable-float') {
       t.selectDeviceOrSkipTestCase('float32-filterable');
     }
@@ -605,7 +605,7 @@ g.test('magFilter,linear')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
     if (kTextureFormatInfo[t.params.format].color.type === 'unfilterable-float') {
       t.selectDeviceOrSkipTestCase('float32-filterable');
     }
@@ -741,7 +741,7 @@ g.test('minFilter,nearest')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
     if (kTextureFormatInfo[t.params.format].color.type === 'unfilterable-float') {
       t.selectDeviceOrSkipTestCase('float32-filterable');
     }
@@ -875,7 +875,7 @@ g.test('minFilter,linear')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
     if (kTextureFormatInfo[t.params.format].color.type === 'unfilterable-float') {
       t.selectDeviceOrSkipTestCase('float32-filterable');
     }
@@ -972,7 +972,7 @@ g.test('mipmapFilter')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
     if (kTextureFormatInfo[t.params.format].color.type === 'unfilterable-float') {
       t.selectDeviceOrSkipTestCase('float32-filterable');
     }

diff --git a/src/webgpu/api/operation/texture_view/write.spec.ts b/src/webgpu/api/operation/texture_view/write.spec.ts
@@ -350,13 +350,13 @@ TODO: Test rgb10a2uint when TexelRepresentation.numericRange is made per-compone
         // Still need to filter again for compat mode.
         t.skipIfTextureFormatNotUsableAsStorageTexture(format);
         if (sampleCount > 1) {
-          t.skipIfMultisampleNotSupportedForFormatOrSelectDevice(format);
+          t.skipIfMultisampleNotSupportedForFormat(format);
         }
         break;
       case 'render-pass-resolve':
       case 'render-pass-store':
         // Requires multisample in `writeTextureAndGetExpectedTexelView`
-        t.skipIfMultisampleNotSupportedForFormatOrSelectDevice(format);
+        t.skipIfMultisampleNotSupportedForFormat(format);
         break;
     }
   })

diff --git a/src/webgpu/api/validation/createBindGroup.spec.ts b/src/webgpu/api/validation/createBindGroup.spec.ts
@@ -206,7 +206,7 @@ g.test('texture_binding_must_have_correct_usage')
       })
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(kTestFormat);
+    t.skipIfColorRenderableNotSupportedForFormat(kTestFormat);
   })
   .fn(t => {
     const { entry, usage } = t.params;

diff --git a/src/webgpu/api/validation/createTexture.spec.ts b/src/webgpu/api/validation/createTexture.spec.ts
@@ -282,7 +282,7 @@ g.test('sampleCount,various_sampleCount_with_all_formats')
     const { format } = t.params;
     const info = kTextureFormatInfo[format];
     t.skipIfTextureFormatNotSupported(format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(format);
+    t.skipIfColorRenderableNotSupportedForFormat(format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {
@@ -359,7 +359,7 @@ g.test('sampleCount,valid_sampleCount_with_other_parameter_varies')
     const info = kTextureFormatInfo[format];
     t.skipIfTextureFormatNotSupported(format);
     t.selectDeviceOrSkipTestCase(info.feature);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(format);
+    t.skipIfColorRenderableNotSupportedForFormat(format);
   })
   .fn(t => {
     const { dimension, sampleCount, format, mipLevelCount, arrayLayerCount, usage } = t.params;
@@ -1053,7 +1053,7 @@ g.test('texture_usage')
     const info = kTextureFormatInfo[format];
     t.skipIfTextureFormatNotSupported(format);
     t.selectDeviceOrSkipTestCase(info.feature);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(format);
+    t.skipIfColorRenderableNotSupportedForFormat(format);
   })
   .fn(t => {
     const { dimension, format, usage0, usage1 } = t.params;

diff --git a/src/webgpu/api/validation/createView.spec.ts b/src/webgpu/api/validation/createView.spec.ts
@@ -379,7 +379,7 @@ g.test('texture_view_usage')
       t.skipIfTextureFormatNotUsableAsStorageTexture(format);
     }
     if (textureUsage & GPUTextureUsage.RENDER_ATTACHMENT) {
-      t.selectDeviceForRenderableColorFormatOrSkipTestCase(format);
+      t.skipIfColorRenderableNotSupportedForFormat(format);
     }
   })
   .fn(t => {

diff --git a/src/webgpu/api/validation/encoding/createRenderBundleEncoder.spec.ts b/src/webgpu/api/validation/encoding/createRenderBundleEncoder.spec.ts
@@ -63,7 +63,7 @@ g.test('attachment_state,limits,maxColorAttachmentBytesPerSample,aligned')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
   })
   .fn(t => {
     const { format, colorFormatCount } = t.params;
@@ -120,7 +120,7 @@ g.test('attachment_state,limits,maxColorAttachmentBytesPerSample,unaligned')
     ])
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+    t.skipIfColorRenderableNotSupportedForFormat('r32float');
   })
   .fn(t => {
     const { formats } = t.params;
@@ -172,7 +172,7 @@ g.test('valid_texture_formats')
   .beforeAllSubcases(t => {
     const { format } = t.params;
     t.selectDeviceForTextureFormatOrSkipTestCase(format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(format);
+    t.skipIfColorRenderableNotSupportedForFormat(format);
   })
   .fn(t => {
     const { format, attachment } = t.params;

diff --git a/src/webgpu/api/validation/queue/copyToTexture/CopyExternalImageToTexture.spec.ts b/src/webgpu/api/validation/queue/copyToTexture/CopyExternalImageToTexture.spec.ts
@@ -682,7 +682,7 @@ g.test('destination_texture,format')
     const { format } = t.params;
     t.skipIfTextureFormatNotSupported(format);
     t.selectDeviceOrSkipTestCase(kTextureFormatInfo[format].feature);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(format);
+    t.skipIfColorRenderableNotSupportedForFormat(format);
   })
   .fn(async t => {
     const { format, copySize } = t.params;

diff --git a/src/webgpu/api/validation/render_pass/render_pass_descriptor.spec.ts b/src/webgpu/api/validation/render_pass/render_pass_descriptor.spec.ts
@@ -211,7 +211,7 @@ g.test('color_attachments,limits,maxColorAttachmentBytesPerSample,aligned')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
   })
   .fn(t => {
     const { format, attachmentCount } = t.params;
@@ -269,7 +269,7 @@ g.test('color_attachments,limits,maxColorAttachmentBytesPerSample,unaligned')
     ])
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+    t.skipIfColorRenderableNotSupportedForFormat('r32float');
   })
   .fn(t => {
     const { formats } = t.params;
@@ -1174,7 +1174,7 @@ g.test('resolveTarget,format_supports_resolve')
   .beforeAllSubcases(t => {
     const { format } = t.params;
     t.skipIfTextureFormatNotSupported(format);
-    t.skipIfMultisampleNotSupportedForFormatOrSelectDevice(format);
+    t.skipIfMultisampleNotSupportedForFormat(format);
   })
   .fn(t => {
     const { format } = t.params;

diff --git a/src/webgpu/api/validation/render_pipeline/float32_blendable.spec.ts b/src/webgpu/api/validation/render_pipeline/float32_blendable.spec.ts
@@ -30,7 +30,7 @@ pipeline that uses blending with any float32-format attachment.
     if (t.params.enabled) {
       t.selectDeviceOrSkipTestCase('float32-blendable');
     }
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+    t.skipIfColorRenderableNotSupportedForFormat('r32float');
   })
   .fn(t => {
     const { isAsync, enabled, hasBlend, format } = t.params;

diff --git a/src/webgpu/api/validation/render_pipeline/fragment_state.spec.ts b/src/webgpu/api/validation/render_pipeline/fragment_state.spec.ts
@@ -181,7 +181,7 @@ g.test('limits,maxColorAttachmentBytesPerSample,aligned')
   )
   .beforeAllSubcases(t => {
     t.skipIfTextureFormatNotSupported(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
   })
   .fn(t => {
     const { format, attachmentCount, isAsync } = t.params;
@@ -230,7 +230,7 @@ g.test('limits,maxColorAttachmentBytesPerSample,unaligned')
       .combine('isAsync', [false, true])
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+    t.skipIfColorRenderableNotSupportedForFormat('r32float');
   })
   .fn(t => {
     const { formats, isAsync } = t.params;
@@ -269,7 +269,7 @@ g.test('targets_format_filterable')
     const { format } = t.params;
     const info = kTextureFormatInfo[format];
     t.skipIfTextureFormatNotSupported(format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(format);
+    t.skipIfColorRenderableNotSupportedForFormat(format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {
@@ -399,7 +399,7 @@ g.test('pipeline_output_targets')
   )
   .beforeAllSubcases(t => {
     t.selectDeviceForTextureFormatOrSkipTestCase(t.params.format);
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfColorRenderableNotSupportedForFormat(t.params.format);
   })
   .fn(t => {
     const { isAsync, format, writeMask, shaderOutput } = t.params;

diff --git a/src/webgpu/api/validation/resource_usages/texture/in_render_common.spec.ts b/src/webgpu/api/validation/resource_usages/texture/in_render_common.spec.ts
@@ -116,7 +116,7 @@ g.test('subresources,color_attachments')
       .unless(t => t.inSamePass && t.level0 !== t.level1)
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+    t.skipIfColorRenderableNotSupportedForFormat('r32float');
   })
   .fn(t => {
     const { layer0, level0, layer1, level1, inSamePass } = t.params;
@@ -197,7 +197,7 @@ g.test('subresources,color_attachment_and_bind_group')
         t.params.bgLayerCount !== kTextureLayers,
         'view array layers must equal texture array layers in compatibility mode'
       );
-      t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+      t.skipIfColorRenderableNotSupportedForFormat('r32float');
     }
   })
   .fn(t => {
@@ -476,7 +476,7 @@ g.test('subresources,multiple_bind_groups')
         t.params.bg0Layers.count !== kTextureLayers || t.params.bg1Layers.count !== kTextureLayers,
         'view array layers must equal texture array layers in compatibility mode'
       );
-      t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+      t.skipIfColorRenderableNotSupportedForFormat('r32float');
     }
   })
   .fn(t => {

diff --git a/src/webgpu/api/validation/resource_usages/texture/in_render_misc.spec.ts b/src/webgpu/api/validation/resource_usages/texture/in_render_misc.spec.ts
@@ -521,7 +521,7 @@ g.test('subresources,texture_usages_in_copy_and_render_pass')
       )
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+    t.skipIfColorRenderableNotSupportedForFormat('r32float');
   })
   .fn(t => {
     const { usage0, usage1 } = t.params;
@@ -620,7 +620,7 @@ g.test('subresources,texture_view_usages')
   )
   .beforeAllSubcases(t => {
     if (t.params.bindingType === 'color-attachment') {
-      t.selectDeviceForRenderableColorFormatOrSkipTestCase('r32float');
+      t.skipIfColorRenderableNotSupportedForFormat('r32float');
     }
   })
   .fn(t => {

diff --git a/src/webgpu/compat/api/validation/encoding/cmds/copyTextureToTexture.spec.ts b/src/webgpu/compat/api/validation/encoding/cmds/copyTextureToTexture.spec.ts
@@ -59,7 +59,7 @@ g.test('multisample')
       })
   )
   .beforeAllSubcases(t => {
-    t.selectDeviceForRenderableColorFormatOrSkipTestCase(t.params.format);
+    t.skipIfMultisampleNotSupportedForFormat(t.params.format);
   })
   .fn(t => {
     const { format } = t.params;