Reland "Vulkan: Fix incorrect exposure of sRGB extensions"

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -2201,6 +2201,13 @@ bool RendererVk::hasLinearImageFormatFeatureBits(VkFormat format,
     return hasFormatFeatureBits<&VkFormatProperties::linearTilingFeatures>(format, featureBits);
 }
 
+VkFormatFeatureFlags RendererVk::getLinearImageFormatFeatureBits(
+    VkFormat format,
+    const VkFormatFeatureFlags featureBits) const
+{
+    return getFormatFeatureBits<&VkFormatProperties::linearTilingFeatures>(format, featureBits);
+}
+
 VkFormatFeatureFlags RendererVk::getImageFormatFeatureBits(
     VkFormat format,
     const VkFormatFeatureFlags featureBits) const
@@ -2301,6 +2308,26 @@ bool RendererVk::hasFormatFeatureBits(VkFormat format, const VkFormatFeatureFlag
     return IsMaskFlagSet(getFormatFeatureBits<features>(format, featureBits), featureBits);
 }
 
+bool RendererVk::haveSameFormatFeatureBits(VkFormat fmt1, VkFormat fmt2) const
+{
+    if (fmt1 == VK_FORMAT_UNDEFINED || fmt2 == 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;
+
+    VkFormatFeatureFlags fmt1LinearFeatureBits =
+        getLinearImageFormatFeatureBits(fmt1, kImageUsageFeatureBits);
+    VkFormatFeatureFlags fmt1OptimalFeatureBits =
+        getImageFormatFeatureBits(fmt1, kImageUsageFeatureBits);
+
+    return hasLinearImageFormatFeatureBits(fmt2, fmt1LinearFeatureBits) &&
+           hasImageFormatFeatureBits(fmt2, fmt1OptimalFeatureBits);
+}
+
 angle::Result RendererVk::cleanupGarbage(Serial lastCompletedQueueSerial)
 {
     std::lock_guard<std::mutex> lock(mGarbageMutex);

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -161,6 +161,9 @@ class RendererVk : angle::NonCopyable
     // device (first time only).
     bool hasLinearImageFormatFeatureBits(VkFormat format,
                                          const VkFormatFeatureFlags featureBits) const;
+    VkFormatFeatureFlags getLinearImageFormatFeatureBits(
+        VkFormat format,
+        const VkFormatFeatureFlags featureBits) const;
     VkFormatFeatureFlags getImageFormatFeatureBits(VkFormat format,
                                                    const VkFormatFeatureFlags featureBits) const;
     bool hasImageFormatFeatureBits(VkFormat format, const VkFormatFeatureFlags featureBits) const;
@@ -294,6 +297,8 @@ class RendererVk : angle::NonCopyable
 
     void outputVmaStatString();
 
+    bool haveSameFormatFeatureBits(VkFormat fmt1, VkFormat fmt2) const;
+
     angle::Result cleanupGarbage(Serial lastCompletedQueueSerial);
 
     angle::Result submitFrame(vk::Context *context,

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -2630,7 +2630,8 @@ angle::Result TextureVk::initImage(ContextVk *contextVk,
                                                                  : vk::ConvertToSRGB(imageFormat);
 
     VkImageFormatListCreateInfoKHR formatListInfo = {};
-    if (renderer->getFeatures().supportsImageFormatList.enabled)
+    if (renderer->getFeatures().supportsImageFormatList.enabled &&
+        renderer->haveSameFormatFeatureBits(imageFormat, imageListFormat))
     {
         mRequiresMutableStorage = true;
 

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -51,6 +51,9 @@ bool HasShaderImageAtomicsSupport(const RendererVk *rendererVk,
     return hasImageAtomicSupport && hasBufferAtomicSupport;
 }
 
+// Checks to see if each format can be reinterpreted to an equivalent format in a different
+// colorspace. If all supported formats can be reinterpreted, it returns true. Formats which are not
+// supported at all are ignored and not counted as failures.
 bool FormatReinterpretationSupported(const std::vector<GLenum> &optionalSizedFormats,
                                      const RendererVk *rendererVk,
                                      bool checkLinearColorspace)
@@ -65,18 +68,14 @@ bool FormatReinterpretationSupported(const std::vector<GLenum> &optionalSizedFor
             VkFormat reinterpretedFormat = checkLinearColorspace
                                                ? ConvertToLinear(vkFormat.vkImageFormat)
                                                : ConvertToSRGB(vkFormat.vkImageFormat);
-            ASSERT(reinterpretedFormat != VK_FORMAT_UNDEFINED);
 
-            constexpr uint32_t kBitsSampleFilter =
-                VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
-                VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
-
-            if (!rendererVk->hasImageFormatFeatureBits(reinterpretedFormat, kBitsSampleFilter))
+            if (!rendererVk->haveSameFormatFeatureBits(vkFormat.vkImageFormat, reinterpretedFormat))
             {
                 return false;
             }
         }
     }
+
     return true;
 }