Index: src/gpu/effects/GrDistanceFieldGeoProc.h |
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h |
index 2786b7e823704b9bd361524190aa34f80bd7fd9d..406c352409c9c8da3f9832ba3af85c46dadff9a0 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, |
}; |
/** |