Standardize naming on CoverageAsAlpha (rather than AlphaAsCoverage)
Also fix a spelling mistake: Coveage -> Coverage
Bug: skia:
Change-Id: I296415ca194b0805470596d297e1d815f43b404a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201394
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrProcessorSet.cpp b/src/gpu/GrProcessorSet.cpp
index f6cd2d4..099c05e 100644
--- a/src/gpu/GrProcessorSet.cpp
+++ b/src/gpu/GrProcessorSet.cpp
@@ -216,7 +216,7 @@
analysis.fRequiresDstTexture =
SkToBool(props & GrXPFactory::AnalysisProperties::kRequiresDstTexture);
analysis.fCompatibleWithCoverageAsAlpha &=
- SkToBool(props & GrXPFactory::AnalysisProperties::kCompatibleWithAlphaAsCoverage);
+ SkToBool(props & GrXPFactory::AnalysisProperties::kCompatibleWithCoverageAsAlpha);
analysis.fRequiresNonOverlappingDraws = SkToBool(
props & GrXPFactory::AnalysisProperties::kRequiresNonOverlappingDraws);
if (props & GrXPFactory::AnalysisProperties::kIgnoresInputColor) {
diff --git a/src/gpu/GrXferProcessor.h b/src/gpu/GrXferProcessor.h
index 98a359b..4c3fa9c 100644
--- a/src/gpu/GrXferProcessor.h
+++ b/src/gpu/GrXferProcessor.h
@@ -264,7 +264,7 @@
/**
* The op may apply coverage as alpha and still blend correctly.
*/
- kCompatibleWithAlphaAsCoverage = 0x2,
+ kCompatibleWithCoverageAsAlpha = 0x2,
/**
* The color input to the GrXferProcessor will be ignored.
*/
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index f69f25a..ce0d355 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -355,13 +355,13 @@
*/
if (can_use_hw_blend_equation(fHWBlendEquation, coverage, caps)) {
if (caps.blendEquationSupport() == GrCaps::kAdvancedCoherent_BlendEquationSupport) {
- return AnalysisProperties::kCompatibleWithAlphaAsCoverage;
+ return AnalysisProperties::kCompatibleWithCoverageAsAlpha;
} else {
- return AnalysisProperties::kCompatibleWithAlphaAsCoverage |
+ return AnalysisProperties::kCompatibleWithCoverageAsAlpha |
AnalysisProperties::kRequiresNonOverlappingDraws;
}
}
- return AnalysisProperties::kCompatibleWithAlphaAsCoverage |
+ return AnalysisProperties::kCompatibleWithCoverageAsAlpha |
AnalysisProperties::kReadsDstInShader;
}
diff --git a/src/gpu/effects/GrDisableColorXP.h b/src/gpu/effects/GrDisableColorXP.h
index 287e988..5e52264 100644
--- a/src/gpu/effects/GrDisableColorXP.h
+++ b/src/gpu/effects/GrDisableColorXP.h
@@ -32,7 +32,7 @@
const GrProcessorAnalysisCoverage&,
const GrCaps&,
GrClampType) const override {
- return AnalysisProperties::kCompatibleWithAlphaAsCoverage |
+ return AnalysisProperties::kCompatibleWithCoverageAsAlpha |
AnalysisProperties::kIgnoresInputColor;
}
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index 060fb36..5b72269 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -804,7 +804,7 @@
}
if (formula.canTweakAlphaForCoverage() && !isLCD) {
- props |= AnalysisProperties::kCompatibleWithAlphaAsCoverage;
+ props |= AnalysisProperties::kCompatibleWithCoverageAsAlpha;
}
if (isLCD) {
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index 1765a5a..4cc72ac 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -228,7 +228,7 @@
void onPrepareDraws(Target* target) override {
// Setup GrGeometryProcessor
sk_sp<GrGeometryProcessor> gp(create_lines_only_gp(target->caps().shaderCaps(),
- fHelper.compatibleWithAlphaAsCoverage(),
+ fHelper.compatibleWithCoverageAsAlpha(),
this->viewMatrix(),
fHelper.usesLocalCoords(),
fWideColor));
diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index f6f73d5..3371062 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -192,7 +192,7 @@
VertexSpec vertexSpec(fDeviceQuads.quadType(), fColorType, fLocalQuads.quadType(),
fHelper.usesLocalCoords(), Domain::kNo, fHelper.aaType(),
- fHelper.compatibleWithAlphaAsCoverage());
+ fHelper.compatibleWithCoverageAsAlpha());
// Make sure that if the op thought it was a solid color, the vertex spec does not use
// local coords.
SkASSERT(!fHelper.isTrivial() || !fHelper.usesLocalCoords());
diff --git a/src/gpu/ops/GrQuadPerEdgeAA.cpp b/src/gpu/ops/GrQuadPerEdgeAA.cpp
index 2593875..9716e31 100644
--- a/src/gpu/ops/GrQuadPerEdgeAA.cpp
+++ b/src/gpu/ops/GrQuadPerEdgeAA.cpp
@@ -616,7 +616,7 @@
static CoverageMode get_mode_for_spec(const GrQuadPerEdgeAA::VertexSpec& spec) {
if (spec.usesCoverageAA()) {
- if (spec.compatibleWithAlphaAsCoverage() && spec.hasVertexColors()) {
+ if (spec.compatibleWithCoverageAsAlpha() && spec.hasVertexColors()) {
return CoverageMode::kWithColor;
} else {
return CoverageMode::kWithPosition;
diff --git a/src/gpu/ops/GrQuadPerEdgeAA.h b/src/gpu/ops/GrQuadPerEdgeAA.h
index a491f26..ee89d37 100644
--- a/src/gpu/ops/GrQuadPerEdgeAA.h
+++ b/src/gpu/ops/GrQuadPerEdgeAA.h
@@ -36,14 +36,14 @@
struct VertexSpec {
public:
VertexSpec(GrQuadType deviceQuadType, ColorType colorType, GrQuadType localQuadType,
- bool hasLocalCoords, Domain domain, GrAAType aa, bool alphaAsCoverage)
+ bool hasLocalCoords, Domain domain, GrAAType aa, bool coverageAsAlpha)
: fDeviceQuadType(static_cast<unsigned>(deviceQuadType))
, fLocalQuadType(static_cast<unsigned>(localQuadType))
, fHasLocalCoords(hasLocalCoords)
, fColorType(static_cast<unsigned>(colorType))
, fHasDomain(static_cast<unsigned>(domain))
, fUsesCoverageAA(aa == GrAAType::kCoverage)
- , fCompatibleWithAlphaAsCoverage(alphaAsCoverage) { }
+ , fCompatibleWithCoverageAsAlpha(coverageAsAlpha) { }
GrQuadType deviceQuadType() const { return static_cast<GrQuadType>(fDeviceQuadType); }
GrQuadType localQuadType() const { return static_cast<GrQuadType>(fLocalQuadType); }
@@ -52,7 +52,7 @@
bool hasVertexColors() const { return ColorType::kNone != this->colorType(); }
bool hasDomain() const { return fHasDomain; }
bool usesCoverageAA() const { return fUsesCoverageAA; }
- bool compatibleWithAlphaAsCoverage() const { return fCompatibleWithAlphaAsCoverage; }
+ bool compatibleWithCoverageAsAlpha() const { return fCompatibleWithCoverageAsAlpha; }
// Will always be 2 or 3
int deviceDimensionality() const;
@@ -70,7 +70,7 @@
unsigned fColorType : 2;
unsigned fHasDomain: 1;
unsigned fUsesCoverageAA: 1;
- unsigned fCompatibleWithAlphaAsCoverage: 1;
+ unsigned fCompatibleWithCoverageAsAlpha: 1;
};
sk_sp<GrGeometryProcessor> MakeProcessor(const VertexSpec& spec);
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index 73fa3ab..9b2b6f2 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@@ -17,7 +17,7 @@
, fPipelineFlags(0)
, fAAType((int)aaType)
, fUsesLocalCoords(false)
- , fCompatibleWithAlphaAsCoveage(false) {
+ , fCompatibleWithCoverageAsAlpha(false) {
SkDEBUGCODE(fDidAnalysis = false);
SkDEBUGCODE(fMadePipeline = false);
if (GrAATypeIsHW(aaType)) {
@@ -57,7 +57,7 @@
}
bool result = fPipelineFlags == that.fPipelineFlags && (fAAType == that.fAAType ||
(noneAsCoverageAA && none_as_coverage_aa_compatible(this->aaType(), that.aaType())));
- SkASSERT(!result || fCompatibleWithAlphaAsCoveage == that.fCompatibleWithAlphaAsCoveage);
+ SkASSERT(!result || fCompatibleWithCoverageAsAlpha == that.fCompatibleWithCoverageAsAlpha);
SkASSERT(!result || fUsesLocalCoords == that.fUsesLocalCoords);
return result;
}
@@ -95,7 +95,7 @@
analysis = GrProcessorSet::EmptySetAnalysis();
}
fUsesLocalCoords = analysis.usesLocalCoords();
- fCompatibleWithAlphaAsCoveage = analysis.isCompatibleWithCoverageAsAlpha();
+ fCompatibleWithCoverageAsAlpha = analysis.isCompatibleWithCoverageAsAlpha();
return analysis;
}
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index d356074..a9a408b 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -94,7 +94,7 @@
return fUsesLocalCoords;
}
- bool compatibleWithAlphaAsCoverage() const { return fCompatibleWithAlphaAsCoveage; }
+ bool compatibleWithCoverageAsAlpha() const { return fCompatibleWithCoverageAsAlpha; }
struct MakeArgs {
private:
@@ -134,7 +134,7 @@
unsigned fPipelineFlags : 8;
unsigned fAAType : 2;
unsigned fUsesLocalCoords : 1;
- unsigned fCompatibleWithAlphaAsCoveage : 1;
+ unsigned fCompatibleWithCoverageAsAlpha : 1;
SkDEBUGCODE(unsigned fMadePipeline : 1;)
SkDEBUGCODE(unsigned fDidAnalysis : 1;)
};
@@ -180,7 +180,7 @@
using GrSimpleMeshDrawOpHelper::setAAType;
using GrSimpleMeshDrawOpHelper::isTrivial;
using GrSimpleMeshDrawOpHelper::usesLocalCoords;
- using GrSimpleMeshDrawOpHelper::compatibleWithAlphaAsCoverage;
+ using GrSimpleMeshDrawOpHelper::compatibleWithCoverageAsAlpha;
bool isCompatible(const GrSimpleMeshDrawOpHelperWithStencil& that, const GrCaps&,
const SkRect& thisBounds, const SkRect& thatBounds,
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index 5825be5..5619c41 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -466,7 +466,7 @@
void AAStrokeRectOp::onPrepareDraws(Target* target) {
sk_sp<GrGeometryProcessor> gp(create_aa_stroke_rect_gp(target->caps().shaderCaps(),
- fHelper.compatibleWithAlphaAsCoverage(),
+ fHelper.compatibleWithCoverageAsAlpha(),
this->viewMatrix(),
fHelper.usesLocalCoords(),
fWideColor));
@@ -506,7 +506,7 @@
info.fDevInside,
fMiterStroke,
info.fDegenerate,
- fHelper.compatibleWithAlphaAsCoverage());
+ fHelper.compatibleWithCoverageAsAlpha());
}
helper.recordDraw(target, std::move(gp));
}
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index 1401c37..a7460f7 100644
--- a/src/gpu/ops/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -333,7 +333,7 @@
: LocalCoords::kUnused_Type;
Coverage::Type coverageType;
if (fAntiAlias) {
- if (fHelper.compatibleWithAlphaAsCoverage()) {
+ if (fHelper.compatibleWithCoverageAsAlpha()) {
coverageType = Coverage::kAttributeTweakAlpha_Type;
} else {
coverageType = Coverage::kAttribute_Type;
