Mesa (staging/18.2): radv/android: Mark android WSI image as shareable.

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: eb453b3f9da3078f8ea644bfce2e4e2d69daee22
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eb453b3f9da3078f8ea644bfce2e4e2d69daee22

Author: Bas Nieuwenhuizen <basni at chromium.org>
Date:   Mon Nov 26 16:26:35 2018 +0100

radv/android: Mark android WSI image as shareable.

Fixes: b1444c9ccb0 "radv: Implement VK_ANDROID_native_buffer."
Acked-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
(cherry picked from commit 51091b3e1f212be956f91ac5214191c14e83ac59)

---

 src/amd/vulkan/radv_android.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c
index f5d70825dd..93799b87b8 100644
--- a/src/amd/vulkan/radv_android.c
+++ b/src/amd/vulkan/radv_android.c
@@ -110,9 +110,19 @@ radv_image_from_gralloc(VkDevice device_h,
 	struct radv_bo *bo = NULL;
 	VkResult result;
 
+	VkImageCreateInfo updated_base_info = *base_info;
+
+	VkExternalMemoryImageCreateInfo external_memory_info = {
+		.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO,
+		.pNext = updated_base_info.pNext,
+		.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
+	};
+
+	updated_base_info.pNext = &external_memory_info;
+
 	result = radv_image_create(device_h,
 	                           &(struct radv_image_create_info) {
-	                               .vk_info = base_info,
+	                               .vk_info = &updated_base_info,
 	                               .scanout = true,
 	                               .no_metadata_planes = true},
 	                           alloc,