From 33947d8dc9476699e1ecbf9397fb4523e7cb236c Mon Sep 17 00:00:00 2001 From: Shrek Shao <shrekshao@google.com> Date: Wed, 29 Jan 2025 13:34:59 -0800 Subject: [PATCH] rename skipIfMultisampleNotSupportedForFormat --- src/webgpu/api/operation/texture_view/write.spec.ts | 4 ++-- .../api/validation/render_pass/render_pass_descriptor.spec.ts | 2 +- src/webgpu/gpu_test.ts | 4 +--- .../expression/call/builtin/textureDimensions.spec.ts | 2 +- .../execution/expression/call/builtin/textureLoad.spec.ts | 2 +- .../execution/expression/call/builtin/texture_utils.spec.ts | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/webgpu/api/operation/texture_view/write.spec.ts b/src/webgpu/api/operation/texture_view/write.spec.ts index 9de136080f0..0719dac6452 100644 --- 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/render_pass/render_pass_descriptor.spec.ts b/src/webgpu/api/validation/render_pass/render_pass_descriptor.spec.ts index 898b91f1c47..5fa3a23c4d4 100644 --- a/src/webgpu/api/validation/render_pass/render_pass_descriptor.spec.ts +++ b/src/webgpu/api/validation/render_pass/render_pass_descriptor.spec.ts @@ -1170,7 +1170,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/gpu_test.ts b/src/webgpu/gpu_test.ts index 9da23a2bf75..e3c6bcef5bb 100644 --- a/src/webgpu/gpu_test.ts +++ b/src/webgpu/gpu_test.ts @@ -282,9 +282,7 @@ export class GPUTestSubcaseBatchState extends SubcaseBatchState { } } - skipIfMultisampleNotSupportedForFormatOrSelectDevice( - ...formats: (GPUTextureFormat | undefined)[] - ) { + skipIfMultisampleNotSupportedForFormat(...formats: (GPUTextureFormat | undefined)[]) { for (const format of formats) { if (format === undefined) continue; if (!isMultisampledTextureFormat(format, this.isCompatibility)) { diff --git a/src/webgpu/shader/execution/expression/call/builtin/textureDimensions.spec.ts b/src/webgpu/shader/execution/expression/call/builtin/textureDimensions.spec.ts index 1f26b0ee275..983b7b8988d 100644 --- a/src/webgpu/shader/execution/expression/call/builtin/textureDimensions.spec.ts +++ b/src/webgpu/shader/execution/expression/call/builtin/textureDimensions.spec.ts @@ -302,7 +302,7 @@ Parameters: t.skipIfTextureFormatNotSupported(t.params.format); if (t.params.samples > 1) { // multisampled texture requires GPUTextureUsage.RENDER_ATTACHMENT usage - t.skipIfMultisampleNotSupportedForFormatOrSelectDevice(t.params.format); + t.skipIfMultisampleNotSupportedForFormat(t.params.format); } t.selectDeviceOrSkipTestCase(info.feature); }) diff --git a/src/webgpu/shader/execution/expression/call/builtin/textureLoad.spec.ts b/src/webgpu/shader/execution/expression/call/builtin/textureLoad.spec.ts index 588ea5820e7..62f91606664 100644 --- a/src/webgpu/shader/execution/expression/call/builtin/textureLoad.spec.ts +++ b/src/webgpu/shader/execution/expression/call/builtin/textureLoad.spec.ts @@ -375,7 +375,7 @@ Parameters: const { format, texture_type } = t.params; t.skipIfTextureFormatNotSupported(format); t.skipIfTextureLoadNotSupportedForTextureType(texture_type); - t.skipIfMultisampleNotSupportedForFormatOrSelectDevice(format); + t.skipIfMultisampleNotSupportedForFormat(format); }) .fn(async t => { const { texture_type, format, stage, samplePoints, C, S } = t.params; diff --git a/src/webgpu/shader/execution/expression/call/builtin/texture_utils.spec.ts b/src/webgpu/shader/execution/expression/call/builtin/texture_utils.spec.ts index e2eed0e4bba..6f4bf2a59cb 100644 --- a/src/webgpu/shader/execution/expression/call/builtin/texture_utils.spec.ts +++ b/src/webgpu/shader/execution/expression/call/builtin/texture_utils.spec.ts @@ -96,7 +96,7 @@ g.test('readTextureToTexelViews') .beforeAllSubcases(t => { t.skipIfTextureViewDimensionNotSupported(t.params.viewDimension); // recheck if multisampled is supported with compat mode flag - t.skipIfMultisampleNotSupportedForFormatOrSelectDevice(t.params.srcFormat); + t.skipIfMultisampleNotSupportedForFormat(t.params.srcFormat); }) .fn(async t => { const { srcFormat, texelViewFormat, viewDimension, sampleCount } = t.params;