Break apart shared use of varying and uniform transforms

src/gpu/glsl/GrGLSLGeometryProcessor.h

Index: src/gpu/glsl/GrGLSLGeometryProcessor.h
diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.h b/src/gpu/glsl/GrGLSLGeometryProcessor.h
index af7d919864cf389940d9ee5cf285469e2032dcf7..72f00f15090ae372085e0005167ff4ea4b00f240 100644
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.h
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.h
@@ -100,7 +100,7 @@ private:
                                 const GrGLSLProgramDataManager& pdman,
                                 int index,
                                 const SkTArray<const GrCoordTransform*, true>& transforms) {
-        SkSTArray<2, Transform, true>& procTransforms = fInstalledTransforms[index];
+        SkSTArray<2, UniformTransform, true>& procTransforms = fInstalledTransforms[index];
         int numTransforms = transforms.count();
         for (int t = 0; t < numTransforms; ++t) {
             SkASSERT(procTransforms[t].fHandle.isValid());
@@ -114,6 +114,13 @@ private:
 
     virtual void onEmitCode(EmitArgs&, GrGPArgs*) = 0;
 

[robertphillips, 2016/05/09 16:51:28]

init fHandle here?

+    struct UniformTransform : public Transform {
+        UniformTransform() : Transform() {}
+        UniformHandle  fHandle;
+    };
+
+    SkSTArray<8, SkSTArray<2, UniformTransform, true> > fInstalledTransforms;
+
     typedef GrGLSLPrimitiveProcessor INHERITED;
 };