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/362950Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Enable GenerateMipmapBaseLevel test on NVIDIA
fb80eaf0 · Olli Etuaho · Commit Bot · 2cc85b3b · fb80eaf0
Commit fb80eaf0 authored Jul 25, 2016 by Olli Etuaho Committed by Commit Bot Oct 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

MipmapTest.cpp src/tests/gl_tests/MipmapTest.cpp +2 -8

No files found.
--- a/src/tests/gl_tests/MipmapTest.cpp
+++ b/src/tests/gl_tests/MipmapTest.cpp
@@ -919,6 +919,8 @@ TEST_P(MipmapTestES3, GenerateMipmapBaseLevel)
    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 @@ TEST_P(MipmapTestES3, GenerateMipmapBaseLevel)
    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());