diff --git a/.pick_status.json b/.pick_status.json index ff56cccc63d..5183a5c6871 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5544,7 +5544,7 @@ "description": "lavapipe: allow AHB export allocation", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "cebb2bf26623e31aa1fbab0e73c7e2a1e3cfe956", "notes": null diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index adab133c397..dcf4e04093b 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -287,6 +287,9 @@ assert_memhandle_type(VkExternalMemoryHandleTypeFlags types) unsigned valid[] = { VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT, VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT, +#if DETECT_OS_ANDROID + VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID, +#endif }; for (unsigned i = 0; i < ARRAY_SIZE(valid); i++) { if (types & valid[i])