Revert "VulkanExternalHelper: Use VK_KHR_image_format_list extension."
This reverts commit 4222d5e5a03f85ca07253d54f3087684fe9447b3.
Reason for revert: errors on multiple builders when rolling into Chromium
https://chromium-review.googlesource.com/c/chromium/src/+/3057227
e.g.
https://ci.chromium.org/ui/p/chromium/builders/try/linux_chromium_asan_rel_ng/924126/overview
Original change's description:
> VulkanExternalHelper: Use VK_KHR_image_format_list extension.
>
> To retrieve correct size requirements when the VK_KHR_image_format_list
> extension is enabled, it must be used to match VkImages created in
> vk_helpers.
>
> RendererVk: Fully enable VK_KHR_image_format_list.
> Enable the extension on non-AMD and non-ARM platforms.
>
> Bug: angleproject:5281
> Change-Id: I3ca60bf6efcf9d9c10d4d96a3fe91b999eb044f7
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3035047
> Commit-Queue: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Reviewed-by: Cody Northrop <cnorthrop@google.com>
> Reviewed-by: Mohan Maiya <m.maiya@samsung.com>
Bug: angleproject:5281, chromium:1233561
Change-Id: I3b15bb2fc2fb779adac8bbf5d805727a25b5795c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3057071
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index da54806..d6e6182 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -2470,7 +2470,8 @@
ANGLE_FEATURE_CONDITION(
&mFeatures, supportsImageFormatList,
- (ExtensionFound(VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME, deviceExtensionNames)));
+ (ExtensionFound(VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME, deviceExtensionNames)) &&
+ (isAMD || isARM));
// Feature disabled due to driver bugs:
//
diff --git a/src/tests/test_utils/VulkanExternalHelper.cpp b/src/tests/test_utils/VulkanExternalHelper.cpp
index 0ba177e..3ad77d2 100644
--- a/src/tests/test_utils/VulkanExternalHelper.cpp
+++ b/src/tests/test_utils/VulkanExternalHelper.cpp
@@ -424,58 +424,6 @@
return true;
}
-// TODO: Deduplicate function from renderer_utils http://anglebug.com/5281
-VkFormat ConvertToSRGB(VkFormat format)
-{
- switch (format)
- {
- case VK_FORMAT_R8G8B8A8_UNORM:
- return VK_FORMAT_R8G8B8A8_SRGB;
- case VK_FORMAT_B8G8R8A8_UNORM:
- return VK_FORMAT_B8G8R8A8_SRGB;
- case VK_FORMAT_R8_UNORM:
- return VK_FORMAT_R8_SRGB;
- case VK_FORMAT_R8G8_UNORM:
- return VK_FORMAT_R8G8_SRGB;
- default:
- return VK_FORMAT_UNDEFINED;
- }
-}
-
-// TODO: Deduplicate function from RendererVk http://anglebug.com/5281
-bool HaveSameFormatFeatureBits(VkPhysicalDevice physicalDevice, VkFormat format1, VkFormat format2)
-{
- if (format1 == VK_FORMAT_UNDEFINED || format2 == VK_FORMAT_UNDEFINED)
- {
- return false;
- }
-
- constexpr VkFormatFeatureFlags kImageUsageFeatureBits =
- VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT |
- VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
-
- VkFormatProperties format1Properties = {};
- vkGetPhysicalDeviceFormatProperties(physicalDevice, format1, &format1Properties);
-
- VkFormatProperties format2Properties = {};
- vkGetPhysicalDeviceFormatProperties(physicalDevice, format2, &format2Properties);
-
- VkFormatFeatureFlags fmt1LinearFeatureBits =
- format1Properties.linearTilingFeatures & kImageUsageFeatureBits;
- VkFormatFeatureFlags fmt2LinearFeatureBits =
- format2Properties.linearTilingFeatures & fmt1LinearFeatureBits;
- bool sameLinearBits = (fmt2LinearFeatureBits & fmt1LinearFeatureBits) == fmt1LinearFeatureBits;
-
- VkFormatFeatureFlags fmt1OptimalFeatureBits =
- format1Properties.optimalTilingFeatures & kImageUsageFeatureBits;
- VkFormatFeatureFlags fmt2OptimalFeatureBits =
- format2Properties.optimalTilingFeatures & fmt1OptimalFeatureBits;
- bool sameOptimalBits =
- (fmt2OptimalFeatureBits & fmt1OptimalFeatureBits) == fmt1OptimalFeatureBits;
-
- return sameLinearBits && sameOptimalBits;
-}
-
VkResult VulkanExternalHelper::createImage2DExternal(VkFormat format,
VkImageCreateFlags createFlags,
VkImageUsageFlags usageFlags,
@@ -491,32 +439,9 @@
/* .handleTypes = */ handleTypes,
};
- // Use the VK_KHR_image_format_list extension to match VkImageCreateInfo in vk_helpers
- constexpr uint32_t kImageListFormatCount = 2;
- VkFormat imageListFormats[kImageListFormatCount] = {format, ConvertToSRGB(format)};
- bool imageFormatListEnabled = false;
- VkImageFormatListCreateInfoKHR imageFormatListInfo = {};
-
- if (HaveSameFormatFeatureBits(mPhysicalDevice, format, ConvertToSRGB(format)))
- {
- imageFormatListEnabled = true;
-
- // Add VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT to VkImage create flag
- createFlags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
-
- // There is just 1 additional format we might use to create a VkImageView for this
- // VkImage
- imageFormatListInfo.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR;
- imageFormatListInfo.pNext = &externalMemoryImageCreateInfo;
- imageFormatListInfo.viewFormatCount = kImageListFormatCount;
- imageFormatListInfo.pViewFormats = imageListFormats;
- }
-
VkImageCreateInfo imageCreateInfo = {
/* .sType = */ VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
- /* .pNext = */
- (imageFormatListEnabled) ? static_cast<const void *>(&imageFormatListInfo)
- : static_cast<const void *>(&externalMemoryImageCreateInfo),
+ /* .pNext = */ &externalMemoryImageCreateInfo,
/* .flags = */ createFlags,
/* .imageType = */ VK_IMAGE_TYPE_2D,
/* .format = */ format,
