Make all GrFragmentProcessors GL independent.

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 "SkOpts.h"
 #include "SkReadBuffer.h"
 #include "SkUnPreMultiply.h"
 #include "SkWriteBuffer.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrCoordTransform.h"
 #include "GrInvariantOutput.h"
 #include "GrTexturePriv.h"
 #include "SkGr.h"
-#include "gl/GrGLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLProgramBuilder.h"
 #include "glsl/GrGLSLProgramDataManager.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace {
 
 int32_t SkNextColorCubeUniqueID() {
     static int32_t gColorCubeUniqueID;
@@ skipping 136 matching lines @@
 
     virtual ~GrColorCubeEffect();
 
     const char* name() const override { return "ColorCube"; }
 
     int colorCubeSize() const { return fColorCubeAccess.getTexture()->width(); }
 
 
     void onComputeInvariantOutput(GrInvariantOutput*) const override;
 
-    class GLProcessor : public GrGLFragmentProcessor {
+    class GLProcessor : public GrGLSLFragmentProcessor {
     public:
         GLProcessor(const GrProcessor&);
         virtual ~GLProcessor();
 
         virtual void emitCode(EmitArgs&) override;
 
         static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
     protected:
         void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
     private:
         GrGLSLProgramDataManager::UniformHandle fColorCubeSizeUni;
         GrGLSLProgramDataManager::UniformHandle fColorCubeInvSizeUni;
 
-        typedef GrGLFragmentProcessor INHERITED;
+        typedef GrGLSLFragmentProcessor INHERITED;
     };
 
 private:
     virtual void onGetGLProcessorKey(const GrGLSLCaps& caps,
                                      GrProcessorKeyBuilder* b) const override;
 
-    GrGLFragmentProcessor* onCreateGLInstance() const override;
+    GrGLSLFragmentProcessor* onCreateGLInstance() const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
     GrColorCubeEffect(GrTexture* colorCube);
 
     GrTextureAccess     fColorCubeAccess;
 
     typedef GrFragmentProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrColorCubeEffect::GrColorCubeEffect(GrTexture* colorCube)
     : fColorCubeAccess(colorCube, "bgra", GrTextureParams::kBilerp_FilterMode) {
     this->initClassID<GrColorCubeEffect>();
     this->addTextureAccess(&fColorCubeAccess);
 }
 
 GrColorCubeEffect::~GrColorCubeEffect() {
 }
 
 void GrColorCubeEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
     GLProcessor::GenKey(*this, caps, b);
 }
 
-GrGLFragmentProcessor* GrColorCubeEffect::onCreateGLInstance() const {
+GrGLSLFragmentProcessor* GrColorCubeEffect::onCreateGLInstance() const {
     return new GLProcessor(*this);
 }
 
 void GrColorCubeEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrColorCubeEffect::GLProcessor::GLProcessor(const GrProcessor&) {
@@ skipping 88 matching lines @@
         if (textureCube) {
             context->textureProvider()->assignUniqueKeyToTexture(key, textureCube);
         } else {
             return nullptr;
         }
     }
 
     return GrColorCubeEffect::Create(textureCube);
 }
 #endif