src/gpu/effects/GrDistanceFieldGeoProc.h - Issue 1512533003: Remove uniform color for GrDistanceFieldGeoProc

Unified Diff: src/gpu/effects/GrDistanceFieldGeoProc.h

Issue 1512533003: Remove uniform color for GrDistanceFieldGeoProc (Closed) Base URL: https://skia.googlesource.com/skia.git@cleanuptext4

Patch Set: tweaks Created 5 years 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/effects/GrDistanceFieldGeoProc.h

diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h

index ad14c518d085031685add260dd2b46b1e363a340..14ce63603199a29da3aa082ce254b0dceba4f875 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)

+ kInvalid_DistanceFieldEffectFlag = 0x20, // invalid state (for initialization)

jvanverth1 2015/12/09 15:01:06 Nit: I'd rather leave this as 0x80, just so we hav

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; }

« no previous file with comments | « src/gpu/batches/GrAtlasTextBatch.cpp ('k') | src/gpu/effects/GrDistanceFieldGeoProc.cpp » ('j') | no next file with comments »