diff options
| author |  robertphillips <robertphillips@google.com> | 2014-10-02 12:12:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-02 12:12:48 -0700 |
| commit | b4b7a4c9ea2e399db550f93e3754c351e5b2079a (patch) | |
| tree | f67932963699b8dac498d3e67f70cc2c505c70a3 /src/effects/SkBlurMaskFilter.cpp | |
| parent | 85d3427d4932c6cfaf02f8a7454f0c6f213b0c2e (diff) | |
Revert of Add isSingleComponent bool to getConstantColorComponent (patchset #6 id:100001 of https://codereview.chromium.org/608253002/)
Reason for revert:
Changing some GMs
Original issue's description:
> Add isSingleComponent bool to getConstantColorComponent
>
> Initial step to allowing effects to use/output 1 or 4 color/coverage components. This cl doesn't change any current logic and all effects still assume they are working with 4 components.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/3b8af078281a5a20f951b9fd84f38d92b8f6217b
TBR=joshualitt@chromium.org,bsalomon@google.com,reed@google.com,egdaniel@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/617853003
Diffstat (limited to 'src/effects/SkBlurMaskFilter.cpp')
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 251398ca5b..123b9d28e5 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -563,6 +563,8 @@ public: typedef GrGLRectBlurEffect GLProcessor; virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; + virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; + /** * Create a simple filter effect with custom bicubic coefficients. */ @@ -592,8 +594,6 @@ private: GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blur_profile); virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE; - static bool CreateBlurProfileTexture(GrContext *context, float sigma, GrTexture **blurProfileTexture); @@ -765,9 +765,9 @@ bool GrRectBlurEffect::onIsEqual(const GrProcessor& sBase) const { return this->getSigma() == s.getSigma() && this->getRect() == s.getRect(); } -void GrRectBlurEffect::onComputeInvariantOutput(InvariantOutput* inout) const { - inout->fValidFlags = 0; - inout->fIsSingleComponent = false; +void GrRectBlurEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { + *validFlags = 0; + return; } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRectBlurEffect); @@ -837,6 +837,8 @@ public: typedef GrGLRRectBlurEffect GLProcessor; + virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; + virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; private: @@ -844,8 +846,6 @@ private: virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE; - SkRRect fRRect; float fSigma; GrTextureAccess fNinePatchAccess; @@ -929,9 +929,8 @@ GrFragmentProcessor* GrRRectBlurEffect::Create(GrContext* context, float sigma, return SkNEW_ARGS(GrRRectBlurEffect, (sigma, rrect, blurNinePatchTexture)); } -void GrRRectBlurEffect::onComputeInvariantOutput(InvariantOutput* inout) const { - inout->fValidFlags = 0; - inout->fIsSingleComponent = false; +void GrRRectBlurEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { + *validFlags = 0; } const GrBackendFragmentProcessorFactory& GrRRectBlurEffect::getFactory() const { |