From d21a970f760c0e8d4c36263e1d51114de5abc64e Mon Sep 17 00:00:00 2001 From: Yuly Novikov Date: Sat, 29 Jan 2022 01:05:08 +0000 Subject: [PATCH] Update SYNC-HAZARD-WRITE_AFTER_READ skip VK_PIPELINE_STAGE_2_NONE_KHR was renamed to VK_PIPELINE_STAGE_2_NONE in https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/3705 Removing the comma in the end of string will make it catch both cases. Bug: chromium:1292106 Change-Id: Idca97cc6b2d53476b7d108595e329e7c287d086f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/78640 Reviewed-by: Kai Ninomiya Commit-Queue: Yuly Novikov Auto-Submit: Yuly Novikov Reviewed-by: Austin Eng --- src/dawn_native/vulkan/BackendVk.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dawn_native/vulkan/BackendVk.cpp b/src/dawn_native/vulkan/BackendVk.cpp index 4916fe6ade..aeba2aa4c8 100644 --- a/src/dawn_native/vulkan/BackendVk.cpp +++ b/src/dawn_native/vulkan/BackendVk.cpp @@ -61,6 +61,8 @@ struct SkippedMessage { constexpr SkippedMessage kSkippedMessages[] = { // These errors are generated when simultaneously using a read-only depth/stencil attachment as // a texture binding. This is valid Vulkan. + // The substring matching matches both + // VK_PIPELINE_STAGE_2_NONE and VK_PIPELINE_STAGE_2_NONE_KHR. // // When storeOp=NONE is not present, Dawn uses storeOp=STORE, but Vulkan validation layer // considers the image read-only and produces a hazard. Dawn can't rely on storeOp=NONE and @@ -69,12 +71,12 @@ 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_KHR, "}, + "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: " - "SYNC_FRAGMENT_SHADER_SHADER_STORAGE_READ, read_barriers: VK_PIPELINE_STAGE_2_NONE_KHR, "}, + "SYNC_FRAGMENT_SHADER_SHADER_STORAGE_READ, read_barriers: VK_PIPELINE_STAGE_2_NONE"}, }; namespace dawn::native::vulkan {