diff options
author | 2016-05-24 06:18:48 -0700 | |
---|---|---|
committer | 2016-05-24 06:18:48 -0700 | |
commit | a167e74b4bb78cfbbec3d8768e5853cd0b9314ab (patch) | |
tree | 66e785ca4f6193bcc81f25a16a8b622cd376e31d /include/gpu | |
parent | 910fff4244cf2a35567adb0caa4f6f7521fc16ff (diff) |
Remove sRGB overrides on GrTextureParams. Use GrPaint flags instead.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002253002
Review-Url: https://codereview.chromium.org/2002253002
Diffstat (limited to 'include/gpu')
-rw-r--r-- | include/gpu/GrTextureParams.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/include/gpu/GrTextureParams.h b/include/gpu/GrTextureParams.h index 40d9ac5375..3186b1b027 100644 --- a/include/gpu/GrTextureParams.h +++ b/include/gpu/GrTextureParams.h @@ -24,11 +24,6 @@ public: static const GrTextureParams gParams(SkShader::kClamp_TileMode, kBilerp_FilterMode); return gParams; } - static const GrTextureParams& ClampNoFilterForceAllowSRGB() { - static const GrTextureParams gParams(SkShader::kClamp_TileMode, kNone_FilterMode, - kForceAllowSRGB_SRGBMode); - return gParams; - } GrTextureParams() { this->reset(); @@ -40,19 +35,10 @@ public: kMipMap_FilterMode }; - enum SRGBMode { - kRespectDestination_SRGBMode, - kForceAllowSRGB_SRGBMode, - }; - GrTextureParams(SkShader::TileMode tileXAndY, FilterMode filterMode) { this->reset(tileXAndY, filterMode); } - GrTextureParams(SkShader::TileMode tileXandY, FilterMode filterMode, SRGBMode srgbMode) { - this->reset(tileXandY, filterMode, srgbMode); - } - GrTextureParams(const SkShader::TileMode tileModes[2], FilterMode filterMode) { this->reset(tileModes, filterMode); } @@ -65,7 +51,6 @@ public: fTileModes[0] = params.fTileModes[0]; fTileModes[1] = params.fTileModes[1]; fFilterMode = params.fFilterMode; - fSRGBMode = params.fSRGBMode; return *this; } @@ -76,20 +61,12 @@ public: void reset(SkShader::TileMode tileXAndY, FilterMode filterMode) { fTileModes[0] = fTileModes[1] = tileXAndY; fFilterMode = filterMode; - fSRGBMode = kRespectDestination_SRGBMode; - } - - void reset(SkShader::TileMode tileXandY, FilterMode filterMode, SRGBMode srgbMode) { - fTileModes[0] = fTileModes[1] = tileXandY; - fFilterMode = filterMode; - fSRGBMode = srgbMode; } void reset(const SkShader::TileMode tileModes[2], FilterMode filterMode) { fTileModes[0] = tileModes[0]; fTileModes[1] = tileModes[1]; fFilterMode = filterMode; - fSRGBMode = kRespectDestination_SRGBMode; } void setClampNoFilter() { @@ -107,8 +84,6 @@ public: void setTileModeY(const SkShader::TileMode tm) { fTileModes[1] = tm; } void setTileModeXAndY(const SkShader::TileMode tm) { fTileModes[0] = fTileModes[1] = tm; } - void setSRGBMode(SRGBMode srgbMode) { fSRGBMode = srgbMode; } - SkShader::TileMode getTileModeX() const { return fTileModes[0]; } SkShader::TileMode getTileModeY() const { return fTileModes[1]; } @@ -120,13 +95,10 @@ public: FilterMode filterMode() const { return fFilterMode; } - SRGBMode srgbMode() const { return fSRGBMode; } - bool operator== (const GrTextureParams& other) const { return fTileModes[0] == other.fTileModes[0] && fTileModes[1] == other.fTileModes[1] && - fFilterMode == other.fFilterMode && - fSRGBMode == other.fSRGBMode; + fFilterMode == other.fFilterMode; } bool operator!= (const GrTextureParams& other) const { return !(*this == other); } @@ -134,6 +106,5 @@ public: private: SkShader::TileMode fTileModes[2]; FilterMode fFilterMode; - SRGBMode fSRGBMode; }; #endif |