+2

CMakeLists.txt

reviewed

··· 264 264 option(XRT_MODULE_AUX_VIVE "Build aux_vive" ON) 265 265 266 266 # Feature configuration (sorted) 267 267 + option_with_deps(XRT_FEATURE_AHARDWARE_BUFFER "Enable AHardwareBuffer for XrSwapchain images on Android (API-level 26+) platforms" DEPENDS ANDROID) 267 268 option_with_deps(XRT_FEATURE_COLOR_LOG "Enable logging in color on supported platforms" DEPENDS XRT_HAVE_LINUX) 268 269 option_with_deps(XRT_FEATURE_OPENXR "Build OpenXR runtime target" DEPENDS "XRT_MODULE_COMPOSITOR_MAIN OR XRT_MODULE_COMPOSITOR_NULL") 269 270 set(XRT_FEATURE_OPENXR_DEBUG_UTILS OFF) # Has never been enabled ··· 571 572 message(STATUS "# MODULE_MONADO_GUI: ${XRT_MODULE_MONADO_GUI}") 572 573 message(STATUS "# MODULE_MONADO_CLI: ${XRT_MODULE_MONADO_CLI}") 573 574 message(STATUS "#") 575 575 + message(STATUS "# FEATURE_AHARDWARE_BUFFER: ${XRT_FEATURE_AHARDWARE_BUFFER}") 574 576 message(STATUS "# FEATURE_CLIENT_DEBUG_GUI: ${XRT_FEATURE_CLIENT_DEBUG_GUI}") 575 577 message(STATUS "# FEATURE_COLOR_LOG: ${XRT_FEATURE_COLOR_LOG}") 576 578 message(STATUS "# FEATURE_DEBUG_GUI: ${XRT_FEATURE_DEBUG_GUI}")

+1

scripts/mapping.imp

reviewed

··· 19 19 { include: ["@[<\"]openxr/openxr_platform.h.*", "private", "\"xrt/xrt_openxr_includes.h\"", "public"] }, 20 20 { include: ["@[<\"]openxr/openxr_platform_defines.h.*", "private", "\"xrt/xrt_openxr_includes.h\"", "public"] }, 21 21 { symbol: ["XRT_ANDROID_PACKAGE", "public", "\"xrt/xrt_config_android.h\"", "public"] }, 22 22 + { symbol: ["XRT_FEATURE_AHARDWARE_BUFFER", "public", "\"xrt/xrt_config_android.h\"", "public"] }, 22 23 { symbol: ["XRT_MODULE_AUX_VIVE", "public", "\"xrt/xrt_config_build.h\"", "public"] }, 23 24 { symbol: ["XRT_MODULE_COMPOSITOR", "public", "\"xrt/xrt_config_build.h\"", "public"] }, 24 25 { symbol: ["XRT_MODULE_COMPOSITOR_MAIN", "public", "\"xrt/xrt_config_build.h\"", "public"] },

+2

src/xrt/include/xrt/xrt_config_android.h.cmake_in

reviewed

··· 10 10 #pragma once 11 11 12 12 #cmakedefine XRT_ANDROID_PACKAGE "@XRT_ANDROID_PACKAGE@" 13 13 + 14 14 + #cmakedefine XRT_FEATURE_AHARDWARE_BUFFER

+3

src/xrt/include/xrt/xrt_config_os.h

reviewed

··· 17 17 */ 18 18 19 19 #if defined(__ANDROID__) 20 20 + #include "xrt/xrt_config_android.h" 20 21 #define XRT_OS_ANDROID 22 22 + #if defined(XRT_FEATURE_AHARDWARE_BUFFER) 21 23 #define XRT_OS_ANDROID_USE_AHB 24 24 + #endif 22 25 #define XRT_OS_LINUX 23 26 #define XRT_OS_UNIX 24 27 #define XRT_OS_WAS_AUTODETECTED