commit 293a96e7e3008bd7ebb8669eb76ee2b262eefd4d
author Gurchetan Singh <gurchetansingh@chromium.org> Thu Jul 28 10:23:18 2022 -0700
committer Gurchetan Singh <gurchetansingh@google.com> Thu Jul 28 14:54:29 2022 -0700
tree 07541937a0a2fbbefb3d9b8eb2be8c30a2914c6a
parent 018e541399bb1af969f5cce3068868b50d14acc5

goldfish-opengl: nuke aligned_buf_{alloc, free}

Never used in the Vulkan part of the code.

BUG=233803018
TEST=run ./deqp-vk.memory*

Change-Id: I30a7a6cc8d2812e1dda7ab1e59dc29d250f5c13d

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index def1abf..944562f 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -182,8 +182,6 @@
 #endif
 #endif
 
-using android::aligned_buf_alloc;
-using android::aligned_buf_free;
 using android::base::Optional;
 using android::base::guest::AutoLock;
 using android::base::guest::RecursiveLock;
@@ -559,12 +557,6 @@
             zx_handle_close(memInfo.vmoHandle);
         }
 
-        if (memInfo.mappedPtr &&
-            !memInfo.virtualHostVisibleBacking &&
-            !memInfo.directMapped) {
-            aligned_buf_free(memInfo.mappedPtr);
-        }
-
         if (memInfo.directMapped) {
             ALOGE("%s: warning: direct mapped memory never goes to unregister!\n", __func__);
             subFreeHostMemory(&memInfo.subAlloc);

system/vulkan_enc/VkEncoder.cpp

diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp
index 9407c48..814ce60 100644
--- a/system/vulkan_enc/VkEncoder.cpp
+++ b/system/vulkan_enc/VkEncoder.cpp
@@ -57,8 +57,6 @@
 
 using namespace goldfish_vk;
 
-using android::aligned_buf_alloc;
-using android::aligned_buf_free;
 using android::base::guest::AutoLock;
 using android::base::guest::Lock;
 using android::base::BumpPool;