Add support for 2x2 matrices

src/gpu/gl/GrGLProgramDataManager.h

Index: src/gpu/gl/GrGLProgramDataManager.h
diff --git a/src/gpu/gl/GrGLProgramDataManager.h b/src/gpu/gl/GrGLProgramDataManager.h
index 2c92cece1b774d7aea07bf352fde8bbdb8f73b95..7e975b2b8fdf6f85bbd65bc1ada68721f7400861 100644
--- a/src/gpu/gl/GrGLProgramDataManager.h
+++ b/src/gpu/gl/GrGLProgramDataManager.h
@@ -61,10 +61,12 @@ public:
     void set4fv(UniformHandle, int arrayCount, const float v[]) const override;
     // matrices are column-major, the first three upload a single matrix, the latter three upload
     // arrayCount matrices into a uniform array.
-    void setMatrix3f(UniformHandle, const float matrix[]) const override;
-    void setMatrix4f(UniformHandle, const float matrix[]) const override;
-    void setMatrix3fv(UniformHandle, int arrayCount, const float matrices[]) const override;
-    void setMatrix4fv(UniformHandle, int arrayCount, const float matrices[]) const override;
+    void setMatrix2f(UniformHandle u, const float matrix[]) const override;

[bsalomon, 2016/03/01 14:18:08]

Why this change? Seems like it just repeats the typename without adding any
additional documentation about what the param means.

[Chris Dalton, 2016/03/07 18:35:38]

Oops, that snuck its way in by accident. Done.

+    void setMatrix3f(UniformHandle u, const float matrix[]) const override;
+    void setMatrix4f(UniformHandle u, const float matrix[]) const override;
+    void setMatrix2fv(UniformHandle u, int arrayCount, const float matrices[]) const override;
+    void setMatrix3fv(UniformHandle u, int arrayCount, const float matrices[]) const override;
+    void setMatrix4fv(UniformHandle u, int arrayCount, const float matrices[]) const override;
 
     // for nvpr only
     void setPathFragmentInputTransform(VaryingHandle u, int components,
@@ -97,6 +99,9 @@ private:
 
     SkDEBUGCODE(void printUnused(const Uniform&) const;)
 
+    template<int N> inline void setMatrices(UniformHandle, int arrayCount,
+                                            const float matrices[]) const;
+
     SkTArray<Uniform, true> fUniforms;
     SkTArray<PathProcVarying, true> fPathProcVaryings;
     GrGLGpu* fGpu;