commit d922775b61373ec780c578483c8eeaf38e24d8f9
author Jiang <yizhou.jiang@intel.com> Thu Oct 19 16:23:07 2017 +0800
committer Commit Bot <commit-bot@chromium.org> Tue Oct 31 13:25:55 2017 +0000
tree aa1d36f7251178e525545563320f325ec53ceeea
parent 6bb4f501f6789dc738421961d88f3c48c11a2d9f

Clean up passed end2end tests on Intel Windows platform

Intel driver has released its latest versions, many intel driver bugs are fixed.
This patch cleans up end2end test cases skipped on windows 10 and windows 7.
The test environment is as follows,
Hardware: Skylake(HD 530), Kabylake(HD 630)
Driver version: 4815, 4821
OS: windows 10(15063), windows 7.

BUG=angleproject:2205

Change-Id: Iae14763aa86a572da1221e9ea35b28da2561d3b0
Reviewed-on: https://chromium-review.googlesource.com/729549
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/tests/gl_tests/TextureTest.cpp

diff --git a/src/tests/gl_tests/TextureTest.cpp b/src/tests/gl_tests/TextureTest.cpp
index f4e004a..d6242d6 100644
--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -174,13 +174,6 @@
     // 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 @@
 // 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 @@
         return;
     }
 
-    if (IsWindows() && IsIntel() && IsOpenGL())
-    {
-        std::cout << "Test skipped on Windows OpenGL on Intel." << std::endl;
-        return;
-    }
-
     runSamplerInStructTest();
 }
 
@@ -2878,11 +2865,6 @@
 // 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 @@
 // 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())
     {