Revert "Suppress some failing end2end_tests on Intel."

src/tests/egl_tests/EGLPresentPathD3D11Test.cpp

@@ -342,12 +342,6 @@ TEST_P(EGLPresentPathD3D11, ClientBufferPresentPathFast)
     createPbufferFromClientBufferSurface();
     makeCurrent();
 
-    if (IsIntel())
-    {
-        std::cout << "Test disabled on Intel." << std::endl;
-        return;
-    }
-
     drawQuadUsingGL();
 
     checkPixelsUsingGL();
@@ -375,12 +369,6 @@ TEST_P(EGLPresentPathD3D11, ClientBufferPresentPathCopy)
     createPbufferFromClientBufferSurface();
     makeCurrent();
 
-    if (IsIntel())
-    {
-        std::cout << "Test disabled on Intel." << std::endl;
-        return;
-    }
-
     drawQuadUsingGL();
 
     checkPixelsUsingGL();

src/tests/gl_tests/BlendMinMaxTest.cpp

@@ -45,7 +45,7 @@ class BlendMinMaxTest : public ANGLETest
         }
 
         // 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 @@ TEST_P(BlendMinMaxTest, RGBA32f)
     }
 
     // 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 @@ TEST_P(BlendMinMaxTest, RGBA16F)
     }
 
     // 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;

src/tests/gl_tests/BlitFramebufferANGLETest.cpp

@@ -698,7 +698,7 @@ TEST_P(BlitFramebufferANGLETest, BlitStencil)
 {
     // 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;

src/tests/gl_tests/BufferDataTest.cpp

@@ -288,7 +288,7 @@ class IndexedBufferCopyTest : public ANGLETest
 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;

src/tests/gl_tests/ClearTest.cpp

@@ -139,7 +139,7 @@ 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)
+    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, BadFBOSerialBug)
 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 @@ TEST_P(ClearTestES3, MixedSRGBClear)
 {
     // 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 @@ TEST_P(ClearTestES3, MixedSRGBClear)
 #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 @@ TEST_P(ClearTestES3, MixedSRGBClear)
 // 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;

src/tests/gl_tests/CopyTexImageTest.cpp

@@ -166,7 +166,7 @@ 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)
+    if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
         std::cout << "Test skipped on Intel OpenGL." << std::endl;
         return;
@@ -269,7 +269,7 @@ 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)
+    if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
         std::cout << "Test skipped on Intel OpenGL." << std::endl;
         return;

src/tests/gl_tests/D3DImageFormatConversionTest.cpp

@@ -129,7 +129,7 @@ TEST_P(D3DImageFormatConversionTest, WriteColorFunctionR4G4B4A4)
     // 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 @@ TEST_P(D3DImageFormatConversionTest, WriteColorFunctionR5G5B5A1)
     // 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 @@ TEST_P(D3DImageFormatConversionTest, WriteColorFunctionR5G6B5)
     // 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 @@ TEST_P(D3DImageFormatConversionTest, WriteColorFunctionR8G8B8A8)
     // 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 @@ TEST_P(D3DImageFormatConversionTest, WriteColorFunctionR8G8B8)
     // 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;

src/tests/gl_tests/FenceSyncTests.cpp

@@ -231,7 +231,7 @@ TEST_P(FenceSyncTest, BasicQueries)
 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;

src/tests/gl_tests/FramebufferRenderMipmapTest.cpp

@@ -123,7 +123,7 @@ TEST_P(FramebufferRenderMipmapTest, Validation)
 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;

src/tests/gl_tests/FramebufferTest.cpp

@@ -77,7 +77,7 @@ class FramebufferFormatsTest : public ANGLETest
                                            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;

src/tests/gl_tests/GLSLTest.cpp

@@ -462,13 +462,21 @@ TEST_P(GLSLTest, NamelessScopedStructs)
 
 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 (isOpenGL() && (IsOSX() || !IsNVIDIA()))
+    if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
-        std::cout << "Test disabled on this OpenGL configuration." << std::endl;
+        std::cout << "Test disabled on AMD OpenGL." << std::endl;
         return;
     }
 
@@ -804,7 +812,7 @@ TEST_P(GLSLTest, MaxVaryingVec4)
 #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;
@@ -829,7 +837,7 @@ TEST_P(GLSLTest, MaxMinusTwoVaryingVec4PlusTwoSpecialVariables)
 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;
