diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-10-16 10:43:17 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-16 19:17:01 +0000 |
| commit | cc7a2f6864945ac7c96ce8900f6f339c4fb95f3b (patch) | |
| tree | 74ab85f12a2312bccfd72839ed24d2683314002a | |
| parent | 82269abfec798621c8dbbc6bd48996c0b2686f41 (diff) | |
CCPR: Blacklist all of Intel except on Mac
Bug: skia:
Change-Id: I11deb503a1ba80118a09d44c2685c4ba11110728
Reviewed-on: https://skia-review.googlesource.com/60102
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 5ae715e350..2bbd72436c 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -409,20 +409,13 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fBlacklistCoverageCounting = true; } - if (kIntel_GrGLVendor == ctxInfo.vendor()) { #ifndef SK_BUILD_FOR_MAC - if (kIntel_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); - } + if (kIntel_GrGLVendor == ctxInfo.vendor()) { + // Non-Mac Intel bots across the board either crash with CCPR or do not draw properly. + // Hopefully this issue resolves itself when we move away from geometry shaders. + fBlacklistCoverageCounting = true; } +#endif if (!contextOptions.fAvoidStencilBuffers) { // To reduce surface area, if we avoid stencil buffers, we also disable MSAA. |