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: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/tests/gl_tests/TextureTest.cpp b/src/tests/gl_tests/TextureTest.cpp
index c2434dc..5897ac5 100644
--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -2066,13 +2066,6 @@
// 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 @@
// 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 @@
// 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 @@
// 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 @@
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 @@
// 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 @@
// 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 @@
// 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 @@
// 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 @@
// 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 @@
// 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 @@
// 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 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 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 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 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 @@
// 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())
{