commit 46d36f0e7b709a077c647841eee23bd3efdc4117
author robertphillips <robertphillips@google.com> Sun Jan 18 08:14:14 2015 -0800
committer Commit bot <commit-bot@chromium.org> Sun Jan 18 08:14:14 2015 -0800
tree f1af8cebc0e3fbaa0eabc29cfbd781eedffee287
parent 75d98fd6f23fc73aad3ce87d6c4b6c41c2d1536e

Refactor position computation to enable device space "nudge"

To match raster's handling of BW geometry we want to be able to perform a device space "nudge" on all geometry. This CL sets us up to be able to do that in GrGLVertexBuilder::transformToNormalizedDeviceSpace.

BUG=423834
TBR=bsalomon@google.com

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

src/gpu/effects/GrBitmapTextGeoProc.cpp

diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 146fb06..924f7cd 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -25,7 +25,7 @@
     GrGLBitmapTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&)
         : fColor(GrColor_ILLEGAL) {}
 
-    void onEmitCode(EmitArgs& args) SK_OVERRIDE {
+    void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) SK_OVERRIDE{
         const GrBitmapTextGeoProc& cte = args.fGP.cast<GrBitmapTextGeoProc>();
         const BitmapTextBatchTracker& local = args.fBT.cast<BitmapTextBatchTracker>();
 
@@ -47,11 +47,11 @@
         this->addUniformViewMatrix(pb);
 
         // Setup position
-        vsBuilder->codeAppendf("%s = %s * vec3(%s, 1);",  this->position(), this->uViewM(),
-                               cte.inPosition()->fName);
+        SetupPosition(vsBuilder, gpArgs, cte.inPosition()->fName,
+                      cte.viewMatrix(), this->uViewM());
 
         // emit transforms
-        this->emitTransforms(args.fPB,  this->position(), cte.inPosition()->fName,
+        this->emitTransforms(args.fPB, gpArgs->fPositionVar, cte.inPosition()->fName,
                              cte.localMatrix(), args.fTransformsIn, args.fTransformsOut);
 
         GrGLGPFragmentBuilder* fsBuilder = pb->getFragmentShaderBuilder();
@@ -86,6 +86,7 @@
         uint32_t key = 0;
         key |= SkToBool(gp.inColor()) ? 0x1 : 0x0;
         key |= local.fUsesLocalCoords && proc.localMatrix().hasPerspective() ? 0x2 : 0x0;
+        key |= ComputePosKey(gp.viewMatrix()) << 2;
         b->add32(local.fInputColorType << 16 | key);
     }