Suppress some failing end2end_tests on Intel.
BUG=589851
Change-Id: I91588014784a8a9b75389aeb596923458c30d80a
Reviewed-on: https://chromium-review.googlesource.com/329427
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp b/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp
index 0b897ab..c06de64 100644
--- a/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp
+++ b/src/tests/egl_tests/EGLPresentPathD3D11Test.cpp
@@ -342,6 +342,12 @@
createPbufferFromClientBufferSurface();
makeCurrent();
+ if (IsIntel())
+ {
+ std::cout << "Test disabled on Intel." << std::endl;
+ return;
+ }
+
drawQuadUsingGL();
checkPixelsUsingGL();
@@ -369,6 +375,12 @@
createPbufferFromClientBufferSurface();
makeCurrent();
+ if (IsIntel())
+ {
+ std::cout << "Test disabled on Intel." << std::endl;
+ return;
+ }
+
drawQuadUsingGL();
checkPixelsUsingGL();
diff --git a/src/tests/gl_tests/BlendMinMaxTest.cpp b/src/tests/gl_tests/BlendMinMaxTest.cpp
index d2f9036..ef1ba26 100644
--- a/src/tests/gl_tests/BlendMinMaxTest.cpp
+++ b/src/tests/gl_tests/BlendMinMaxTest.cpp
@@ -45,7 +45,7 @@
}
// TODO(geofflang): figure out why this fails
- if (isIntel() && GetParam() == ES2_OPENGL())
+ if (IsIntel() && GetParam() == ES2_OPENGL())
{
std::cout << "Test skipped on OpenGL Intel due to flakyness." << std::endl;
return;
@@ -174,14 +174,14 @@
}
// TODO(jmadill): Figure out why this is broken on Intel
- if (isIntel() && (GetParam() == ES2_D3D11() || GetParam() == ES2_D3D9()))
+ if (IsIntel() && (GetParam() == ES2_D3D11() || GetParam() == ES2_D3D9()))
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
}
// TODO (bug 1284): Investigate RGBA32f D3D SDK Layers messages on D3D11_FL9_3
- if (isD3D11_FL93())
+ if (IsD3D11_FL93())
{
std::cout << "Test skipped on Feature Level 9_3." << std::endl;
return;
@@ -200,7 +200,7 @@
}
// TODO(jmadill): figure out why this fails
- if (isIntel() && (GetParam() == ES2_D3D11() || GetParam() == ES2_D3D9()))
+ if (IsIntel() && (GetParam() == ES2_D3D11() || GetParam() == ES2_D3D9()))
{
std::cout << "Test skipped on Intel due to failures." << std::endl;
return;
diff --git a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
index 2184086..4180765 100644
--- a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
+++ b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
@@ -698,7 +698,7 @@
{
// TODO(jmadill): Figure out if we can fix this on D3D9.
// https://code.google.com/p/angleproject/issues/detail?id=809
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE)
{
std::cout << "Test skipped on Intel D3D9." << std::endl;
return;
diff --git a/src/tests/gl_tests/BufferDataTest.cpp b/src/tests/gl_tests/BufferDataTest.cpp
index 3984d9e..6e23ecc 100644
--- a/src/tests/gl_tests/BufferDataTest.cpp
+++ b/src/tests/gl_tests/BufferDataTest.cpp
@@ -288,7 +288,7 @@
TEST_P(IndexedBufferCopyTest, IndexRangeBug)
{
// TODO(geofflang): Figure out why this fails on AMD OpenGL (http://anglebug.com/1291)
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test disabled on AMD OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/ClearTest.cpp b/src/tests/gl_tests/ClearTest.cpp
index 1517a52..87ce041 100644
--- a/src/tests/gl_tests/ClearTest.cpp
+++ b/src/tests/gl_tests/ClearTest.cpp
@@ -139,7 +139,7 @@
TEST_P(ClearTest, ClearIssue)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
@@ -275,7 +275,7 @@
TEST_P(ClearTestES3, SRGBClear)
{
// TODO(jmadill): figure out why this fails
- if (isIntel() && GetParam() == ES3_OPENGL())
+ if (IsIntel() && GetParam() == ES3_OPENGL())
{
std::cout << "Test skipped on Intel due to failures." << std::endl;
return;
@@ -303,7 +303,7 @@
{
// TODO(cwallez) figure out why it is broken on Intel on Mac
#if defined(ANGLE_PLATFORM_APPLE)
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel on Mac." << std::endl;
return;
@@ -311,7 +311,7 @@
#endif
// TODO(jmadill): figure out why this fails
- if (isIntel() && GetParam() == ES3_OPENGL())
+ if (IsIntel() && GetParam() == ES3_OPENGL())
{
std::cout << "Test skipped on Intel due to failures." << std::endl;
return;
@@ -356,7 +356,7 @@
// flush or finish after ClearBufferfv or each draw.
TEST_P(ClearTestES3, RepeatedClear)
{
- if (isD3D11() && (isNVidia() || isIntel()))
+ if (IsD3D11() && (IsNVIDIA() || IsIntel()))
{
std::cout << "Test skipped on Nvidia and Intel D3D11." << std::endl;
return;
diff --git a/src/tests/gl_tests/CopyTexImageTest.cpp b/src/tests/gl_tests/CopyTexImageTest.cpp
index 00f14ba..293d114 100644
--- a/src/tests/gl_tests/CopyTexImageTest.cpp
+++ b/src/tests/gl_tests/CopyTexImageTest.cpp
@@ -166,7 +166,7 @@
{
// 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)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
@@ -269,7 +269,7 @@
{
// 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)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/D3DImageFormatConversionTest.cpp b/src/tests/gl_tests/D3DImageFormatConversionTest.cpp
index 16c8a0e..8d305a4 100644
--- a/src/tests/gl_tests/D3DImageFormatConversionTest.cpp
+++ b/src/tests/gl_tests/D3DImageFormatConversionTest.cpp
@@ -129,7 +129,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
@@ -144,7 +144,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
@@ -159,7 +159,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
@@ -174,7 +174,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
@@ -189,7 +189,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
diff --git a/src/tests/gl_tests/FenceSyncTests.cpp b/src/tests/gl_tests/FenceSyncTests.cpp
index 78d5b64..1568509 100644
--- a/src/tests/gl_tests/FenceSyncTests.cpp
+++ b/src/tests/gl_tests/FenceSyncTests.cpp
@@ -231,7 +231,7 @@
TEST_P(FenceSyncTest, BasicOperations)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp b/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
index 3aebde9..5269a4d 100644
--- a/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
+++ b/src/tests/gl_tests/FramebufferRenderMipmapTest.cpp
@@ -123,7 +123,7 @@
TEST_P(FramebufferRenderMipmapTest, RenderToMipmap)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/FramebufferTest.cpp b/src/tests/gl_tests/FramebufferTest.cpp
index 7b0c45c..5edd998 100644
--- a/src/tests/gl_tests/FramebufferTest.cpp
+++ b/src/tests/gl_tests/FramebufferTest.cpp
@@ -77,7 +77,7 @@
GLenum internalFormat)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/GLSLTest.cpp b/src/tests/gl_tests/GLSLTest.cpp
index 9c00cf5..046b449 100644
--- a/src/tests/gl_tests/GLSLTest.cpp
+++ b/src/tests/gl_tests/GLSLTest.cpp
@@ -462,21 +462,13 @@
TEST_P(GLSLTest, ScopedStructsOrderBug)
{
-#if defined(__APPLE__)
// TODO(geofflang): Find out why this doesn't compile on Apple OpenGL drivers
// (http://anglebug.com/1292)
- if (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
- {
- std::cout << "Test disabled on Apple OpenGL." << std::endl;
- return;
- }
-#endif
-
// TODO(geofflang): Find out why this doesn't compile on AMD OpenGL drivers
// (http://anglebug.com/1291)
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (isOpenGL() && (IsOSX() || !IsNVIDIA()))
{
- std::cout << "Test disabled on AMD OpenGL." << std::endl;
+ std::cout << "Test disabled on this OpenGL configuration." << std::endl;
return;
}
@@ -812,7 +804,7 @@
#if defined(__APPLE__)
// TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
// (http://anglebug.com/1291)
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
return;
@@ -837,7 +829,7 @@
TEST_P(GLSLTest, MaxMinusTwoVaryingVec4PlusThreeSpecialVariables)
{
// TODO(geofflang): Figure out why this fails on OpenGL AMD (http://anglebug.com/1291)
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test disabled on OpenGL." << std::endl;
return;
@@ -893,7 +885,7 @@
// Disabled because of a failure in D3D9
TEST_P(GLSLTest, MaxVaryingVec3AndOneFloat)
{
- if (isD3D9())
+ if (IsD3D9())
{
std::cout << "Test disabled on D3D9." << std::endl;
return;
@@ -908,7 +900,7 @@
// Disabled because of a failure in D3D9
TEST_P(GLSLTest, MaxVaryingVec3ArrayAndOneFloatArray)
{
- if (isD3D9())
+ if (IsD3D9())
{
std::cout << "Test disabled on D3D9." << std::endl;
return;
@@ -923,7 +915,7 @@
// Disabled because of a failure in D3D9
TEST_P(GLSLTest, TwiceMaxVaryingVec2)
{
- if (isD3D9())
+ if (IsD3D9())
{
std::cout << "Test disabled on D3D9." << std::endl;
return;
@@ -939,7 +931,7 @@
#if defined(__APPLE__)
// TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
// (http://anglebug.com/1291)
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
return;
@@ -955,7 +947,7 @@
// Disabled because of a failure in D3D9
TEST_P(GLSLTest, MaxVaryingVec2Arrays)
{
- if (isD3DSM3())
+ if (IsD3DSM3())
{
std::cout << "Test disabled on SM3." << std::endl;
return;
@@ -971,7 +963,7 @@
#if defined(__APPLE__)
// TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
// (http://anglebug.com/1291)
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/MipmapTest.cpp b/src/tests/gl_tests/MipmapTest.cpp
index fa73641..14fdc04 100644
--- a/src/tests/gl_tests/MipmapTest.cpp
+++ b/src/tests/gl_tests/MipmapTest.cpp
@@ -564,7 +564,7 @@
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)
+ if ((IsAMD() || IsIntel()) && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel/AMD OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/PackUnpackTest.cpp b/src/tests/gl_tests/PackUnpackTest.cpp
index b832523..f968b6c 100644
--- a/src/tests/gl_tests/PackUnpackTest.cpp
+++ b/src/tests/gl_tests/PackUnpackTest.cpp
@@ -151,7 +151,7 @@
{
// TODO(cwallez) figure out why it is broken on Intel on Mac
#if defined(ANGLE_PLATFORM_APPLE)
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel on Mac." << std::endl;
return;
diff --git a/src/tests/gl_tests/PointSpritesTest.cpp b/src/tests/gl_tests/PointSpritesTest.cpp
index 3fc974b..2045e48 100644
--- a/src/tests/gl_tests/PointSpritesTest.cpp
+++ b/src/tests/gl_tests/PointSpritesTest.cpp
@@ -43,7 +43,7 @@
TEST_P(PointSpritesTest, PointCoordAndPointSizeCompliance)
{
// TODO(jmadill): figure out why this fails
- if (isIntel() && GetParam() == ES2_D3D9())
+ if (IsIntel() && GetParam() == ES2_D3D9())
{
std::cout << "Test skipped on Intel due to failures." << std::endl;
return;
diff --git a/src/tests/gl_tests/ProvokingVertexTest.cpp b/src/tests/gl_tests/ProvokingVertexTest.cpp
index 1e7fe07..a407616 100644
--- a/src/tests/gl_tests/ProvokingVertexTest.cpp
+++ b/src/tests/gl_tests/ProvokingVertexTest.cpp
@@ -142,7 +142,7 @@
{
// TODO(cwallez) figure out why it is broken on AMD on Mac
#if defined(ANGLE_PLATFORM_APPLE)
- if (isAMD())
+ if (IsAMD())
{
std::cout << "Test skipped on AMD on Mac." << std::endl;
return;
@@ -253,7 +253,7 @@
TEST_P(ProvokingVertexTest, FlatTriStripPrimitiveRestart)
{
// TODO(jmadill): Implement on the D3D back-end.
- if (isD3D11())
+ if (IsD3D11())
{
std::cout << "Test disabled on D3D11." << std::endl;
return;
diff --git a/src/tests/gl_tests/ReadPixelsTest.cpp b/src/tests/gl_tests/ReadPixelsTest.cpp
index 8d5c077..368e98c 100644
--- a/src/tests/gl_tests/ReadPixelsTest.cpp
+++ b/src/tests/gl_tests/ReadPixelsTest.cpp
@@ -137,7 +137,7 @@
TEST_P(ReadPixelsPBOTest, ExistingDataPreserved)
{
// TODO(geofflang): Figure out why this fails on AMD OpenGL (http://anglebug.com/1291)
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test disabled on AMD OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/SixteenBppTextureTest.cpp b/src/tests/gl_tests/SixteenBppTextureTest.cpp
index 24e8145..2e80b21 100644
--- a/src/tests/gl_tests/SixteenBppTextureTest.cpp
+++ b/src/tests/gl_tests/SixteenBppTextureTest.cpp
@@ -134,7 +134,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
@@ -175,7 +175,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
@@ -213,7 +213,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
@@ -263,7 +263,7 @@
// These tests fail on certain Intel machines running an un-updated version of Win7
// The tests pass after installing the latest updates from Windows Update.
// TODO: reenable these tests once the bots have been updated
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
diff --git a/src/tests/gl_tests/StateChangeTest.cpp b/src/tests/gl_tests/StateChangeTest.cpp
index e96cc05..cc086ed 100644
--- a/src/tests/gl_tests/StateChangeTest.cpp
+++ b/src/tests/gl_tests/StateChangeTest.cpp
@@ -75,7 +75,7 @@
// Ensure that CopyTexImage2D syncs framebuffer changes.
TEST_P(StateChangeTest, CopyTexImage2DSync)
{
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
// TODO(geofflang): Fix on Linux AMD drivers (http://anglebug.com/1291)
std::cout << "Test disabled on AMD OpenGL." << std::endl;
diff --git a/src/tests/gl_tests/SwizzleTest.cpp b/src/tests/gl_tests/SwizzleTest.cpp
index 095fd69..bc5afb7 100644
--- a/src/tests/gl_tests/SwizzleTest.cpp
+++ b/src/tests/gl_tests/SwizzleTest.cpp
@@ -142,7 +142,7 @@
void runTest2D()
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
diff --git a/src/tests/gl_tests/TextureTest.cpp b/src/tests/gl_tests/TextureTest.cpp
index d4afbb1..26b51e9 100644
--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -148,7 +148,7 @@
void testFloatCopySubImage(int sourceImageChannels, int destImageChannels)
{
// TODO(jmadill): Figure out why this is broken on Intel D3D11
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel D3D11." << std::endl;
return;
@@ -1222,7 +1222,7 @@
TEST_P(Texture2DTest, CopySubImageFloat_RGB_RGB)
{
// TODO (bug 1284): Investigate RGBA32f D3D SDK Layers messages on D3D11_FL9_3
- if (isD3D11_FL93())
+ if (IsD3D11_FL93())
{
std::cout << "Test skipped on Feature Level 9_3." << std::endl;
return;
@@ -1244,7 +1244,7 @@
TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGB)
{
// TODO (bug 1284): Investigate RGBA32f D3D SDK Layers messages on D3D11_FL9_3
- if (isD3D11_FL93())
+ if (IsD3D11_FL93())
{
std::cout << "Test skipped on Feature Level 9_3." << std::endl;
return;
@@ -1256,7 +1256,7 @@
TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGBA)
{
// TODO (bug 1284): Investigate RGBA32f D3D SDK Layers messages on D3D11_FL9_3
- if (isD3D11_FL93())
+ if (IsD3D11_FL93())
{
std::cout << "Test skipped on Feature Level 9_3." << std::endl;
return;
@@ -1559,7 +1559,7 @@
// Calling textureSize() on the samplers hits the D3D sampler metadata workaround.
TEST_P(TextureSizeTextureArrayTest, BaseLevelVariesInTextureArray)
{
- if ((isAMD() || isIntel()) && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if ((IsAMD() || IsIntel()) && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel and AMD D3D." << std::endl;
return;
@@ -1653,7 +1653,7 @@
{
if (extensionEnabled("GL_OES_texture_half_float"))
{
- if (isNVidia() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE)
+ if (IsNVIDIA() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE)
{
std::cout << "Test skipped on NVIDIA" << std::endl;
return;
@@ -1674,7 +1674,7 @@
// ES 3.0.4 table 3.24
TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB8UIImplicitAlpha1)
{
- if (isOSX() && isIntel())
+ if (IsOSX() && IsIntel())
{
std::cout << "Test disabled on OSX Intel." << std::endl;
return;
@@ -1695,7 +1695,7 @@
// ES 3.0.4 table 3.24
TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB8IImplicitAlpha1)
{
- if (isOSX() && isIntel())
+ if (IsOSX() && IsIntel())
{
std::cout << "Test disabled on OSX Intel." << std::endl;
return;
@@ -1717,9 +1717,9 @@
// ES 3.0.4 table 3.24
TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB16UIImplicitAlpha1)
{
- if (isOSX() && isIntel())
+ if (IsIntel())
{
- std::cout << "Test disabled on OSX Intel." << std::endl;
+ std::cout << "Test disabled on Intel." << std::endl;
return;
}
glActiveTexture(GL_TEXTURE0);
@@ -1738,9 +1738,9 @@
// ES 3.0.4 table 3.24
TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB16IImplicitAlpha1)
{
- if (isOSX() && isIntel())
+ if (IsIntel())
{
- std::cout << "Test disabled on OSX Intel." << std::endl;
+ std::cout << "Test disabled on Intel." << std::endl;
return;
}
glActiveTexture(GL_TEXTURE0);
@@ -1759,9 +1759,9 @@
// ES 3.0.4 table 3.24
TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB32UIImplicitAlpha1)
{
- if (isOSX() && isIntel())
+ if (IsIntel())
{
- std::cout << "Test disabled on OSX Intel." << std::endl;
+ std::cout << "Test disabled on Intel." << std::endl;
return;
}
glActiveTexture(GL_TEXTURE0);
@@ -1780,7 +1780,7 @@
// ES 3.0.4 table 3.24
TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB32IImplicitAlpha1)
{
- if (isOSX() && isIntel())
+ if (IsOSX() && IsIntel())
{
std::cout << "Test disabled on OSX Intel." << std::endl;
return;
@@ -2068,7 +2068,7 @@
TEST_P(TextureLimitsTest, MaxVertexTextures)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
@@ -2085,7 +2085,7 @@
TEST_P(TextureLimitsTest, MaxFragmentTextures)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
@@ -2102,7 +2102,7 @@
TEST_P(TextureLimitsTest, MaxCombinedTextures)
{
// TODO(jmadill): Investigate workaround.
- if (isIntel() && GetParam() == ES2_OPENGL())
+ if (IsIntel() && GetParam() == ES2_OPENGL())
{
std::cout << "Test skipped on Intel." << std::endl;
return;
@@ -2143,7 +2143,7 @@
TEST_P(TextureLimitsTest, MaxActiveVertexTextures)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
@@ -2160,7 +2160,7 @@
TEST_P(TextureLimitsTest, MaxActiveFragmentTextures)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
diff --git a/src/tests/gl_tests/TimerQueriesTest.cpp b/src/tests/gl_tests/TimerQueriesTest.cpp
index 79c0ac9..269dcb7 100644
--- a/src/tests/gl_tests/TimerQueriesTest.cpp
+++ b/src/tests/gl_tests/TimerQueriesTest.cpp
@@ -168,7 +168,7 @@
TEST_P(TimerQueriesTest, TimeElapsedTextureTest)
{
// OSX drivers don't seem to properly time non-draw calls so we skip the test on Mac
- if (isOSX())
+ if (IsOSX())
{
std::cout << "Test skipped on OSX" << std::endl;
return;
diff --git a/src/tests/gl_tests/TransformFeedbackTest.cpp b/src/tests/gl_tests/TransformFeedbackTest.cpp
index fc4ed36..48ca9d4 100644
--- a/src/tests/gl_tests/TransformFeedbackTest.cpp
+++ b/src/tests/gl_tests/TransformFeedbackTest.cpp
@@ -145,7 +145,7 @@
TEST_P(TransformFeedbackTest, RecordAndDraw)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
@@ -444,7 +444,7 @@
}
#if defined(ANGLE_PLATFORM_APPLE)
- if ((isNVidia() || isAMD()) && GetParam() == ES3_OPENGL())
+ if ((IsNVIDIA() || IsAMD()) && GetParam() == ES3_OPENGL())
{
std::cout << "Test skipped on NVidia and AMD OpenGL on OSX." << std::endl;
return;
@@ -452,7 +452,7 @@
#endif
#if defined(ANGLE_PLATFORM_LINUX)
- if (isAMD() && GetParam() == ES3_OPENGL())
+ if (IsAMD() && GetParam() == ES3_OPENGL())
{
std::cout << "Test skipped on AMD OpenGL on Linux." << std::endl;
return;
diff --git a/src/tests/gl_tests/UniformBufferTest.cpp b/src/tests/gl_tests/UniformBufferTest.cpp
index 5702771..0d35df1 100644
--- a/src/tests/gl_tests/UniformBufferTest.cpp
+++ b/src/tests/gl_tests/UniformBufferTest.cpp
@@ -78,7 +78,7 @@
TEST_P(UniformBufferTest, Simple)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
@@ -105,7 +105,7 @@
TEST_P(UniformBufferTest, UniformBufferRange)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
@@ -183,7 +183,7 @@
TEST_P(UniformBufferTest, UniformBufferBindings)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
@@ -246,7 +246,7 @@
TEST_P(UniformBufferTest, UniformBufferManyUpdates)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE ||
+ if (IsIntel() && (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE ||
getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE))
{
std::cout << "Test skipped on Intel." << std::endl;
@@ -287,7 +287,7 @@
TEST_P(UniformBufferTest, ManyUniformBufferRange)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
diff --git a/src/tests/gl_tests/UniformTest.cpp b/src/tests/gl_tests/UniformTest.cpp
index 194b50b..9d1bd8c 100644
--- a/src/tests/gl_tests/UniformTest.cpp
+++ b/src/tests/gl_tests/UniformTest.cpp
@@ -99,7 +99,7 @@
TEST_P(UniformTest, UniformArrayLocations)
{
// TODO(geofflang): Figure out why this is broken on Intel OpenGL
- if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel OpenGL." << std::endl;
return;
diff --git a/src/tests/gl_tests/VertexAttributeTest.cpp b/src/tests/gl_tests/VertexAttributeTest.cpp
index 3b574b8..cd04a53 100644
--- a/src/tests/gl_tests/VertexAttributeTest.cpp
+++ b/src/tests/gl_tests/VertexAttributeTest.cpp
@@ -41,7 +41,7 @@
void runTest(const TestData& test)
{
// TODO(geofflang): Figure out why this is broken on AMD OpenGL
- if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on AMD OpenGL." << std::endl;
return;
@@ -289,7 +289,7 @@
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)
+ if ((IsIntel() || IsAMD()) && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel and AMD." << std::endl;
return;
@@ -316,7 +316,7 @@
TEST_P(VertexAttributeTest, MaxAttribsPlusOne)
{
// TODO(jmadill): Figure out why we get this error on AMD/ES2/OpenGL
- if (isAMD() && GetParam() == ES2_OPENGL())
+ if (IsAMD() && GetParam() == ES2_OPENGL())
{
std::cout << "Test disabled on AMD/ES2/OpenGL" << std::endl;
return;
@@ -337,7 +337,7 @@
TEST_P(VertexAttributeTest, SimpleBindAttribLocation)
{
// TODO(jmadill): Figure out why this fails on Intel.
- if (isIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+ if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Intel." << std::endl;
return;
diff --git a/src/tests/test_utils/ANGLETest.cpp b/src/tests/test_utils/ANGLETest.cpp
index b1fb777..ee14e6c 100644
--- a/src/tests/test_utils/ANGLETest.cpp
+++ b/src/tests/test_utils/ANGLETest.cpp
@@ -433,58 +433,62 @@
mOSWindow->setVisible(isVisible);
}
-bool ANGLETest::isIntel() const
+bool IsIntel()
{
std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
return (rendererString.find("Intel") != std::string::npos);
}
-bool ANGLETest::isAMD() const
+bool IsAMD()
{
std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
return (rendererString.find("AMD") != std::string::npos) ||
(rendererString.find("ATI") != std::string::npos);
}
-bool ANGLETest::isNVidia() const
+bool IsNVIDIA()
{
std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
return (rendererString.find("NVIDIA") != std::string::npos);
}
-bool ANGLETest::isD3D11() const
+bool IsD3D11()
{
std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
return (rendererString.find("Direct3D11 vs_5_0") != std::string::npos);
}
-bool ANGLETest::isD3D11_FL93() const
+bool IsD3D11_FL93()
{
std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
return (rendererString.find("Direct3D11 vs_4_0_") != std::string::npos);
}
-bool ANGLETest::isD3D9() const
+bool IsD3D9()
{
std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
return (rendererString.find("Direct3D9") != std::string::npos);
}
-bool ANGLETest::isD3DSM3() const
+bool IsD3DSM3()
{
- std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
- return isD3D9() || isD3D11_FL93();
+ return IsD3D9() || IsD3D11_FL93();
}
-bool ANGLETest::isOSX() const
+bool IsOSX()
{
-#ifdef __APPLE__
+#if defined(__APPLE__)
return true;
#else
return false;
#endif
}
+bool ANGLETest::isOpenGL() const
+{
+ return getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
+}
+
EGLint ANGLETest::getPlatformRenderer() const
{
assert(mEGLWindow);
diff --git a/src/tests/test_utils/ANGLETest.h b/src/tests/test_utils/ANGLETest.h
index 106ac5f..3e73712 100644
--- a/src/tests/test_utils/ANGLETest.h
+++ b/src/tests/test_utils/ANGLETest.h
@@ -137,17 +137,7 @@
int getWindowHeight() const;
bool isMultisampleEnabled() const;
- bool isIntel() const;
- bool isAMD() const;
- bool isNVidia() const;
- // Note: FL9_3 is explicitly *not* considered D3D11.
- bool isD3D11() const;
- bool isD3D11_FL93() const;
- // Is a D3D9-class renderer.
- bool isD3D9() const;
- // Is D3D9 or SM9_3 renderer.
- bool isD3DSM3() const;
- bool isOSX() const;
+ bool isOpenGL() const;
EGLint getPlatformRenderer() const;
void ignoreD3D11SDKLayersWarnings();
@@ -174,4 +164,16 @@
virtual void TearDown();
};
+bool IsIntel();
+bool IsAMD();
+bool IsNVIDIA();
+// Note: FL9_3 is explicitly *not* considered D3D11.
+bool IsD3D11();
+bool IsD3D11_FL93();
+// Is a D3D9-class renderer.
+bool IsD3D9();
+// Is D3D9 or SM9_3 renderer.
+bool IsD3DSM3();
+bool IsOSX();
+
#endif // ANGLE_TESTS_ANGLE_TEST_H_