From 8d46d042909f746c6ff30a3922d968fb37125027 Mon Sep 17 00:00:00 2001
From: Takashi KANNAN <26959415+kannan-xiao4@users.noreply.github.com>
Date: Fri, 19 Jul 2024 10:05:42 +0900
Subject: [PATCH 1/2] add error logs

---
 .../GraphicsDevice/Vulkan/VulkanUtility.cpp        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Plugin~/WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp b/Plugin~/WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp
index baa41df74..bb0b6e2d2 100644
--- a/Plugin~/WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp
+++ b/Plugin~/WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp
@@ -66,8 +66,7 @@ namespace webrtc
         if (exportHandle)
         {
             externalInfo.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO;
-            externalInfo.handleTypes =
-                static_cast<VkExternalMemoryHandleTypeFlags>(EXTERNAL_MEMORY_HANDLE_SUPPORTED_TYPE);
+            externalInfo.handleTypes = EXTERNAL_MEMORY_HANDLE_SUPPORTED_TYPE;
             imageInfo.pNext = &externalInfo;
         }
         imageInfo.imageType = VK_IMAGE_TYPE_2D;
@@ -86,6 +85,7 @@ namespace webrtc
         VkResult result = vkCreateImage(instance.device, &imageInfo, allocator, &unityVulkanImage->image);
         if (result != VK_SUCCESS)
         {
+            RTC_LOG(LS_ERROR) << "Failed vkCreateImage result: " << result;
             return result;
         }
 
@@ -99,10 +99,10 @@ namespace webrtc
             instance.physicalDevice, memRequirements.memoryTypeBits, properties, &allocInfo.memoryTypeIndex);
         RTC_CHECK(success);
 
-        VkExportMemoryAllocateInfoKHR exportInfo = {};
+        VkExportMemoryAllocateInfo exportInfo = {};
         if (exportHandle)
         {
-            exportInfo.sType = VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR;
+            exportInfo.sType = VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO;
             exportInfo.handleTypes = EXTERNAL_MEMORY_HANDLE_SUPPORTED_TYPE;
             allocInfo.pNext = &exportInfo;
         }
@@ -110,6 +110,7 @@ namespace webrtc
         result = vkAllocateMemory(instance.device, &allocInfo, allocator, &unityVulkanImage->memory.memory);
         if (result != VK_SUCCESS)
         {
+            RTC_LOG(LS_ERROR) << "Failed vkAllocateMemory result: " << result;
             return result;
         }
 
@@ -118,11 +119,12 @@ namespace webrtc
             vkBindImageMemory(instance.device, unityVulkanImage->image, unityVulkanImage->memory.memory, memoryOffset);
         if (result != VK_SUCCESS)
         {
+            RTC_LOG(LS_ERROR) << "Failed vkBindImageMemory result: " << result;
             return result;
         }
 
         unityVulkanImage->memory.offset = memoryOffset;
-        unityVulkanImage->memory.size = memRequirements.size;
+        unityVulkanImage->memory.size = allocInfo.allocationSize;
         unityVulkanImage->memory.flags = properties;
         unityVulkanImage->memory.memoryTypeIndex = allocInfo.memoryTypeIndex;
         unityVulkanImage->layout = imageInfo.initialLayout;
@@ -163,7 +165,7 @@ namespace webrtc
         VkImageView imageView = nullptr;
         if (vkCreateImageView(instance.device, &viewInfo, allocator, &imageView) != VK_SUCCESS)
         {
-            RTC_LOG(LS_INFO) << "Failed vkCreateImageView";
+            RTC_LOG(LS_ERROR) << "Failed vkCreateImageView";
             return nullptr;
         }
 

From 4c49f2d88dc15b67be684728e75f183e2ac2e997 Mon Sep 17 00:00:00 2001
From: Takashi KANNAN <26959415+kannan-xiao4@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:30:48 +0900
Subject: [PATCH 2/2] add VkMemoryDedicatedAllocateInfo on android

---
 .../WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Plugin~/WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp b/Plugin~/WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp
index bb0b6e2d2..1cb8b97c0 100644
--- a/Plugin~/WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp
+++ b/Plugin~/WebRTCPlugin/GraphicsDevice/Vulkan/VulkanUtility.cpp
@@ -100,8 +100,17 @@ namespace webrtc
         RTC_CHECK(success);
 
         VkExportMemoryAllocateInfo exportInfo = {};
+        VkMemoryDedicatedAllocateInfo dedicatedAllocateInfo = {};
         if (exportHandle)
         {
+#if UNITY_ANDROID
+            // When AllocateMemory is executed, Android requires the VkImage to be used as additional information.
+            dedicatedAllocateInfo.sType  = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO;
+            dedicatedAllocateInfo.pNext  = nullptr;
+            dedicatedAllocateInfo.buffer = VK_NULL_HANDLE;
+            dedicatedAllocateInfo.image  = unityVulkanImage->image;
+            exportInfo.pNext = &dedicatedAllocateInfo;
+#endif
             exportInfo.sType = VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO;
             exportInfo.handleTypes = EXTERNAL_MEMORY_HANDLE_SUPPORTED_TYPE;
             allocInfo.pNext = &exportInfo;