Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(832)

Unified Diff: src/gpu/effects/GrPorterDuffXferProcessor.cpp

Issue 1161273005: Update XPF invariant info to not account for conflation (Closed) Base URL: https://skia.googlesource.com/skia.git@upload_reenablebea
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/effects/GrDisableColorXP.h ('k') | tests/GrPorterDuffTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/effects/GrPorterDuffXferProcessor.cpp
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index 812cfeaaa4472e4bef2a4a170e7bdd4a22b19265..83c72f934255f9bd6ac674b77313bf52cb802e41 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -709,6 +709,7 @@ PDLCDXferProcessor::onGetOptimizations(const GrProcOptInfo& colorPOI,
GrPorterDuffXPFactory::GrPorterDuffXPFactory(SkXfermode::Mode xfermode)
: fXfermode(xfermode) {
+ SkASSERT(fXfermode <= SkXfermode::kLastCoeffMode);
this->initClassID<GrPorterDuffXPFactory>();
}
@@ -770,39 +771,34 @@ bool GrPorterDuffXPFactory::supportsRGBCoverage(GrColor /*knownColor*/,
return false;
}
-void GrPorterDuffXPFactory::getInvariantOutput(const GrProcOptInfo& colorPOI,
- const GrProcOptInfo& coveragePOI,
- GrXPFactory::InvariantOutput* output) const {
- output->fWillBlendWithDst = true;
- output->fBlendedColorFlags = kNone_GrColorComponentFlags;
-
- // The blend table doesn't support LCD coverage, but these formulas never have invariant output.
- if (coveragePOI.isFourChannelOutput()) {
+void GrPorterDuffXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+ InvariantBlendedColor* blendedColor) const {
+ // Find the blended color info based on the formula that does not have coverage.
+ BlendFormula colorFormula = gBlendTable[colorPOI.isOpaque()][0][fXfermode];
+ if (colorFormula.usesDstColor()) {
+ blendedColor->fWillBlendWithDst = true;
+ blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
return;
}
- const BlendFormula& blendFormula = get_blend_formula(fXfermode, colorPOI, coveragePOI);
- if (blendFormula.usesDstColor()) {
- return;
- }
+ blendedColor->fWillBlendWithDst = false;
- SkASSERT(coveragePOI.isSolidWhite());
- SkASSERT(kAdd_GrBlendEquation == blendFormula.fBlendEquation);
+ SkASSERT(kAdd_GrBlendEquation == colorFormula.fBlendEquation);
- output->fWillBlendWithDst = false;
-
- switch (blendFormula.fSrcCoeff) {
+ switch (colorFormula.fSrcCoeff) {
case kZero_GrBlendCoeff:
- output->fBlendedColor = 0;
- output->fBlendedColorFlags = kRGBA_GrColorComponentFlags;
+ blendedColor->fKnownColor = 0;
+ blendedColor->fKnownColorFlags = kRGBA_GrColorComponentFlags;
return;
case kOne_GrBlendCoeff:
- output->fBlendedColor = colorPOI.color();
- output->fBlendedColorFlags = colorPOI.validFlags();
+ blendedColor->fKnownColor = colorPOI.color();
+ blendedColor->fKnownColorFlags = colorPOI.validFlags();
return;
- default: return;
+ default:
+ blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+ return;
}
}
« no previous file with comments | « src/gpu/effects/GrDisableColorXP.h ('k') | tests/GrPorterDuffTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698