Vulkan: Implement GL_CHROMIUM_copy_texture with CPU copies.

src/libANGLE/angletypes.h

@@ -60,14 +60,16 @@ bool ClipRectangle(const Rectangle &source, const Rectangle &clip, Rectangle *in
 
 struct Offset
 {
-    Offset() : x(0), y(0), z(0) {}
-    Offset(int x_in, int y_in, int z_in) : x(x_in), y(y_in), z(z_in) {}
+    constexpr Offset() : x(0), y(0), z(0) {}
+    constexpr Offset(int x_in, int y_in, int z_in) : x(x_in), y(y_in), z(z_in) {}
 
     int x;
     int y;
     int z;
 };
 
+constexpr Offset kOffsetZero(0, 0, 0);
+
 bool operator==(const Offset &a, const Offset &b);
 bool operator!=(const Offset &a, const Offset &b);
 

src/libANGLE/renderer/vulkan/TextureVk.h

@@ -131,6 +131,26 @@ class TextureVk : public TextureImpl, public vk::CommandGraphResource
                            const gl::Offset &destOffset,
                            const gl::Rectangle &sourceArea,
                            gl::Framebuffer *source) override;
+
+    gl::Error copyTexture(const gl::Context *context,
+                          const gl::ImageIndex &index,
+                          GLenum internalFormat,
+                          GLenum type,
+                          size_t sourceLevel,
+                          bool unpackFlipY,
+                          bool unpackPremultiplyAlpha,
+                          bool unpackUnmultiplyAlpha,
+                          const gl::Texture *source) override;
+    gl::Error copySubTexture(const gl::Context *context,
+                             const gl::ImageIndex &index,
+                             const gl::Offset &destOffset,
+                             size_t sourceLevel,
+                             const gl::Rectangle &sourceArea,
+                             bool unpackFlipY,
+                             bool unpackPremultiplyAlpha,
+                             bool unpackUnmultiplyAlpha,
+                             const gl::Texture *source) override;
+
     gl::Error setStorage(const gl::Context *context,
                          gl::TextureType type,
                          size_t levels,
@@ -178,6 +198,16 @@ class TextureVk : public TextureImpl, public vk::CommandGraphResource
     angle::Result ensureImageInitialized(ContextVk *contextVk);
 
   private:
+    angle::Result redefineImage(const gl::Context *context,
+                                const gl::ImageIndex &index,
+                                const gl::InternalFormat &internalFormat,
+                                const gl::Extents &size);
+
+    angle::Result copyImageDataToBuffer(ContextVk *contextVk,
+                                        size_t sourceLevel,
+                                        const gl::Rectangle &sourceArea,
+                                        uint8_t **outDataPtr);
+
     angle::Result generateMipmapWithBlit(ContextVk *contextVk);
 
     angle::Result generateMipmapWithCPU(const gl::Context *context);
@@ -198,6 +228,18 @@ class TextureVk : public TextureImpl, public vk::CommandGraphResource
                                    const gl::Rectangle &sourceArea,
                                    const gl::InternalFormat &internalFormat,
                                    gl::Framebuffer *source);
+
+    gl::Error copySubTextureImpl(ContextVk *contextVk,
+                                 const gl::ImageIndex &index,
+                                 const gl::Offset &destOffset,
+                                 const gl::InternalFormat &destFormat,
+                                 size_t sourceLevel,
+                                 const gl::Rectangle &sourceArea,
+                                 bool unpackFlipY,
+                                 bool unpackPremultiplyAlpha,
+                                 bool unpackUnmultiplyAlpha,
+                                 TextureVk *source);
+
     angle::Result initImage(ContextVk *contextVk,
                             const vk::Format &format,
                             const gl::Extents &extents,

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -43,6 +43,7 @@ void GenerateCaps(const VkPhysicalDeviceProperties &physicalDeviceProperties,
     outExtensions->mapBufferRange = true;
     outExtensions->textureStorage = true;
     outExtensions->framebufferBlit = true;
+    outExtensions->copyTexture     = true;
 
     // TODO(lucferron): Eventually remove everything above this line in this function as the caps
     // get implemented.

src/tests/gl_tests/CopyTextureTest.cpp

@@ -684,6 +684,9 @@ TEST_P(CopyTextureTest, Alpha)
 // Test that copying to cube maps works
 TEST_P(CopyTextureTest, CubeMapTarget)
 {
+    // TODO(jmadill): Support cube map framebuffer attachments. http://anglebug.com/2470
+    ANGLE_SKIP_TEST_IF(IsVulkan());
+
     if (!checkExtensions())
     {
         return;