Changes to remove program effects builder

src/gpu/gl/builders/GrGLShaderBuilder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLShaderBuilder_DEFINED
 #define GrGLShaderBuilder_DEFINED
 
@@ skipping 12 matching lines @@
 class GrEffectStage;
 class GrGLProgramDesc;
 class GrGLProgramBuilder;
 class GrGLFullProgramBuilder;
 
 /**
   base class for all shaders builders
 */
 class GrGLShaderBuilder {
 public:
-    typedef GrGLProgramEffects::TransformedCoordsArray TransformedCoordsArray;
-    typedef GrGLProgramEffects::TextureSampler TextureSampler;
+    typedef GrGLEffect::TransformedCoordsArray TransformedCoordsArray;
+    typedef GrGLEffect::TextureSampler TextureSampler;
     GrGLShaderBuilder(GrGLProgramBuilder* program);
 
     void addInput(GrGLShaderVar i) { fInputs.push_back(i); }
     void addOutput(GrGLShaderVar i) { fOutputs.push_back(i); }
 
     /*
      * We put texture lookups in the base class because it is TECHNICALLY possible to do texture
      * lookups in any kind of shader.  However, for the time being using these calls on non-fragment
      * shaders will result in a shader compilation error as texture sampler uniforms are only
      * visible to the fragment shader.  It would not be hard to change this behavior, if someone
@@ skipping 120 matching lines @@
 public:
     GrGLFullShaderBuilder(GrGLFullProgramBuilder* program);
 
     GrGLFullProgramBuilder* fullProgramBuilder() { return fFullProgramBuilder; }
 protected:
     GrGLFullProgramBuilder* fFullProgramBuilder;
 private:
     typedef GrGLShaderBuilder INHERITED;
 };
 #endif