Changes to remove program effects builder

src/gpu/gl/builders/GrGLShaderBuilder.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 "GrGLShaderBuilder.h"
 #include "GrGLFullProgramBuilder.h"
 #include "GrGLProgramBuilder.h"
@@ skipping 79 matching lines @@
     fFunctions.append(body);
     fFunctions.append("}\n\n");
 }
 
 void GrGLShaderBuilder::appendTextureLookup(SkString* out,
                                             const TextureSampler& sampler,
                                             const char* coordName,
                                             GrSLType varyingType) const {
     append_texture_lookup(out,
                           fProgramBuilder->gpu(),
-                          fProgramBuilder->getUniformCStr(sampler.samplerUniform()),
+                          fProgramBuilder->getUniformCStr(sampler.fSamplerUniform),
                           coordName,
                           sampler.configComponentMask(),
                           sampler.swizzle(),
                           varyingType);
 }
 
 void GrGLShaderBuilder::appendTextureLookup(const TextureSampler& sampler,
                                             const char* coordName,
                                             GrSLType varyingType) {
     this->appendTextureLookup(&fCode, sampler, coordName, varyingType);
@@ skipping 42 matching lines @@
                           coordName,
                           configComponentMask,
                           swizzle,
                           kVec2f_GrSLType);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 GrGLFullShaderBuilder::GrGLFullShaderBuilder(GrGLFullProgramBuilder* program)
     : INHERITED(program)
     , fFullProgramBuilder(program) {}