From aeecf2010dd12e9d7fee4340b834d055cdf028a0 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Tue, 7 Jul 2020 01:51:50 +0200 Subject: [PATCH] radv: Use correct semaphore handle type for Android import. Coincidentally got a bugreport of a game that is broken without the import fix below, but it turns out I made a copy-paste error as well .. In good news it is clearly tested now. Fixes: ad151499583 "radv: Set handle types in Android semaphore/fence import." Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit ffb8020f6e7ae3fb89d5b5ab17ff6fbdc6798ac4) --- .pick_status.json | 2 +- src/amd/vulkan/radv_android.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f9693f7d939..d365cc6fcf7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -31,7 +31,7 @@ "description": "radv: Use correct semaphore handle type for Android import.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "ad151499583f1814280218bf2eae4eaf1e7090a4" }, diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c index 6c3360906f8..567d2b1f1fa 100644 --- a/src/amd/vulkan/radv_android.c +++ b/src/amd/vulkan/radv_android.c @@ -396,7 +396,7 @@ radv_AcquireImageANDROID( .flags = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT, .fd = semaphore_fd, .semaphore = semaphore, - .handleType = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT, + .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT, }); }