Move GrInvariantOutput out of GrProcessor and into its own class.

src/effects/SkColorCubeFilter.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorCubeFilter.h"
 #include "SkColorPriv.h"
 #include "SkOnce.h"
 #include "SkReadBuffer.h"
 #include "SkUnPreMultiply.h"
 #include "SkWriteBuffer.h"
 #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"
 #include "GrTexturePriv.h"
 #include "SkGr.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace {
 
@@ skipping 158 matching lines @@
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkColorCubeFilter::toString(SkString* str) const {
     str->append("SkColorCubeFilter ");
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 #if SK_SUPPORT_GPU
+
 class GrColorCubeEffect : public GrFragmentProcessor {
 public:
     static GrFragmentProcessor* Create(GrTexture* colorCube) {
         return (NULL != colorCube) ? SkNEW_ARGS(GrColorCubeEffect, (colorCube)) : NULL;
     }
 
     virtual ~GrColorCubeEffect();
 
     virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
     int colorCubeSize() const { return fColorCubeAccess.getTexture()->width(); }
 
     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:
         GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&);
         virtual ~GLProcessor();
 
         virtual void emitCode(GrGLFPBuilder*,
                               const GrFragmentProcessor&,
                               const GrProcessorKey&,
                               const char* outputColor,
@@ skipping 32 matching lines @@
     this->addTextureAccess(&fColorCubeAccess);
 }
 
 GrColorCubeEffect::~GrColorCubeEffect() {
 }
 
 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);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrColorCubeEffect::GLProcessor::GLProcessor(const GrBackendProcessorFactory& factory,
                                             const GrProcessor&)
     : INHERITED(factory) {
 }
 
 GrColorCubeEffect::GLProcessor::~GLProcessor() {
@@ skipping 88 matching lines @@
     SkAutoTUnref<GrTexture> textureCube;
     if (surface) {
         textureCube.reset(surface->asTexture());
     } else {
         textureCube.reset(context->createTexture(NULL, desc, cacheID, fCubeData->data(), 0));
     }
 
     return textureCube ? GrColorCubeEffect::Create(textureCube) : NULL;
 }
 #endif