Hash :
6fe13477
Author :
Date :
2021-11-11T00:47:14
Vulkan: Add external's pNext to ANGLE_external_objects_flags ANGLE was chaining VkImageFormatListCreateInfoKHR to VkImageCreateInfo::pNext to support sRGB extensions. For external images, it was unknown whether that was valid because there was no way to know if external used an identical chain of pNexts. This was causing a discrepancy between images created by Chrome and those created by ANGLE as part of an import. This change updates ANGLE_external_objects_flags to take in the pNext chain external has used to create the image so ANGLE could create the image identically. Bug: chromium:1266094 Change-Id: I479b9e7ff39d437425dc91c79834880749766f99 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3274177 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Peng Huang <penghuang@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
//
// Copyright 2019 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// VulkanExternalHelper.h : Helper for allocating & managing vulkan external objects.
#ifndef ANGLE_TESTS_TESTUTILS_VULKANEXTERNALHELPER_H_
#define ANGLE_TESTS_TESTUTILS_VULKANEXTERNALHELPER_H_
#include "common/vulkan/vk_headers.h"
#include "vulkan/vulkan_fuchsia_ext.h"
namespace angle
{
class VulkanExternalHelper
{
public:
VulkanExternalHelper();
~VulkanExternalHelper();
void initialize(bool useSwiftshader, bool enableValidationLayers);
VkInstance getInstance() const { return mInstance; }
VkPhysicalDevice getPhysicalDevice() const { return mPhysicalDevice; }
VkDevice getDevice() const { return mDevice; }
VkQueue getGraphicsQueue() const { return mGraphicsQueue; }
bool canCreateImageExternal(VkFormat format,
VkImageType type,
VkImageTiling tiling,
VkImageCreateFlags createFlags,
VkImageUsageFlags usageFlags,
VkExternalMemoryHandleTypeFlagBits handleType) const;
VkResult createImage2DExternal(VkFormat format,
VkImageCreateFlags createFlags,
VkImageUsageFlags usageFlags,
const void *imageCreateInfoPNext,
VkExtent3D extent,
VkExternalMemoryHandleTypeFlags handleTypes,
VkImage *imageOut,
VkDeviceMemory *deviceMemoryOut,
VkDeviceSize *deviceMemorySizeOut);
// VK_KHR_external_memory_fd
bool canCreateImageOpaqueFd(VkFormat format,
VkImageType type,
VkImageTiling tiling,
VkImageCreateFlags createFlags,
VkImageUsageFlags usageFlags) const;
VkResult createImage2DOpaqueFd(VkFormat format,
VkImageCreateFlags createFlags,
VkImageUsageFlags usageFlags,
const void *imageCreateInfoPNext,
VkExtent3D extent,
VkImage *imageOut,
VkDeviceMemory *deviceMemoryOut,
VkDeviceSize *deviceMemorySizeOut);
VkResult exportMemoryOpaqueFd(VkDeviceMemory deviceMemory, int *fd);
// VK_FUCHSIA_external_memory
bool canCreateImageZirconVmo(VkFormat format,
VkImageType type,
VkImageTiling tiling,
VkImageCreateFlags createFlags,
VkImageUsageFlags usageFlags) const;
VkResult createImage2DZirconVmo(VkFormat format,
VkImageCreateFlags createFlags,
VkImageUsageFlags usageFlags,
const void *imageCreateInfoPNext,
VkExtent3D extent,
VkImage *imageOut,
VkDeviceMemory *deviceMemoryOut,
VkDeviceSize *deviceMemorySizeOut);
VkResult exportMemoryZirconVmo(VkDeviceMemory deviceMemory, zx_handle_t *vmo);
// VK_KHR_external_semaphore_fd
bool canCreateSemaphoreOpaqueFd() const;
VkResult createSemaphoreOpaqueFd(VkSemaphore *semaphore);
VkResult exportSemaphoreOpaqueFd(VkSemaphore semaphore, int *fd);
// VK_FUCHSIA_external_semaphore
bool canCreateSemaphoreZirconEvent() const;
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 = {};
uint32_t mGraphicsQueueFamilyIndex = UINT32_MAX;
bool mHasExternalMemoryFd = false;
bool mHasExternalMemoryFuchsia = false;
bool mHasExternalSemaphoreFd = false;
bool mHasExternalSemaphoreFuchsia = false;
PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2 =
nullptr;
PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR = nullptr;
PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR = nullptr;
PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR
vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = nullptr;
PFN_vkGetMemoryZirconHandleFUCHSIA vkGetMemoryZirconHandleFUCHSIA = nullptr;
PFN_vkGetSemaphoreZirconHandleFUCHSIA vkGetSemaphoreZirconHandleFUCHSIA = nullptr;
};
} // namespace angle
#endif // ANGLE_TESTS_TESTUTILS_VULKANEXTERNALHELPER_H_