@@ -885,7 +893,7 @@ TEST_P(GLSLTest, MaxVaryingVec3Array)
 // Disabled because of a failure in D3D9
 TEST_P(GLSLTest, MaxVaryingVec3AndOneFloat)
 {
-    if (IsD3D9())
+    if (isD3D9())
     {
         std::cout << "Test disabled on D3D9." << std::endl;
         return;
@@ -900,7 +908,7 @@ TEST_P(GLSLTest, MaxVaryingVec3AndOneFloat)
 // Disabled because of a failure in D3D9
 TEST_P(GLSLTest, MaxVaryingVec3ArrayAndOneFloatArray)
 {
-    if (IsD3D9())
+    if (isD3D9())
     {
         std::cout << "Test disabled on D3D9." << std::endl;
         return;
@@ -915,7 +923,7 @@ TEST_P(GLSLTest, MaxVaryingVec3ArrayAndOneFloatArray)
 // Disabled because of a failure in D3D9
 TEST_P(GLSLTest, TwiceMaxVaryingVec2)
 {
-    if (IsD3D9())
+    if (isD3D9())
     {
         std::cout << "Test disabled on D3D9." << std::endl;
         return;
@@ -931,7 +939,7 @@ TEST_P(GLSLTest, TwiceMaxVaryingVec2)
 #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;
@@ -947,7 +955,7 @@ TEST_P(GLSLTest, TwiceMaxVaryingVec2)
 // Disabled because of a failure in D3D9
 TEST_P(GLSLTest, MaxVaryingVec2Arrays)
 {
-    if (IsD3DSM3())
+    if (isD3DSM3())
     {
         std::cout << "Test disabled on SM3." << std::endl;
         return;
@@ -963,7 +971,7 @@ TEST_P(GLSLTest, MaxVaryingVec2Arrays)
 #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;

src/tests/gl_tests/MipmapTest.cpp

@@ -564,7 +564,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)
+    if ((isAMD() || isIntel()) && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
         std::cout << "Test skipped on Intel/AMD OpenGL." << std::endl;
         return;

src/tests/gl_tests/PackUnpackTest.cpp

@@ -151,7 +151,7 @@ TEST_P(PackUnpackTest, PackUnpackHalfNormal)
 {
     // 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;

src/tests/gl_tests/PointSpritesTest.cpp

@@ -43,7 +43,7 @@ class PointSpritesTest : public ANGLETest
 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;

src/tests/gl_tests/ProvokingVertexTest.cpp

@@ -142,7 +142,7 @@ TEST_P(ProvokingVertexTest, FlatTriWithTransformFeedback)
 {
     // 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, FlatTriStrip)
 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;

src/tests/gl_tests/ReadPixelsTest.cpp

@@ -137,7 +137,7 @@ TEST_P(ReadPixelsPBOTest, ArrayBufferTarget)
 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;

src/tests/gl_tests/SixteenBppTextureTest.cpp

@@ -134,7 +134,7 @@ TEST_P(SixteenBppTextureTest, RGB565Validation)
     // 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 @@ TEST_P(SixteenBppTextureTest, RGBA5551Validation)
     // 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 @@ TEST_P(SixteenBppTextureTest, RGBA5551ClearAlpha)
     // 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 @@ TEST_P(SixteenBppTextureTest, RGBA4444Validation)
     // 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;

src/tests/gl_tests/StateChangeTest.cpp

@@ -75,7 +75,7 @@ class StateChangeTestES3 : public StateChangeTest
 // 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;

src/tests/gl_tests/SwizzleTest.cpp

@@ -142,7 +142,7 @@ class SwizzleTest : public ANGLETest
     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;

src/tests/gl_tests/TextureTest.cpp

@@ -148,7 +148,7 @@ class Texture2DTest : public TexCoordDrawTest
     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_RG)
 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_RG)
 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_RGB)
 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 @@ TEST_P(SamplerTypeMixTestES3, SamplerTypeMixDraw)
 // 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 @@ TEST_P(Texture2DTestES3, TextureLuminance16ImplicitAlpha1)
 {
     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 @@ TEST_P(Texture2DTestES3, TextureLuminance16ImplicitAlpha1)
 // 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 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB8UIImplicitAlpha1)
 // 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 @@ TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB8IImplicitAlpha1)
 // ES 3.0.4 table 3.24
 TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB16UIImplicitAlpha1)
 {
-    if (IsIntel())
+    if (isOSX() && isIntel())
     {
-        std::cout << "Test disabled on Intel." << std::endl;
+        std::cout << "Test disabled on OSX Intel." << std::endl;
         return;
     }
     glActiveTexture(GL_TEXTURE0);
@@ -1738,9 +1738,9 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB16UIImplicitAlpha1)
 // ES 3.0.4 table 3.24
 TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB16IImplicitAlpha1)
 {
-    if (IsIntel())
+    if (isOSX() && isIntel())
     {
-        std::cout << "Test disabled on Intel." << std::endl;
+        std::cout << "Test disabled on OSX Intel." << std::endl;
         return;
     }
     glActiveTexture(GL_TEXTURE0);
@@ -1759,9 +1759,9 @@ TEST_P(Texture2DIntegerAlpha1TestES3, TextureRGB16IImplicitAlpha1)
 // ES 3.0.4 table 3.24
 TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB32UIImplicitAlpha1)
 {
-    if (IsIntel())
+    if (isOSX() && isIntel())
     {
-        std::cout << "Test disabled on Intel." << std::endl;
+        std::cout << "Test disabled on OSX Intel." << std::endl;
         return;
     }
     glActiveTexture(GL_TEXTURE0);
@@ -1780,7 +1780,7 @@ TEST_P(Texture2DUnsignedIntegerAlpha1TestES3, TextureRGB32UIImplicitAlpha1)
 // 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 @@ class TextureLimitsTest : public ANGLETest
 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, MaxVertexTextures)
 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, MaxFragmentTextures)
 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, ExcessiveFragmentTextures)
 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, MaxActiveVertexTextures)
 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;

src/tests/gl_tests/TimerQueriesTest.cpp

@@ -168,7 +168,7 @@ TEST_P(TimerQueriesTest, TimeElapsed)
 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;

src/tests/gl_tests/TransformFeedbackTest.cpp

@@ -145,7 +145,7 @@ TEST_P(TransformFeedbackTest, ZeroSizedViewport)
 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 @@ TEST_P(TransformFeedbackTest, MultiContext)
     }
 
 #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 @@ TEST_P(TransformFeedbackTest, MultiContext)
 #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;

src/tests/gl_tests/UniformBufferTest.cpp

@@ -78,7 +78,7 @@ class UniformBufferTest : public ANGLETest
 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, Simple)
 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, UniformBufferRange)
 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, UnboundUniformBuffer)
 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, UniformBufferManyUpdates)
 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;

