From 0f3c73220a25eba9bf11583db3d0f76a2c4f6331 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 9 Nov 2017 14:51:17 -0500 Subject: renamed GrPrimitiveEdgeType / GrProcessorEdgeType to GrClipEdgeType Bug: skia: Change-Id: I4a9af0b9b2cfa47875b2ba098098183e8dca29a7 Reviewed-on: https://skia-review.googlesource.com/69601 Reviewed-by: Brian Salomon Commit-Queue: Ethan Nicholas --- include/private/GrTypesPriv.h | 56 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'include') diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h index 3aa6aa5be6..f23b686e8f 100644 --- a/include/private/GrTypesPriv.h +++ b/include/private/GrTypesPriv.h @@ -649,46 +649,46 @@ enum class GrSLRestrict { * GrProcessorEdgeType will succeed with all values and it is up to the caller to check for * a NULL return. */ -enum GrPrimitiveEdgeType { - kFillBW_GrProcessorEdgeType, - kFillAA_GrProcessorEdgeType, - kInverseFillBW_GrProcessorEdgeType, - kInverseFillAA_GrProcessorEdgeType, - kHairlineAA_GrProcessorEdgeType, - - kLast_GrProcessorEdgeType = kHairlineAA_GrProcessorEdgeType +enum GrClipEdgeType { + kFillBW_GrClipEdgeType, + kFillAA_GrClipEdgeType, + kInverseFillBW_GrClipEdgeType, + kInverseFillAA_GrClipEdgeType, + kHairlineAA_GrClipEdgeType, + + kLast_GrClipEdgeType = kHairlineAA_GrClipEdgeType }; -static const int kGrProcessorEdgeTypeCnt = kLast_GrProcessorEdgeType + 1; +static const int kGrProcessorEdgeTypeCnt = kLast_GrClipEdgeType + 1; -static inline bool GrProcessorEdgeTypeIsFill(const GrPrimitiveEdgeType edgeType) { - return (kFillAA_GrProcessorEdgeType == edgeType || kFillBW_GrProcessorEdgeType == edgeType); +static inline bool GrProcessorEdgeTypeIsFill(const GrClipEdgeType edgeType) { + return (kFillAA_GrClipEdgeType == edgeType || kFillBW_GrClipEdgeType == edgeType); } -static inline bool GrProcessorEdgeTypeIsInverseFill(const GrPrimitiveEdgeType edgeType) { - return (kInverseFillAA_GrProcessorEdgeType == edgeType || - kInverseFillBW_GrProcessorEdgeType == edgeType); +static inline bool GrProcessorEdgeTypeIsInverseFill(const GrClipEdgeType edgeType) { + return (kInverseFillAA_GrClipEdgeType == edgeType || + kInverseFillBW_GrClipEdgeType == edgeType); } -static inline bool GrProcessorEdgeTypeIsAA(const GrPrimitiveEdgeType edgeType) { - return (kFillBW_GrProcessorEdgeType != edgeType && - kInverseFillBW_GrProcessorEdgeType != edgeType); +static inline bool GrProcessorEdgeTypeIsAA(const GrClipEdgeType edgeType) { + return (kFillBW_GrClipEdgeType != edgeType && + kInverseFillBW_GrClipEdgeType != edgeType); } -static inline GrPrimitiveEdgeType GrInvertProcessorEdgeType(const GrPrimitiveEdgeType edgeType) { +static inline GrClipEdgeType GrInvertProcessorEdgeType(const GrClipEdgeType edgeType) { switch (edgeType) { - case kFillBW_GrProcessorEdgeType: - return kInverseFillBW_GrProcessorEdgeType; - case kFillAA_GrProcessorEdgeType: - return kInverseFillAA_GrProcessorEdgeType; - case kInverseFillBW_GrProcessorEdgeType: - return kFillBW_GrProcessorEdgeType; - case kInverseFillAA_GrProcessorEdgeType: - return kFillAA_GrProcessorEdgeType; - case kHairlineAA_GrProcessorEdgeType: + case kFillBW_GrClipEdgeType: + return kInverseFillBW_GrClipEdgeType; + case kFillAA_GrClipEdgeType: + return kInverseFillAA_GrClipEdgeType; + case kInverseFillBW_GrClipEdgeType: + return kFillBW_GrClipEdgeType; + case kInverseFillAA_GrClipEdgeType: + return kFillAA_GrClipEdgeType; + case kHairlineAA_GrClipEdgeType: SK_ABORT("Hairline fill isn't invertible."); } - return kFillAA_GrProcessorEdgeType; // suppress warning. + return kFillAA_GrClipEdgeType; // suppress warning. } /** -- cgit v1.2.3