Re-land "Finish ReadBuffer support in end2end_tests."

Currently we had a few TODOs concerned about unimplemented calls in ANGLE. ANGLE now has support for ReadBuffer, so uncomment the calls. Re-land with end2end_tests fix. BUG=angleproject:940 Change-Id: I6e00c3aac6307308fb7f00c7e0426812563ed778 Reviewed-on: https://chromium-review.googlesource.com/317821 Tryjob-Request: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Re-land "Finish ReadBuffer support in end2end_tests."
cb34ea5e · Jamie Madill · 7c8d1d84 · cb34ea5e · cb34ea5e
Commit cb34ea5e authored Dec 11, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

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

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

No files found.
--- a/src/tests/gl_tests/ClearTest.cpp
+++ b/src/tests/gl_tests/ClearTest.cpp
@@ -177,11 +177,9 @@ TEST_P(ClearTestES3, MaskedClearBufferBug)
    ASSERT_GL_NO_ERROR();
    EXPECT_PIXEL_EQ(0, 0, 255, 255, 255, 255);
-    // TODO: glReadBuffer support
+    glReadBuffer(GL_COLOR_ATTACHMENT1);
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, 0, 0);
+    ASSERT_GL_NO_ERROR();
-    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,6 @@ 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); // FIXME: currently UNIMPLEMENTED
    glBindFramebuffer(GL_READ_FRAMEBUFFER, mFBO);
    EXPECT_GL_NO_ERROR();