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

Unified Diff: src/gpu/GrPaint.cpp

Issue 608253002: Add isSingleComponent bool to getConstantColorComponent (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update comment and nits Created 6 years, 3 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
Index: src/gpu/GrPaint.cpp
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp
index 84fdf420e269819e7eda6163d8ebee796b7c6008..524e23662b0935185b21f1f9d29d9f82c591ba7b 100644
--- a/src/gpu/GrPaint.cpp
+++ b/src/gpu/GrPaint.cpp
@@ -52,28 +52,32 @@ bool GrPaint::getOpaqueAndKnownColor(GrColor* solidColor,
// TODO: Share this implementation with GrDrawState
- GrColor coverage = GrColorPackRGBA(fCoverage, fCoverage, fCoverage, fCoverage);
- uint32_t coverageComps = kRGBA_GrColorComponentFlags;
+ GrProcessor::InvarientOutput invarientOutput;
+ invarientOutput.color = GrColorPackRGBA(fCoverage, fCoverage, fCoverage, fCoverage);
+ invarientOutput.validFlags = kRGBA_GrColorComponentFlags;
+ invarientOutput.isSingleComponent = false;
int count = fCoverageStages.count();
for (int i = 0; i < count; ++i) {
- fCoverageStages[i].getProcessor()->getConstantColorComponents(&coverage, &coverageComps);
+ fCoverageStages[i].getProcessor()->computeInvarientOutput(&invarientOutput);
}
- if (kRGBA_GrColorComponentFlags != coverageComps || 0xffffffff != coverage) {
+ if (!invarientOutput.hasOpaqueColor()) {
return false;
}
- GrColor color = fColor;
- uint32_t colorComps = kRGBA_GrColorComponentFlags;
+ invarientOutput.color = fColor;
+ invarientOutput.validFlags = kRGBA_GrColorComponentFlags;
+ invarientOutput.isSingleComponent = false;
count = fColorStages.count();
for (int i = 0; i < count; ++i) {
- fColorStages[i].getProcessor()->getConstantColorComponents(&color, &colorComps);
+ fColorStages[i].getProcessor()->computeInvarientOutput(&invarientOutput);
}
SkASSERT((NULL == solidColor) == (NULL == solidColorKnownComponents));
GrBlendCoeff srcCoeff = fSrcBlendCoeff;
GrBlendCoeff dstCoeff = fDstBlendCoeff;
- GrSimplifyBlend(&srcCoeff, &dstCoeff, color, colorComps, 0, 0, 0);
+ GrSimplifyBlend(&srcCoeff, &dstCoeff, invarientOutput.color, invarientOutput.validFlags,
+ 0, 0, 0);
bool opaque = kZero_GrBlendCoeff == dstCoeff && !GrBlendCoeffRefsDst(srcCoeff);
if (solidColor) {
@@ -85,8 +89,8 @@ bool GrPaint::getOpaqueAndKnownColor(GrColor* solidColor,
break;
case kOne_GrBlendCoeff:
- *solidColor = color;
- *solidColorKnownComponents = colorComps;
+ *solidColor = invarientOutput.color;
+ *solidColorKnownComponents = invarientOutput.validFlags;
break;
// The src coeff should never refer to the src and if it refers to dst then opaque

Powered by Google App Engine
This is Rietveld 408576698