Clean up passed end2end tests on Intel Windows platform

src/tests/gl_tests/BlendMinMaxTest.cpp

@@ -202,13 +202,6 @@ TEST_P(BlendMinMaxTest, RGBA32F)
         return;
     }
 
-    // TODO(jmadill): Figure out why this is broken on Intel
-    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())
     {
@@ -228,13 +221,6 @@ TEST_P(BlendMinMaxTest, RGBA16F)
         return;
     }
 
-    // TODO(jmadill): figure out why this fails
-    if (IsIntel() && (GetParam() == ES2_D3D11() || GetParam() == ES2_D3D9()))
-    {
-        std::cout << "Test skipped on Intel due to failures." << std::endl;
-        return;
-    }
-
     runTest(GL_RGBA16F, GL_FLOAT);
 }
 

src/tests/gl_tests/ClearTest.cpp

@@ -351,14 +351,6 @@ TEST_P(ClearTestES3, MixedSRGBClear)
 // flush or finish after ClearBufferfv or each draw.
 TEST_P(ClearTestES3, RepeatedClear)
 {
-    if (IsD3D11() && IsIntel())
-    {
-        // Note that there's been a bug affecting this test on NVIDIA drivers as well, until fall
-        // 2016 driver releases.
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     const std::string &vertexSource =
         "#version 300 es\n"
         "in highp vec2 position;\n"

src/tests/gl_tests/D3DImageFormatConversionTest.cpp

@@ -122,75 +122,30 @@ class D3DImageFormatConversionTest : public ANGLETest
 // Validation test for rx::R4G4B4A4's writeColor functions
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     runTest<R4G4B4A4>(GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
 }
 
 // Validation test for rx::R5G5B5A1's writeColor functions
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     runTest<R5G5B5A1>(GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
 }
 
 // Validation test for rx::R5G6B5's writeColor functions
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     runTest<R5G6B5>(GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
 }
 
 // Validation test for rx::R8G8B8A8's writeColor functions
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     runTest<R8G8B8A8>(GL_RGBA, GL_UNSIGNED_BYTE);
 }
 
 // Validation test for rx::R8G8B8's writeColor functions
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     runTest<R8G8B8>(GL_RGB, GL_UNSIGNED_BYTE);
 }

src/tests/gl_tests/FramebufferTest.cpp

@@ -670,9 +670,6 @@ TEST_P(FramebufferTest_ES31, IncompleteMultisampleFixedSampleLocationsTex)
 // object's default width and height.
 TEST_P(FramebufferTest_ES31, RenderingLimitToDefaultFBOSizeWithNoAttachments)
 {
-    // TODO(yizhou): Investigate why this case fail on Intel GPU.
-    ANGLE_SKIP_TEST_IF(IsIntel() && IsD3D11());
-
     const std::string &vertexShader =
         "#version 310 es\n"
         "in layout(location = 0) highp vec2 a_position;\n\n"

src/tests/gl_tests/PointSpritesTest.cpp

@@ -37,13 +37,6 @@ class PointSpritesTest : public ANGLETest
 // https://www.khronos.org/registry/webgl/sdk/tests/conformance/glsl/variables/gl-pointcoord.html
 TEST_P(PointSpritesTest, PointCoordAndPointSizeCompliance)
 {
-    // TODO(jmadill): figure out why this fails
-    if (IsIntel() && GetParam() == ES2_D3D9())
-    {
-        std::cout << "Test skipped on Intel due to failures." << std::endl;
-        return;
-    }
-
     // TODO(jmadill): Investigate potential AMD driver bug.
     // http://anglebug.com/1643
     if (IsAMD() && IsDesktopOpenGL() && IsWindows())
@@ -154,14 +147,6 @@ TEST_P(PointSpritesTest, PointWithoutAttributesCompliance)
         return;
     }
 
-    // TODO(jmadill): Figure out why this fails on Intel.
-    // http://anglebug.com/1346
-    if (IsIntel() && IsWindows() && (IsD3D11() || IsD3D9()))
-    {
-        std::cout << "Test skipped on Intel Windows D3D." << std::endl;
-        return;
-    }
-
     const std::string fs =
         R"(precision mediump float;
         void main()

src/tests/gl_tests/SixteenBppTextureTest.cpp

@@ -149,15 +149,6 @@ class SixteenBppTextureTestES3 : public SixteenBppTextureTest
 // Samples from the texture, renders to it, generates mipmaps etc.
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     GLuint test;
     memcpy(&test, &GLColor::black, 4);
 
@@ -185,15 +176,6 @@ TEST_P(SixteenBppTextureTest, RGB565Validation)
 // Samples from the texture, renders to it, generates mipmaps etc.
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     GLushort pixels[4] =
     {
         0xF801, // Red
@@ -220,15 +202,6 @@ TEST_P(SixteenBppTextureTest, RGBA5551Validation)
 // Based on WebGL test conformance/textures/texture-attachment-formats.html
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     GLTexture tex;
     GLFramebuffer fbo;
 
@@ -264,15 +237,6 @@ TEST_P(SixteenBppTextureTest, RGBA5551ClearAlpha)
 // Samples from the texture, renders to it, generates mipmaps etc.
 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)
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     GLushort pixels[4] =
     {
         0xF00F, // Red

src/tests/gl_tests/TextureTest.cpp

@@ -174,13 +174,6 @@ class Texture2DTest : public TexCoordDrawTest
     // Tests CopyTexSubImage with floating point textures of various formats.
     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)
-        {
-            std::cout << "Test skipped on Intel D3D11." << std::endl;
-            return;
-        }
-
         setUpProgram();
 
         if (getClientMajorVersion() < 3)
@@ -2532,9 +2525,9 @@ 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() && IsD3D11())
     {
-        std::cout << "Test skipped on Intel and AMD D3D." << std::endl;
+        std::cout << "Test skipped on AMD D3D." << std::endl;
         return;
     }
     glActiveTexture(GL_TEXTURE0);
