commit 39d37e1eb82534842087ebb14387da75b6827170
author Roman Kiryanov <rkir@google.com> Thu Feb 02 19:47:28 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 02 19:47:28 2023 +0000
tree 774830e7fcd3dcacf052dc5eef094f76f0a12cb5
parent 1ddf6043e0aa9db1aa48370819f3dd07d7daa7d2
parent bdbc97c2dd3ec9f22b9f8f0840db54a5c411e3b0

Merge "Do not allocate CPU buffers if not requested"

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 2e85f2d..aebcdc0 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -5099,7 +5099,6 @@
         VkDeviceSize memoryOffset) {
         VkEncoder* enc = (VkEncoder*)context;
         // Do not forward calls with invalid handles to host.
-        AutoLock<RecursiveLock> lock(mLock);
         if (info_VkDeviceMemory.find(memory) == info_VkDeviceMemory.end() ||
             info_VkImage.find(image) == info_VkImage.end()) {
             return VK_ERROR_OUT_OF_DEVICE_MEMORY;
@@ -5111,9 +5110,10 @@
         void* context, VkResult,
         VkDevice device, uint32_t bindingCount, const VkBindImageMemoryInfo* pBindInfos) {
         VkEncoder* enc = (VkEncoder*)context;
-        AutoLock<RecursiveLock> lock(mLock);
+        // Do not forward calls with invalid handles to host.
         if (!pBindInfos ||
-            info_VkDeviceMemory.find(pBindInfos->memory) == info_VkDeviceMemory.end() ||
+            info_VkDeviceMemory.find(pBindInfos->memory) ==
+                info_VkDeviceMemory.end() ||
             info_VkImage.find(pBindInfos->image) == info_VkImage.end()) {
             return VK_ERROR_OUT_OF_DEVICE_MEMORY;
         }
@@ -5125,9 +5125,9 @@
         VkDevice device, uint32_t bindingCount, const VkBindImageMemoryInfo* pBindInfos) {
         VkEncoder* enc = (VkEncoder*)context;
         // Do not forward calls with invalid handles to host.
-        AutoLock<RecursiveLock> lock(mLock);
         if (!pBindInfos ||
-            info_VkDeviceMemory.find(pBindInfos->memory) == info_VkDeviceMemory.end() ||
+            info_VkDeviceMemory.find(pBindInfos->memory) ==
+                info_VkDeviceMemory.end() ||
             info_VkImage.find(pBindInfos->image) == info_VkImage.end()) {
             return VK_ERROR_OUT_OF_DEVICE_MEMORY;
         }