diff --git a/.pick_status.json b/.pick_status.json index a8af3b6e459..83dc38c392e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6824,7 +6824,7 @@ "description": "zink: update renderdoc layer string for android", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 68fb77a4bd7..a260a318a88 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2222,7 +2222,12 @@ setup_renderdoc(struct zink_screen *screen) const char *capture_id = debug_get_option("ZINK_RENDERDOC", NULL); if (!capture_id) return; - void *renderdoc = dlopen("librenderdoc.so", RTLD_NOW | RTLD_NOLOAD); +#if DETECT_OS_ANDROID + const char *libstr = "libVkLayer_GLES_RenderDoc.so"; +#else + const char *libstr = "librenderdoc.so"; +#endif + void *renderdoc = dlopen(libstr, RTLD_NOW | RTLD_NOLOAD); /* not loaded */ if (!renderdoc) return;