fix for uniform view matrix being uploaded but not used

src/gpu/gl/GrGLGeometryProcessor.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 "GrGLGeometryProcessor.h"
 
 #include "builders/GrGLProgramBuilder.h"
@@ skipping 88 matching lines @@
     for (int t = 0; t < numTransforms; ++t) {
         SkASSERT(procTransforms[t].fHandle.isValid());
         const SkMatrix& transform = GetTransformMatrix(primProc.localMatrix(), *transforms[t]);
         if (!procTransforms[t].fCurrentValue.cheapEqualTo(transform)) {
             pdman.setSkMatrix(procTransforms[t].fHandle.convertToUniformHandle(), transform);
             procTransforms[t].fCurrentValue = transform;
         }
     }
 }
 
-void GrGLGeometryProcessor::SetupPosition(GrGLVertexBuilder* vsBuilder,
+void GrGLGeometryProcessor::setupPosition(GrGLGPBuilder* pb,
                                           GrGPArgs* gpArgs,
                                           const char* posName,
-                                          const SkMatrix& mat,
-                                          const char* matName) {
+                                          const SkMatrix& mat) {
+    GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder();
     if (mat.isIdentity()) {
         gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2");
 
         vsBuilder->codeAppendf("vec2 %s = %s;", gpArgs->fPositionVar.c_str(), posName);
     } else if (!mat.hasPerspective()) {
+        this->addUniformViewMatrix(pb);
         gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2");
 
         vsBuilder->codeAppendf("vec2 %s = vec2(%s * vec3(%s, 1));",
-                               gpArgs->fPositionVar.c_str(), matName, posName);
+                               gpArgs->fPositionVar.c_str(), this->uViewM(), posName);
     } else {
+        this->addUniformViewMatrix(pb);
         gpArgs->fPositionVar.set(kVec3f_GrSLType, "pos3");
 
         vsBuilder->codeAppendf("vec3 %s = %s * vec3(%s, 1);",
-                               gpArgs->fPositionVar.c_str(), matName, posName);
+                               gpArgs->fPositionVar.c_str(), this->uViewM(), posName);
     }
 }