Vulkan: add clear test for emulated stencil or depth formats

src/libANGLE/renderer/vulkan/FeaturesVk.h → include/platform/FeaturesVk.h

@@ -3,14 +3,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// vk_helpers:
-//   Optional features for the Vulkan renderer.
+// FeaturesVk.h: Optional features for the Vulkan renderer.
+//
 
-#ifndef LIBANGLE_RENDERER_VULKAN_FEATURESVK_H_
-#define LIBANGLE_RENDERER_VULKAN_FEATURESVK_H_
+#ifndef ANGLE_PLATFORM_FEATURESVK_H_
+#define ANGLE_PLATFORM_FEATURESVK_H_
 
-namespace rx
+namespace angle
 {
+
 struct FeaturesVk
 {
     // Line segment rasterization must follow OpenGL rules. This means using an algorithm similar
@@ -37,7 +38,13 @@ struct FeaturesVk
     // Add an extra copy region when using vkCmdCopyBuffer as the Windows Intel driver seems
     // to have a bug where the last region is ignored.
     bool extraCopyBufferRegion = false;
+
+    // This flag is added for the sole purpose of end2end tests, to test the correctness
+    // of various algorithms when a fallback format is used, such as using a packed format to
+    // emulate a depth- or stencil-only format.
+    bool forceFallbackFormat = false;
 };
-}  // namespace rx
 
-#endif  // LIBANGLE_RENDERER_VULKAN_FEATURESVK_H_
+}  // namespace angle
+
+#endif  // ANGLE_PLATFORM_FEATURESVK_H_

include/platform/Platform.h

