Default geometry processor

src/gpu/gl/GrGLProgramDesc.h

Index: src/gpu/gl/GrGLProgramDesc.h
diff --git a/src/gpu/gl/GrGLProgramDesc.h b/src/gpu/gl/GrGLProgramDesc.h
index 4e1be5b2f9c0d1127b62c134bfdc2471a17bb55d..30c7decae8473bb325b8e68533aeed689c5ebd96 100644
--- a/src/gpu/gl/GrGLProgramDesc.h
+++ b/src/gpu/gl/GrGLProgramDesc.h
@@ -47,10 +47,6 @@ public:
                       const GrDeviceCoordTexture*,
                       GrGLProgramDesc*);
 
-    bool hasGeometryProcessor() const {
-        return SkToBool(this->getHeader().fHasGeometryProcessor);
-    }
-
     int numColorEffects() const {
         return this->getHeader().fColorEffectCnt;
     }
@@ -108,7 +104,6 @@ private:
         int8_t                      fColorAttributeIndex;
         int8_t                      fCoverageAttributeIndex;
 
-        SkBool8                     fHasGeometryProcessor;
         int8_t                      fColorEffectCnt;
         int8_t                      fCoverageEffectCnt;
     };
@@ -170,7 +165,7 @@ private:
                     fBaseIndex = 0;
                     break;
                 case kFragment_ProcessorType:
-                    fBaseIndex = desc->hasGeometryProcessor() ? 1 : 0;
+                    fBaseIndex = desc->getHeader().fUseFragShaderOnly ? 0 : 1;
                     break;
             }
         }
@@ -206,6 +201,7 @@ private:
     // visible to GrGLProcessors. Then make public accessors as necessary and remove friends.
     friend class GrGLProgram;
     friend class GrGLProgramBuilder;
+    friend class GrGLNvprProgramBuilderBase;
     friend class GrGLLegacyNvprProgramBuilder;
     friend class GrGLVertexBuilder;
     friend class GrGLFragmentShaderBuilder;