Refactor how we store and use samplers in Ganesh

src/gpu/effects/GrYUVEffect.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 "GrYUVEffect.h"
 
 #include "GrCoordTransform.h"
@@ skipping 82 matching lines @@
 
     SkYUVColorSpace getColorSpace() const { return fColorSpace; }
 
     class GLSLProcessor : public GrGLSLFragmentProcessor {
     public:
         // this class always generates the same code.
         static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*) {}
 
         void emitCode(EmitArgs& args) override {
             GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
+            GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
 
             const char* colorSpaceMatrix = nullptr;
-            fMatrixUni = args.fUniformHandler->addUniform(kFragment_GrShaderFlag,
-                                                          kMat44f_GrSLType, kDefault_GrSLPrecision,
-                                                          "ColorSpaceMatrix", &colorSpaceMatrix);
+            fMatrixUni = uniformHandler->addUniform(kFragment_GrShaderFlag,
+                                                    kMat44f_GrSLType, kDefault_GrSLPrecision,
+                                                    "ColorSpaceMatrix", &colorSpaceMatrix);
             fragBuilder->codeAppendf("%s = vec4(", args.fOutputColor);
-            fragBuilder->appendTextureLookup(args.fTexSamplers[0], args.fCoords[0].c_str(),
+            fragBuilder->appendTextureLookup(uniformHandler->getSampler(args.fTexSamplers[0]),
+                                             args.fCoords[0].c_str(),
                                              args.fCoords[0].getType());
             fragBuilder->codeAppend(".r,");
-            fragBuilder->appendTextureLookup(args.fTexSamplers[1], args.fCoords[1].c_str(),
+            fragBuilder->appendTextureLookup(uniformHandler->getSampler(args.fTexSamplers[1]),
+                                             args.fCoords[1].c_str(),
                                              args.fCoords[1].getType());
             fragBuilder->codeAppend(".r,");
-            fragBuilder->appendTextureLookup(args.fTexSamplers[2], args.fCoords[2].c_str(),
+            fragBuilder->appendTextureLookup(uniformHandler->getSampler(args.fTexSamplers[2]),
+                                             args.fCoords[2].c_str(),
                                              args.fCoords[2].getType());
             fragBuilder->codeAppendf(".r, 1.0) * %s;", colorSpaceMatrix);
         }
 
     protected:
         void onSetData(const GrGLSLProgramDataManager& pdman,
                        const GrProcessor& processor) override {
             const YUVtoRGBEffect& yuvEffect = processor.cast<YUVtoRGBEffect>();
             switch (yuvEffect.getColorSpace()) {
                 case kJPEG_SkYUVColorSpace:
@@ skipping 253 matching lines @@
 GrYUVEffect::CreateRGBToU(const GrFragmentProcessor* rgbFP, SkYUVColorSpace colorSpace) {
     SkASSERT(rgbFP);
     return new RGBToYUVEffect(rgbFP, colorSpace, RGBToYUVEffect::kU_OutputChannels);
 }
 
 const GrFragmentProcessor*
 GrYUVEffect::CreateRGBToV(const GrFragmentProcessor* rgbFP, SkYUVColorSpace colorSpace) {
     SkASSERT(rgbFP);
     return new RGBToYUVEffect(rgbFP, colorSpace, RGBToYUVEffect::kV_OutputChannels);
 }