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/gpu/effects/GrOvalEffect.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/gpu/effects/GrOvalEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrOvalEffect.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 2a04e16611..10fd8a6bf4 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -32,6 +32,8 @@ public: typedef GLCircleEffect GLProcessor; + virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; + virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; private: @@ -39,8 +41,6 @@ private: virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE; - SkPoint fCenter; SkScalar fRadius; GrPrimitiveEdgeType fEdgeType; @@ -56,9 +56,8 @@ GrFragmentProcessor* CircleEffect::Create(GrPrimitiveEdgeType edgeType, const Sk return SkNEW_ARGS(CircleEffect, (edgeType, center, radius)); } -void CircleEffect::onComputeInvariantOutput(InvariantOutput* inout) const { - inout->fValidFlags = 0; - inout->fIsSingleComponent = false; +void CircleEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { + *validFlags = 0; } const GrBackendFragmentProcessorFactory& CircleEffect::getFactory() const { @@ -205,6 +204,8 @@ public: typedef GLEllipseEffect GLProcessor; + virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; + virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; private: @@ -212,8 +213,6 @@ private: virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE; - SkPoint fCenter; SkVector fRadii; GrPrimitiveEdgeType fEdgeType; @@ -231,9 +230,8 @@ GrFragmentProcessor* EllipseEffect::Create(GrPrimitiveEdgeType edgeType, return SkNEW_ARGS(EllipseEffect, (edgeType, center, rx, ry)); } -void EllipseEffect::onComputeInvariantOutput(InvariantOutput* inout) const { - inout->fValidFlags = 0; - inout->fIsSingleComponent = false; +void EllipseEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { + *validFlags = 0; } const GrBackendFragmentProcessorFactory& EllipseEffect::getFactory() const { |