From bf99a720c38dce133584f405287d9b10a227f102 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 26 Apr 2021 08:31:15 +0000 Subject: [PATCH] Re-enable unittests for Tint Bug: tint:717 Bug: tint:692 Bug: tint:718 Change-Id: I5765d8582ee0132efb47939f495781954a1e2afa Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/48843 Reviewed-by: Corentin Wallez Commit-Queue: Corentin Wallez Auto-Submit: Ryan Harrison --- .../unittests/validation/ShaderModuleValidationTests.cpp | 3 --- .../validation/StorageTextureValidationTests.cpp | 9 --------- 2 files changed, 12 deletions(-) diff --git a/src/tests/unittests/validation/ShaderModuleValidationTests.cpp b/src/tests/unittests/validation/ShaderModuleValidationTests.cpp index 802903fa83..1c68dd7ecb 100644 --- a/src/tests/unittests/validation/ShaderModuleValidationTests.cpp +++ b/src/tests/unittests/validation/ShaderModuleValidationTests.cpp @@ -118,9 +118,6 @@ TEST_F(ShaderModuleValidationTest, CombinedTextureAndSampler) { // Test that it is not allowed to declare a multisampled-array interface texture. // TODO(enga): Also test multisampled cube, cube array, and 3D. These have no GLSL keywords. TEST_F(ShaderModuleValidationTest, MultisampledArrayTexture) { - // TODO(https://crbug.com/tint/717): Remove skip once this is fixed - DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); - // SPIR-V ASM produced by glslang for the following fragment shader: // // #version 450 diff --git a/src/tests/unittests/validation/StorageTextureValidationTests.cpp b/src/tests/unittests/validation/StorageTextureValidationTests.cpp index 36c62264cc..0069e057c1 100644 --- a/src/tests/unittests/validation/StorageTextureValidationTests.cpp +++ b/src/tests/unittests/validation/StorageTextureValidationTests.cpp @@ -227,9 +227,6 @@ TEST_F(StorageTextureValidationTests, ComputePipeline) { // Validate read-write storage textures are not currently supported. TEST_F(StorageTextureValidationTests, ReadWriteStorageTexture) { - // TODO(https://crbug.com/tint/692): Remove skip once this is fixed. - DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); - // Read-write storage textures cannot be declared in a vertex shader by default. { ASSERT_DEVICE_ERROR(utils::CreateShaderModule(device, R"( @@ -293,9 +290,6 @@ TEST_F(StorageTextureValidationTests, BindGroupLayoutWithStorageTextureBindingTy // Validate it is an error to declare a read-only or write-only storage texture in shaders with any // format that doesn't support TextureUsage::Storage texture usages. TEST_F(StorageTextureValidationTests, StorageTextureFormatInShaders) { - // TODO(https://crbug.com/tint/718): Remove skip once this is fixed. - DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); - // Not include RGBA8UnormSrgb, BGRA8Unorm, BGRA8UnormSrgb because they are not related to any // SPIR-V Image Formats. constexpr std::array kWGPUTextureFormatSupportedAsSPIRVImageFormats = { @@ -332,9 +326,6 @@ TEST_F(StorageTextureValidationTests, StorageTextureFormatInShaders) { // Verify that declaring a storage texture format that is not supported in WebGPU causes validation // error. TEST_F(StorageTextureValidationTests, UnsupportedWGSLStorageTextureFormat) { - // TODO(https://crbug.com/tint/718): Remove skip once this is fixed. - DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); - constexpr std::array kUnsupportedTextureFormats = { wgpu::TextureFormat::R8Unorm, wgpu::TextureFormat::R8Snorm, wgpu::TextureFormat::R8Uint, wgpu::TextureFormat::R8Sint,