diff options
author | brianosman <brianosman@google.com> | 2016-07-22 11:04:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-22 11:04:53 -0700 |
commit | 839345d63466a4209a0985654ec033624821fd78 (patch) | |
tree | 71590a11b99b3b554a4c80096f36c759b5d68ced /src/core/SkNormalSource.cpp | |
parent | 8a8accbcd1958c1646246b9b994fb47a3b5a6021 (diff) |
Bundle SkShader::asFragmentProcessor arguments in a struct
The signature of this thing keeps changing (and is about to change again).
This just makes maintenance much easier.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2175563003
Review-Url: https://codereview.chromium.org/2175563003
Diffstat (limited to 'src/core/SkNormalSource.cpp')
-rw-r--r-- | src/core/SkNormalSource.cpp | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/core/SkNormalSource.cpp b/src/core/SkNormalSource.cpp index c082d843c1..c282a124e0 100644 --- a/src/core/SkNormalSource.cpp +++ b/src/core/SkNormalSource.cpp @@ -26,11 +26,7 @@ public: , fInvCTM(invCTM) {} #if SK_SUPPORT_GPU - sk_sp<GrFragmentProcessor> asFragmentProcessor(GrContext*, - const SkMatrix& viewM, - const SkMatrix* localMatrix, - SkFilterQuality, - SkSourceGammaTreatment) const override; + sk_sp<GrFragmentProcessor> asFragmentProcessor(const SkShader::AsFPArgs&) const override; #endif SkNormalSource::Provider* asProvider(const SkShader::ContextRec& rec, @@ -178,13 +174,8 @@ private: }; sk_sp<GrFragmentProcessor> NormalMapSourceImpl::asFragmentProcessor( - GrContext *context, - const SkMatrix &viewM, - const SkMatrix *localMatrix, - SkFilterQuality filterQuality, - SkSourceGammaTreatment gammaTreatment) const { - sk_sp<GrFragmentProcessor> mapFP = fMapShader->asFragmentProcessor(context, viewM, - localMatrix, filterQuality, gammaTreatment); + const SkShader::AsFPArgs& args) const { + sk_sp<GrFragmentProcessor> mapFP = fMapShader->asFragmentProcessor(args); if (!mapFP) { return nullptr; } @@ -336,11 +327,7 @@ public: NormalFlatSourceImpl(){} #if SK_SUPPORT_GPU - sk_sp<GrFragmentProcessor> asFragmentProcessor(GrContext*, - const SkMatrix& viewM, - const SkMatrix* localMatrix, - SkFilterQuality, - SkSourceGammaTreatment) const override; + sk_sp<GrFragmentProcessor> asFragmentProcessor(const SkShader::AsFPArgs&) const override; #endif SkNormalSource::Provider* asProvider(const SkShader::ContextRec& rec, @@ -418,11 +405,7 @@ private: }; sk_sp<GrFragmentProcessor> NormalFlatSourceImpl::asFragmentProcessor( - GrContext *context, - const SkMatrix &viewM, - const SkMatrix *localMatrix, - SkFilterQuality filterQuality, - SkSourceGammaTreatment gammaTreatment) const { + const SkShader::AsFPArgs&) const { return sk_make_sp<NormalFlatFP>(); } |