Skip to content

vulkan: export memory info for non-colorbuffer allocations in AHB mode #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ikicha wants to merge 1 commit into
base: main
Choose a base branch
from
Open

vulkan: export memory info for non-colorbuffer allocations in AHB mode #207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions host/vulkan/vk_common_operations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2233,21 +2233,6 @@ bool VkEmulation::allocExternalMemory(VulkanDispatch* vk, VkEmulation::ExternalM

auto allocInfoChain = vk_make_chain_iterator(&allocInfo);

// HostAllocation mode uses host side allocation and should not add VkExportMemoryAllocateInfo.
// AndroidAHB mode uses AHardwareBuffer_allocate + import instead of export (see switch below).
if (mDeviceInfo.supportsExternalMemoryExport &&
getExternalMemoryMode() != ExternalMemory::Mode::HostAllocation &&
getExternalMemoryMode() != ExternalMemory::Mode::AndroidAHB) {
exportAi.handleTypes =
static_cast<VkExternalMemoryHandleTypeFlags>(getDefaultExternalMemoryHandleType());

if (mDeviceInfo.supportsDmaBuf) {
exportAi.handleTypes |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
}

vk_append_struct(&allocInfoChain, &exportAi);
}

if (bufferForDedicatedAllocation.hasValue() || imageForDedicatedAllocation.hasValue()) {
info->dedicatedAllocation = true;
if (bufferForDedicatedAllocation.hasValue()) {
Expand Down Expand Up @@ -2489,6 +2474,29 @@ bool VkEmulation::allocExternalMemory(VulkanDispatch* vk, VkEmulation::ExternalM
break;
}

// HostAllocation mode uses host side allocation and should not add VkExportMemoryAllocateInfo.
// AndroidAHB mode uses AHardwareBuffer_allocate + import for ColorBuffers instead of export.
// Non-ColorBuffer allocations (e.g. VkBuffer in setupVkBuffer) or when AHB import was not used
// (e.g. allocAhb failure) still rely on export, so they must add VkExportMemoryAllocateInfo.
bool isAndroidAhbImport = false;
#ifdef __ANDROID__
isAndroidAhbImport = (getExternalMemoryMode() == ExternalMemory::Mode::AndroidAHB &&
importAhbInfo.buffer != nullptr);
#endif

if (mDeviceInfo.supportsExternalMemoryExport &&
getExternalMemoryMode() != ExternalMemory::Mode::HostAllocation &&
!isAndroidAhbImport) {
exportAi.handleTypes =
static_cast<VkExternalMemoryHandleTypeFlags>(getDefaultExternalMemoryHandleType());

if (mDeviceInfo.supportsDmaBuf) {
exportAi.handleTypes |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
}

vk_append_struct(&allocInfoChain, &exportAi);
}

bool memoryAllocated = false;
std::vector<VkDeviceMemory> allocationAttempts;
constexpr size_t kMaxAllocationAttempts = 20u;
Expand Down Expand Up @@ -2626,10 +2634,12 @@ bool VkEmulation::allocExternalMemory(VulkanDispatch* vk, VkEmulation::ExternalM
exportRes =
vk->vkGetMemoryAndroidHardwareBufferANDROID(mDevice, &getAhbInfo, &exportHandle);
validHandle = (VK_SUCCESS == exportRes) && (NULL != exportHandle);
info->handleInfo = ExternalHandleInfo{
.handle = reinterpret_cast<ExternalHandleType>(exportHandle),
.streamHandleType = STREAM_HANDLE_TYPE_PLATFORM_AHB,
};
if (validHandle) {
info->handleInfo = ExternalHandleInfo{
.handle = reinterpret_cast<ExternalHandleType>(exportHandle),
.streamHandleType = STREAM_HANDLE_TYPE_PLATFORM_AHB,
};
}
}
#endif
break;
Expand Down
Loading