commit a27b9ddd4c3be284c61f41ed10c4b7f388b05449
author Jason Macnak <natsu@google.com> Thu Mar 30 00:16:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 30 00:16:22 2023 +0000
tree b4834f750523ee9bad8e53b9c0bf0ccc4e6e7d1f
parent 52b037630b3695962fbceb0911b1aa05d8a79724
parent cfcd06b4b39c295f580970b26b50ca979bda7a40

Merge "Revert "Use "gfxstream" namespace""

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index a5c04fc..023cca1 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -3884,43 +3884,6 @@
         // no-op
     }
 
-uint32_t transformNonExternalResourceMemoryTypeBitsForGuest(
-        uint32_t hostBits) {
-        uint32_t res = 0;
-        for (uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i) {
-            if (hostBits & (1 << i)) {
-                res |= (1 << i);
-            }
-        }
-        return res;
-    }
-
-    uint32_t transformExternalResourceMemoryTypeBitsForGuest(
-        uint32_t normalBits) {
-        uint32_t res = 0;
-        for (uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i) {
-            bool shouldAcceptMemoryIndex = normalBits & (1 << i);
-            if (shouldAcceptMemoryIndex) {
-                res |= (1 << i);
-            }
-        }
-        return res;
-    }
-
-    void transformNonExternalResourceMemoryRequirementsForGuest(
-        VkMemoryRequirements* reqs) {
-        reqs->memoryTypeBits =
-            transformNonExternalResourceMemoryTypeBitsForGuest(
-                reqs->memoryTypeBits);
-    }
-
-    void transformExternalResourceMemoryRequirementsForGuest(
-        VkMemoryRequirements* reqs) {
-        reqs->memoryTypeBits =
-            transformExternalResourceMemoryTypeBitsForGuest(
-                reqs->memoryTypeBits);
-    }
-
     void transformExternalResourceMemoryDedicatedRequirementsForGuest(
         VkMemoryDedicatedRequirements* dedicatedReqs) {
         dedicatedReqs->prefersDedicatedAllocation = VK_TRUE;
@@ -3931,38 +3894,9 @@
         VkImage image,
         VkMemoryRequirements* reqs) {
 
-        auto it = info_VkImage.find(image);
-        if (it == info_VkImage.end()) return;
-
-        auto& info = it->second;
-
-        if (!info.external ||
-            !info.externalCreateInfo.handleTypes) {
-            transformNonExternalResourceMemoryRequirementsForGuest(reqs);
-        } else {
-            transformExternalResourceMemoryRequirementsForGuest(reqs);
-        }
         setMemoryRequirementsForSysmemBackedImage(image, reqs);
     }
 
-    void transformBufferMemoryRequirementsForGuestLocked(
-        VkBuffer buffer,
-        VkMemoryRequirements* reqs) {
-
-        auto it = info_VkBuffer.find(buffer);
-        if (it == info_VkBuffer.end()) return;
-
-        auto& info = it->second;
-
-        if (!info.external ||
-            !info.externalCreateInfo.handleTypes) {
-            transformNonExternalResourceMemoryRequirementsForGuest(reqs);
-            return;
-        }
-
-        transformExternalResourceMemoryRequirementsForGuest(reqs);
-    }
-
     void transformImageMemoryRequirements2ForGuest(
         VkImage image,
         VkMemoryRequirements2* reqs2) {
@@ -3976,14 +3910,10 @@
 
         if (!info.external ||
             !info.externalCreateInfo.handleTypes) {
-            transformNonExternalResourceMemoryRequirementsForGuest(
-                &reqs2->memoryRequirements);
             setMemoryRequirementsForSysmemBackedImage(image, &reqs2->memoryRequirements);
             return;
         }
 
-        transformExternalResourceMemoryRequirementsForGuest(&reqs2->memoryRequirements);
-
         setMemoryRequirementsForSysmemBackedImage(image, &reqs2->memoryRequirements);
 
         VkMemoryDedicatedRequirements* dedicatedReqs =
@@ -4008,13 +3938,9 @@
 
         if (!info.external ||
             !info.externalCreateInfo.handleTypes) {
-            transformNonExternalResourceMemoryRequirementsForGuest(
-                &reqs2->memoryRequirements);
             return;
         }
 
-        transformExternalResourceMemoryRequirementsForGuest(&reqs2->memoryRequirements);
-
         VkMemoryDedicatedRequirements* dedicatedReqs =
             vk_find_struct<VkMemoryDedicatedRequirements>(reqs2);
 
@@ -5268,6 +5194,7 @@
 
         if (supportsCreateResourcesWithRequirements()) {
             info.baseRequirementsKnown = true;
+            info.baseRequirements = memReqs;
         }
 
         if (extBufCiPtr) {
@@ -5281,11 +5208,6 @@
         }
 #endif
 
-        if (info.baseRequirementsKnown) {
-            transformBufferMemoryRequirementsForGuestLocked(*pBuffer, &memReqs);
-            info.baseRequirements = memReqs;
-        }
-
         return res;
     }
 
@@ -5319,8 +5241,6 @@
 
         lock.lock();
 
-        transformBufferMemoryRequirementsForGuestLocked(
-            buffer, pMemoryRequirements);
         info.baseRequirementsKnown = true;
         info.baseRequirements = *pMemoryRequirements;
     }