commit 9a51498720e234b413e5a3c46d38ab40bda131de
author Brian Salomon <bsalomon@google.com> Tue Feb 14 10:28:22 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 14 16:06:13 2017 +0000
tree d9eab53b0bc23e4d5b3f575552fdac5e83c588e5
parent 8a8937c3d18e42f5d878885b40f3c1f8140627b7

Remove component flags from GrXPFactory output analysis.

Change-Id: Ieb8dab564e6e593dca2e092d352756052dadfd90
Reviewed-on: https://skia-review.googlesource.com/8354
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/effects/GrCustomXfermode.cpp

diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index 4a4cb60..bc11d7e 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -331,16 +331,20 @@
     constexpr CustomXPFactory(SkBlendMode mode)
             : fMode(mode), fHWBlendEquation(hw_blend_equation(mode)) {}
 
-    void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
-                                  GrXPFactory::InvariantBlendedColor*) const override;
-
 private:
     GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
                                            const GrPipelineAnalysis&,
                                            bool hasMixedSamples,
                                            const DstTexture*) const override;
 
-    bool willReadDstColor(const GrCaps&, ColorType, CoverageType) const override;
+    bool isPreCoverageBlendedColorConstant(const GrProcOptInfo& colorInput,
+                                           GrColor* color) const override {
+        return false;
+    }
+
+    bool willReadsDst(const GrProcOptInfo&, const GrProcOptInfo&) const override { return true; }
+
+    bool willReadDstInShader(const GrCaps&, ColorType, CoverageType) const override;
 
     GR_DECLARE_XP_FACTORY_TEST;
 
@@ -366,20 +370,14 @@
     return new CustomXP(dstTexture, hasMixedSamples, fMode);
 }
 
-bool CustomXPFactory::willReadDstColor(const GrCaps& caps, ColorType colorType,
-                                       CoverageType coverageType) const {
+bool CustomXPFactory::willReadDstInShader(const GrCaps& caps, ColorType colorType,
+                                          CoverageType coverageType) const {
     // This should not be called if we're using PLS dst read.
     static constexpr bool kUsesPLSRead = false;
     return !can_use_hw_blend_equation(fHWBlendEquation, kUsesPLSRead,
                                       CoverageType::kLCD == coverageType, caps);
 }
 
-void CustomXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
-                                               InvariantBlendedColor* blendedColor) const {
-    blendedColor->fWillBlendWithDst = true;
-    blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
-}
-
 GR_DEFINE_XP_FACTORY_TEST(CustomXPFactory);
 #if GR_TEST_UTILS
 const GrXPFactory* CustomXPFactory::TestGet(GrProcessorTestData* d) {