mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-02-05 21:38:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipc/client: Use Android allocator on client side.

Browse source
This commit is contained in:
Ryan Pavlik 2020-08-19 15:38:17 -05:00
parent a57507518d
commit 7c0df6506b
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/changes/ipc/mr.493.md Normal file
View file

@ -0,0 +1 @@
Use a native AHardwareBuffer allocator on the client side when building for recent-enough Android.

6
src/xrt/ipc/CMakeLists.txt
View file

@ -52,7 +52,11 @@ target_include_directories(ipc_client PRIVATE
target_link_libraries(ipc_client PRIVATE
aux_util
)
if(ANDROID)
target_link_libraries(ipc_client PRIVATE
aux_android
)
endif()
###
# Server

9
src/xrt/ipc/ipc_client_instance.c
View file

@ -129,9 +129,16 @@ ipc_client_instance_create_native_compositor(
{
struct ipc_client_instance *ii = ipc_client_instance(xinst);
struct xrt_compositor_native *xcn = NULL;
struct xrt_image_native_allocator *xina = NULL;
int ret = ipc_client_compositor_create(&ii->ipc_c, NULL, xdev, &xcn);
#ifdef XRT_GRAPHICS_BUFFER_HANDLE_IS_AHARDWAREBUFFER
// On Android, we allocate images natively on the client side.
xina = android_ahardwarebuffer_allocator_create();
#endif // XRT_GRAPHICS_BUFFER_HANDLE_IS_AHARDWAREBUFFER
int ret = ipc_client_compositor_create(&ii->ipc_c, xina, xdev, &xcn);
if (ret < 0 || xcn == NULL) {
xrt_images_destroy(&xina);
return -1;
}