commit 78fa08b279c5929fdeff66c163e68878d1ece39b
author Chris Dalton <csmartdalton@google.com> Sat Nov 16 02:53:52 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Nov 16 02:54:06 2019 +0000
tree b6c9b8452de7494f30ccacf438c47ce08a05809b
parent cb73b6250ec57b2d0e1d778753713140baef4d6d

Revert "Enable msaa ccpr on vulkan"

This reverts commit cb73b6250ec57b2d0e1d778753713140baef4d6d.

Reason for revert: Win10 crash is back

Original change's description:
> Enable msaa ccpr on vulkan
> 
> TBR=egdaniel@google.com
> 
> Bug: skia:9643
> Change-Id: Ie06891734b700c940b996a63c7b1264ce0f2597c
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/254808
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Auto-Submit: Chris Dalton <csmartdalton@google.com>

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

Change-Id: I5261d6143f6dce6f50cf712a6ecc28d6d999b210
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:9643
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255007
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/ccpr/GrStencilAtlasOp.cpp

diff --git a/src/gpu/ccpr/GrStencilAtlasOp.cpp b/src/gpu/ccpr/GrStencilAtlasOp.cpp
index 258e495..99d513e 100644
--- a/src/gpu/ccpr/GrStencilAtlasOp.cpp
+++ b/src/gpu/ccpr/GrStencilAtlasOp.cpp
@@ -90,13 +90,11 @@
 );
 
 // Resolves stencil winding counts to A8 coverage. Leaves stencil values untouched.
-// NOTE: For the CCW face we intentionally use "1 == (stencil & 1)" because the contrapositive logic
-// (i.e. 0 != ...) causes bugs on Adreno Vulkan. http://skbug.com/9643
 static constexpr GrUserStencilSettings kResolveStencilCoverage(
     GrUserStencilSettings::StaticInitSeparate<
-        0x0000,                           0x0001,
-        GrUserStencilTest::kNotEqual,     GrUserStencilTest::kEqual,
-        0xffff,                           0x0001,
+        0x0000,                           0x0000,
+        GrUserStencilTest::kNotEqual,     GrUserStencilTest::kNotEqual,
+        0xffff,                           0x1,
         GrUserStencilOp::kKeep,           GrUserStencilOp::kKeep,
         GrUserStencilOp::kKeep,           GrUserStencilOp::kKeep,
         0xffff,                           0xffff>()
@@ -108,7 +106,7 @@
     GrUserStencilSettings::StaticInitSeparate<
         0x0000,                           0x0000,
         GrUserStencilTest::kNotEqual,     GrUserStencilTest::kNotEqual,
-        0xffff,                           0x0001,
+        0xffff,                           0x1,
         GrUserStencilOp::kZero,           GrUserStencilOp::kZero,
         GrUserStencilOp::kKeep,           GrUserStencilOp::kKeep,
         0xffff,                           0xffff>()

src/gpu/vk/GrVkCaps.cpp

diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 314ab5c..aeb9ec7 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -441,6 +441,10 @@
     // GrCaps workarounds
     ////////////////////////////////////////////////////////////////////////////
 
+    // Temporarily disable the MSAA implementation of CCPR while we work out a crash on Win10
+    // GTX660 and incorrect rendring on Adreno.
+    fDriverBlacklistMSAACCPR = true;
+
     if (kARM_VkVendor == properties.vendorID) {
         fInstanceAttribSupport = false;
         fAvoidWritePixelsFastPath = true; // bugs.skia.org/8064