From 07617642562bccbbd6598ed7368ef40bcd019bdf Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Thu, 2 Feb 2023 17:33:38 +0000 Subject: [PATCH] BackendVk: Add suppressions for new formatting of VVL errors Bug: dawn:1225 Change-Id: Icc15a8bdad48d9cabed96af62e011a531ea7f5c9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/118400 Commit-Queue: Corentin Wallez Reviewed-by: Austin Eng Kokoro: Kokoro --- src/dawn/native/vulkan/BackendVk.cpp | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/dawn/native/vulkan/BackendVk.cpp b/src/dawn/native/vulkan/BackendVk.cpp index 7dfad6f450..601d672dc1 100644 --- a/src/dawn/native/vulkan/BackendVk.cpp +++ b/src/dawn/native/vulkan/BackendVk.cpp @@ -78,18 +78,37 @@ constexpr SkippedMessage kSkippedMessages[] = { {"SYNC-HAZARD-WRITE-AFTER-READ", "depth aspect during store with storeOp VK_ATTACHMENT_STORE_OP_STORE. Access info (usage: " "SYNC_LATE_FRAGMENT_TESTS_DEPTH_STENCIL_ATTACHMENT_WRITE, prior_usage: " - "SYNC_FRAGMENT_SHADER_SHADER_STORAGE_READ, read_barriers: VK_PIPELINE_STAGE_2_NONE"}, + "SYNC_FRAGMENT_SHADER_SHADER_STORAGE_READ, read_barriers: VkPipelineStageFlags2KHR(0)"}, // Depth used in sampling {"SYNC-HAZARD-WRITE-AFTER-READ", "depth aspect during store with storeOp VK_ATTACHMENT_STORE_OP_STORE. Access info (usage: " "SYNC_LATE_FRAGMENT_TESTS_DEPTH_STENCIL_ATTACHMENT_WRITE, prior_usage: " - "SYNC_FRAGMENT_SHADER_SHADER_SAMPLED_READ, read_barriers: VK_PIPELINE_STAGE_2_NONE"}, + "SYNC_FRAGMENT_SHADER_SHADER_SAMPLED_READ, read_barriers: VkPipelineStageFlags2KHR(0)"}, // Stencil used as storage {"SYNC-HAZARD-WRITE-AFTER-READ", "stencil aspect during store with stencilStoreOp VK_ATTACHMENT_STORE_OP_STORE. Access info " "(usage: SYNC_LATE_FRAGMENT_TESTS_DEPTH_STENCIL_ATTACHMENT_WRITE, prior_usage: " - "SYNC_FRAGMENT_SHADER_SHADER_STORAGE_READ, read_barriers: VK_PIPELINE_STAGE_2_NONE"}, + "SYNC_FRAGMENT_SHADER_SHADER_STORAGE_READ, read_barriers: VkPipelineStageFlags2KHR(0)"}, // Stencil used in sampling (note no tests actually hit this) + {"SYNC-HAZARD-WRITE-AFTER-READ", + "stencil aspect during store with stencilStoreOp VK_ATTACHMENT_STORE_OP_STORE. Access info " + "(usage: SYNC_LATE_FRAGMENT_TESTS_DEPTH_STENCIL_ATTACHMENT_WRITE, prior_usage: " + "SYNC_FRAGMENT_SHADER_SHADER_SAMPLED_READ, read_barriers: VkPipelineStageFlags2KHR(0)"}, + + // The same messages but with the previous formatting of pipeline stages. + // TODO(dawn:1225) remove after VVL commit ea1305065a11754ac6c93936e025996fcf08b543 is rolled + {"SYNC-HAZARD-WRITE-AFTER-READ", + "depth aspect during store with storeOp VK_ATTACHMENT_STORE_OP_STORE. Access info (usage: " + "SYNC_LATE_FRAGMENT_TESTS_DEPTH_STENCIL_ATTACHMENT_WRITE, prior_usage: " + "SYNC_FRAGMENT_SHADER_SHADER_STORAGE_READ, read_barriers: VK_PIPELINE_STAGE_2_NONE"}, + {"SYNC-HAZARD-WRITE-AFTER-READ", + "depth aspect during store with storeOp VK_ATTACHMENT_STORE_OP_STORE. Access info (usage: " + "SYNC_LATE_FRAGMENT_TESTS_DEPTH_STENCIL_ATTACHMENT_WRITE, prior_usage: " + "SYNC_FRAGMENT_SHADER_SHADER_SAMPLED_READ, read_barriers: VK_PIPELINE_STAGE_2_NONE"}, + {"SYNC-HAZARD-WRITE-AFTER-READ", + "stencil aspect during store with stencilStoreOp VK_ATTACHMENT_STORE_OP_STORE. Access info " + "(usage: SYNC_LATE_FRAGMENT_TESTS_DEPTH_STENCIL_ATTACHMENT_WRITE, prior_usage: " + "SYNC_FRAGMENT_SHADER_SHADER_STORAGE_READ, read_barriers: VK_PIPELINE_STAGE_2_NONE"}, {"SYNC-HAZARD-WRITE-AFTER-READ", "stencil aspect during store with stencilStoreOp VK_ATTACHMENT_STORE_OP_STORE. Access info " "(usage: SYNC_LATE_FRAGMENT_TESTS_DEPTH_STENCIL_ATTACHMENT_WRITE, prior_usage: "