Commit fb80eaf0 by Olli Etuaho Committed by Commit Bot

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: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent 2cc85b3b
...@@ -919,6 +919,8 @@ TEST_P(MipmapTestES3, GenerateMipmapBaseLevel) ...@@ -919,6 +919,8 @@ TEST_P(MipmapTestES3, GenerateMipmapBaseLevel)
glBindTexture(GL_TEXTURE_2D, mTexture); glBindTexture(GL_TEXTURE_2D, mTexture);
ASSERT(getWindowWidth() == getWindowHeight());
// Fill level 0 with blue // Fill level 0 with blue
std::vector<GLColor> pixelsBlue(getWindowWidth() * getWindowHeight(), GLColor::blue); std::vector<GLColor> pixelsBlue(getWindowWidth() * getWindowHeight(), GLColor::blue);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, getWindowWidth(), getWindowHeight(), 0, GL_RGBA, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
...@@ -949,14 +951,6 @@ TEST_P(MipmapTestES3, GenerateMipmapBaseLevel) ...@@ -949,14 +951,6 @@ TEST_P(MipmapTestES3, GenerateMipmapBaseLevel)
clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4); clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::red); 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. // Draw using level 0. It should still be blue.
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight()); clearAndDrawQuad(m2DProgram, getWindowWidth(), getWindowHeight());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment