commit f070cbec0708b49e4bd15139cfd8a1724def3a60
author Chris Dalton <csmartdalton@google.com> Thu Oct 03 04:52:34 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 03 04:52:45 2019 +0000
tree dfd6e6603f01616760a7bed092c219d5b7432b49
parent c31e44ca1981fb85ea5856af4d8f8051b1d28ef4

Revert "ccpr: Unblacklist Qualcomm with msaa"

This reverts commit 3f55695a042ab842d6e47e47dc26ccb9eda443c0.

Reason for revert: Pixel 2 still crashing

Original change's description:
> ccpr: Unblacklist Qualcomm with msaa
> 
> Bug: skia:
> Change-Id: I1ab69fe87136955b01a329675f1d0affec3700ec
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245530
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com

Change-Id: I120cc9e55ae205281992a5fe102f15a4b917e73e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245921
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 cc5c007..fd94d80 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -3603,7 +3603,8 @@
     // Temporarily disable the MSAA implementation of CCPR on various platforms while we work out
     // specific issues.
     if (kATI_GrGLVendor == ctxInfo.vendor() ||  // Radeon drops stencil draws that use sample mask.
-        kImagination_GrGLVendor == ctxInfo.vendor() /* PowerVR produces flaky results on Gold. */) {
+        kImagination_GrGLVendor == ctxInfo.vendor() ||  // PowerVR produces flaky results on Gold.
+        kQualcomm_GrGLVendor == ctxInfo.vendor()  /* Pixel2 crashes in nanobench. */) {
         fDriverBlacklistMSAACCPR = true;
     }