@@ -36,6 +36,7 @@
 namespace angle
 {
 struct WorkaroundsD3D;
+struct FeaturesVk;
 using TraceEventHandle = uint64_t;
 using EGLDisplayType   = void *;
 struct PlatformMethods;
@@ -233,6 +234,13 @@ inline void DefaultOverrideWorkaroundsD3D(PlatformMethods *platform,
 {
 }
 
+using OverrideFeaturesVkFunc = void (*)(PlatformMethods *platform,
+                                        angle::FeaturesVk *workaroundsVulkan);
+inline void DefaultOverrideFeaturesVk(PlatformMethods *platform,
+                                      angle::FeaturesVk *workaroundsVulkan)
+{
+}
+
 // Callback on a successful program link with the program binary. Can be used to store
 // shaders to disk. Keys are a 160-bit SHA-1 hash.
 using ProgramKeyType   = std::array<uint8_t, 20>;
@@ -262,6 +270,7 @@ inline void DefaultCacheProgram(PlatformMethods *platform,
     OP(histogramSparse, HistogramSparse)                         \
     OP(histogramBoolean, HistogramBoolean)                       \
     OP(overrideWorkaroundsD3D, OverrideWorkaroundsD3D)           \
+    OP(overrideFeaturesVk, OverrideFeaturesVk)                   \
     OP(cacheProgram, CacheProgram)
 
 #define ANGLE_PLATFORM_METHOD_DEF(Name, CapsName) CapsName##Func Name = Default##CapsName;

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -1142,7 +1142,7 @@ VkColorComponentFlags ContextVk::getClearColorMask() const
     return mClearColorMask;
 }
 
-const FeaturesVk &ContextVk::getFeatures() const
+const angle::FeaturesVk &ContextVk::getFeatures() const
 {
     return mRenderer->getFeatures();
 }

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -16,9 +16,13 @@
 #include "libANGLE/renderer/ContextImpl.h"
 #include "libANGLE/renderer/vulkan/vk_helpers.h"
 
-namespace rx
+namespace angle
 {
 struct FeaturesVk;
+}
+
+namespace rx
+{
 class RendererVk;
 
 class ContextVk : public ContextImpl, public vk::Context
@@ -157,7 +161,7 @@ class ContextVk : public ContextImpl, public vk::Context
     angle::Result memoryBarrierByRegion(const gl::Context *context, GLbitfield barriers) override;
 
     VkDevice getDevice() const;
-    const FeaturesVk &getFeatures() const;
+    const angle::FeaturesVk &getFeatures() const;
 
     void invalidateVertexAndIndexBuffers();
     void invalidateDefaultAttribute(size_t attribIndex);

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -187,9 +187,37 @@ angle::Result FramebufferVk::clear(const gl::Context *context, GLbitfield mask)
 
     bool clearColor = IsMaskFlagSet(static_cast<int>(mask), GL_COLOR_BUFFER_BIT);
 
-    const gl::FramebufferAttachment *depthStencilAttachment = mState.getDepthStencilAttachment();
     const gl::State &glState = context->getGLState();
 
+    VkClearDepthStencilValue clearDepthStencilValue =
+        contextVk->getClearDepthStencilValue().depthStencil;
+
+    // Apply the stencil mask to the clear value.
+    clearDepthStencilValue.stencil &=
+        contextVk->getGLState().getDepthStencilState().stencilWritemask;
+
+    // If the depth or stencil is being cleared, and the image was originally requested to have a
+    // single aspect, but it's emulated with a depth/stencil format, clear both aspects, setting the
+    // other aspect to 0.
+    if (clearStencil || clearDepth)
+    {
+        RenderTargetVk *depthStencil = mRenderTargetCache.getDepthStencil();
+        const vk::Format &format     = depthStencil->getImageFormat();
+
+        // GL_DEPTH_COMPONENT24 is always emulated with a format that has stencil.
+        if (format.angleFormat().stencilBits == 0)
+        {
+            clearStencil                   = true;
+            clearDepthStencilValue.stencil = 0;
+        }
+        // GL_STENCIL_INDEX8 may or may not be emulated.
+        else if (format.angleFormat().depthBits == 0 && format.vkTextureFormat != VK_FORMAT_S8_UINT)
+        {
+            clearDepth                   = true;
+            clearDepthStencilValue.depth = 0;
+        }
+    }
+
     // The most costly clear mode is when we need to mask out specific color channels. This can
     // only be done with a draw call. The scissor region however can easily be integrated with
     // this method. Similarly for depth/stencil clear.
@@ -206,24 +234,19 @@ angle::Result FramebufferVk::clear(const gl::Context *context, GLbitfield mask)
 
         if (clearDepth || clearStencil)
         {
-            ANGLE_TRY(clearWithClearAttachments(contextVk, false, clearDepth, clearStencil));
+            ANGLE_TRY(clearWithClearAttachments(contextVk, false, clearDepth, clearStencil,
+                                                clearDepthStencilValue));
         }
         return angle::Result::Continue();
     }
 
-    // If we clear the depth OR the stencil but not both, and we have a packed depth stencil
-    // attachment, we need to use clearAttachments instead of clearDepthStencil since Vulkan won't
-    // allow us to clear one or the other separately.
-    // Note: this might be bugged if we emulate single depth or stencil with a packed format.
-    // TODO(jmadill): Investigate emulated packed formats. http://anglebug.com/2815
-    bool isSingleClearOnPackedDepthStencilAttachment =
-        depthStencilAttachment && (clearDepth != clearStencil);
-    if (glState.isScissorTestEnabled() || isSingleClearOnPackedDepthStencilAttachment)
+    if (glState.isScissorTestEnabled())
     {
         // With scissor test enabled, we clear very differently and we don't need to access
         // the image inside each attachment we can just use clearCmdAttachments with our
         // scissor region instead.
-        ANGLE_TRY(clearWithClearAttachments(contextVk, clearColor, clearDepth, clearStencil));
+        ANGLE_TRY(clearWithClearAttachments(contextVk, clearColor, clearDepth, clearStencil,
+                                            clearDepthStencilValue));
         return angle::Result::Continue();
     }
 
@@ -232,19 +255,22 @@ angle::Result FramebufferVk::clear(const gl::Context *context, GLbitfield mask)
     {
         ANGLE_TRY(mFramebuffer.recordCommands(contextVk, &commandBuffer));
 
-        VkClearDepthStencilValue clearDepthStencilValue =
-            contextVk->getClearDepthStencilValue().depthStencil;
-
-        // Apply the stencil mask to the clear value.
-        clearDepthStencilValue.stencil &=
-            contextVk->getGLState().getDepthStencilState().stencilWritemask;
-
         RenderTargetVk *renderTarget         = mRenderTargetCache.getDepthStencil();
         const angle::Format &format          = renderTarget->getImageFormat().textureFormat();
         const VkImageAspectFlags aspectFlags = vk::GetDepthStencilAspectFlags(format);
 
+        VkImageAspectFlags clearAspects = aspectFlags;
+        if (!clearDepth)
+        {
+            clearAspects &= ~VK_IMAGE_ASPECT_DEPTH_BIT;
+        }
+        if (!clearStencil)
+        {
+            clearAspects &= ~VK_IMAGE_ASPECT_STENCIL_BIT;
+        }
+
         vk::ImageHelper *image = renderTarget->getImageForWrite(&mFramebuffer);
-        image->clearDepthStencil(aspectFlags, clearDepthStencilValue, commandBuffer);
+        image->clearDepthStencil(aspectFlags, clearAspects, clearDepthStencilValue, commandBuffer);
     }
 
     if (!clearColor)
@@ -875,10 +901,12 @@ angle::Result FramebufferVk::getFramebuffer(ContextVk *contextVk, vk::Framebuffe
     return angle::Result::Continue();
 }
 
-angle::Result FramebufferVk::clearWithClearAttachments(ContextVk *contextVk,
+angle::Result FramebufferVk::clearWithClearAttachments(
+    ContextVk *contextVk,
     bool clearColor,
     bool clearDepth,
-                                                       bool clearStencil)
+    bool clearStencil,
+    const VkClearDepthStencilValue &clearDepthStencilValue)
 {
     // Trigger a new command node to ensure overlapping writes happen sequentially.
     mFramebuffer.finishCurrentCommands(contextVk->getRenderer());
@@ -939,15 +967,8 @@ angle::Result FramebufferVk::clearWithClearAttachments(ContextVk *contextVk,
         }
     }
 
-    VkClearValue depthStencilClearValue = contextVk->getClearDepthStencilValue();
-
-    // Apply the stencil mask to the clear value.  Stencil mask is generally respected through the
-    // respective pipeline state, but clear uses its own special function.
-    if (clearStencil)
-    {
-        depthStencilClearValue.depthStencil.stencil &=
-            contextVk->getGLState().getDepthStencilState().stencilWritemask;
-    }
+    VkClearValue depthStencilClearValue = {};
+    depthStencilClearValue.depthStencil = clearDepthStencilValue;
 
     if (clearDepth && clearStencil && mState.getDepthStencilAttachment() != nullptr)
     {

src/libANGLE/renderer/vulkan/FramebufferVk.h

@@ -161,7 +161,8 @@ class FramebufferVk : public FramebufferImpl
     angle::Result clearWithClearAttachments(ContextVk *contextVk,
                                             bool clearColor,
                                             bool clearDepth,
-                                            bool clearStencil);
+                                            bool clearStencil,
+                                            const VkClearDepthStencilValue &clearDepthStencilValue);
     angle::Result clearWithDraw(ContextVk *contextVk, VkColorComponentFlags colorMaskFlags);
     void updateActiveColorMasks(size_t colorIndex, bool r, bool g, bool b, bool a);
 

src/libANGLE/renderer/vulkan/RenderbufferVk.cpp

@@ -89,7 +89,7 @@ angle::Result RenderbufferVk::setStorage(const gl::Context *context,
 
         if (isDepthOrStencilFormat)
         {
-            mImage.clearDepthStencil(aspect, kDefaultClearDepthStencilValue, commandBuffer);
+            mImage.clearDepthStencil(aspect, aspect, kDefaultClearDepthStencilValue, commandBuffer);
         }
         else
         {

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -531,7 +531,7 @@ angle::Result RendererVk::initialize(DisplayVk *displayVk,
     GlslangWrapper::Initialize();
 
     // Initialize the format table.
-    mFormatTable.initialize(mPhysicalDevice, &mNativeTextureCaps,
+    mFormatTable.initialize(mPhysicalDevice, mFeatures, &mNativeTextureCaps,
                             &mNativeCaps.compressedTextureFormats);
 
     return angle::Result::Continue();
@@ -751,6 +751,9 @@ void RendererVk::initFeatures()
     // http://anglebug.com/2838
     mFeatures.extraCopyBufferRegion = IsIntel(mPhysicalDeviceProperties.vendorID);
 #endif
+
+    angle::PlatformMethods *platform = ANGLEPlatformCurrent();
+    platform->overrideFeaturesVk(platform, &mFeatures);
 }
 
 void RendererVk::initPipelineCacheVkKey()

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -17,7 +17,6 @@
 #include "libANGLE/BlobCache.h"
 #include "libANGLE/Caps.h"
 #include "libANGLE/renderer/vulkan/CommandGraph.h"
-#include "libANGLE/renderer/vulkan/FeaturesVk.h"
 #include "libANGLE/renderer/vulkan/QueryVk.h"
 #include "libANGLE/renderer/vulkan/vk_format_utils.h"
 #include "libANGLE/renderer/vulkan/vk_helpers.h"
@@ -171,7 +170,7 @@ class RendererVk : angle::NonCopyable
     Serial issueShaderSerial();
 
     vk::ShaderLibrary *getShaderLibrary();
-    const FeaturesVk &getFeatures() const { return mFeatures; }
+    const angle::FeaturesVk &getFeatures() const { return mFeatures; }
 
     angle::Result getTimestamp(vk::Context *context, uint64_t *timestampOut);
 
@@ -226,7 +225,7 @@ class RendererVk : angle::NonCopyable
     mutable gl::TextureCapsMap mNativeTextureCaps;
     mutable gl::Extensions mNativeExtensions;
     mutable gl::Limitations mNativeLimitations;
-    mutable FeaturesVk mFeatures;
+    mutable angle::FeaturesVk mFeatures;
 
     VkInstance mInstance;
     bool mEnableValidationLayers;

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -529,7 +529,7 @@ angle::Result WindowSurfaceVk::initializeImpl(DisplayVk *displayVk)
         // Clear the image.
         vk::CommandBuffer *commandBuffer = nullptr;
         ANGLE_TRY(mDepthStencilImage.recordCommands(displayVk, &commandBuffer));
-        mDepthStencilImage.clearDepthStencil(aspect, depthStencilClearValue, commandBuffer);
+        mDepthStencilImage.clearDepthStencil(aspect, aspect, depthStencilClearValue, commandBuffer);
 
         ANGLE_TRY(mDepthStencilImage.initImageView(displayVk, gl::TextureType::_2D, aspect,
                                                    gl::SwizzleState(), &mDepthStencilImageView, 1));

src/libANGLE/renderer/vulkan/gen_vk_format_table.py

@@ -41,7 +41,9 @@ namespace rx
 namespace vk
 {{
 
-void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &angleFormat)
+void Format::initialize(VkPhysicalDevice physicalDevice,
+                        const angle::Format &angleFormat,
+                        const angle::FeaturesVk &featuresVk)
 {{
     switch (angleFormat.id)
     {{
@@ -77,7 +79,7 @@ texture_struct_template="{{{texture}, {vk_texture_format}, {texture_initializer}
 
 texture_fallback_template = """{{
 static constexpr TextureFormatInitInfo kInfo[] = {{{texture_list}}};
-initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo));
+initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo), featuresVk);
 }}"""
 
 buffer_basic_template = """bufferFormatID = {buffer};
@@ -97,12 +99,16 @@ initBufferFallback(physicalDevice, kInfo, ArraySize(kInfo));
 def is_packed(format_id):
   return "true" if "_PACK" in format_id else "false"
 
+
 def gen_format_case(angle, internal_format, vk_json_data):
   vk_map = vk_json_data["map"]
   vk_overrides = vk_json_data["overrides"]
   vk_fallbacks = vk_json_data["fallbacks"]
-    args = dict(format_id=angle, internal_format=internal_format,
-                texture_template="", buffer_template="")
+  args = dict(
+      format_id=angle,
+      internal_format=internal_format,
+      texture_template="",
+      buffer_template="")
 
   if ((angle not in vk_map) and (angle not in vk_overrides) and
       (angle not in vk_fallbacks)) or angle == 'NONE':
@@ -121,16 +127,16 @@ def gen_format_case(angle, internal_format, vk_json_data):
     return dict(
         texture="angle::FormatID::" + format,
         vk_texture_format=vk_map[format],
-            texture_initializer=angle_format.get_internal_format_initializer(internal_format,
-                                                                             format)
-        )
+        texture_initializer=angle_format.get_internal_format_initializer(
+            internal_format, format))
 
   def buffer_args(format):
     return dict(
         buffer="angle::FormatID::" + format,
         vk_buffer_format=vk_map[format],
         vk_buffer_format_is_packed=is_packed(vk_map[format]),
-            vertex_load_function=angle_format.get_vertex_copy_function(angle, format),
+        vertex_load_function=angle_format.get_vertex_copy_function(
+            angle, format),
         vertex_load_converts='false' if angle == format else 'true',
     )
 
@@ -141,9 +147,9 @@ def gen_format_case(angle, internal_format, vk_json_data):
   elif len(textures) > 1:
     args.update(
         texture_template=texture_fallback_template,
-            texture_list=", ".join(texture_struct_template.format(**texture_args(i))
-                                   for i in textures)
-        )
+        texture_list=", ".join(
+            texture_struct_template.format(**texture_args(i))
+            for i in textures))
 
   buffers = get_formats(angle, "buffer")
   if len(buffers) == 1:
@@ -152,11 +158,12 @@ def gen_format_case(angle, internal_format, vk_json_data):
   elif len(buffers) > 1:
     args.update(
         buffer_template=buffer_fallback_template,
-            buffer_list=", ".join(buffer_struct_template.format(**buffer_args(i)) for i in buffers)
-        )
+        buffer_list=", ".join(
+            buffer_struct_template.format(**buffer_args(i)) for i in buffers))
 
   return format_entry_template.format(**args).format(**args)
 
+
 input_file_name = 'vk_format_map.json'
 out_file_name = 'vk_format_table'
 

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -15,7 +15,6 @@
 #include "libANGLE/Caps.h"
 #include "libANGLE/formatutils.h"
 #include "libANGLE/renderer/vulkan/DisplayVk.h"
-#include "libANGLE/renderer/vulkan/FeaturesVk.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "vk_format_utils.h"
 

src/libANGLE/renderer/vulkan/vk_format_map.json

@@ -243,16 +243,16 @@
     },
     "fallbacks": {
         "D32_FLOAT_S8X24_UINT": {
-            "texture": "D24_UNORM_S8_UINT"
+            "texture": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT"]
         },
         "D24_UNORM_S8_UINT": {
-            "texture": "D32_FLOAT_S8X24_UINT"
+            "texture": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"]
         },
         "D24_UNORM_X8_UINT": {
-            "texture": "D32_FLOAT_S8X24_UINT"
+            "texture": ["D32_FLOAT_S8X24_UINT", "D24_UNORM_S8_UINT"]
         },
         "S8_UINT": {
-            "texture": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT"]
+            "texture": ["D24_UNORM_S8_UINT", "D32_FLOAT_S8X24_UINT", "S8_UINT"]
         },
 
         "R8_UNORM": {
@@ -352,6 +352,5 @@
         "R16G16B16A16_SSCALED": {
             "buffer": "R32G32B32A32_FLOAT"
         }
-
     }
 }

src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp

@@ -22,7 +22,9 @@ namespace rx
 namespace vk
 {
 
-void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &angleFormat)
+void Format::initialize(VkPhysicalDevice physicalDevice,
+                        const angle::Format &angleFormat,
+                        const angle::FeaturesVk &featuresVk)
 {
     switch (angleFormat.id)
     {
@@ -535,8 +537,9 @@ void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &an
             {
                 static constexpr TextureFormatInitInfo kInfo[] = {
                     {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
-                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr}};
-                initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo));
+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr}};
+                initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo), featuresVk);
             }
             bufferFormatID               = angle::FormatID::D24_UNORM_S8_UINT;
             vkBufferFormat               = VK_FORMAT_D24_UNORM_S8_UINT;
@@ -550,8 +553,9 @@ void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &an
             {
                 static constexpr TextureFormatInitInfo kInfo[] = {
                     {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
-                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr}};
-                initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo));
+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr}};
+                initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo), featuresVk);
             }
             bufferFormatID               = angle::FormatID::NONE;
             vkBufferFormat               = VK_FORMAT_UNDEFINED;
@@ -577,8 +581,9 @@ void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &an
             {
                 static constexpr TextureFormatInitInfo kInfo[] = {
                     {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
-                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr}};
-                initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo));
+                    {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr}};
+                initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo), featuresVk);
             }
             bufferFormatID               = angle::FormatID::D32_FLOAT_S8X24_UINT;
             vkBufferFormat               = VK_FORMAT_D32_SFLOAT_S8_UINT;
@@ -1813,8 +1818,9 @@ void Format::initialize(VkPhysicalDevice physicalDevice, const angle::Format &an
                 static constexpr TextureFormatInitInfo kInfo[] = {
                     {angle::FormatID::S8_UINT, VK_FORMAT_S8_UINT, nullptr},
                     {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, nullptr},
-                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr}};
-                initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo));
+                    {angle::FormatID::D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, nullptr},
+                    {angle::FormatID::S8_UINT, VK_FORMAT_S8_UINT, nullptr}};
+                initTextureFallback(physicalDevice, kInfo, ArraySize(kInfo), featuresVk);
             }
             bufferFormatID               = angle::FormatID::S8_UINT;
             vkBufferFormat               = VK_FORMAT_S8_UINT;

src/libANGLE/renderer/vulkan/vk_format_utils.cpp

@@ -71,7 +71,7 @@ int FindSupportedFormat(VkPhysicalDevice physicalDevice,
                         int numInfo,
                         SupportTest hasSupport)
 {
-    ASSERT(numInfo > 1);
+    ASSERT(numInfo > 0);
     const int last = numInfo - 1;
 
     for (int i = 0; i < last; ++i)
@@ -131,9 +131,14 @@ Format::Format()
 
 void Format::initTextureFallback(VkPhysicalDevice physicalDevice,
                                  const TextureFormatInitInfo *info,
-                                 int numInfo)
+                                 int numInfo,
+                                 const angle::FeaturesVk &featuresVk)
 {
-    int i = FindSupportedFormat(physicalDevice, info, numInfo, HasFullTextureFormatSupport);
+    size_t skip = featuresVk.forceFallbackFormat ? 1 : 0;
+    int i       = FindSupportedFormat(physicalDevice, info + skip, numInfo - skip,
+                                HasFullTextureFormatSupport);
+    i += skip;
+
     textureFormatID            = info[i].format;
     vkTextureFormat            = info[i].vkFormat;
     textureInitializerFunction = info[i].initializer;
@@ -186,6 +191,7 @@ FormatTable::~FormatTable()
 }
 
 void FormatTable::initialize(VkPhysicalDevice physicalDevice,
+                             const angle::FeaturesVk &featuresVk,
                              gl::TextureCapsMap *outTextureCapsMap,
                              std::vector<GLenum> *outCompressedTextureFormats)
 {
@@ -193,7 +199,7 @@ void FormatTable::initialize(VkPhysicalDevice physicalDevice,
     {
         const auto formatID              = static_cast<angle::FormatID>(formatIndex);
         const angle::Format &angleFormat = angle::Format::Get(formatID);
-        mFormatData[formatIndex].initialize(physicalDevice, angleFormat);
+        mFormatData[formatIndex].initialize(physicalDevice, angleFormat, featuresVk);
         const GLenum internalFormat = mFormatData[formatIndex].internalFormat;
         mFormatData[formatIndex].textureLoadFunctions =
             GetLoadFunctionsMap(internalFormat, mFormatData[formatIndex].textureFormatID);

src/libANGLE/renderer/vulkan/vk_format_utils.h

@@ -15,6 +15,7 @@
 #include "libANGLE/renderer/Format.h"
 #include "libANGLE/renderer/copyvertex.h"
 #include "libANGLE/renderer/renderer_utils.h"
+#include "platform/FeaturesVk.h"
 
 #include <array>
 
@@ -56,11 +57,14 @@ struct Format final : private angle::NonCopyable
     bool valid() const { return internalFormat != 0; }
 
     // This is an auto-generated method in vk_format_table_autogen.cpp.
-    void initialize(VkPhysicalDevice physicalDevice, const angle::Format &angleFormat);
+    void initialize(VkPhysicalDevice physicalDevice,
+                    const angle::Format &angleFormat,
+                    const angle::FeaturesVk &featuresVk);
 
     void initTextureFallback(VkPhysicalDevice physicalDevice,
                              const TextureFormatInitInfo *info,
-                             int numInfo);
+                             int numInfo,
+                             const angle::FeaturesVk &featuresVk);
     void initBufferFallback(VkPhysicalDevice physicalDevice,
                             const BufferFormatInitInfo *info,
                             int numInfo);
@@ -93,6 +97,7 @@ class FormatTable final : angle::NonCopyable
 
     // Also initializes the TextureCapsMap and the compressedTextureCaps in the Caps instance.
     void initialize(VkPhysicalDevice physicalDevice,
+                    const angle::FeaturesVk &featuresVk,
                     gl::TextureCapsMap *outTextureCapsMap,
                     std::vector<GLenum> *outCompressedTextureFormats);
 

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -1238,18 +1238,19 @@ void ImageHelper::clearColorLayer(const VkClearColorValue &color,
     commandBuffer->clearColorImage(mImage, mCurrentLayout, color, 1, &range);
 }
 
-void ImageHelper::clearDepthStencil(VkImageAspectFlags aspectFlags,
+void ImageHelper::clearDepthStencil(VkImageAspectFlags imageAspectFlags,
+                                    VkImageAspectFlags clearAspectFlags,
                                     const VkClearDepthStencilValue &depthStencil,
                                     CommandBuffer *commandBuffer)
 {
     ASSERT(valid());
 
-    changeLayoutWithStages(aspectFlags, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+    changeLayoutWithStages(imageAspectFlags, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
                            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
                            commandBuffer);
 
     VkImageSubresourceRange clearRange = {
-        /*aspectMask*/ aspectFlags,
+        /*aspectMask*/ clearAspectFlags,
         /*baseMipLevel*/ 0,
         /*levelCount*/ 1,
         /*baseArrayLayer*/ 0,

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -471,7 +471,8 @@ class ImageHelper final : public RecordableGraphResource
                          uint32_t layerCount,
                          CommandBuffer *commandBuffer);
 
-    void clearDepthStencil(VkImageAspectFlags aspectFlags,
+    void clearDepthStencil(VkImageAspectFlags imageAspectFlags,
+                           VkImageAspectFlags clearAspectFlags,
                            const VkClearDepthStencilValue &depthStencil,
                            CommandBuffer *commandBuffer);
     gl::Extents getSize(const gl::ImageIndex &index) const;

src/libGLESv2.gni

@@ -108,6 +108,7 @@ libangle_includes = [
   "include/GLSLANG/ShaderLang.h",
   "include/GLSLANG/ShaderVars.h",
   "include/KHR/khrplatform.h",
+  "include/platform/FeaturesVk.h",
   "include/platform/Platform.h",
   "include/platform/WorkaroundsD3D.h",
 ]
@@ -747,7 +748,6 @@ libangle_vulkan_sources = [
   "src/libANGLE/renderer/vulkan/DeviceVk.h",
   "src/libANGLE/renderer/vulkan/DisplayVk.cpp",
   "src/libANGLE/renderer/vulkan/DisplayVk.h",
-  "src/libANGLE/renderer/vulkan/FeaturesVk.h",
   "src/libANGLE/renderer/vulkan/FenceNVVk.cpp",
   "src/libANGLE/renderer/vulkan/FenceNVVk.h",
   "src/libANGLE/renderer/vulkan/FramebufferVk.cpp",

src/tests/test_utils/ANGLETest.cpp

@@ -79,6 +79,16 @@ void TestPlatform_overrideWorkaroundsD3D(angle::PlatformMethods *platform,
     }
 }
 
+void TestPlatform_overrideFeaturesVk(angle::PlatformMethods *platform,
+                                     FeaturesVk *workaroundsVulkan)
+{
+    auto *testPlatformContext = static_cast<TestPlatformContext *>(platform->context);
+    if (testPlatformContext->currentTest)
+    {
+        testPlatformContext->currentTest->overrideFeaturesVk(workaroundsVulkan);
+    }
+}
+
 std::array<angle::Vector3, 4> GetIndexedQuadVertices()
 {
     std::array<angle::Vector3, 4> vertices;
@@ -350,6 +360,7 @@ void ANGLETestBase::ANGLETestSetUp()
     }
 
     mPlatformMethods.overrideWorkaroundsD3D = angle::TestPlatform_overrideWorkaroundsD3D;
+    mPlatformMethods.overrideFeaturesVk     = angle::TestPlatform_overrideFeaturesVk;
     mPlatformMethods.logError               = angle::TestPlatform_logError;
     mPlatformMethods.logWarning             = angle::TestPlatform_logWarning;
     mPlatformMethods.logInfo                = angle::TestPlatform_logInfo;

src/tests/test_utils/ANGLETest.h

@@ -118,8 +118,6 @@ static constexpr GLColor32F kFloatRed   = {1.0f, 0.0f, 0.0f, 1.0f};
 static constexpr GLColor32F kFloatGreen = {0.0f, 1.0f, 0.0f, 1.0f};
 static constexpr GLColor32F kFloatBlue  = {0.0f, 0.0f, 1.0f, 1.0f};
 
-struct WorkaroundsD3D;
-
 // The input here for pixelPoints are the expected integer window coordinates, we add .5 to every
 // one of them and re-scale the numbers to be between [-1,1]. Using this technique, we can make
 // sure the rasterization stage will end up drawing pixels at the expected locations.
@@ -260,6 +258,7 @@ class ANGLETestBase
     static bool eglDisplayExtensionEnabled(EGLDisplay display, const std::string &extName);
 
     virtual void overrideWorkaroundsD3D(angle::WorkaroundsD3D *workaroundsD3D) {}
+    virtual void overrideFeaturesVk(angle::FeaturesVk *workaroundsVulkan) {}
 
   protected:
     void ANGLETestSetUp();
@@ -474,7 +473,6 @@ bool IsRelease();
     do                                                            \
     {                                                             \
         if (COND)                                                 \
-                                                                  \
         {                                                         \
             std::cout << "Test skipped: " #COND "." << std::endl; \
             return;                                               \