diff --git a/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp b/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp index 68a8fb20380..f62844b6e27 100644 --- a/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp +++ b/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.cpp @@ -16,10 +16,6 @@ using android::base::SubAllocator; namespace gfxstream { namespace vk { -bool isHostVisible(const VkPhysicalDeviceMemoryProperties* memoryProps, uint32_t index) { - return memoryProps->memoryTypes[index].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; -} - CoherentMemory::CoherentMemory(VirtGpuResourceMappingPtr blobMapping, uint64_t size, VkDevice device, VkDeviceMemory memory) : mSize(size), mBlobMapping(blobMapping), mDevice(device), mMemory(memory) { diff --git a/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.h b/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.h index ac3c46490c2..fdbe9de22c5 100644 --- a/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.h +++ b/src/gfxstream/guest/vulkan_enc/HostVisibleMemoryVirtualization.h @@ -24,8 +24,6 @@ constexpr uint64_t kHostVisibleHeapSize = 512 * kMegaByte; // 512 mb namespace gfxstream { namespace vk { -bool isHostVisible(const VkPhysicalDeviceMemoryProperties* memoryProps, uint32_t index); - using GoldfishAddressSpaceBlockPtr = std::shared_ptr; using SubAllocatorPtr = std::unique_ptr; diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp index 245cc8c0815..06fd4248f14 100644 --- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp +++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp @@ -268,6 +268,10 @@ bool descriptorBindingIsImmutableSampler(VkDescriptorSet dstSet, uint32_t dstBin return as_goldfish_VkDescriptorSet(dstSet)->reified->bindingIsImmutableSampler[dstBinding]; } +static bool isHostVisible(const VkPhysicalDeviceMemoryProperties* memoryProps, uint32_t index) { + return memoryProps->memoryTypes[index].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; +} + VkDescriptorImageInfo ResourceTracker::filterNonexistentSampler( const VkDescriptorImageInfo& inputInfo) { VkSampler sampler = inputInfo.sampler;