diff options
author | 2014-11-12 08:35:25 -0800 | |
---|---|---|
committer | 2014-11-12 08:35:25 -0800 | |
commit | 605dd0fbce9dbb2a0d3313e13e161f2bd54870d7 (patch) | |
tree | ee19a010a90d3b29baebbf50f5b1221923d3371b /src/gpu/effects/GrOvalEffect.cpp | |
parent | e4bf793120d3bfc9b003d11880a3fb73ff2b89e9 (diff) |
Move GrInvariantOutput out of GrProcessor and into its own class.
This will help with the ability to subclass, add to, etc. GrInvariantOutput. Also it was simply
getting a little too big to be a "supporting" subclass
BUG=skia:
Review URL: https://codereview.chromium.org/699943003
Diffstat (limited to 'src/gpu/effects/GrOvalEffect.cpp')
-rw-r--r-- | src/gpu/effects/GrOvalEffect.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 8965c990c0..26b96ad8ec 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -7,7 +7,7 @@ #include "gl/builders/GrGLProgramBuilder.h" #include "GrOvalEffect.h" - +#include "GrInvariantOutput.h" #include "gl/GrGLProcessor.h" #include "gl/GrGLSL.h" #include "GrTBackendProcessorFactory.h" @@ -39,7 +39,7 @@ private: virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE; + virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkPoint fCenter; SkScalar fRadius; @@ -56,7 +56,7 @@ GrFragmentProcessor* CircleEffect::Create(GrPrimitiveEdgeType edgeType, const Sk return SkNEW_ARGS(CircleEffect, (edgeType, center, radius)); } -void CircleEffect::onComputeInvariantOutput(InvariantOutput* inout) const { +void CircleEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { inout->mulByUnknownAlpha(); } @@ -211,7 +211,7 @@ private: virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE; - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE; + virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; SkPoint fCenter; SkVector fRadii; @@ -230,7 +230,7 @@ GrFragmentProcessor* EllipseEffect::Create(GrPrimitiveEdgeType edgeType, return SkNEW_ARGS(EllipseEffect, (edgeType, center, rx, ry)); } -void EllipseEffect::onComputeInvariantOutput(InvariantOutput* inout) const { +void EllipseEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { inout->mulByUnknownAlpha(); } |