Vulkan: Implement copyImage and enable all tests for it

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -408,8 +408,13 @@ gl::Error TextureVk::copyImage(const gl::Context *context,
                                GLenum internalFormat,
                                gl::Framebuffer *source)
 {
-    UNIMPLEMENTED();
-    return gl::InternalError();
+    gl::Extents newImageSize(sourceArea.width, sourceArea.height, 1);
+    const gl::InternalFormat &internalFormatInfo =
+        gl::GetInternalFormatInfo(internalFormat, GL_UNSIGNED_BYTE);
+    ANGLE_TRY(setImage(context, index, internalFormat, newImageSize, internalFormatInfo.format,
+                       internalFormatInfo.type, gl::PixelUnpackState(), nullptr));
+    return copySubImageImpl(context, index, gl::Offset(0, 0, 0), sourceArea, internalFormatInfo,
+                            source);
 }
 
 gl::Error TextureVk::copySubImage(const gl::Context *context,
@@ -418,6 +423,17 @@ gl::Error TextureVk::copySubImage(const gl::Context *context,
                                   const gl::Rectangle &sourceArea,
                                   gl::Framebuffer *source)
 {
+    const gl::InternalFormat &currentFormat = *mState.getBaseLevelDesc().format.info;
+    return copySubImageImpl(context, index, destOffset, sourceArea, currentFormat, source);
+}
+
+gl::Error TextureVk::copySubImageImpl(const gl::Context *context,
+                                      const gl::ImageIndex &index,
+                                      const gl::Offset &destOffset,
+                                      const gl::Rectangle &sourceArea,
+                                      const gl::InternalFormat &internalFormat,
+                                      gl::Framebuffer *source)
+{
     gl::Extents fbSize = source->getReadColorbuffer()->getSize();
     gl::Rectangle clippedSourceArea;
     if (!ClipRectangle(sourceArea, gl::Rectangle(0, 0, fbSize.width, fbSize.height),
@@ -431,9 +447,8 @@ gl::Error TextureVk::copySubImage(const gl::Context *context,
 
     ContextVk *contextVk = vk::GetImpl(context);
 
-    FramebufferVk *framebufferVk            = vk::GetImpl(source);
-    RenderTargetVk *renderTarget            = framebufferVk->getColorReadRenderTarget();
-    const gl::InternalFormat &currentFormat = *mState.getBaseLevelDesc().format.info;
+    FramebufferVk *framebufferVk = vk::GetImpl(source);
+    RenderTargetVk *renderTarget = framebufferVk->getColorReadRenderTarget();
 
     vk::CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(framebufferVk->beginWriteResource(contextVk->getRenderer(), &commandBuffer));
@@ -444,7 +459,7 @@ gl::Error TextureVk::copySubImage(const gl::Context *context,
     // when its supported.
     ANGLE_TRY(mPixelBuffer.stageSubresourceUpdateFromRenderTarget(
         context, index, clippedSourceArea, modifiedDestOffset,
-        gl::Extents(clippedSourceArea.width, clippedSourceArea.height, 1), currentFormat,
+        gl::Extents(clippedSourceArea.width, clippedSourceArea.height, 1), internalFormat,
         commandBuffer, renderTarget));
 
     vk::CommandGraphNode *writingNode = getNewWritingNode(contextVk->getRenderer());

src/libANGLE/renderer/vulkan/TextureVk.h

@@ -113,7 +113,6 @@ class TextureVk : public TextureImpl, public vk::CommandGraphResource
                            const gl::Offset &destOffset,
                            const gl::Rectangle &sourceArea,
                            gl::Framebuffer *source) override;
-
     gl::Error setStorage(const gl::Context *context,
                          gl::TextureType type,
                          size_t levels,
@@ -161,6 +160,12 @@ class TextureVk : public TextureImpl, public vk::CommandGraphResource
     vk::Error ensureImageInitialized(RendererVk *renderer);
 
   private:
+    gl::Error copySubImageImpl(const gl::Context *context,
+                               const gl::ImageIndex &index,
+                               const gl::Offset &destOffset,
+                               const gl::Rectangle &sourceArea,
+                               const gl::InternalFormat &internalFormat,
+                               gl::Framebuffer *source);
     vk::Error initImage(RendererVk *renderer,
                         const vk::Format &format,
                         const gl::Extents &extents,

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -195,7 +195,6 @@
 2161 VULKAN : dEQP-GLES2.functional.shaders.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.mipmap.2d.generate.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.generate.* = SKIP
-2500 VULKAN : dEQP-GLES2.functional.texture.specification.basic_copyteximage2d.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.completeness.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.vertex.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.fragment_ops.random.* = SKIP

src/tests/gl_tests/CopyTexImageTest.cpp

@@ -352,7 +352,8 @@ ANGLE_INSTANTIATE_TEST(CopyTexImageTest,
                        ES2_D3D11(EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE),
                        ES2_OPENGL(),
                        ES2_OPENGL(3, 3),
-                       ES2_OPENGLES());
+                       ES2_OPENGLES(),
+                       ES2_VULKAN());
 
 ANGLE_INSTANTIATE_TEST(CopyTexImageTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
 }