commit df1681ec06619f54b73f65008203ecbe822bf87e
author Chris Dalton <csmartdalton@google.com> Thu Mar 29 23:16:55 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 29 23:17:07 2018 +0000
tree 92b861b8db2a2f266bb18565c1a2a430f3db30c6
parent f5b418839f2e43ec9f92ed9a5f873eb9cf63f713

Revert "vulkan: Blacklist MSAA path renderer on Qualcomm drivers"

This reverts commit 03616574024a7f321e885e5ab6fc575746573109.

Reason for revert: Caused more bad golds than it fixed

Original change's description:
> vulkan: Blacklist MSAA path renderer on Qualcomm drivers
> 
> Bug: skia:7758
> Change-Id: I96b5c259352949d67f5e0263a7164cdce54b3269
> Reviewed-on: https://skia-review.googlesource.com/117152
> Reviewed-by: Derek Sollenberger <djsollen@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

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

Change-Id: I80714a4cba7d495bc6ad89616b6c5f6eb8492bdb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7758
Reviewed-on: https://skia-review.googlesource.com/117340
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

include/gpu/GrCaps.h

diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h
index 984e0ef..02a51a0 100644
--- a/include/gpu/GrCaps.h
+++ b/include/gpu/GrCaps.h
@@ -73,8 +73,6 @@
 
     bool blacklistCoverageCounting() const { return fBlacklistCoverageCounting; }
 
-    bool blacklistMSAAPathRenderer() const { return fBlacklistMSAAPathRenderer; }
-
     bool avoidStencilBuffers() const { return fAvoidStencilBuffers; }
 
     /**
@@ -294,7 +292,6 @@
 
     // Driver workaround
     bool fBlacklistCoverageCounting                  : 1;
-    bool fBlacklistMSAAPathRenderer                  : 1;
     bool fAvoidStencilBuffers                        : 1;
 
     // ANGLE performance workaround

src/gpu/GrCaps.cpp

diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index 933292d..0507a3f 100644
--- a/src/gpu/GrCaps.cpp
+++ b/src/gpu/GrCaps.cpp
@@ -91,7 +91,6 @@
 #endif
     fBufferMapThreshold = options.fBufferMapThreshold;
     fBlacklistCoverageCounting = false;
-    fBlacklistMSAAPathRenderer = false;
     fAvoidStencilBuffers = false;
 
     fPreferVRAMUseOverFlushes = true;
@@ -103,7 +102,6 @@
         // We always blacklist coverage counting on Vulkan currently. TODO: Either stop doing that
         // or disambiguate blacklisting from incomplete implementation.
         // SkASSERT(!fBlacklistCoverageCounting);
-        SkASSERT(!fBlacklistMSAAPathRenderer);
         SkASSERT(!fAvoidStencilBuffers);
         SkASSERT(!fAdvBlendEqBlacklist);
     }
@@ -175,7 +173,6 @@
 
     writer->appendBool("Blacklist Coverage Counting Path Renderer [workaround]",
                        fBlacklistCoverageCounting);
-    writer->appendBool("Blacklist MSAA Path Renderer [workaround]", fBlacklistMSAAPathRenderer);
     writer->appendBool("Prefer VRAM Use over flushes [workaround]", fPreferVRAMUseOverFlushes);
     writer->appendBool("Avoid stencil buffers [workaround]", fAvoidStencilBuffers);
 

src/gpu/GrPathRendererChain.cpp

diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index 47f18ea..1e1d87a 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -41,7 +41,7 @@
     }
 #ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
     if (options.fGpuPathRenderers & GpuPathRenderers::kMSAA) {
-        if (caps.sampleShadingSupport() && !caps.blacklistMSAAPathRenderer()) {
+        if (caps.sampleShadingSupport()) {
             fChain.push_back(sk_make_sp<GrMSAAPathRenderer>());
         }
     }

src/gpu/vk/GrVkCaps.cpp

diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index aa93f2e..83546da 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -131,10 +131,6 @@
         fNewCBOnPipelineChange = true;
     }
 
-    if (kIntel_VkVendor == properties.vendorID) {
-        fCanUseWholeSizeOnFlushMappedMemory = false;
-    }
-
     ////////////////////////////////////////////////////////////////////////////
     // GrCaps workarounds
     ////////////////////////////////////////////////////////////////////////////
@@ -148,14 +144,8 @@
         fMaxVertexAttributes = SkTMin(fMaxVertexAttributes, 32);
     }
 
-    if (kQualcomm_VkVendor == properties.vendorID) {
-        // http://skbug.com/7758 -- the bots have a rendering issue related to the MSAA path
-        // renderer. It doesn't repro locally, and there doesn't seem to be a correlation between it
-        // and the driver version. Blacklisting across-the-board for now.
-        //
-        //     properties.driverVersion=93622907, Android 8.1 -> no repro
-        //     properties.driverVersion=159578699, Android 8.0 -> repros
-        fBlacklistMSAAPathRenderer = true;
+    if (kIntel_VkVendor == properties.vendorID) {
+        fCanUseWholeSizeOnFlushMappedMemory = false;
     }
 
     ////////////////////////////////////////////////////////////////////////////