diff options
author | brianosman <brianosman@google.com> | 2016-04-13 13:10:14 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-13 13:10:14 -0700 |
commit | b461d3457567cf79a3efac3123c00f7afc37fecb (patch) | |
tree | 6b1600d0da18cefc3e29568419354bd68c9e5b41 /src/gpu/effects/GrDistanceFieldGeoProc.h | |
parent | 54ef1a7c95bcc8e507f7d6ccd9a49bd9a110ba90 (diff) |
Rename lots of things from 'sRGB' to 'GammaCorrect', where appropriate
Trying to be much more explicit about where we really mean sRGB as a format,
and where we mean gamma-correct, as in: "not legacy behavior". Most of the
changes to rendering behavior are dependent on the latter, so let's be precise.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1884873006
Review URL: https://codereview.chromium.org/1884873006
Diffstat (limited to 'src/gpu/effects/GrDistanceFieldGeoProc.h')
-rw-r--r-- | src/gpu/effects/GrDistanceFieldGeoProc.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h index 2786b7e823..406c352409 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.h +++ b/src/gpu/effects/GrDistanceFieldGeoProc.h @@ -17,12 +17,12 @@ class GrGLDistanceFieldLCDTextGeoProc; class GrInvariantOutput; enum GrDistanceFieldEffectFlags { - kSimilarity_DistanceFieldEffectFlag = 0x01, // ctm is similarity matrix - kScaleOnly_DistanceFieldEffectFlag = 0x02, // ctm has only scale and translate - 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) - kSRGB_DistanceFieldEffectFlag = 0x20, // assume sRGB dest (use linstep, not smoothstep) + kSimilarity_DistanceFieldEffectFlag = 0x01, // ctm is similarity matrix + kScaleOnly_DistanceFieldEffectFlag = 0x02, // ctm has only scale and translate + 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) + kGammaCorrect_DistanceFieldEffectFlag = 0x20, // assume gamma-correct output (linear blending) kInvalid_DistanceFieldEffectFlag = 0x80, // invalid state (for initialization) @@ -31,13 +31,13 @@ enum GrDistanceFieldEffectFlags { // The subset of the flags relevant to GrDistanceFieldA8TextGeoProc kNonLCD_DistanceFieldEffectMask = kSimilarity_DistanceFieldEffectFlag | kScaleOnly_DistanceFieldEffectFlag | - kSRGB_DistanceFieldEffectFlag, + kGammaCorrect_DistanceFieldEffectFlag, // The subset of the flags relevant to GrDistanceFieldLCDTextGeoProc kLCD_DistanceFieldEffectMask = kSimilarity_DistanceFieldEffectFlag | kScaleOnly_DistanceFieldEffectFlag | kUseLCD_DistanceFieldEffectFlag | kBGR_DistanceFieldEffectFlag | - kSRGB_DistanceFieldEffectFlag, + kGammaCorrect_DistanceFieldEffectFlag, }; /** |