Refactor how we store and use samplers in Ganesh

src/core/SkLightingShader.cpp

Index: src/core/SkLightingShader.cpp
diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp
index f37f664d9859a537ff1f30a2550c552a90b74680..b23557c385acf173ace447fd4fe0becd7c37d57b 100644
--- a/src/core/SkLightingShader.cpp
+++ b/src/core/SkLightingShader.cpp
@@ -203,15 +203,17 @@ public:
                                                    "Xform", &xformUniName);
 
             fragBuilder->codeAppend("vec4 diffuseColor = ");
-            fragBuilder->appendTextureLookupAndModulate(args.fInputColor, args.fTexSamplers[0],
-                                                args.fCoords[0].c_str(),
-                                                args.fCoords[0].getType());
+            fragBuilder->appendTextureLookupAndModulate(
+                                                   args.fInputColor,
+                                                   uniformHandler->getSampler(args.fTexSamplers[0]),
+                                                   args.fCoords[0].c_str(),
+                                                   args.fCoords[0].getType());
             fragBuilder->codeAppend(";");
 
             fragBuilder->codeAppend("vec4 normalColor = ");
-            fragBuilder->appendTextureLookup(args.fTexSamplers[1],
-                                     args.fCoords[1].c_str(),
-                                     args.fCoords[1].getType());
+            fragBuilder->appendTextureLookup(uniformHandler->getSampler(args.fTexSamplers[1]),
+                                             args.fCoords[1].c_str(),
+                                             args.fCoords[1].getType());
             fragBuilder->codeAppend(";");
 
             fragBuilder->codeAppend("vec3 normal = normalColor.rgb - vec3(0.5);");