Skip to content

[4/n][ET-VK] Enable AHB extension for Android builds #5729

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

Closed
wants to merge 3 commits into from
Closed

[4/n][ET-VK] Enable AHB extension for Android builds #5729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25d529d
[4/n][ET-VK] Enable AHB extension for Android builds
Sep 27, 2024
deeb63a
Update on "[4/n][ET-VK] Enable AHB extension for Android builds"
Sep 27, 2024
359dbfd
Update on "[4/n][ET-VK] Enable AHB extension for Android builds"
Sep 27, 2024
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
3 changes: 3 additions & 0 deletions backends/vulkan/runtime/vk_api/Adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ VkDevice create_logical_device(
#ifdef VK_KHR_portability_subset
VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME,
#endif /* VK_KHR_portability_subset */
#ifdef VK_ANDROID_external_memory_android_hardware_buffer
VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME,
#endif /* VK_ANDROID_external_memory_android_hardware_buffer */
VK_KHR_16BIT_STORAGE_EXTENSION_NAME,
VK_KHR_8BIT_STORAGE_EXTENSION_NAME,
VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME,
Expand Down
6 changes: 6 additions & 0 deletions backends/vulkan/runtime/vk_api/vk_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@

#ifdef USE_VULKAN_WRAPPER
#ifdef USE_VULKAN_VOLK
#ifdef VK_ANDROID_external_memory_android_hardware_buffer
#include <android/hardware_buffer.h>
#include <vulkan/vulkan.h>
#include <vulkan/vulkan_android.h>
#endif /* VK_ANDROID_external_memory_android_hardware_buffer */

#include <volk.h>
#else
#include <vulkan_wrapper.h>
Expand Down
8 changes: 8 additions & 0 deletions backends/vulkan/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,18 @@ def define_common_targets(is_fbcode = False):
VK_API_DEPS += [
"fbsource//third-party/volk:volk",
]
VK_API_DEPS += select({
"DEFAULT": [],
"ovr_config//os:android": ["fbsource//third-party/toolchains:android"],
})
VK_API_PREPROCESSOR_FLAGS += [
"-DUSE_VULKAN_WRAPPER",
"-DUSE_VULKAN_VOLK",
]
VK_API_PREPROCESSOR_FLAGS += select({
"DEFAULT": [],
"ovr_config//os:android": ["-DVK_ANDROID_external_memory_android_hardware_buffer"],
})
else:
VK_API_DEPS += [
"fbsource//third-party/swiftshader:swiftshader_vk_headers",
Expand Down
Loading