commit 3ccf2e75ed92adb3c2c289e0cb95901d162df394
author cdalton <cdalton@nvidia.com> Fri May 06 09:41:16 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri May 06 09:41:16 2016 -0700
tree 92e4b20cdc1b5a7fff7945fc982bd22f1e8636d0
parent 73e81abd5e87a6630a2e2725abf13e11af4c8792

Remove hasMixedSamples() from GrPipelineBuilder

This info is unknown until after any clip has been applied to the
stencil settings, so it's misleading to include in the builder.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1952323002

Review-Url: https://codereview.chromium.org/1952323002

src/gpu/GrXferProcessor.cpp

diff --git a/src/gpu/GrXferProcessor.cpp b/src/gpu/GrXferProcessor.cpp
index 3e2ffaa..910b873 100644
--- a/src/gpu/GrXferProcessor.cpp
+++ b/src/gpu/GrXferProcessor.cpp
@@ -197,7 +197,7 @@
                                                   const DstTexture* dstTexture,
                                                   const GrCaps& caps) const {
 #ifdef SK_DEBUG
-    if (this->willReadDstColor(caps, optimizations, hasMixedSamples)) {
+    if (this->willReadDstColor(caps, optimizations)) {
         if (!caps.shaderCaps()->dstReadInShaderSupport()) {
             SkASSERT(dstTexture && dstTexture->texture());
         } else {
@@ -212,15 +212,12 @@
 }
 
 bool GrXPFactory::willNeedDstTexture(const GrCaps& caps,
-                                     const GrPipelineOptimizations& optimizations,
-                                     bool hasMixedSamples) const {
-    return (this->willReadDstColor(caps, optimizations, hasMixedSamples) &&
+                                     const GrPipelineOptimizations& optimizations) const {
+    return (this->willReadDstColor(caps, optimizations) &&
             !caps.shaderCaps()->dstReadInShaderSupport());
 }
 
 bool GrXPFactory::willReadDstColor(const GrCaps& caps,
-                                   const GrPipelineOptimizations& optimizations,
-                                   bool hasMixedSamples) const {
-    return optimizations.fOverrides.fUsePLSDstRead || this->onWillReadDstColor(caps, optimizations,
-                                                                               hasMixedSamples);
+                                   const GrPipelineOptimizations& optimizations) const {
+    return optimizations.fOverrides.fUsePLSDstRead || this->onWillReadDstColor(caps, optimizations);
 }