commit 9259fd0d4f4ca335d2b0f99edb2a9e47ec053944
author Olli Etuaho <oetuaho@nvidia.com> Wed Aug 22 12:12:00 2018 +0300
committer Commit Bot <commit-bot@chromium.org> Wed Aug 22 15:16:24 2018 +0000
tree a6ac81a4a29c4889effd83198d4363cb22b50c72
parent a7b35c336ea3531f7346ff812be1a999b58a5f3d

Clean and enable NoLeakingFragments multiview test

Use helper to create multiview backing textures in NoLeakingFragments
test instead of doing FBO attachments twice.

The test seems to pass on Windows after the recent fixes that have
been done to the tests, or possibly due to other earlier fixes.

BUG=angleproject:2687
TEST=angle_end2end_tests

Change-Id: I6015a5b44fdd06faf7b9375bad501355be8d7732
Reviewed-on: https://chromium-review.googlesource.com/1184713
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/tests/gl_tests/MultiviewDrawTest.cpp

diff --git a/src/tests/gl_tests/MultiviewDrawTest.cpp b/src/tests/gl_tests/MultiviewDrawTest.cpp
index af00b77..6e7e3f2 100644
--- a/src/tests/gl_tests/MultiviewDrawTest.cpp
+++ b/src/tests/gl_tests/MultiviewDrawTest.cpp
@@ -1687,21 +1687,28 @@
 // bounds. The test does not rely on the actual line width being greater than 1.0.
 TEST_P(MultiviewSideBySideRenderTest, NoLeakingFragments)
 {
-    // TODO(oetuaho): Diagnose and fix http://anglebug.com/2687
-    ANGLE_SKIP_TEST_IF(IsWindows() && IsD3D11());
-
     if (!requestMultiviewExtension())
     {
         return;
     }
 
-    updateFBOs(2, 1, 2);
+    GLTexture colorTexture;
 
+    CreateMultiviewBackingTextures(GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE, 2, 1, 2,
+                                   colorTexture, 0u, 0u);
+
+    GLFramebuffer drawFramebuffer;
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, drawFramebuffer);
     GLint viewportOffsets[4] = {1, 0, 3, 0};
     glFramebufferTextureMultiviewSideBySideANGLE(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                                 mColorTexture, 0, 2, &viewportOffsets[0]);
-    glFramebufferTextureMultiviewSideBySideANGLE(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                                                 mDepthTexture, 0, 2, &viewportOffsets[0]);
+                                                 colorTexture, 0, 2, &viewportOffsets[0]);
+
+    GLFramebuffer readFramebuffer;
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, readFramebuffer);
+    glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, colorTexture,
+                           0);
+
+    ASSERT_GL_NO_ERROR();
 
     glViewport(0, 0, 1, 1);
     glScissor(0, 0, 1, 1);