ViewMatrix uniform upload moved to GeometryProcessor

src/gpu/GrGeometryProcessor.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 "GrGeometryProcessor.h"
 
 #include "gl/GrGLGeometryProcessor.h"
@@ skipping 38 matching lines @@
                                        &stagedLocalVarName);
         fs->codeAppendf("%s = %s;", outputName, stagedLocalVarName);
     } else if (kAttribute_GrGPInput == inputType) {
         SkASSERT(colorAttr);
         pb->addPassThroughAttribute(colorAttr, outputName);
     } else if (kAllOnes_GrGPInput == inputType) {
         fs->codeAppendf("%s = vec4(1);", outputName);
     }
 }
 
+void GrGLGeometryProcessor::setupUniformViewMatrix(GrGLGPBuilder* pb) {

[bsalomon, 2014/12/30 13:19:38]

These functions are so similarly named. Maybe we could rename the first to
addUniformViewMatrix just to differentiate it a bit? Also, it does call
"add"Uniform.

+    fViewMatrixUniform = pb->addUniform(GrGLProgramBuilder::kVertex_Visibility,
+                                        kMat33f_GrSLType, kDefault_GrSLPrecision,
+                                        "uViewM",
+                                        &fViewMatrixName);
+}
+
+void GrGLGeometryProcessor::setUniformViewMatrix(const GrGLProgramDataManager& pdman,
+                                                 const SkMatrix& viewMatrix) {
+    if (!fViewMatrix.cheapEqualTo(viewMatrix)) {
+        SkASSERT(fViewMatrixUniform.isValid());
+        fViewMatrix = viewMatrix;
+
+        GrGLfloat viewMatrix[3 * 3];
+        GrGLGetMatrix<3>(viewMatrix, fViewMatrix);
+        pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 struct PathBatchTracker {
     GrGPInput fInputColorType;
     GrGPInput fInputCoverageType;
     GrColor fColor;
     bool fUsesLocalCoords;
 };
 
 class GrGLPathProcessor : public GrGLGeometryProcessor {
@@ skipping 104 matching lines @@
 
 void GrPathProcessor::getGLProcessorKey(const GrBatchTracker& bt,
                                         const GrGLCaps& caps,
                                         GrProcessorKeyBuilder* b) const {
     GrGLPathProcessor::GenKey(*this, bt, caps, b);
 }
 
 GrGLGeometryProcessor* GrPathProcessor::createGLInstance(const GrBatchTracker& bt) const {
     return SkNEW_ARGS(GrGLPathProcessor, (*this, bt));
 }