commit aadc8f376a2c797db98d69d308c9980ca818f57f
author Geoff Lang <geofflang@chromium.org> Fri Aug 11 17:34:44 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Aug 15 15:51:18 2017 +0000
tree cfae88125b60f0bc58220607fcc0b6952bc5f04d
parent 79f7104ab9aa7777c0531bc6333160e7f45d9e50

Implement the CPU fallback for CopyTextureCHROMIUM on OpenGL.

BUG=angleproject:1932

Change-Id: Iabc1a3e361d66313dc16bf19b392402b7836f8a5
Reviewed-on: https://chromium-review.googlesource.com/612562
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 7046499..3de1cca 100644
--- a/src/tests/gl_tests/CopyTextureTest.cpp
+++ b/src/tests/gl_tests/CopyTextureTest.cpp
@@ -1099,21 +1099,13 @@
                         GL_UNSIGNED_BYTE, false, true, false, GLColor(0, 0, 0, 128));
 
     // New sRGB dest formats
-    if (IsOpenGLES() || IsOpenGL())
-    {
-        std::cout << "Skipping GL_SRGB and GL_SRGB_ALPHA because it is not implemented yet."
-                  << std::endl;
-    }
-    else
-    {
-        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_SRGB,
-                            GL_UNSIGNED_BYTE, false, false, false, GLColor(55, 13, 4, 255));
-        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_SRGB,
-                            GL_UNSIGNED_BYTE, false, true, false, GLColor(13, 4, 1, 255));
-        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
-                            GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, false, false, false,
-                            GLColor(55, 13, 4, 128));
-    }
+    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_SRGB,
+                        GL_UNSIGNED_BYTE, false, false, false, GLColor(55, 13, 4, 255));
+    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_SRGB,
+                        GL_UNSIGNED_BYTE, false, true, false, GLColor(13, 4, 1, 255));
+    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
+                        GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, false, false, false,
+                        GLColor(55, 13, 4, 128));
 }
 
 // Test the newly added ES3 float formats
@@ -1234,22 +1226,12 @@
                         GL_R11F_G11F_B10F, GL_FLOAT, false, false, true,
                         GLColor32F(1.0f, 0.5f, 0.25f, 1.0f));
 
-    if (IsOpenGL() || IsOpenGLES())
-    {
-        std::cout << "Skipping GL_RGB9_E5 because it is not implemented yet." << std::endl;
-    }
-    else
-    {
-        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
-                            GL_RGB9_E5, GL_FLOAT, false, false, false,
-                            GLColor32F(0.5f, 0.25f, 0.125f, 1.0f));
-        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
-                            GL_RGB9_E5, GL_FLOAT, false, true, false,
-                            GLColor32F(0.25f, 0.125f, 0.0625f, 1.0f));
-        testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128),
-                            GL_RGB9_E5, GL_FLOAT, false, false, true,
-                            GLColor32F(1.0f, 0.5f, 0.25f, 1.0f));
-    }
+    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_RGB9_E5,
+                        GL_FLOAT, false, false, false, GLColor32F(0.5f, 0.25f, 0.125f, 1.0f));
+    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_RGB9_E5,
+                        GL_FLOAT, false, true, false, GLColor32F(0.25f, 0.125f, 0.0625f, 1.0f));
+    testCopyCombination(GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, GLColor(128, 64, 32, 128), GL_RGB9_E5,
+                        GL_FLOAT, false, false, true, GLColor32F(1.0f, 0.5f, 0.25f, 1.0f));
 }
 
 // Test the newly added ES3 unsigned integer formats
@@ -1343,22 +1325,12 @@
     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));
 
-    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_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));