From 8a2916436238386d6465ec2cab9735e65ad14070 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:20:42 +0200 Subject: [PATCH] fix texture_formats:canvas_configuration test for https://github.com/gpuweb/gpuweb/pull/4911 (#3998) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> Co-authored-by: François Beaufort --- .../features/texture_formats.spec.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/webgpu/api/validation/capability_checks/features/texture_formats.spec.ts b/src/webgpu/api/validation/capability_checks/features/texture_formats.spec.ts index 6941dac6b265..3def716d59de 100644 --- a/src/webgpu/api/validation/capability_checks/features/texture_formats.spec.ts +++ b/src/webgpu/api/validation/capability_checks/features/texture_formats.spec.ts @@ -5,6 +5,7 @@ Tests for capability checking for features enabling optional texture formats. import { makeTestGroup } from '../../../../../common/framework/test_group.js'; import { getGPU } from '../../../../../common/util/navigator_gpu.js'; import { assert } from '../../../../../common/util/util.js'; +import { kCanvasTextureFormats } from '../../../../capability_info.js'; import { kAllTextureFormats, kTextureFormatInfo } from '../../../../format_info.js'; import { kAllCanvasTypes, createCanvas } from '../../../../util/create_elements.js'; import { ValidationTest } from '../../validation_test.js'; @@ -161,15 +162,15 @@ g.test('canvas_configuration') usage: GPUTextureUsage.COPY_SRC | GPUTextureUsage.COPY_DST, }; - if (enable_required_feature) { - t.expectValidationError(() => { - ctx.configure(canvasConf); - }); - } else { - t.shouldThrow('TypeError', () => { - ctx.configure(canvasConf); - }); - } + const expectedError = + enable_required_feature && + (kCanvasTextureFormats as unknown as Array).includes(format) + ? false + : 'TypeError'; + + t.shouldThrow(expectedError, () => { + ctx.configure(canvasConf); + }); }); g.test('canvas_configuration_view_formats')