Vulkan: Fix glCopyTexSubImage3D()

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -395,8 +395,10 @@ angle::Result TextureVk::copySubImageImpl(const gl::Context *context,
     // If negative offsets are given, clippedSourceArea ensures we don't read from those offsets.
     // However, that changes the sourceOffset->destOffset mapping.  Here, destOffset is shifted by
     // the same amount as clipped to correct the error.
+    VkImageType imageType = gl_vk::GetImageType(mState.getType());
+    int zOffset           = (imageType == VK_IMAGE_TYPE_3D) ? destOffset.z : 0;
     const gl::Offset modifiedDestOffset(destOffset.x + clippedSourceArea.x - sourceArea.x,
-                                        destOffset.y + clippedSourceArea.y - sourceArea.y, 0);
+                                        destOffset.y + clippedSourceArea.y - sourceArea.y, zOffset);
 
     RenderTargetVk *colorReadRT = framebufferVk->getColorReadRenderTarget();
 
@@ -578,6 +580,13 @@ angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk,
         destSubresource.mipLevel                 = level;
         destSubresource.baseArrayLayer           = baseLayer;
 
+        VkImageType imageType = gl_vk::GetImageType(mState.getType());
+        if (imageType == VK_IMAGE_TYPE_3D)
+        {
+            destSubresource.baseArrayLayer = 0;
+            destSubresource.layerCount     = 1;
+        }
+
         vk::ImageHelper::Copy(srcImage, mImage, srcOffset, destOffset, extents, srcSubresource,
                               destSubresource, commandBuffer);
     }
@@ -610,7 +619,9 @@ angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk,
                               srcSubresource, destSubresource, commandBuffer);
 
         // Stage the copy for when the image storage is actually created.
-        mImage->stageSubresourceUpdateFromImage(stagingImage.release(), index, destOffset, extents);
+        VkImageType imageType = gl_vk::GetImageType(mState.getType());
+        mImage->stageSubresourceUpdateFromImage(stagingImage.release(), index, destOffset, extents,
+                                                imageType);
         onStagingBufferChange();
     }
 
@@ -705,9 +716,10 @@ angle::Result TextureVk::copySubImageImplWithDraw(ContextVk *contextVk,
         }
 
         // Stage the copy for when the image storage is actually created.
-        mImage->stageSubresourceUpdateFromImage(
-            stagingImage.release(), index, destOffset,
-            gl::Extents(sourceArea.width, sourceArea.height, 1));
+        VkImageType imageType = gl_vk::GetImageType(mState.getType());
+        mImage->stageSubresourceUpdateFromImage(stagingImage.release(), index, destOffset,
+                                                gl::Extents(sourceArea.width, sourceArea.height, 1),
+                                                imageType);
         onStagingBufferChange();
     }
 

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -2366,15 +2366,33 @@ angle::Result ImageHelper::stageSubresourceUpdateFromFramebuffer(
 void ImageHelper::stageSubresourceUpdateFromImage(vk::ImageHelper *image,
                                                   const gl::ImageIndex &index,
                                                   const gl::Offset &destOffset,
-                                                  const gl::Extents &glExtents)
+                                                  const gl::Extents &glExtents,
+                                                  const VkImageType imageType)
 {
     VkImageCopy copyToImage                   = {};
     copyToImage.srcSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
     copyToImage.srcSubresource.layerCount     = index.getLayerCount();
     copyToImage.dstSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
     copyToImage.dstSubresource.mipLevel       = index.getLevelIndex();
-    copyToImage.dstSubresource.baseArrayLayer = index.hasLayer() ? index.getLayerIndex() : 0;
-    copyToImage.dstSubresource.layerCount     = index.getLayerCount();
+
+    if (imageType == VK_IMAGE_TYPE_3D)
+    {
+        // These values must be set explicitly to follow the Vulkan spec:
+        // https://www.khronos.org/registry/vulkan/specs/1.1-extensions/man/html/VkImageCopy.html
+        // If either of the calling command’s srcImage or dstImage parameters are of VkImageType
+        // VK_IMAGE_TYPE_3D, the baseArrayLayer and layerCount members of the corresponding
+        // subresource must be 0 and 1, respectively
+        copyToImage.dstSubresource.baseArrayLayer = 0;
+        copyToImage.dstSubresource.layerCount     = 1;
+        // Preserve the assumption that destOffset.z == "dstSubresource.baseArrayLayer"
+        ASSERT(destOffset.z == (index.hasLayer() ? index.getLayerIndex() : 0));
+    }
+    else
+    {
+        copyToImage.dstSubresource.baseArrayLayer = index.hasLayer() ? index.getLayerIndex() : 0;
+        copyToImage.dstSubresource.layerCount     = index.getLayerCount();
+    }
+
     gl_vk::GetOffset(destOffset, &copyToImage.dstOffset);
     gl_vk::GetExtent(glExtents, &copyToImage.extent);
 

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -791,7 +791,8 @@ class ImageHelper final : public CommandGraphResource
     void stageSubresourceUpdateFromImage(vk::ImageHelper *image,
                                          const gl::ImageIndex &index,
                                          const gl::Offset &destOffset,
-                                         const gl::Extents &glExtents);
+                                         const gl::Extents &glExtents,
+                                         const VkImageType imageType);
 
     // Stage a clear operation to a clear value based on WebGL requirements.
     void stageSubresourceRobustClear(const gl::ImageIndex &index, const angle::Format &format);

src/tests/deqp_support/deqp_khr_gles2_test_expectations.txt

@@ -35,8 +35,9 @@
 // 3d texture framebuffer tests
 3188 VULKAN : KHR-GLES2.texture_3d.framebuffer_texture.rgba8 = SKIP
 
-// Unclear what is happening here, failing to validate a 2D texture format
-3190 VULKAN : KHR-GLES2.texture_3d.copy_sub_image.rgba8 = SKIP
+// GL_RGBA8 is not supported in GLES2
+// GL_OES_rgb8_rgba8 only enables GL_RGBA8 for render buffers (not textures)
+3797 VULKAN : KHR-GLES2.texture_3d.copy_sub_image.rgba8 = FAIL
 
 // Compressed texture tests on Android
 3190 VULKAN PIXEL2 : KHR-GLES2.texture_3d.compressed_texture.rgba_astc_* = SKIP