Create GLSL base class for ProgramDataManager

src/core/SkLightingShader.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapProcState.h"
 #include "SkColor.h"
@@ skipping 114 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
 
 #include "GrCoordTransform.h"
 #include "GrFragmentProcessor.h"
 #include "GrTextureAccess.h"
 #include "gl/GrGLProcessor.h"
 #include "gl/builders/GrGLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 #include "SkGr.h"
 #include "SkGrPriv.h"
 
 class LightingFP : public GrFragmentProcessor {
 public:
     LightingFP(GrTexture* diffuse, GrTexture* normal, const SkMatrix& diffMatrix,
                const SkMatrix& normMatrix, const GrTextureParams& diffParams,
                const GrTextureParams& normParams, const SkLightingShader::Lights* lights,
                const SkVector& invNormRotation)
         : fDiffDeviceTransform(kLocal_GrCoordSet, diffMatrix, diffuse, diffParams.filterMode())
@@ skipping 85 matching lines @@
         }
 
         static void GenKey(const GrProcessor& proc, const GrGLSLCaps&,
                            GrProcessorKeyBuilder* b) {
 //            const LightingFP& lightingFP = proc.cast<LightingFP>();
             // only one shader generated currently
             b->add32(0x0);
         }
 
     protected:
-        void onSetData(const GrGLProgramDataManager& pdman, const GrProcessor& proc) override {
+        void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) override {
             const LightingFP& lightingFP = proc.cast<LightingFP>();
 
             const SkVector3& lightDir = lightingFP.lightDir();
             if (lightDir != fLightDir) {
                 pdman.set3fv(fLightDirUni, 1, &lightDir.fX);
                 fLightDir = lightDir;
             }
 
             const SkColor3f& lightColor = lightingFP.lightColor();
             if (lightColor != fLightColor) {
                 pdman.set3fv(fLightColorUni, 1, &lightColor.fX);
                 fLightColor = lightColor;
             }
 
             const SkColor3f& ambientColor = lightingFP.ambientColor();
             if (ambientColor != fAmbientColor) {
                 pdman.set3fv(fAmbientColorUni, 1, &ambientColor.fX);
                 fAmbientColor = ambientColor;
             }
 
             const SkVector& invNormRotation = lightingFP.invNormRotation();
             if (invNormRotation != fInvNormRotation) {
                 pdman.set2fv(fXformUni, 1, &invNormRotation.fX);
                 fInvNormRotation = invNormRotation;
             }
         }
 
     private:
         SkVector3 fLightDir;
-        GrGLProgramDataManager::UniformHandle fLightDirUni;
+        GrGLSLProgramDataManager::UniformHandle fLightDirUni;
 
         SkColor3f fLightColor;
-        GrGLProgramDataManager::UniformHandle fLightColorUni;
+        GrGLSLProgramDataManager::UniformHandle fLightColorUni;
 
         SkColor3f fAmbientColor;
-        GrGLProgramDataManager::UniformHandle fAmbientColorUni;
+        GrGLSLProgramDataManager::UniformHandle fAmbientColorUni;
 
         SkVector fInvNormRotation;
-        GrGLProgramDataManager::UniformHandle fXformUni;
+        GrGLSLProgramDataManager::UniformHandle fXformUni;
     };
 
     void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
         LightingGLFP::GenKey(*this, caps, b);
     }
 
     const char* name() const override { return "LightingFP"; }
 
     void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
         inout->mulByUnknownFourComponents();
@@ skipping 422 matching lines @@
                                     normLocalM);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkLightingShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
 
 ///////////////////////////////////////////////////////////////////////////////