Skip to content

A
angle
Commit 8e5ba8bb by Yunchao He Committed by Commit Bot
Options

Clean up end2end tests for Intel Linux platform.

Removed tests can pass on Intel Linux Desktop (Intel KabyLake, Ubuntu 17.04) with system default mesa and latest upstream mesa. BUG=angleproject:2205 BUG=chromium:680631 Change-Id: Ie3f0f34b9708a7dab81f66d9ec83a469658deee7 Reviewed-on: https://chromium-review.googlesource.com/901382 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 5420cb2a
Showing with 20 additions and 207 deletions
src/tests/gl_tests/BlendMinMaxTest.cpp
......@@ -45,13 +45,6 @@ class BlendMinMaxTest : public ANGLETest
return;
}
// TODO(geofflang): figure out why this fails
if (IsIntel() && GetParam() == ES2_OPENGL())
{
std::cout << "Test skipped on OpenGL Intel due to flakyness." << std::endl;
return;
}
SetUpFramebuffer(colorFormat);
int minValue = 0;
......
src/tests/gl_tests/ClearTest.cpp
......@@ -133,13 +133,6 @@ TEST_P(ClearTest, RGBA8Framebuffer)
TEST_P(ClearTest, ClearIssue)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LEQUAL);
......@@ -269,13 +262,6 @@ TEST_P(ClearTestES3, BadFBOSerialBug)
// Test that SRGB framebuffers clear to the linearized clear color
TEST_P(ClearTestES3, SRGBClear)
{
// TODO(jmadill): figure out why this fails
if (IsIntel() && GetParam() == ES3_OPENGL())
{
std::cout << "Test skipped on Intel due to failures." << std::endl;
return;
}
// First make a simple framebuffer, and clear it
glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
......@@ -305,13 +291,6 @@ TEST_P(ClearTestES3, MixedSRGBClear)
}
#endif
// TODO(jmadill): figure out why this fails
if (IsIntel() && GetParam() == ES3_OPENGL())
{
std::cout << "Test skipped on Intel due to failures." << std::endl;
return;
}
glBindFramebuffer(GL_FRAMEBUFFER, mFBOs[0]);
GLuint textures[2];
......
src/tests/gl_tests/CopyTexImageTest.cpp
......@@ -165,14 +165,6 @@ TEST_P(CopyTexImageTest, RGBAToL)
TEST_P(CopyTexImageTest, RGBToL)
{
// TODO (geofflang): Figure out why CopyTex[Sub]Image doesn't work with
// RGB->L on older Intel chips
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
GLfloat color[] = {
0.25f, 1.0f, 0.75f, 0.5f,
};
......@@ -268,14 +260,6 @@ TEST_P(CopyTexImageTest, SubImageRGBAToLA)
TEST_P(CopyTexImageTest, SubImageRGBToL)
{
// TODO (geofflang): Figure out why CopyTex[Sub]Image doesn't work with
// RGB->L on older Intel chips
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
GLfloat color0[] = {
0.25f, 1.0f, 0.75f, 0.5f,
};
......
src/tests/gl_tests/FenceSyncTests.cpp
......@@ -230,13 +230,6 @@ TEST_P(FenceSyncTest, BasicQueries)
// Test that basic usage works and doesn't generate errors or crash
TEST_P(FenceSyncTest, BasicOperations)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
......
src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
......@@ -117,13 +117,6 @@ TEST_P(FramebufferRenderMipmapTest, Validation)
// Render to various levels of a texture and check that they have the correct color data via ReadPixels
TEST_P(FramebufferRenderMipmapTest, RenderToMipmap)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
bool renderToMipmapSupported =
extensionEnabled("GL_OES_fbo_render_mipmap") || getClientMajorVersion() > 2;
if (!renderToMipmapSupported)
......
src/tests/gl_tests/GLSLTest.cpp
......@@ -1794,12 +1794,6 @@ TEST_P(GLSLTest, LoopIndexingValidation)
// can actually be used.
TEST_P(GLSLTest, VerifyMaxVertexUniformVectors)
{
if (IsLinux() && IsIntel())
{
std::cout << "Test timed out on Linux Intel. See crbug.com/680631." << std::endl;
return;
}
int maxUniforms = 10000;
glGetIntegerv(GL_MAX_VERTEX_UNIFORM_VECTORS, &maxUniforms);
EXPECT_GL_NO_ERROR();
......@@ -1846,12 +1840,6 @@ TEST_P(GLSLTest, VerifyMaxVertexUniformVectorsExceeded)
// can actually be used.
TEST_P(GLSLTest, VerifyMaxFragmentUniformVectors)
{
if (IsLinux() && IsIntel())
{
std::cout << "Test timed out on Linux Intel. See crbug.com/680631." << std::endl;
return;
}
int maxUniforms = 10000;
glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS, &maxUniforms);
EXPECT_GL_NO_ERROR();
......
src/tests/gl_tests/MipmapTest.cpp
......@@ -603,11 +603,7 @@ TEST_P(MipmapTest, GenerateMipmapFromRenderedImage)
TEST_P(MipmapTest, RenderOntoLevelZeroAfterGenerateMipmap)
{
// TODO(geofflang): Figure out why this is broken on AMD OpenGL
if ((IsAMD() || IsIntel()) && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel/AMD OpenGL." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
glBindTexture(GL_TEXTURE_2D, mTexture2D);
......
src/tests/gl_tests/TextureTest.cpp
......@@ -2066,13 +2066,6 @@ TEST_P(Texture2DArrayTestES3, DrawWithLevelsOutsideRangeWithInconsistentDimensio
// GLES 3.0.4 section 3.8.13 Texture completeness
TEST_P(Texture2DTestES3, TextureCompletenessChangesWithMaxLevel)
{
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
// Intel was observed having wrong behavior after the texture is made incomplete by changing
// the base level.
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
if (IsOSX())
{
// Observed incorrect rendering on OSX.
......@@ -2119,13 +2112,6 @@ TEST_P(Texture2DTestES3, TextureCompletenessChangesWithMaxLevel)
// GLES 3.0.4 section 3.8.13 Texture completeness
TEST_P(Texture3DTestES3, Texture3DCompletenessChangesWithMaxLevel)
{
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
// Intel was observed having wrong behavior after the texture is made incomplete by changing
// the base level.
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
if (IsOSX())
{
// Observed incorrect rendering on OSX.
......@@ -2172,14 +2158,6 @@ TEST_P(Texture3DTestES3, Texture3DCompletenessChangesWithMaxLevel)
// GLES 3.0.4 section 3.8.13 Texture completeness
TEST_P(Texture2DTestES3, TextureCompletenessChangesWithBaseLevel)
{
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
// Intel was observed having wrong behavior after the texture is made incomplete by changing
// the base level.
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D);
std::vector<GLColor> texDataGreen(8u * 8u, GLColor::green);
......@@ -2221,14 +2199,6 @@ TEST_P(Texture2DTestES3, TextureCompletenessChangesWithBaseLevel)
// GLES 3.0.4 section 3.8.13 Texture completeness
TEST_P(Texture2DTestES3, TextureBaseLevelGreaterThanMaxLevel)
{
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
// Intel Windows OpenGL driver crashes if the base level of a non-immutable texture is out
// of range.
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D);
......@@ -2286,12 +2256,7 @@ TEST_P(Texture2DTestES3, TextureFormatChangesWithBaseLevel)
std::cout << "Test skipped on NVIDIA OpenGL." << std::endl;
return;
}
if (IsIntel() && IsDesktopOpenGL())
{
// Observed incorrect rendering on Intel OpenGL.
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsDesktopOpenGL());
if (IsAMD() && IsDesktopOpenGL())
{
// Observed incorrect rendering on AMD OpenGL.
......@@ -2625,11 +2590,8 @@ TEST_P(Texture2DTestES3, TextureLuminance16ImplicitAlpha1)
// ES 3.0.4 table 3.24
TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB8UIImplicitAlpha1)
{
if (IsIntel())
{
std::cout << "Test disabled on Intel." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8UI, 1, 1, 0, GL_RGB_INTEGER, GL_UNSIGNED_BYTE, nullptr);
......@@ -2646,11 +2608,8 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB8UIImplicitAlpha1)
// ES 3.0.4 table 3.24
TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB8IImplicitAlpha1)
{
if (IsIntel())
{
std::cout << "Test disabled on Intel." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D);
......@@ -2668,11 +2627,8 @@ TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB8IImplicitAlpha1)
// ES 3.0.4 table 3.24
TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB16UIImplicitAlpha1)
{
if (IsIntel())
{
std::cout << "Test disabled on Intel." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB16UI, 1, 1, 0, GL_RGB_INTEGER, GL_UNSIGNED_SHORT, nullptr);
......@@ -2689,11 +2645,8 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB16UIImplicitAlpha1)
// ES 3.0.4 table 3.24
TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB16IImplicitAlpha1)
{
if (IsIntel())
{
std::cout << "Test disabled on Intel." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB16I, 1, 1, 0, GL_RGB_INTEGER, GL_SHORT, nullptr);
......@@ -2710,11 +2663,8 @@ TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB16IImplicitAlpha1)
// ES 3.0.4 table 3.24
TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB32UIImplicitAlpha1)
{
if (IsIntel())
{
std::cout << "Test disabled on Intel." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32UI, 1, 1, 0, GL_RGB_INTEGER, GL_UNSIGNED_INT, nullptr);
......@@ -2731,11 +2681,8 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB32UIImplicitAlpha1)
// ES 3.0.4 table 3.24
TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB32IImplicitAlpha1)
{
if (IsIntel())
{
std::cout << "Test disabled on Intel." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX());
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32I, 1, 1, 0, GL_RGB_INTEGER, GL_INT, nullptr);
......@@ -3090,13 +3037,6 @@ class TextureLimitsTest : public ANGLETest
// Test rendering with the maximum vertex texture units.
TEST_P(TextureLimitsTest, MaxVertexTextures)
{
// TODO(jmadill): Figure out why this fails on Intel.
if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
}
compileProgramWithTextureCounts("tex", mMaxVertexTextures, mMaxVertexTextures, "tex", 0, 0);
ASSERT_NE(0u, mProgram);
ASSERT_GL_NO_ERROR();
......@@ -3107,13 +3047,6 @@ TEST_P(TextureLimitsTest, MaxVertexTextures)
// Test rendering with the maximum fragment texture units.
TEST_P(TextureLimitsTest, MaxFragmentTextures)
{
// TODO(jmadill): Figure out why this fails on Intel.
if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
}
compileProgramWithTextureCounts("tex", 0, 0, "tex", mMaxFragmentTextures, mMaxFragmentTextures);
ASSERT_NE(0u, mProgram);
ASSERT_GL_NO_ERROR();
......@@ -3124,13 +3057,6 @@ TEST_P(TextureLimitsTest, MaxFragmentTextures)
// Test rendering with maximum combined texture units.
TEST_P(TextureLimitsTest, MaxCombinedTextures)
{
// TODO(jmadill): Investigate workaround.
if (IsIntel() && GetParam() == ES2_OPENGL())
{
std::cout << "Test skipped on Intel." << std::endl;
return;
}
GLint vertexTextures = mMaxVertexTextures;
if (vertexTextures + mMaxFragmentTextures > mMaxCombinedTextures)
......@@ -3165,13 +3091,6 @@ TEST_P(TextureLimitsTest, ExcessiveFragmentTextures)
// Test active vertex textures under the limit, but excessive textures specified.
TEST_P(TextureLimitsTest, MaxActiveVertexTextures)
{
// TODO(jmadill): Figure out why this fails on Intel.
if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
}
compileProgramWithTextureCounts("tex", mMaxVertexTextures + 4, mMaxVertexTextures, "tex", 0, 0);
ASSERT_NE(0u, mProgram);
ASSERT_GL_NO_ERROR();
......@@ -3182,13 +3101,6 @@ TEST_P(TextureLimitsTest, MaxActiveVertexTextures)
// Test active fragment textures under the limit, but excessive textures specified.
TEST_P(TextureLimitsTest, MaxActiveFragmentTextures)
{
// TODO(jmadill): Figure out why this fails on Intel.
if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
}
compileProgramWithTextureCounts("tex", 0, 0, "tex", mMaxFragmentTextures + 4,
mMaxFragmentTextures);
ASSERT_NE(0u, mProgram);
......@@ -3381,11 +3293,8 @@ TEST_P(Texture2DNorm16TestES3, TextureNorm16Test)
// GLES 3.0.4 section 3.8.3.
TEST_P(Texture2DTestES3, UnpackSkipImages2D)
{
if (IsIntel() && IsDesktopOpenGL())
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
ANGLE_SKIP_TEST_IF(IsIntel() && IsWindows() && IsDesktopOpenGL());
// TODO(ynovikov): re-enable once root cause of http://anglebug.com/1429 is fixed
if (IsAndroid() && IsAdreno() && IsOpenGLES())
{
......
src/tests/gl_tests/UniformBufferTest.cpp
......@@ -221,12 +221,8 @@ TEST_P(UniformBufferTest, UnboundUniformBuffer)
// https://code.google.com/p/angleproject/issues/detail?id=965
TEST_P(UniformBufferTest, UniformBufferManyUpdates)
{
// TODO(jmadill): Figure out why this fails on Intel OpenGL.
if (IsIntel() && IsOpenGL())
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
// TODO(jmadill): Figure out why this fails on OSX Intel OpenGL.
ANGLE_SKIP_TEST_IF(IsIntel() && IsOSX() && IsOpenGL());
int px = getWindowWidth() / 2;
int py = getWindowHeight() / 2;
......
src/tests/gl_tests/UniformTest.cpp
......@@ -103,13 +103,6 @@ TEST_P(UniformTest, GetUniformNoCurrentProgram)
TEST_P(UniformTest, UniformArrayLocations)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
const std::string vertexShader =
R"(precision mediump float;
uniform float uPosition[4];
......
src/tests/gl_tests/VertexAttributeTest.cpp
......@@ -699,12 +699,8 @@ TEST_P(VertexAttributeTestES3, VertexArrayObjectRendering)
// Validate that we can support GL_MAX_ATTRIBS attribs
TEST_P(VertexAttributeTest, MaxAttribs)
{
// TODO(jmadill): Figure out why we get this error on AMD/OpenGL and Intel.
if ((IsIntel() || IsAMD()) && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel and AMD." << std::endl;
return;
}
// TODO(jmadill): Figure out why we get this error on AMD/OpenGL.
ANGLE_SKIP_TEST_IF(IsAMD() && IsOpenGL());
GLint maxAttribs;
glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &maxAttribs);
......@@ -747,13 +743,6 @@ TEST_P(VertexAttributeTest, MaxAttribsPlusOne)
// Simple test for when we use glBindAttribLocation
TEST_P(VertexAttributeTest, SimpleBindAttribLocation)
{
// TODO(jmadill): Figure out why this fails on Intel.
if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
}
// Re-use the multi-attrib program, binding attribute 0
GLuint program = compileMultiAttribProgram(1);
glBindAttribLocation(program, 2, "position");
......
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