src/tests/gl_tests/UniformTest.cpp

@@ -99,7 +99,7 @@ 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)
+    if (isIntel() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
         std::cout << "Test skipped on Intel OpenGL." << std::endl;
         return;

src/tests/gl_tests/VertexAttributeTest.cpp

@@ -41,7 +41,7 @@ class VertexAttributeTest : public ANGLETest
     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, ShortNormalized)
 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, MaxAttribs)
 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, MaxAttribsPlusOne)
 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;

src/tests/test_utils/ANGLETest.cpp

@@ -433,62 +433,58 @@ void ANGLETest::SetWindowVisible(bool isVisible)
     mOSWindow->setVisible(isVisible);
 }
 
-bool IsIntel()
+bool ANGLETest::isIntel() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Intel") != std::string::npos);
 }
 
-bool IsAMD()
+bool ANGLETest::isAMD() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("AMD") != std::string::npos) ||
            (rendererString.find("ATI") != std::string::npos);
 }
 
-bool IsNVIDIA()
+bool ANGLETest::isNVidia() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("NVIDIA") != std::string::npos);
 }
 
-bool IsD3D11()
+bool ANGLETest::isD3D11() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D11 vs_5_0") != std::string::npos);
 }
 
-bool IsD3D11_FL93()
+bool ANGLETest::isD3D11_FL93() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D11 vs_4_0_") != std::string::npos);
 }
 
-bool IsD3D9()
+bool ANGLETest::isD3D9() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D9") != std::string::npos);
 }
 
-bool IsD3DSM3()
+bool ANGLETest::isD3DSM3() const
 {
-    return IsD3D9() || IsD3D11_FL93();
+    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
+    return isD3D9() || isD3D11_FL93();
 }
 
-bool IsOSX()
+bool ANGLETest::isOSX() const
 {
-#if defined(__APPLE__)
+#ifdef __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);

src/tests/test_utils/ANGLETest.h

@@ -137,7 +137,17 @@ class ANGLETest : public ::testing::TestWithParam<angle::PlatformParameters>
     int getWindowHeight() const;
     bool isMultisampleEnabled() const;
 
-    bool isOpenGL() 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;
     EGLint getPlatformRenderer() const;
 
     void ignoreD3D11SDKLayersWarnings();
@@ -164,16 +174,4 @@ class ANGLETestEnvironment : public testing::Environment
     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_