diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-10-06 14:28:11 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-06 21:56:51 +0000 |
| commit | 4a6a732352fcb1445802dc95a477a943a31a9ac4 (patch) | |
| tree | 80d28afd539c39bf625efd6b9df8bbe068803cbf | |
| parent | 384f0a7d6626026f21313e85e51890d747171ee8 (diff) | |
CCPR: Blacklist intel 4xxx and 6xxx
Bug: skia:
Change-Id: I590725027a6ed66a5612631686f41d62aeeb09fd
Reviewed-on: https://skia-review.googlesource.com/56803
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLUtil.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLUtil.h | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 21aadd59f6..3b401e65a1 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -408,6 +408,12 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fBlacklistCoverageCounting = true; } + if (kIntel_GrGLDriver == ctxInfo.driver()) { + // Intel HD4400, HD4600, and Iris6100 crash on the bots. + fBlacklistCoverageCounting = kIntel4xxx_GrGLRenderer == ctxInfo.renderer() || + kIntel6xxx_GrGLRenderer == ctxInfo.renderer(); + } + if (!contextOptions.fAvoidStencilBuffers) { // To reduce surface area, if we avoid stencil buffers, we also disable MSAA. this->initFSAASupport(contextOptions, ctxInfo, gli); diff --git a/src/gpu/gl/GrGLUtil.cpp b/src/gpu/gl/GrGLUtil.cpp index 6c6148b5cb..76bab8b552 100644 --- a/src/gpu/gl/GrGLUtil.cpp +++ b/src/gpu/gl/GrGLUtil.cpp @@ -339,6 +339,9 @@ GrGLRenderer GrGLGetRendererFromString(const char* rendererString) { n = sscanf(rendererString, "Intel(R) HD Graphics %d", &intelNumber); } if (1 == n) { + if (intelNumber >= 4000 && intelNumber < 5000) { + return kIntel4xxx_GrGLRenderer; + } if (intelNumber >= 6000 && intelNumber < 7000) { return kIntel6xxx_GrGLRenderer; } diff --git a/src/gpu/gl/GrGLUtil.h b/src/gpu/gl/GrGLUtil.h index 59d6b839c3..f1b339f301 100644 --- a/src/gpu/gl/GrGLUtil.h +++ b/src/gpu/gl/GrGLUtil.h @@ -55,6 +55,8 @@ enum GrGLRenderer { kAdreno5xx_GrGLRenderer, kOSMesa_GrGLRenderer, kIntelIrisPro_GrGLRenderer, + /** Either HD 4xxx or Iris 4xxx */ + kIntel4xxx_GrGLRenderer, /** Either HD 6xxx or Iris 6xxx */ kIntel6xxx_GrGLRenderer, /** T-6xx, T-7xx, or T-8xx */ |