Revert "Finish ReadBuffer support in end2end_tests."

Fails on the bots, on ReadPixelsTest.DrawWithPBO/ES3_D3D11 BUG=angleproject:940 This reverts commit ada5d07e. Change-Id: I60c71af6317f6b5ee1bf1555cb4573c5e82a11d6 Reviewed-on: https://chromium-review.googlesource.com/317430Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Revert "Finish ReadBuffer support in end2end_tests."
d3754d82 · Jamie Madill · 0c93b8a0 · d3754d82 · d3754d82
Commit d3754d82 authored Dec 09, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

ClearTest.cpp src/tests/gl_tests/ClearTest.cpp +4 -2

ReadPixelsTest.cpp src/tests/gl_tests/ReadPixelsTest.cpp +1 -1

No files found.
--- a/src/tests/gl_tests/ClearTest.cpp
+++ b/src/tests/gl_tests/ClearTest.cpp
@@ -177,9 +177,11 @@ TEST_P(ClearTestES3, MaskedClearBufferBug)
    ASSERT_GL_NO_ERROR();
    EXPECT_PIXEL_EQ(0, 0, 255, 255, 255, 255);
-    glReadBuffer(GL_COLOR_ATTACHMENT1);
+    // TODO: glReadBuffer support
-    ASSERT_GL_NO_ERROR();
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, 0, 0);
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, textures[1], 0);
+    //TODO(jmadill): Robust handling of pixel test error ranges
    EXPECT_PIXEL_NEAR(0, 0, 0, 127, 255, 255, 1);
    glDeleteTextures(2, textures);

--- a/src/tests/gl_tests/ReadPixelsTest.cpp
+++ b/src/tests/gl_tests/ReadPixelsTest.cpp
@@ -256,7 +256,7 @@ TEST_P(ReadPixelsTest, DrawWithPBO)
    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, data);
    EXPECT_GL_NO_ERROR();
-    glReadBuffer(GL_COLOR_ATTACHMENT0);
+    // glReadBuffer(GL_COLOR_ATTACHMENT0); // FIXME: currently UNIMPLEMENTED
    glBindFramebuffer(GL_READ_FRAMEBUFFER, mFBO);
    EXPECT_GL_NO_ERROR();