From cdec06a2aa2b8426f55170733e6954e9af621bcf Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Tue, 17 Jan 2023 19:32:46 +0000 Subject: [PATCH] Revert "Suppress vkUpdateDescriptorSets-None-03047" This reverts commit afc3f9d4c7d91898f772962cc7105b8d43c99ff8. Reason for revert: crbug.com/dawn/1615 should be fixed now that vulkan-deps has rolled into Chromium. Original change's description: > Suppress vkUpdateDescriptorSets-None-03047 > > Bug: dawn:1615 > Change-Id: I40f745fe7f7736c9c5ece34fc9fb114d478c9118 > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/116926 > Commit-Queue: Austin Eng > Reviewed-by: Zhaoming Jiang > Auto-Submit: Austin Eng > Kokoro: Kokoro # Not skipping CQ checks because original CL landed > 1 day ago. Bug: dawn:1615 Change-Id: I5dbd7ae82a0c4f3b3b88ea70a9faac35507a0418 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/117320 Kokoro: Austin Eng Reviewed-by: Kai Ninomiya Auto-Submit: Austin Eng Commit-Queue: Austin Eng --- src/dawn/native/vulkan/BackendVk.cpp | 3 --- src/dawn/tests/end2end/BindGroupTests.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/dawn/native/vulkan/BackendVk.cpp b/src/dawn/native/vulkan/BackendVk.cpp index 8942ae3726..3528d1f2a1 100644 --- a/src/dawn/native/vulkan/BackendVk.cpp +++ b/src/dawn/native/vulkan/BackendVk.cpp @@ -102,9 +102,6 @@ constexpr SkippedMessage kSkippedMessages[] = { {"VUID-vkCmdBindDescriptorSets-pDescriptorSets-00358", "is empty (has no bindings). Use VK_NULL_HANDLE to indicate this set is unused if using " "VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT"}, - // http://crbug.com/dawn/1615 - {"VUID-vkUpdateDescriptorSets-None-03047", - "Cannot call vkUpdateDescriptorSets() to perform write update on VkDescriptorSet"}, // A warning that's generated on valid usage of the WebGPU API where a fragment output doesn't // have a corresponding attachment diff --git a/src/dawn/tests/end2end/BindGroupTests.cpp b/src/dawn/tests/end2end/BindGroupTests.cpp index 06859c26d4..1bc8871dc1 100644 --- a/src/dawn/tests/end2end/BindGroupTests.cpp +++ b/src/dawn/tests/end2end/BindGroupTests.cpp @@ -1231,8 +1231,6 @@ TEST_P(BindGroupTests, DynamicBindingNoneVisibility) { TEST_P(BindGroupTests, ArbitraryBindingNumbers) { // TODO(crbug.com/dawn/736): Test output is wrong with D3D12 + WARP. DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP()); - // TODO(crbug.com/dawn/1617): VUID-vkUpdateDescriptorSets-None-03047 on Windows - DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan() && IsBackendValidationEnabled()); utils::BasicRenderPass renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);