commit 4e6f2aeac25a50cd86137a4386792f5832dcdd63
author Brandon Jones <brandon1.jones@intel.com> Wed Sep 19 11:09:51 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Oct 04 12:06:13 2018 +0000
tree 051078ef0e4dbb3c0c77a17f1e39a9ec462be424
parent 5541a6c86a64a21a49e7f8fa1a87754c2b2f8f77

Implement ANGLE_copy_texture_3d Extension

Adds copyTexture3DANGLE and copySubTexture3DANGLE that adds copy
operations on volumetric textures.

Bug: angleproject:2762
Test: angle_end2end_tests

Change-Id: I0076989c2b7ed69abfc73143c325065bdb06a360
Reviewed-on: https://chromium-review.googlesource.com/c/1207216
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 09591ca..2cf44aa 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -3166,6 +3166,7 @@
         supportedExtensions.textureNorm16         = false;
         supportedExtensions.multiview             = false;
         supportedExtensions.maxViews              = 1u;
+        supportedExtensions.copyTexture3d         = false;
     }
 
     if (getClientVersion() < ES_3_1)
@@ -4308,8 +4309,65 @@
     gl::Texture *sourceTexture = getTexture(sourceId);
     gl::Texture *destTexture   = getTexture(destId);
     Offset offset(xoffset, yoffset, 0);
-    Rectangle area(x, y, width, height);
-    handleError(destTexture->copySubTexture(this, destTarget, destLevel, offset, sourceLevel, area,
+    Box box(x, y, 0, width, height, 1);
+    handleError(destTexture->copySubTexture(this, destTarget, destLevel, offset, sourceLevel, box,
+                                            ConvertToBool(unpackFlipY),
+                                            ConvertToBool(unpackPremultiplyAlpha),
+                                            ConvertToBool(unpackUnmultiplyAlpha), sourceTexture));
+}
+
+void Context::copyTexture3D(GLuint sourceId,
+                            GLint sourceLevel,
+                            TextureTarget destTarget,
+                            GLuint destId,
+                            GLint destLevel,
+                            GLint internalFormat,
+                            GLenum destType,
+                            GLboolean unpackFlipY,
+                            GLboolean unpackPremultiplyAlpha,
+                            GLboolean unpackUnmultiplyAlpha)
+{
+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
+
+    Texture *sourceTexture = getTexture(sourceId);
+    Texture *destTexture   = getTexture(destId);
+    handleError(destTexture->copyTexture(this, destTarget, destLevel, internalFormat, destType,
+                                         sourceLevel, ConvertToBool(unpackFlipY),
+                                         ConvertToBool(unpackPremultiplyAlpha),
+                                         ConvertToBool(unpackUnmultiplyAlpha), sourceTexture));
+}
+
+void Context::copySubTexture3D(GLuint sourceId,
+                               GLint sourceLevel,
+                               TextureTarget destTarget,
+                               GLuint destId,
+                               GLint destLevel,
+                               GLint xoffset,
+                               GLint yoffset,
+                               GLint zoffset,
+                               GLint x,
+                               GLint y,
+                               GLint z,
+                               GLsizei width,
+                               GLsizei height,
+                               GLsizei depth,
+                               GLboolean unpackFlipY,
+                               GLboolean unpackPremultiplyAlpha,
+                               GLboolean unpackUnmultiplyAlpha)
+{
+    // Zero sized copies are valid but no-ops
+    if (width == 0 || height == 0 || depth == 0)
+    {
+        return;
+    }
+
+    ANGLE_CONTEXT_TRY(syncStateForTexImage());
+
+    Texture *sourceTexture = getTexture(sourceId);
+    Texture *destTexture   = getTexture(destId);
+    Offset offset(xoffset, yoffset, zoffset);
+    Box box(x, y, z, width, height, depth);
+    handleError(destTexture->copySubTexture(this, destTarget, destLevel, offset, sourceLevel, box,
                                             ConvertToBool(unpackFlipY),
                                             ConvertToBool(unpackPremultiplyAlpha),
                                             ConvertToBool(unpackUnmultiplyAlpha), sourceTexture));