diff options
| author |  Brian Osman <brianosman@google.com> | 2017-10-18 13:15:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-18 18:46:25 +0000 |
| commit | 2240be96d97b5ac0886381d74a21f1e2a0928f55 (patch) | |
| tree | e0148f28dd2eb10bbfd3541213e4720b10b043b0 /src/gpu/GrPaint.cpp | |
| parent | 8fed655df87618f8460af2a6284bdef764cf84c8 (diff) | |
Remove color space xform from GrTextureDomain & GrSimpleTextureEffect
Bug: skia:
Change-Id: I31435d334da28cce9bbc654c4b98746b03078897
Reviewed-on: https://skia-review.googlesource.com/61460
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/GrPaint.cpp')
| -rw-r--r-- | src/gpu/GrPaint.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp index 0d52a5dede..e29c464bc0 100644 --- a/src/gpu/GrPaint.cpp +++ b/src/gpu/GrPaint.cpp @@ -37,34 +37,26 @@ void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCovera this->setXPFactory(GrCoverageSetOpXPFactory::Get(regionOp, invertCoverage)); } -void GrPaint::addColorTextureProcessor(sk_sp<GrTextureProxy> proxy, - sk_sp<GrColorSpaceXform> colorSpaceXform, - const SkMatrix& matrix) { - this->addColorFragmentProcessor(GrSimpleTextureEffect::Make(std::move(proxy), - std::move(colorSpaceXform), - matrix)); +void GrPaint::addColorTextureProcessor(sk_sp<GrTextureProxy> proxy, const SkMatrix& matrix) { + this->addColorFragmentProcessor(GrSimpleTextureEffect::Make(std::move(proxy), matrix)); } -void GrPaint::addColorTextureProcessor(sk_sp<GrTextureProxy> proxy, - sk_sp<GrColorSpaceXform> colorSpaceXform, - const SkMatrix& matrix, +void GrPaint::addColorTextureProcessor(sk_sp<GrTextureProxy> proxy, const SkMatrix& matrix, const GrSamplerState& samplerState) { - this->addColorFragmentProcessor(GrSimpleTextureEffect::Make(std::move(proxy), - std::move(colorSpaceXform), - matrix, samplerState)); + this->addColorFragmentProcessor(GrSimpleTextureEffect::Make(std::move(proxy), matrix, + samplerState)); } void GrPaint::addCoverageTextureProcessor(sk_sp<GrTextureProxy> proxy, const SkMatrix& matrix) { - this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Make(std::move(proxy), - nullptr, matrix)); + this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Make(std::move(proxy), matrix)); } void GrPaint::addCoverageTextureProcessor(sk_sp<GrTextureProxy> proxy, const SkMatrix& matrix, const GrSamplerState& params) { - this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Make(std::move(proxy), - nullptr, matrix, params)); + this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Make(std::move(proxy), matrix, + params)); } bool GrPaint::isConstantBlendedColor(GrColor* constantColor) const { |