From 4953dabab732b87f39ac70dbe9033a75e9c913e3 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Wed, 21 Sep 2022 16:42:34 +0000 Subject: [PATCH] dawn/tests: Remove OverridesWithZeroDefault test It's not invalid to have create a shader module using zero-defaulted `override`s as workgroup size parameters. These can be initialized with non-zero pipeline override values. Bug: dawn:1504 Change-Id: I2636cbe2d26a6604735b0c8b0f5526bbc14e8ce2 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/103220 Commit-Queue: Ben Clayton Reviewed-by: Shrek Shao Reviewed-by: Corentin Wallez Kokoro: Kokoro --- .../tests/end2end/ShaderValidationTests.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/dawn/tests/end2end/ShaderValidationTests.cpp b/src/dawn/tests/end2end/ShaderValidationTests.cpp index e2e436553d..302a6baf64 100644 --- a/src/dawn/tests/end2end/ShaderValidationTests.cpp +++ b/src/dawn/tests/end2end/ShaderValidationTests.cpp @@ -32,17 +32,6 @@ override x: u32 = 1u; override y: u32 = 1u; override z: u32 = 1u; -@compute @workgroup_size(x, y, z) fn main() { - _ = 0u; -})"); - } - - wgpu::ShaderModule SetUpShaderWithZeroDefaultValueConstants() { - return utils::CreateShaderModule(device, R"( -override x: u32 = 0u; -override y: u32 = 0u; -override z: u32 = 0u; - @compute @workgroup_size(x, y, z) fn main() { _ = 0u; })"); @@ -237,12 +226,6 @@ TEST_P(WorkgroupSizeValidationTest, OverridesWithValidDefault) { } } -// Test workgroup size validation with zero as the overrides default values. -TEST_P(WorkgroupSizeValidationTest, OverridesWithZeroDefault) { - // Error: zero is detected as invalid at shader creation time - ASSERT_DEVICE_ERROR(SetUpShaderWithZeroDefaultValueConstants()); -} - // Test workgroup size validation with out-of-limits overrides default values. TEST_P(WorkgroupSizeValidationTest, OverridesWithOutOfLimitsDefault) { wgpu::ShaderModule module = SetUpShaderWithOutOfLimitsDefaultValueConstants();