commit eec6f7be5461e588210f383b8af18f324a2bdb46
author Brian Salomon <bsalomon@google.com> Fri Feb 10 14:29:38 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 10 20:02:32 2017 +0000
tree 1d72e2d8636f65b32e0edaa4a47fe3fa6d6c3b05
parent 2aeae78a2ce3b036f0401fd0381d6fd6e2a7a1fc

Use new fragment processor optimization queries.

This doesn't yet delete the old virtuals.

It still uses the color and component flags model for the pipeline input and blended output but I'm planning to change those as well.

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

src/gpu/effects/GrPorterDuffXferProcessor.cpp

diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index 73c6ef4..5f44c7a 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -465,7 +465,7 @@
         if (!fBlendFormula.usesInputColor()) {
             optFlags |= GrXferProcessor::kIgnoreColor_OptFlag;
         }
-        if (analysis.fColorPOI.allStagesMultiplyInput() &&
+        if (analysis.fColorPOI.allProcessorsModulateByPremul() &&
             fBlendFormula.canTweakAlphaForCoverage() && !analysis.fCoveragePOI.isLCDCoverage()) {
             optFlags |= GrXferProcessor::kCanTweakAlphaForCoverage_OptFlag;
         }
@@ -627,20 +627,16 @@
     this->initClassID<PDLCDXferProcessor>();
 }
 
-GrXferProcessor* PDLCDXferProcessor::Create(SkBlendMode xfermode,
-                                            const GrProcOptInfo& colorPOI) {
+GrXferProcessor* PDLCDXferProcessor::Create(SkBlendMode xfermode, const GrProcOptInfo& colorPOI) {
     if (SkBlendMode::kSrcOver != xfermode) {
         return nullptr;
     }
-
-    if (kRGBA_GrColorComponentFlags != colorPOI.validFlags()) {
+    GrColor blendConstant;
+    if (!colorPOI.hasKnownOutputColor(&blendConstant)) {
         return nullptr;
     }
-
-    GrColor blendConstant = GrUnpremulColor(colorPOI.color());
     uint8_t alpha = GrColorUnpackA(blendConstant);
     blendConstant |= (0xff << GrColor_SHIFT_A);
-
     return new PDLCDXferProcessor(blendConstant, alpha);
 }
 
@@ -746,8 +742,7 @@
     }
     BlendFormula blendFormula;
     if (analysis.fCoveragePOI.isLCDCoverage()) {
-        if (SkBlendMode::kSrcOver == fBlendMode &&
-            kRGBA_GrColorComponentFlags == analysis.fColorPOI.validFlags() &&
+        if (SkBlendMode::kSrcOver == fBlendMode && analysis.fColorPOI.hasKnownOutputColor() &&
             !caps.shaderCaps()->dualSourceBlendingSupport() &&
             !caps.shaderCaps()->dstReadInShaderSupport()) {
             // If we don't have dual source blending or in shader dst reads, we fall back to this
@@ -789,12 +784,12 @@
             blendedColor->fKnownColor = 0;
             blendedColor->fKnownColorFlags = kRGBA_GrColorComponentFlags;
             return;
-
         case kOne_GrBlendCoeff:
-            blendedColor->fKnownColor = colorPOI.color();
-            blendedColor->fKnownColorFlags = colorPOI.validFlags();
+            blendedColor->fKnownColorFlags =
+                    colorPOI.hasKnownOutputColor(&blendedColor->fKnownColor)
+                            ? kRGBA_GrColorComponentFlags
+                            : kNone_GrColorComponentFlags;
             return;
-
         default:
             blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
             return;
@@ -880,7 +875,7 @@
         return nullptr;
     }
 
-    if (kRGBA_GrColorComponentFlags == analysis.fColorPOI.validFlags() &&
+    if (analysis.fColorPOI.hasKnownOutputColor() &&
         !caps.shaderCaps()->dualSourceBlendingSupport() &&
         !caps.shaderCaps()->dstReadInShaderSupport()) {
         // If we don't have dual source blending or in shader dst reads, we fall
@@ -905,6 +900,21 @@
     return sk_make_sp<PorterDuffXferProcessor>(formula);
 }
 
+void GrPorterDuffXPFactory::SrcOverInvariantBlendedColor(
+        const GrProcOptInfo& colorPOI, GrXPFactory::InvariantBlendedColor* blendedColor) {
+    if (!colorPOI.isOpaque()) {
+        blendedColor->fWillBlendWithDst = true;
+        blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+        return;
+    }
+    blendedColor->fWillBlendWithDst = false;
+    if (colorPOI.hasKnownOutputColor(&blendedColor->fKnownColor)) {
+        blendedColor->fKnownColorFlags = kRGBA_GrColorComponentFlags;
+    } else {
+        blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+    }
+}
+
 bool GrPorterDuffXPFactory::SrcOverWillNeedDstTexture(const GrCaps& caps,
                                                       const GrPipelineAnalysis& analysis) {
     if (caps.shaderCaps()->dstReadInShaderSupport() ||
@@ -916,7 +926,7 @@
     // blend. The one exception is when we are using srcover mode and we know the input color
     // into the XP.
     if (analysis.fCoveragePOI.isLCDCoverage()) {
-        if (kRGBA_GrColorComponentFlags == analysis.fColorPOI.validFlags() &&
+        if (analysis.fColorPOI.hasKnownOutputColor() &&
             !caps.shaderCaps()->dstReadInShaderSupport()) {
             return false;
         }