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

3 files changed, 6 insertions, 17 deletions

diff --git a/include/gpu/GrXferProcessor.h b/include/gpu/GrXferProcessor.h
index 3a698143c3..1d4717e156 100644
--- a/include/gpu/GrXferProcessor.h
+++ b/include/gpu/GrXferProcessor.h
@@ -323,8 +323,7 @@ public:
     virtual void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
                                           InvariantBlendedColor*) const = 0;
 
-    bool willNeedDstTexture(const GrCaps& caps, const GrPipelineOptimizations& optimizations, 
-                            bool hasMixedSamples) const;
+    bool willNeedDstTexture(const GrCaps& caps, const GrPipelineOptimizations& optimizations) const;
 
     bool isEqual(const GrXPFactory& that) const {
         if (this->classID() != that.classID()) {
@@ -358,16 +357,12 @@ private:
 
     virtual bool onIsEqual(const GrXPFactory&) const = 0;
 
-    bool willReadDstColor(const GrCaps& caps,
-                          const GrPipelineOptimizations& optimizations,
-                          bool hasMixedSamples) const;
+    bool willReadDstColor(const GrCaps&, const GrPipelineOptimizations&) const;
     /**
      *  Returns true if the XP generated by this factory will explicitly read dst in the fragment
      *  shader.
      */
-    virtual bool onWillReadDstColor(const GrCaps& caps,
-                                    const GrPipelineOptimizations& optimizations,
-                                    bool hasMixedSamples) const = 0;
+    virtual bool onWillReadDstColor(const GrCaps&, const GrPipelineOptimizations&) const = 0;
 
     static uint32_t GenClassID() {
         // fCurrXPFactoryID has been initialized to kIllegalXPFactoryID. The
diff --git a/include/gpu/effects/GrCoverageSetOpXP.h b/include/gpu/effects/GrCoverageSetOpXP.h
index 42ac6ac528..06cc759812 100644
--- a/include/gpu/effects/GrCoverageSetOpXP.h
+++ b/include/gpu/effects/GrCoverageSetOpXP.h
@@ -34,9 +34,7 @@ private:
                                            bool hasMixedSamples,
                                            const DstTexture*) const override;
 
-    bool onWillReadDstColor(const GrCaps& /*caps*/,
-                            const GrPipelineOptimizations& /*optimizations*/,
-                            bool /*hasMixedSamples*/) const override {
+    bool onWillReadDstColor(const GrCaps&, const GrPipelineOptimizations&) const override {
         return false;
     }
 
diff --git a/include/gpu/effects/GrPorterDuffXferProcessor.h b/include/gpu/effects/GrPorterDuffXferProcessor.h
index 865ef44253..476a039ad2 100644
--- a/include/gpu/effects/GrPorterDuffXferProcessor.h
+++ b/include/gpu/effects/GrPorterDuffXferProcessor.h
@@ -48,9 +48,7 @@ public:
         blendedColor->fKnownColorFlags = validColorFlags;
     }
 
-    static bool SrcOverWillNeedDstTexture(const GrCaps& caps,
-                                          const GrPipelineOptimizations& optimizations,
-                                          bool hasMixedSamples);
+    static bool SrcOverWillNeedDstTexture(const GrCaps&, const GrPipelineOptimizations&);
 
 private:
     GrPorterDuffXPFactory(SkXfermode::Mode);
@@ -60,9 +58,7 @@ private:
                                            bool hasMixedSamples,
                                            const DstTexture*) const override;
 
-    bool onWillReadDstColor(const GrCaps& caps,
-                            const GrPipelineOptimizations& optimizations,
-                            bool hasMixedSamples) const override;
+    bool onWillReadDstColor(const GrCaps&, const GrPipelineOptimizations&) const override;
 
     bool onIsEqual(const GrXPFactory& xpfBase) const override {
         const GrPorterDuffXPFactory& xpf = xpfBase.cast<GrPorterDuffXPFactory>();