commit 789c940d20cdb3c590830f52148825c9fe164091
author Kaiyi Li <kaiyili@google.com> Thu Sep 30 15:54:56 2021 -0700
committer Kaiyi Li <kaiyili@google.com> Wed Oct 20 14:30:04 2021 -0700
tree 5d2aa1b9b13a1d113cb1726da338129446d56fcf
parent c9ea55b8421e5da94b70bcb4ed00f40cc457214a

Fix validation layer error

Test: run the emulator with VVL

Change-Id: I241c881fb2762561b1253cbd342ef9e3c1eee98a

stream-servers/vulkan/VkCommonOperations.cpp

diff --git a/stream-servers/vulkan/VkCommonOperations.cpp b/stream-servers/vulkan/VkCommonOperations.cpp
index 37beef0..a926072 100644
--- a/stream-servers/vulkan/VkCommonOperations.cpp
+++ b/stream-servers/vulkan/VkCommonOperations.cpp
@@ -1931,7 +1931,7 @@
     VkImageMemoryBarrier presentToTransferSrc = {
         VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, 0,
         0,
-        VK_ACCESS_HOST_READ_BIT,
+        VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
         infoPtr->currentLayout,
         VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
         VK_QUEUE_FAMILY_IGNORED,

stream-servers/vulkan/vk_util.h

diff --git a/stream-servers/vulkan/vk_util.h b/stream-servers/vulkan/vk_util.h
index 6033c57..92c0469 100644
--- a/stream-servers/vulkan/vk_util.h
+++ b/stream-servers/vulkan/vk_util.h
@@ -344,8 +344,10 @@
         const T &self = static_cast<const T &>(*this);
         VkImageMemoryBarrier imageBarrier = {
             .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-            .srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,
-            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT,
+            .srcAccessMask =
+                VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
+            .dstAccessMask =
+                VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
             .oldLayout = oldLayout,
             .newLayout = newLayout,
             .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,