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/SkLightingShader.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/SkLightingShader.cpp')
| -rw-r--r-- | src/core/SkLightingShader.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp index b6b54967d5..b478ee7eca 100644 --- a/src/core/SkLightingShader.cpp +++ b/src/core/SkLightingShader.cpp @@ -53,11 +53,7 @@ public: bool isOpaque() const override; #if SK_SUPPORT_GPU - sk_sp<GrFragmentProcessor> asFragmentProcessor(GrContext*, - const SkMatrix& viewM, - const SkMatrix* localMatrix, - SkFilterQuality, - SkSourceGammaTreatment) const override; + sk_sp<GrFragmentProcessor> asFragmentProcessor(const AsFPArgs&) const override; #endif class LightingShaderContext : public SkShader::Context { @@ -265,23 +261,15 @@ private: //////////////////////////////////////////////////////////////////////////// -sk_sp<GrFragmentProcessor> SkLightingShaderImpl::asFragmentProcessor( - GrContext* context, - const SkMatrix& viewM, - const SkMatrix* localMatrix, - SkFilterQuality filterQuality, - SkSourceGammaTreatment gammaTreatment) const { - sk_sp<GrFragmentProcessor> normalFP( - fNormalSource->asFragmentProcessor(context, viewM, localMatrix, filterQuality, - gammaTreatment)); +sk_sp<GrFragmentProcessor> SkLightingShaderImpl::asFragmentProcessor(const AsFPArgs& args) const { + sk_sp<GrFragmentProcessor> normalFP(fNormalSource->asFragmentProcessor(args)); if (!normalFP) { return nullptr; } if (fDiffuseShader) { sk_sp<GrFragmentProcessor> fpPipeline[] = { - fDiffuseShader->asFragmentProcessor(context, viewM, localMatrix, filterQuality, - gammaTreatment), + fDiffuseShader->asFragmentProcessor(args), sk_make_sp<LightingFP>(std::move(normalFP), fLights) }; if(!fpPipeline[0]) { |