Move most of the transform logic into the primitive processors

src/gpu/GrDefaultGeoProcFactory.cpp

Index: src/gpu/GrDefaultGeoProcFactory.cpp
diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
index b64c456b5f56b94136968fbbad4fcae6fdfe095c..c99b50847120a448cc7134c4d46a299e6a7bfe43 100644
--- a/src/gpu/GrDefaultGeoProcFactory.cpp
+++ b/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -83,32 +83,40 @@ public:
         GLProcessor(const GrGeometryProcessor& gp, const GrBatchTracker&)
             : fColor(GrColor_ILLEGAL), fCoverage(0xff) {}
 
-        virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+        virtual void emitCode(EmitArgs& args) SK_OVERRIDE {
             const DefaultGeoProc& gp = args.fGP.cast<DefaultGeoProc>();
             GrGLGPBuilder* pb = args.fPB;
             GrGLVertexBuilder* vs = pb->getVertexShaderBuilder();
             GrGLGPFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder();
             const BatchTracker& local = args.fBT.cast<BatchTracker>();
 
-            vs->codeAppendf("%s = %s;", vs->positionCoords(), gp.inPosition()->fName);
+            // emit attributes
+            vs->emitAttributes(gp);
 
             // Setup pass through color
             this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, gp.inColor(),
                                         &fColorUniform);
 
-            // Setup local coords if needed
+            // setup uniform viewMatrix
+            this->addUniformViewMatrix(pb);
+
+            // Setup position
+            const char* pos3 = "pos3";
+            vs->codeAppendf("vec3 %s;", pos3);
+            vs->codeAppendf("%s = %s * vec3(%s, 1);", pos3, this->uViewM(), gp.inPosition()->fName);
+
             if (gp.inLocalCoords()) {
-                vs->codeAppendf("%s = %s;", vs->localCoords(), gp.inLocalCoords()->fName);
+                // emit transforms with explicit local coords
+                this->emitTransforms(pb, pos3, gp.inLocalCoords()->fName, gp.localMatrix(),
+                                     args.fTransformsIn, args.fTransformsOut);
             } else {
-                vs->codeAppendf("%s = %s;", vs->localCoords(), gp.inPosition()->fName);
+                // emit transforms with position
+                this->emitTransforms(pb, pos3, gp.inPosition()->fName, gp.localMatrix(),
+                                     args.fTransformsIn, args.fTransformsOut);
             }
 
-            // setup uniform viewMatrix
-            this->addUniformViewMatrix(pb);
+            vs->transformToNormalizedDeviceSpace(pos3);
 
-            // setup position varying
-            vs->codeAppendf("%s = %s * vec3(%s, 1);", vs->glPosition(), this->uViewM(),
-                            gp.inPosition()->fName);
 
             // Setup coverage as pass through
             if (kUniform_GrGPInput == local.fInputCoverageType) {
@@ -174,7 +182,8 @@ public:
         GLProcessor::GenKey(*this, bt, caps, b);
     }
 
-    virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE {
+    virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
+                                                     const GrGLCaps&) const SK_OVERRIDE {
         return SkNEW_ARGS(GLProcessor, (*this, bt));
     }