Mesa (staging/20.1): radv: Set handle types in Android semaphore/fence import.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 045f69f25d652f0c4f706c0bd479ab55e0da1c58
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=045f69f25d652f0c4f706c0bd479ab55e0da1c58

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sun Jul  5 19:57:29 2020 +0200

radv: Set handle types in Android semaphore/fence import.

Seems like we forgot to set it all this time ...

Fixes: b1444c9ccb0 "radv: Implement VK_ANDROID_native_buffer."
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5759>
(cherry picked from commit ad151499583f1814280218bf2eae4eaf1e7090a4)

---

 .pick_status.json             | 2 +-
 src/amd/vulkan/radv_android.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4df7b8d7784..5437ff345c7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -130,7 +130,7 @@
         "description": "radv: Set handle types in Android semaphore/fence import.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "b1444c9ccb06661d932969302d19166df442818c"
     },
diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c
index a9f39ec9e02..6c3360906f8 100644
--- a/src/amd/vulkan/radv_android.c
+++ b/src/amd/vulkan/radv_android.c
@@ -396,6 +396,7 @@ radv_AcquireImageANDROID(
 		                                                 .flags = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT,
 		                                                 .fd = semaphore_fd,
 		                                                 .semaphore = semaphore,
+		                                                 .handleType = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT,
 		                                            });
 	}
 
@@ -407,6 +408,7 @@ radv_AcquireImageANDROID(
 		                                         .flags = VK_FENCE_IMPORT_TEMPORARY_BIT,
 		                                         .fd = fence_fd,
 		                                         .fence = fence,
+		                                         .handleType = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT,
 		                                     });
 	}