diff options
author | 2014-10-02 12:12:48 -0700 | |
---|---|---|
committer | 2014-10-02 12:12:48 -0700 | |
commit | b4b7a4c9ea2e399db550f93e3754c351e5b2079a (patch) | |
tree | f67932963699b8dac498d3e67f70cc2c505c70a3 /src/effects/SkAlphaThresholdFilter.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/SkAlphaThresholdFilter.cpp')
-rw-r--r-- | src/effects/SkAlphaThresholdFilter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 462cfec55e..09cc61851c 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -76,6 +76,8 @@ public: static const char* Name() { return "Alpha Threshold"; } virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; + virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; + float innerThreshold() const { return fInnerThreshold; } float outerThreshold() const { return fOuterThreshold; } @@ -102,8 +104,6 @@ private: virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE; - GR_DECLARE_FRAGMENT_PROCESSOR_TEST; float fInnerThreshold; @@ -228,13 +228,13 @@ bool AlphaThresholdEffect::onIsEqual(const GrProcessor& sBase) const { this->fOuterThreshold == s.fOuterThreshold); } -void AlphaThresholdEffect::onComputeInvariantOutput(InvariantOutput* inout) const { - if (inout->isOpaque() && GrPixelConfigIsOpaque(this->texture(0)->config())) { - inout->fValidFlags = kA_GrColorComponentFlag; +void AlphaThresholdEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { + if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) && + GrPixelConfigIsOpaque(this->texture(0)->config())) { + *validFlags = kA_GrColorComponentFlag; } else { - inout->fValidFlags = 0; + *validFlags = 0; } - inout->fIsSingleComponent = false; } #endif |