Skip failing Texture tests on Intel D3D11.

tests/angle_tests/ANGLETest.cpp

@@ -231,6 +231,30 @@ void ANGLETest::SetWindowVisible(bool isVisible)
     mOSWindow->setVisible(isVisible);
 }
 
+bool ANGLETest::isIntel() const
+{
+    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
+    return (rendererString.find("Intel") != std::string::npos);
+}
+
+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 ANGLETest::isNVidia() const
+{
+    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
+    return (rendererString.find("NVIDIA") != std::string::npos);
+}
+
+EGLint ANGLETest::getPlatformRenderer() const
+{
+    return mEGLWindow && mEGLWindow->getPlatform().renderer;
+}
+
 OSWindow *ANGLETest::mOSWindow = NULL;
 
 void ANGLETestEnvironment::SetUp()

tests/angle_tests/ANGLETest.h

@@ -89,6 +89,11 @@ class ANGLETest : public testing::Test
     int getWindowHeight() const;
     bool isMultisampleEnabled() const;
 
+    bool isIntel() const;
+    bool isAMD() const;
+    bool isNVidia() const;
+    EGLint getPlatformRenderer() const;
+
   private:
     bool createEGLContext();
     bool destroyEGLContext();

tests/angle_tests/BlitFramebufferANGLETest.cpp

@@ -303,8 +303,6 @@ protected:
 
     GLuint mBGRAMultisampledRenderbuffer;
     GLuint mBGRAMultisampledFBO;
-
-    T mFixtureType;
 };
 
 // Draw to user-created framebuffer, blit whole-buffer color to original framebuffer.
@@ -695,10 +693,9 @@ TYPED_TEST(BlitFramebufferANGLETest, BlitStencil)
 {
     // TODO(jmadill): Figure out if we can fix this on D3D9.
     // https://code.google.com/p/angleproject/issues/detail?id=809
-    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
-    if (rendererString.find("Intel") != std::string::npos &&
-        mFixtureType.GetPlatform().renderer == 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;
     }
 

tests/angle_tests/TextureTest.cpp

@@ -476,6 +476,13 @@ TYPED_TEST(TextureTest, DISABLED_CopySubImageFloat_RGB_RG)
 
 TYPED_TEST(TextureTest, CopySubImageFloat_RGB_RGB)
 {
+    // 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;
+    }
+
     testFloatCopySubImage(3, 3);
 }
 
@@ -493,10 +500,24 @@ TYPED_TEST(TextureTest, DISABLED_CopySubImageFloat_RGBA_RG)
 
 TYPED_TEST(TextureTest, CopySubImageFloat_RGBA_RGB)
 {
+    // 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;
+    }
+
     testFloatCopySubImage(4, 3);
 }
 
 TYPED_TEST(TextureTest, CopySubImageFloat_RGBA_RGBA)
 {
+    // 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;
+    }
+
     testFloatCopySubImage(4, 4);
 }