diff options
| author |  egdaniel <egdaniel@google.com> | 2014-11-12 08:35:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-12 08:35:25 -0800 |
| commit | 605dd0fbce9dbb2a0d3313e13e161f2bd54870d7 (patch) | |
| tree | ee19a010a90d3b29baebbf50f5b1221923d3371b /src/effects/SkColorCubeFilter.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/effects/SkColorCubeFilter.cpp')
| -rw-r--r-- | src/effects/SkColorCubeFilter.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index d9d6841e50..751d974ba3 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -14,6 +14,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrCoordTransform.h" +#include "GrInvariantOutput.h" #include "gl/GrGLProcessor.h" #include "gl/builders/GrGLProgramBuilder.h" #include "GrTBackendProcessorFactory.h" @@ -192,6 +193,7 @@ void SkColorCubeFilter::toString(SkString* str) const { /////////////////////////////////////////////////////////////////////////////// #if SK_SUPPORT_GPU + class GrColorCubeEffect : public GrFragmentProcessor { public: static GrFragmentProcessor* Create(GrTexture* colorCube) { @@ -205,7 +207,7 @@ public: static const char* Name() { return "ColorCube"; } - virtual void onComputeInvariantOutput(GrProcessor::InvariantOutput*) const SK_OVERRIDE; + virtual void onComputeInvariantOutput(GrInvariantOutput*) const SK_OVERRIDE; class GLProcessor : public GrGLFragmentProcessor { public: @@ -258,8 +260,8 @@ const GrBackendFragmentProcessorFactory& GrColorCubeEffect::getFactory() const { return GrTBackendFragmentProcessorFactory<GrColorCubeEffect>::getInstance(); } -void GrColorCubeEffect::onComputeInvariantOutput(InvariantOutput* inout) const { - inout->setToUnknown(InvariantOutput::kWill_ReadInput); +void GrColorCubeEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { + inout->setToUnknown(GrInvariantOutput::kWill_ReadInput); } /////////////////////////////////////////////////////////////////////////////// |