Reland "Vulkan: Add semaphores test to VulkanExternalImageTest"

src/libANGLE/renderer/vulkan/SemaphoreVk.cpp

@@ -193,6 +193,8 @@ angle::Result SemaphoreVk::signal(gl::Context *context,
                 layout = image.getCurrentImageLayout();
             }
 
+            ANGLE_TRY(textureVk->ensureImageInitialized(contextVk, ImageMipLevels::EnabledLevels));
+
             vk::CommandBuffer *commandBuffer;
             ANGLE_TRY(contextVk->endRenderPassAndGetCommandBuffer(&commandBuffer));
 

src/tests/test_utils/VulkanExternalHelper.h

@@ -66,11 +66,40 @@ class VulkanExternalHelper
     VkResult createSemaphoreZirconEvent(VkSemaphore *semaphore);
     VkResult exportSemaphoreZirconEvent(VkSemaphore semaphore, zx_handle_t *event);
 
+    // Performs a queue ownership transfer to VK_QUEUE_FAMILY_EXTERNAL on an
+    // image owned by our instance. The current image layout must be |oldLayout|
+    // and will be in |newLayout| after the memory barrier. |semaphore|
+    // will be signaled upon completion of the release operation.
+    void releaseImageAndSignalSemaphore(VkImage image,
+                                        VkImageLayout oldLayout,
+                                        VkImageLayout newLayout,
+                                        VkSemaphore semaphore);
+
+    // Performs a queue ownership transfer from VK_QUEUE_FAMILY_EXTERNAL on an
+    // image owned by an external instance. The current image layout must be
+    // |oldLayout| and will be in |newLayout| after the memory barrier. The
+    // barrier will wait for |semaphore|.
+    void waitSemaphoreAndAcquireImage(VkImage image,
+                                      VkImageLayout oldLayout,
+                                      VkImageLayout newLayout,
+                                      VkSemaphore semaphore);
+
+    // Copies pixels out of an image. Currently only VK_FORMAT_R8G8B8A8_UNORM
+    // and VK_FORMAT_B8G8R8A8_UNORM formats are supported.
+    void readPixels(VkImage srcImage,
+                    VkImageLayout srcImageLayout,
+                    VkFormat srcImageFormat,
+                    VkOffset3D imageOffset,
+                    VkExtent3D imageExtent,
+                    void *pixels,
+                    size_t pixelsSize);
+
   private:
     VkInstance mInstance             = VK_NULL_HANDLE;
     VkPhysicalDevice mPhysicalDevice = VK_NULL_HANDLE;
     VkDevice mDevice                 = VK_NULL_HANDLE;
     VkQueue mGraphicsQueue           = VK_NULL_HANDLE;
+    VkCommandPool mCommandPool       = VK_NULL_HANDLE;
 
     VkPhysicalDeviceMemoryProperties mMemoryProperties = {};
 
@@ -85,8 +114,9 @@ class VulkanExternalHelper
     PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR       = nullptr;
     PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR = nullptr;
     PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR
-        vkGetPhysicalDeviceExternalSemaphorePropertiesKHR             = nullptr;
-    PFN_vkGetMemoryZirconHandleFUCHSIA vkGetMemoryZirconHandleFUCHSIA = nullptr;
+        vkGetPhysicalDeviceExternalSemaphorePropertiesKHR                   = nullptr;
+    PFN_vkGetMemoryZirconHandleFUCHSIA vkGetMemoryZirconHandleFUCHSIA       = nullptr;
+    PFN_vkGetSemaphoreZirconHandleFUCHSIA vkGetSemaphoreZirconHandleFUCHSIA = nullptr;
 };
 
 }  // namespace angle