commit fb80eaf072f8d2342bcf18bff28c1fe71664b614
author Olli Etuaho <oetuaho@nvidia.com> Mon Jul 25 13:39:30 2016 +0300
committer Commit Bot <commit-bot@chromium.org> Tue Oct 25 12:20:57 2016 +0000
tree 5ff9e9b09f5b0f99e11bcbb4029e706f7f7c06d4
parent 2cc85b3b607babc99b3da8034012111bbf219bc9

Enable GenerateMipmapBaseLevel test on NVIDIA

The issue is no longer reproducible on newest drivers.

TEST=angle_end2end_tests

Change-Id: I18728877ed9b936ecb469c44e3dae185ab4f08d3
Reviewed-on: https://chromium-review.googlesource.com/362950
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/tests/gl_tests/MipmapTest.cpp

diff --git a/src/tests/gl_tests/MipmapTest.cpp b/src/tests/gl_tests/MipmapTest.cpp
index 9691b18..2ab9411 100644
--- a/src/tests/gl_tests/MipmapTest.cpp
+++ b/src/tests/gl_tests/MipmapTest.cpp
@@ -919,6 +919,8 @@
 
     glBindTexture(GL_TEXTURE_2D, mTexture);
 
+    ASSERT(getWindowWidth() == getWindowHeight());
+
     // Fill level 0 with blue
     std::vector<GLColor> pixelsBlue(getWindowWidth() * getWindowHeight(), GLColor::blue);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
@@ -949,14 +951,6 @@
     clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::red);
 
-    if (IsNVIDIA() && IsOpenGL())
-    {
-        // Observed incorrect rendering on NVIDIA, level zero seems to be incorrectly affected by
-        // GenerateMipmap.
-        std::cout << "Test partially skipped on NVIDIA OpenGL." << std::endl;
-        return;
-    }
-
     // Draw using level 0. It should still be blue.
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
     clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());