Vulkan: Workaround vkCmdClearAttachment bug on Pixel

include/platform/FeaturesVk.h

@@ -429,6 +429,14 @@ struct FeaturesVk : FeatureSetBase
                                          "Compress vertex data to smaller data types when "
                                          "possible. Using this feature makes ANGLE non-conformant.",
                                          &members};
+
+    // Qualcomm missynchronizes vkCmdClearAttachments in the middle of render pass.
+    // https://issuetracker.google.com/166809097
+    Feature preferDrawClearOverVkCmdClearAttachments = {
+        "prefer_draw_clear_over_vkCmdClearAttachments", FeatureCategory::VulkanWorkarounds,
+        "On some hardware, clear using a draw call instead of vkCmdClearAttachments in the middle "
+        "of render pass due to bugs",
+        &members, "https://issuetracker.google.com/166809097"};
 };
 
 inline FeaturesVk::FeaturesVk()  = default;

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -484,10 +484,25 @@ angle::Result FramebufferVk::clearImpl(const gl::Context *context,
                 "Clear effectively discarding previous draw call results. Suggest earlier Clear "
                 "followed by masked color or depth/stencil draw calls instead");
 
-            clearWithCommand(&contextVk->getStartedRenderPassCommands().getCommandBuffer(),
-                             scissoredRenderArea, clearColorDrawBuffersMask,
-                             clearDepthWithRenderPassLoadOp, clearStencilWithRenderPassLoadOp,
-                             clearColorValue, clearDepthStencilValue);
+            RendererVk *renderer     = contextVk->getRenderer();
+            bool clearAnyWithCommand = clearAnyWithRenderPassLoadOp;
+
+            // On buggy hardware, prefer to clear color with a draw call instead of
+            // vkCmdClearAttachments.
+            if (renderer->getFeatures().preferDrawClearOverVkCmdClearAttachments.enabled)
+            {
+                clearColorDrawBuffersMask.reset();
+                clearAnyWithCommand =
+                    clearDepthWithRenderPassLoadOp || clearStencilWithRenderPassLoadOp;
+            }
+
+            if (clearAnyWithCommand)
+            {
+                clearWithCommand(&contextVk->getStartedRenderPassCommands().getCommandBuffer(),
+                                 scissoredRenderArea, clearColorDrawBuffersMask,
+                                 clearDepthWithRenderPassLoadOp, clearStencilWithRenderPassLoadOp,
+                                 clearColorValue, clearDepthStencilValue);
+            }
         }
         else
         {
@@ -497,7 +512,7 @@ angle::Result FramebufferVk::clearImpl(const gl::Context *context,
         }
 
         // Fallback to other methods for whatever isn't cleared here.
-        if (clearColorWithRenderPassLoadOp)
+        if (clearColorDrawBuffersMask.any())
         {
             clearColorBuffers.reset();
             clearColor = false;

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -1940,6 +1940,8 @@ void RendererVk::initFeatures(DisplayVk *displayVk, const ExtensionNameList &dev
 
     ANGLE_FEATURE_CONDITION(&mFeatures, compressVertexData, false);
 
+    ANGLE_FEATURE_CONDITION(&mFeatures, preferDrawClearOverVkCmdClearAttachments, isQualcomm);
+
     angle::PlatformMethods *platform = ANGLEPlatformCurrent();
     platform->overrideFeaturesVk(platform, &mFeatures);