From 9e63dfe52dc534c7764e5773c9bb4869cee8482e Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 30 May 2024 14:21:24 +0530 Subject: [PATCH] android: Fix zink build failure Otherwise we run into following build error on Android: ld.lld: error: undefined symbol: galliumvk_driver_extensions Fixes: cfa955ed78be ("glx/egl: fix LIBGL_KOPPER_DISABLE") Signed-off-by: Amit Pundir Part-of: (cherry picked from commit 38dfbae116722836c985179b8e5105ca9faee0ca) --- .pick_status.json | 2 +- src/gallium/targets/dri/target.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 7708dccd3f1..cd3ef4d110c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -224,7 +224,7 @@ "description": "android: Fix zink build failure", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "cfa955ed78bef56ba025a64468e8b841149fab18", "notes": null diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c index b5e360349ac..0915a84480d 100644 --- a/src/gallium/targets/dri/target.c +++ b/src/gallium/targets/dri/target.c @@ -142,6 +142,9 @@ DEFINE_LOADER_DRM_ENTRYPOINT(lima) #endif #if defined(GALLIUM_ZINK) +#if DETECT_OS_ANDROID +DEFINE_LOADER_DRM_ENTRYPOINT(zink); +#else const __DRIextension **__driDriverGetExtensions_zink(void); PUBLIC const __DRIextension **__driDriverGetExtensions_zink(void) @@ -149,6 +152,7 @@ PUBLIC const __DRIextension **__driDriverGetExtensions_zink(void) return debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) ? galliumdrm_driver_extensions : galliumvk_driver_extensions; } #endif +#endif #if defined(GALLIUM_D3D12) DEFINE_LOADER_DRM_ENTRYPOINT(d3d12);