ViewMatrix uniform upload moved to GeometryProcessor

src/gpu/GrOptDrawState.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 "GrOptDrawState.h"
 
 #include "GrDrawState.h"
@@ skipping 48 matching lines @@
     }
 
     // When path rendering the stencil settings are not always set on the draw state
     // so we must check the draw type. In cases where we will skip drawing we simply return a
     // null GrOptDrawState.
     if (!xferProcessor || (GrXferProcessor::kSkipDraw_OptFlag & optFlags)) {
         // Set the fields that don't default init and return. The lack of a render target will
         // indicate that this can be skipped.
         fFlags = 0;
         fDrawFace = GrDrawState::kInvalid_DrawFace;
-        fViewMatrix.reset();
         return;
     }
 
     fRenderTarget.reset(drawState.fRenderTarget.get());
     SkASSERT(fRenderTarget);
     fScissorState = scissorState;
-    fViewMatrix = fPrimitiveProcessor->viewMatrix();
     fStencilSettings = drawState.getStencil();
     fDrawFace = drawState.getDrawFace();
     // TODO move this out of optDrawState
     if (dstCopy) {
         fDstCopy = *dstCopy;
     }
 
     fFlags = 0;
     if (drawState.isHWAntialias()) {
         fFlags |= kHWAA_Flag;
@@ skipping 86 matching lines @@
 
 bool GrOptDrawState::combineIfPossible(const GrOptDrawState& that) {
     if (fDescInfo != that.fDescInfo) {
         return false;
     }
 
     if (this->getRenderTarget() != that.getRenderTarget() ||
         this->fFragmentStages.count() != that.fFragmentStages.count() ||
         this->fNumColorStages != that.fNumColorStages ||
         this->fScissorState != that.fScissorState ||
-        !this->fViewMatrix.cheapEqualTo(that.fViewMatrix) ||
         this->fDrawType != that.fDrawType ||
         this->fFlags != that.fFlags ||
         this->fStencilSettings != that.fStencilSettings ||
         this->fDrawFace != that.fDrawFace ||
         this->fDstCopy.texture() != that.fDstCopy.texture()) {
         return false;
     }
 
     if (!this->getPrimitiveProcessor()->canMakeEqual(fBatchTracker,
                                                      *that.getPrimitiveProcessor(),
@@ skipping 12 matching lines @@
         if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
             return false;
         }
     }
 
     // Now update the GrPrimitiveProcessor's batch tracker
     fPrimitiveProcessor->makeEqual(&fBatchTracker, that.getBatchTracker());
     return true;
 }