commit 47bb4933fb83e51d5a01606423643e1b318804ea
author Geoff Lang <geofflang@chromium.org> Thu Aug 03 11:52:13 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Aug 10 18:11:29 2017 +0000
tree 4ea07586fd5c6fcc9479b2a58baf494bf74076b7
parent 553590a57921fd83abb814fee943c0ccc9bf45a2

Implement CopyTexture functions for uint texture formats.

BUG=angleproject:1932

Change-Id: I6474237cbb82b59a0bd40c1b9b9e2455952d3755
Reviewed-on: https://chromium-review.googlesource.com/600510
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/tests/gl_tests/CopyTextureTest.cpp

diff --git a/src/tests/gl_tests/CopyTextureTest.cpp b/src/tests/gl_tests/CopyTextureTest.cpp
index b2d2e49..7046499 100644
--- a/src/tests/gl_tests/CopyTextureTest.cpp
+++ b/src/tests/gl_tests/CopyTextureTest.cpp
@@ -1260,13 +1260,6 @@
         return;
     }
 
-    if (IsOpenGL() || IsOpenGLES())
-    {
-        std::cout << "Test on OpenGL and OpenGLES because not all formats are implemented yet."
-                  << std::endl;
-        return;
-    }
-
     using GLColor32U = std::tuple<GLuint, GLuint, GLuint, GLuint>;
 
     auto testOutput = [this](GLuint texture, const GLColor32U &expectedColor) {
@@ -1350,12 +1343,22 @@
     testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_RGBA8UI,
                         GL_UNSIGNED_BYTE, false, false, true, GLColor32U(255, 128, 64, 128));
 
-    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_RGB8UI,
-                        GL_UNSIGNED_BYTE, false, false, false, GLColor32U(128, 64, 32, 1));
-    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_RGB8UI,
-                        GL_UNSIGNED_BYTE, false, true, false, GLColor32U(64, 32, 16, 1));
-    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_RGB8UI,
-                        GL_UNSIGNED_BYTE, false, false, true, GLColor32U(255, 128, 64, 1));
+    if (IsOpenGL() || IsOpenGLES())
+    {
+        std::cout << "Skipping GL_RGB8UI because it is not implemented yet." << std::endl;
+    }
+    else
+    {
+        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
+                            GL_RGB8UI, GL_UNSIGNED_BYTE, false, false, false,
+                            GLColor32U(128, 64, 32, 1));
+        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
+                            GL_RGB8UI, GL_UNSIGNED_BYTE, false, true, false,
+                            GLColor32U(64, 32, 16, 1));
+        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
+                            GL_RGB8UI, GL_UNSIGNED_BYTE, false, false, true,
+                            GLColor32U(255, 128, 64, 1));
+    }
 
     testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_RG8UI,
                         GL_UNSIGNED_BYTE, false, false, false, GLColor32U(128, 64, 0, 1));