diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-12-10 07:29:54 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-10 07:29:54 -0800 |
| commit | 53f26aa045d58feb9f2114f53629024bffe52dea (patch) | |
| tree | f02eff8c28488d4b4f5559e0734e81507f88ca9a /src/gpu/effects/GrDistanceFieldGeoProc.h | |
| parent | 9ca30a3b9b8a348a2bae609c583c11a9536a6f11 (diff) | |
Remove uniform color for GrDistanceFieldGeoProc
BUG=skia:
Review URL: https://codereview.chromium.org/1512533003
Diffstat (limited to 'src/gpu/effects/GrDistanceFieldGeoProc.h')
| -rw-r--r-- | src/gpu/effects/GrDistanceFieldGeoProc.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h index ad14c518d0..46d39f0123 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.h +++ b/src/gpu/effects/GrDistanceFieldGeoProc.h @@ -22,21 +22,18 @@ enum GrDistanceFieldEffectFlags { kUseLCD_DistanceFieldEffectFlag = 0x04, // use lcd text kBGR_DistanceFieldEffectFlag = 0x08, // lcd display has bgr order kPortrait_DistanceFieldEffectFlag = 0x10, // lcd display is in portrait mode (not used yet) - kColorAttr_DistanceFieldEffectFlag = 0x20, // color vertex attribute kInvalid_DistanceFieldEffectFlag = 0x80, // invalid state (for initialization) kUniformScale_DistanceFieldEffectMask = kSimilarity_DistanceFieldEffectFlag | kRectToRect_DistanceFieldEffectFlag, // The subset of the flags relevant to GrDistanceFieldA8TextGeoProc - kNonLCD_DistanceFieldEffectMask = kSimilarity_DistanceFieldEffectFlag | - kColorAttr_DistanceFieldEffectFlag, + kNonLCD_DistanceFieldEffectMask = kSimilarity_DistanceFieldEffectFlag, // The subset of the flags relevant to GrDistanceFieldLCDTextGeoProc kLCD_DistanceFieldEffectMask = kSimilarity_DistanceFieldEffectFlag | kRectToRect_DistanceFieldEffectFlag | kUseLCD_DistanceFieldEffectFlag | - kBGR_DistanceFieldEffectFlag | - kColorAttr_DistanceFieldEffectFlag, + kBGR_DistanceFieldEffectFlag, }; /** @@ -72,7 +69,6 @@ public: const Attribute* inTextureCoords() const { return fInTextureCoords; } GrColor color() const { return fColor; } bool colorIgnored() const { return GrColor_ILLEGAL == fColor; } - bool hasVertexColor() const { return SkToBool(fInColor); } const SkMatrix& viewMatrix() const { return fViewMatrix; } bool usesLocalCoords() const { return fUsesLocalCoords; } #ifdef SK_GAMMA_APPLY_TO_A8 @@ -134,7 +130,6 @@ public: const Attribute* inTextureCoords() const { return fInTextureCoords; } GrColor color() const { return fColor; } bool colorIgnored() const { return GrColor_ILLEGAL == fColor; } - bool hasVertexColor() const { return SkToBool(fInColor); } const SkMatrix& viewMatrix() const { return fViewMatrix; } uint32_t getFlags() const { return fFlags; } bool usesLocalCoords() const { return fUsesLocalCoords; } @@ -203,7 +198,6 @@ public: DistanceAdjust getDistanceAdjust() const { return fDistanceAdjust; } GrColor color() const { return fColor; } bool colorIgnored() const { return GrColor_ILLEGAL == fColor; } - bool hasVertexColor() const { return SkToBool(fInColor); } const SkMatrix& viewMatrix() const { return fViewMatrix; } uint32_t getFlags() const { return fFlags; } bool usesLocalCoords() const { return fUsesLocalCoords; } |