Make all GrFragmentProcessors GL independent.

tests/GLProgramsTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
@@ skipping 13 matching lines @@
 #include "SkChecksum.h"
 #include "SkRandom.h"
 #include "Test.h"
 
 #include "batches/GrDrawBatch.h"
 
 #include "effects/GrConfigConversionEffect.h"
 #include "effects/GrPorterDuffXferProcessor.h"
 #include "effects/GrXfermodeFragmentProcessor.h"
 
-#include "gl/GrGLFragmentProcessor.h"
 #include "gl/GrGLGpu.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLProgramBuilder.h"
 
 /*
  * A dummy processor which just tries to insert a massive key and verify that it can retrieve the
  * whole thing correctly
  */
 static const uint32_t kMaxKeySize = 1024;
 
-class GLBigKeyProcessor : public GrGLFragmentProcessor {
+class GLBigKeyProcessor : public GrGLSLFragmentProcessor {
 public:
     GLBigKeyProcessor(const GrProcessor&) {}
 
     virtual void emitCode(EmitArgs& args) override {
         // pass through
         GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder();
         if (args.fInputColor) {
             fsBuilder->codeAppendf("%s = %s;\n", args.fOutputColor, args.fInputColor);
         } else {
             fsBuilder->codeAppendf("%s = vec4(1.0);\n", args.fOutputColor);
         }
     }
 
     static void GenKey(const GrProcessor& processor, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
         for (uint32_t i = 0; i < kMaxKeySize; i++) {
             b->add32(i);
         }
     }
 
 private:
-    typedef GrGLFragmentProcessor INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
 class BigKeyProcessor : public GrFragmentProcessor {
 public:
     static GrFragmentProcessor* Create() {
         return new BigKeyProcessor;
     }
 
     const char* name() const override { return "Big Ole Key"; }
 
-    GrGLFragmentProcessor* onCreateGLInstance() const override {
+    GrGLSLFragmentProcessor* onCreateGLInstance() const override {
         return new GLBigKeyProcessor(*this);
     }
 
 private:
     BigKeyProcessor() {
         this->initClassID<BigKeyProcessor>();
     }
     virtual void onGetGLProcessorKey(const GrGLSLCaps& caps,
                                      GrProcessorKeyBuilder* b) const override {
         GLBigKeyProcessor::GenKey(*this, caps, b);
@@ skipping 15 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 
 class BlockInputFragmentProcessor : public GrFragmentProcessor {
 public:
     static GrFragmentProcessor* Create(const GrFragmentProcessor* fp) {
         return new BlockInputFragmentProcessor(fp);
     }
 
     const char* name() const override { return "Block Input"; }
 
-    GrGLFragmentProcessor* onCreateGLInstance() const override { return new GLFP; }
+    GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLFP; }
 
 private:
-    class GLFP : public GrGLFragmentProcessor {
+    class GLFP : public GrGLSLFragmentProcessor {
     public:
         void emitCode(EmitArgs& args) override {
             this->emitChild(0, nullptr, args);
         }
 
     private:
-        typedef GrGLFragmentProcessor INHERITED;
+        typedef GrGLSLFragmentProcessor INHERITED;
     };
 
     BlockInputFragmentProcessor(const GrFragmentProcessor* child) {
         this->initClassID<BlockInputFragmentProcessor>();
         this->registerChildProcessor(child);
     }
 
     void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {}
 
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
@@ skipping 311 matching lines @@
 #endif
             GrTestTarget testTarget;
             context->getTestTarget(&testTarget);
             REPORTER_ASSERT(reporter, GrDrawingManager::ProgramUnitTest(
                                             context, testTarget.target(), maxStages));
         }
     }
 }
 
 #endif