Cleanup of shader building system

src/gpu/GrDrawState.cpp

Index: src/gpu/GrDrawState.cpp
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index 872d20a1ab48cb0c9ae6b0e93fb066a4a3e9fa7c..47c3b58e93cf87348a78fe910af6f32a003a591e 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -289,7 +289,7 @@ bool GrDrawState::validateVertexAttribs() const {
 
     if (this->hasGeometryProcessor()) {
         const GrGeometryStage& stage = *this->getGeometryProcessor();
-        const GrGeometryProcessor* gp = stage.getGeometryProcessor();
+        const GrGeometryProcessor* gp = stage.getProcessor();
         SkASSERT(gp);
         // make sure that any attribute indices have the correct binding type, that the attrib
         // type and effect's shader lang type are compatible, and that attributes shared by
@@ -433,7 +433,7 @@ bool GrDrawState::hasSolidCoverage() const {
 
     // Run through the coverage stages and see if the coverage will be all ones at the end.
     if (this->hasGeometryProcessor()) {
-        const GrGeometryProcessor* gp = fGeometryProcessor->getGeometryProcessor();
+        const GrGeometryProcessor* gp = fGeometryProcessor->getProcessor();
         gp->getConstantColorComponents(&coverage, &validComponentFlags);
     }
     for (int s = 0; s < this->numCoverageStages(); ++s) {
@@ -459,13 +459,13 @@ GrDrawState::AutoVertexAttribRestore::AutoVertexAttribRestore(GrDrawState* drawS
 bool GrDrawState::willEffectReadDstColor() const {
     if (!this->isColorWriteDisabled()) {
         for (int s = 0; s < this->numColorStages(); ++s) {
-            if (this->getColorStage(s).getFragmentProcessor()->willReadDstColor()) {
+            if (this->getColorStage(s).getProcessor()->willReadDstColor()) {
                 return true;
             }
         }
     }
     for (int s = 0; s < this->numCoverageStages(); ++s) {
-        if (this->getCoverageStage(s).getFragmentProcessor()->willReadDstColor()) {
+        if (this->getCoverageStage(s).getProcessor()->willReadDstColor()) {
             return true;
         }
     }