ViewMatrix uniform upload moved to GeometryProcessor

src/gpu/GrDefaultGeoProcFactory.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 "GrDefaultGeoProcFactory.h"
 
 #include "GrDrawState.h"
@@ skipping 85 matching lines @@
             this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, gp.inColor(),
                                         &fColorUniform);
 
             // Setup local coords if needed
             if (gp.inLocalCoords()) {
                 vs->codeAppendf("%s = %s;", vs->localCoords(), gp.inLocalCoords()->fName);
             } else {
                 vs->codeAppendf("%s = %s;", vs->localCoords(), gp.inPosition()->fName);
             }
 
+            // setup uniform viewMatrix
+            this->addUniformViewMatrix(pb);
+
             // setup position varying
-            vs->codeAppendf("%s = %s * vec3(%s, 1);", vs->glPosition(), vs->uViewM(),
+            vs->codeAppendf("%s = %s * vec3(%s, 1);", vs->glPosition(), this->uViewM(),
                             gp.inPosition()->fName);
 
             // Setup coverage as pass through
             if (kUniform_GrGPInput == local.fInputCoverageType) {
                 const char* fragCoverage;
                 fCoverageUniform = pb->addUniform(GrGLProgramBuilder::kFragment_Visibility,
                                                   kFloat_GrSLType,
                                                   kDefault_GrSLPrecision,
                                                   "Coverage",
                                                   &fragCoverage);
@@ skipping 16 matching lines @@
             const BatchTracker& local = bt.cast<BatchTracker>();
             uint32_t key = def.fFlags;
             key |= local.fInputColorType << 8 | local.fInputCoverageType << 16;
             key |= local.fUsesLocalCoords && gp.localMatrix().hasPerspective() ? 0x1 << 24 : 0x0;
             b->add32(key);
         }
 
         virtual void setData(const GrGLProgramDataManager& pdman,
                              const GrPrimitiveProcessor& gp,
                              const GrBatchTracker& bt) SK_OVERRIDE {
+            this->setUniformViewMatrix(pdman, gp.viewMatrix());
+
             const BatchTracker& local = bt.cast<BatchTracker>();
             if (kUniform_GrGPInput == local.fInputColorType && local.fColor != fColor) {
                 GrGLfloat c[4];
                 GrColorToRGBAFloat(local.fColor, c);
                 pdman.set4fv(fColorUniform, 1, c);
                 fColor = local.fColor;
             }
             if (kUniform_GrGPInput == local.fInputCoverageType && local.fCoverage != fCoverage) {
                 pdman.set1f(fCoverageUniform, GrNormalizeByteToFloat(local.fCoverage));
                 fCoverage = local.fCoverage;
@@ skipping 118 matching lines @@
                                                            const SkMatrix& localMatrix,
                                                            bool opaqueVertexColors,
                                                            uint8_t coverage) {
     return DefaultGeoProc::Create(gpTypeFlags,
                                   color,
                                   viewMatrix,
                                   localMatrix,
                                   opaqueVertexColors,
                                   coverage);
 }