@@ -2865,12 +2858,6 @@ TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParamete
         return;
     }
 
-    if (IsWindows() && IsIntel() && IsOpenGL())
-    {
-        std::cout << "Test skipped on Windows OpenGL on Intel." << std::endl;
-        return;
-    }
-
     runSamplerInStructTest();
 }
 
@@ -2878,11 +2865,6 @@ TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParamete
 // parameter.
 TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFunctionParameter)
 {
-    if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
-    {
-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
-        return;
-    }
     // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1427 is fixed
     if (IsAndroid() && IsAdreno() && IsOpenGLES())
     {
@@ -2896,11 +2878,6 @@ TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFuncti
 // parameter.
 TEST_P(SamplerInNestedStructAsFunctionParameterTest, SamplerInNestedStructAsFunctionParameter)
 {
-    if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
-    {
-        std::cout << "Test skipped on Intel OpenGL." << std::endl;
-        return;
-    }
     // TODO(ynovikov): re-enable once root cause of http://anglebug.com/1427 is fixed
     if (IsAndroid() && IsAdreno() && IsOpenGLES())
     {

src/tests/gl_tests/TransformFeedbackTest.cpp

@@ -218,13 +218,6 @@ TEST_P(TransformFeedbackTest, BufferRebinding)
 // afterward.
 TEST_P(TransformFeedbackTest, RecordAndDraw)
 {
-    // TODO(jmadill): Figure out why this fails on Intel.
-    if (IsIntel() && GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE)
-    {
-        std::cout << "Test skipped on Intel." << std::endl;
-        return;
-    }
-
     glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
     glClear(GL_COLOR_BUFFER_BIT);
 
@@ -1058,13 +1051,6 @@ class TransformFeedbackLifetimeTest : public TransformFeedbackTest
 // Tests a bug with state syncing and deleted transform feedback buffers.
 TEST_P(TransformFeedbackLifetimeTest, DeletedBuffer)
 {
-    // TODO(ynovikov): Obscure driver error on Intel HD 530 http://anglebug.com/1879
-    if (IsWindows() && IsIntel() && IsDesktopOpenGL())
-    {
-        std::cout << "Test skipped on Intel OpenGL on Windows." << std::endl;
-        return;
-    }
-
     // First stream vertex data to mTransformFeedbackBuffer.
     glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, mTransformFeedback);
     glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, mTransformFeedbackBuffer);

src/tests/gl_tests/WebGLReadOutsideFramebufferTest.cpp

@@ -359,13 +359,6 @@ TEST_P(WebGLReadOutsideFramebufferTest, ReadPixels)
 // the corresponding source pixel is outside the framebuffer.
 TEST_P(WebGLReadOutsideFramebufferTest, CopyTexSubImage2D)
 {
-    // TODO(fjhenigman): Figure out why this fails on Win10 Intel OpenGL
-    if (IsWindows() && IsIntel() && IsDesktopOpenGL())
-    {
-        std::cout << "Test skipped on Windows OpenGL on Intel." << std::endl;
-        return;
-    }
-
     Main2D(&WebGLReadOutsideFramebufferTest::TestCopyTexSubImage2D, false);
 
 #ifdef _WIN64
@@ -383,13 +376,6 @@ TEST_P(WebGLReadOutsideFramebufferTest, CopyTexSubImage2D)
 // Check that copyTexImage2D sets (0,0,0,0) for pixels outside the framebuffer.
 TEST_P(WebGLReadOutsideFramebufferTest, CopyTexImage2D)
 {
-    // TODO(fjhenigman): Figure out why this fails on Win10 Intel OpenGL
-    if (IsWindows() && IsIntel() && IsDesktopOpenGL())
-    {
-        std::cout << "Test skipped on Windows OpenGL on Intel." << std::endl;
-        return;
-    }
-
     Main2D(&WebGLReadOutsideFramebufferTest::TestCopyTexImage2D, true);
 
 #ifdef _WIN64