Break apart shared use of varying and uniform transforms

src/gpu/glsl/GrGLSLGeometryProcessor.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLSLGeometryProcessor_DEFINED
 #define GrGLSLGeometryProcessor_DEFINED
 
@@ skipping 82 matching lines @@
         } else {
             return 0x02;
         }
     }
 
 private:
     void setTransformDataMatrix(const SkMatrix& localMatrix,
                                 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());
             const SkMatrix& transform = GetTransformMatrix(localMatrix, *transforms[t]);
             if (!procTransforms[t].fCurrentValue.cheapEqualTo(transform)) {
                 pdman.setSkMatrix(procTransforms[t].fHandle.toIndex(), transform);
                 procTransforms[t].fCurrentValue = transform;
             }
         }
     }
 
     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;
 };
 
 #endif