commit 4cad310adb97ee16be578342fc4bbd147219ade8
author Chris Dalton <csmartdalton@google.com> Sun Oct 08 11:40:03 2017 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sun Oct 08 18:36:11 2017 +0000
tree 3b05ed184e69e7bd738f7c6d1355c77101e2358d
parent c9cb9e8147d47c17d523f2d9c978bd9513c7da5d

CCPR: Blacklist Intel driver except on Mac

TBR=bsalomon@google.com

Bug: skia:
Change-Id: I93306a285c5bd1d71a69c4c8a12b7fc583a52e12
Reviewed-on: https://skia-review.googlesource.com/57160
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/gl/GrGLCaps.cpp

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index d49b4df..af04dc7 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -410,11 +410,14 @@
     }
 
     if (kIntel_GrGLVendor == ctxInfo.vendor()) {
+#ifndef SK_BUILD_FOR_MAC
         if (kIntel_GrGLDriver == ctxInfo.driver()) {
-            // Intel HD4400, HD4600, and Iris6100 crash on the bots.
-            fBlacklistCoverageCounting = kIntel4xxx_GrGLRenderer == ctxInfo.renderer() ||
-                                         kIntel6xxx_GrGLRenderer == ctxInfo.renderer();
-        } else if (kMesa_GrGLDriver == ctxInfo.driver()) {
+            // Every Windows Intel bot either crashes with CCPR or does not draw properly. Hopefully
+            // this issue resolves itself when we move away from geometry shaders.
+            fBlacklistCoverageCounting = true;
+        }
+#endif
+        if (kMesa_GrGLDriver == ctxInfo.driver()) {
             // Blocking old Intel/Mesa setups while we investigate
             // https://bugs.chromium.org/p/skia/issues/detail?id=7134.
             fBlacklistCoverageCounting = version < GR_GL_VER(4,0);