commit 700229721aa0adbb5cb07bf8afae442fc26c62ab
author Geoff Lang <geofflang@chromium.org> Tue Aug 18 17:53:00 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Tue Aug 18 17:53:20 2015 +0000
tree 6882941af0d34a61a33ec0b5e22a12733969332e
parent 1e9497997f5dc513e7ff00c9363047b733cdf32d

Revert "Work around deprecated LUMA formats in the core profile."

Caused failures in the WebglConformance.conformance_textures_misc_copy_tex_image_2d_formats test on the ATI FYI waterfall bot.
This reverts commit 61f51dc1b7d383bcb3632218cd2434f65cac4b7a.

Change-Id: Iddea03d53ae2a9b639e36931f01c1e889e550af4
Reviewed-on: https://chromium-review.googlesource.com/294262
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/tests/gl_tests/SwizzleTest.cpp

diff --git a/src/tests/gl_tests/SwizzleTest.cpp b/src/tests/gl_tests/SwizzleTest.cpp
index 4d0dbda..92cafd9 100644
--- a/src/tests/gl_tests/SwizzleTest.cpp
+++ b/src/tests/gl_tests/SwizzleTest.cpp
@@ -108,7 +108,8 @@
     {
         glGenTextures(1, &mTexture);
         glBindTexture(GL_TEXTURE_2D, mTexture);
-        glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, 1, 1, 0, dataFormat, dataType, data);
+        glTexStorage2D(GL_TEXTURE_2D, 1, internalFormat, 1, 1);
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, dataFormat, dataType, data);
 
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -267,48 +268,6 @@
     runTest2D();
 }
 
-TEST_P(SwizzleTest, L8_2D)
-{
-    GLubyte data[] = { 0x77 };
-    init2DTexture(GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, data);
-    runTest2D();
-}
-
-TEST_P(SwizzleTest, A8_2D)
-{
-    GLubyte data[] = { 0x55 };
-    init2DTexture(GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, data);
-    runTest2D();
-}
-
-TEST_P(SwizzleTest, LA8_2D)
-{
-    GLubyte data[] = { 0x77, 0x66 };
-    init2DTexture(GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, data);
-    runTest2D();
-}
-
-TEST_P(SwizzleTest, L32F_2D)
-{
-    GLfloat data[] = { 0.7f };
-    init2DTexture(GL_LUMINANCE, GL_LUMINANCE, GL_FLOAT, data);
-    runTest2D();
-}
-
-TEST_P(SwizzleTest, A32F_2D)
-{
-    GLfloat data[] = { 0.4f, };
-    init2DTexture(GL_ALPHA, GL_ALPHA, GL_FLOAT, data);
-    runTest2D();
-}
-
-TEST_P(SwizzleTest, LA32F_2D)
-{
-    GLfloat data[] = { 0.5f, 0.6f, };
-    init2DTexture(GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_FLOAT, data);
-    runTest2D();
-}
-
 #include "media/pixel.inl"
 
 TEST_P(SwizzleTest, CompressedDXT_2D)