Fix clearing compressed textures with Vulkan backend

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -1515,11 +1515,10 @@ angle::Result TextureVk::initializeContents(const gl::Context *context,
         contextVk->getRenderer()->getFormat(desc.format.info->sizedInternalFormat);
 
     ASSERT(mImage);
-    mImage->stageRobustResourceClear(imageIndex, format);
 
     // Note that we cannot ensure the image is initialized because we might be calling subImage
     // on a non-complete cube map.
-    return angle::Result::Continue;
+    return mImage->stageRobustResourceClear(contextVk, desc.size, imageIndex, format);
 }
 
 void TextureVk::releaseOwnershipOfImage(const gl::Context *context)

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -2464,7 +2464,7 @@ void ImageHelper::clear(VkImageAspectFlags aspectFlags,
                         uint32_t layerCount,
                         CommandBuffer *commandBuffer)
 {
-    const angle::Format &angleFormat = mFormat->intendedFormat();
+    const angle::Format &angleFormat = mFormat->actualImageFormat();
     bool isDepthStencil              = angleFormat.depthBits > 0 || angleFormat.stencilBits > 0;
 
     if (isDepthStencil)
@@ -2474,6 +2474,8 @@ void ImageHelper::clear(VkImageAspectFlags aspectFlags,
     }
     else
     {
+        ASSERT(!angleFormat.isBlock);
+
         clearColor(value.color, mipLevel, 1, baseArrayLayer, layerCount, commandBuffer);
     }
 }
@@ -3119,14 +3121,54 @@ void ImageHelper::stageSubresourceClear(const gl::ImageIndex &index)
     appendSubresourceUpdate(SubresourceUpdate(aspectFlags, clearValue, index));
 }
 
-void ImageHelper::stageRobustResourceClear(const gl::ImageIndex &index, const vk::Format &format)
+angle::Result ImageHelper::stageRobustResourceClear(ContextVk *contextVk,
+                                                    const gl::Extents &glExtents,
+                                                    const gl::ImageIndex &index,
+                                                    const vk::Format &format)
 {
-    const VkImageAspectFlags aspectFlags = GetFormatAspectFlags(format.actualImageFormat());
+    const angle::Format &imageFormat     = format.actualImageFormat();
+    const VkImageAspectFlags aspectFlags = GetFormatAspectFlags(imageFormat);
 
     // Robust clears must only be staged if we do not have any prior data for this subresource.
     ASSERT(!isUpdateStaged(index.getLevelIndex(), index.getLayerIndex()));
     VkClearValue clearValue = GetClearValue(format);
-    appendSubresourceUpdate(SubresourceUpdate(aspectFlags, clearValue, index));
+
+    if (imageFormat.isBlock)
+    {
+        // This only supports doing an initial clear to 0, not clearing to a specific encoded RGBA
+        // value
+        ASSERT((clearValue.color.int32[0] == 0) && (clearValue.color.int32[1] == 0) &&
+               (clearValue.color.int32[2] == 0) && (clearValue.color.int32[3] == 0));
+
+        const gl::InternalFormat &formatInfo =
+            gl::GetSizedInternalFormatInfo(imageFormat.glInternalFormat);
+        GLuint totalSize;
+        ANGLE_VK_CHECK_MATH(contextVk,
+                            formatInfo.computeCompressedImageSize(glExtents, &totalSize));
+
+        VkBuffer bufferHandle      = VK_NULL_HANDLE;
+        uint8_t *stagingPointer    = nullptr;
+        VkDeviceSize stagingOffset = 0;
+        ANGLE_TRY(mStagingBuffer.allocate(contextVk, totalSize, &stagingPointer, &bufferHandle,
+                                          &stagingOffset, nullptr));
+        memset(stagingPointer, 0, totalSize);
+
+        VkBufferImageCopy copyRegion               = {};
+        copyRegion.imageExtent.width               = glExtents.width;
+        copyRegion.imageExtent.height              = glExtents.height;
+        copyRegion.imageExtent.depth               = glExtents.depth;
+        copyRegion.imageSubresource.aspectMask     = aspectFlags;
+        copyRegion.imageSubresource.baseArrayLayer = index.hasLayer() ? index.getLayerIndex() : 0;
+        copyRegion.imageSubresource.layerCount     = index.getLayerCount();
+
+        appendSubresourceUpdate(SubresourceUpdate(mStagingBuffer.getCurrentBuffer(), copyRegion));
+    }
+    else
+    {
+        appendSubresourceUpdate(SubresourceUpdate(aspectFlags, clearValue, index));
+    }
+
+    return angle::Result::Continue;
 }
 
 void ImageHelper::stageClearIfEmulatedFormat(Context *context)

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -918,7 +918,10 @@ class ImageHelper final : public Resource, public angle::Subject
                                          const VkImageType imageType);
 
     // Stage a clear based on robust resource init.
-    void stageRobustResourceClear(const gl::ImageIndex &index, const vk::Format &format);
+    angle::Result stageRobustResourceClear(ContextVk *contextVk,
+                                           const gl::Extents &glExtents,
+                                           const gl::ImageIndex &index,
+                                           const vk::Format &format);
     void stageSubresourceClear(const gl::ImageIndex &index);
 
     // This will use the underlying dynamic buffer to allocate some memory to be used as a src or

src/tests/gl_tests/RobustResourceInitTest.cpp

@@ -1686,8 +1686,6 @@ TEST_P(RobustResourceInitTestES3, CompressedSubImage)
 {
     ANGLE_SKIP_TEST_IF(!hasGLExtension());
     ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_compression_dxt1"));
-    // http://anglebug.com/4092
-    ANGLE_SKIP_TEST_IF(IsVulkan());
 
     constexpr int width     = 8;
     constexpr int height    = 8;