commit 46aac193306336fb48a60db82836c0200c8a1f78
author Gurchetan Singh <gurchetansingh@chromium.org> Wed Jun 26 16:31:32 2024 -0700
committer Gurchetan Singh <gurchetansingh@google.com> Fri Jun 28 08:23:07 2024 -0700
tree 788b259e6ba523984a7dd64a3c53ac9cb69b726c
parent 498345b84b7c29d489ff4421fa888adfca1f69c7

gfxstream: don't define hasDedicatedImage + hasDedicatedBuffer multiple times

Every guest OS uses it (Linux, Android, Fuchsia).  Probably we
should clean up/merge logic further.

BUG=349122558
TEST=compile

Change-Id: I03ad2751eb36131af5b3de3fd83daad0d233d821

guest/vulkan_enc/ResourceTracker.cpp

diff --git a/guest/vulkan_enc/ResourceTracker.cpp b/guest/vulkan_enc/ResourceTracker.cpp
index 7a73c8a..055f566 100644
--- a/guest/vulkan_enc/ResourceTracker.cpp
+++ b/guest/vulkan_enc/ResourceTracker.cpp
@@ -3236,6 +3236,9 @@
 
     VkEncoder* enc = (VkEncoder*)context;
 
+    bool hasDedicatedImage = false;
+    bool hasDedicatedBuffer = false;
+
     VkMemoryAllocateInfo finalAllocInfo = vk_make_orphan_copy(*pAllocateInfo);
     vk_struct_chain_iterator structChainIter = vk_make_chain_iterator(&finalAllocInfo);
 
@@ -3382,9 +3385,9 @@
 
 #if defined(VK_USE_PLATFORM_ANDROID_KHR)
     if (exportAhb) {
-        bool hasDedicatedImage =
+        hasDedicatedImage =
             dedicatedAllocInfoPtr && (dedicatedAllocInfoPtr->image != VK_NULL_HANDLE);
-        bool hasDedicatedBuffer =
+        hasDedicatedBuffer =
             dedicatedAllocInfoPtr && (dedicatedAllocInfoPtr->buffer != VK_NULL_HANDLE);
         VkExtent3D imageExtent = {0, 0, 0};
         uint32_t imageLayers = 0;
@@ -3482,9 +3485,9 @@
     }
 
     if (exportVmo) {
-        bool hasDedicatedImage =
+        hasDedicatedImage =
             dedicatedAllocInfoPtr && (dedicatedAllocInfoPtr->image != VK_NULL_HANDLE);
-        bool hasDedicatedBuffer =
+        hasDedicatedBuffer =
             dedicatedAllocInfoPtr && (dedicatedAllocInfoPtr->buffer != VK_NULL_HANDLE);
 
         if (hasDedicatedImage && hasDedicatedBuffer) {
@@ -3757,9 +3760,9 @@
 #if defined(LINUX_GUEST_BUILD)
     if (exportDmabuf) {
         VirtGpuDevice* instance = VirtGpuDevice::getInstance();
-        bool hasDedicatedImage =
+        hasDedicatedImage =
             dedicatedAllocInfoPtr && (dedicatedAllocInfoPtr->image != VK_NULL_HANDLE);
-        bool hasDedicatedBuffer =
+        hasDedicatedBuffer =
             dedicatedAllocInfoPtr && (dedicatedAllocInfoPtr->buffer != VK_NULL_HANDLE);
 
         if (hasDedicatedImage) {