commit dd2198701b0ec9da61ecf73418cad03642d715e7
author joshualitt <joshualitt@chromium.org> Thu Feb 12 14:48:42 2015 -0800
committer Commit bot <commit-bot@chromium.org> Thu Feb 12 14:48:42 2015 -0800
tree d16f763f6e5fbdd546180b60cfa21400aafe313c
parent 8072caa80384292858d31ae34b7e19768875866b

fix for uniform view matrix being uploaded but not used

As discussed, I'll follow this up by removing localmatrix/uniform view matrix from the base classe

BUG=skia:

Review URL: https://codereview.chromium.org/920933002

src/gpu/effects/GrBitmapTextGeoProc.cpp

diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index a699b04..2487b65 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -43,11 +43,8 @@
         this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, cte.inColor(),
                                     &fColorUniform);
 
-        // setup uniform viewMatrix
-        this->addUniformViewMatrix(pb);
-
         // Setup position
-        SetupPosition(vsBuilder, gpArgs, cte.inPosition()->fName, cte.viewMatrix(), this->uViewM());
+        this->setupPosition(pb, gpArgs, cte.inPosition()->fName, cte.viewMatrix());
 
         // emit transforms
         this->emitTransforms(args.fPB, gpArgs->fPositionVar, cte.inPosition()->fName,