Make GrGLShaderBuilder store a GenProgramOutput

src/gpu/gl/GrGLProgram.cpp

Index: src/gpu/gl/GrGLProgram.cpp
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 1edbecfc197f9653e72cdcdd0178a65db5bb3760..f0a240a1e215139dd2a11287a0fda0639f9f6dbd 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -48,8 +48,8 @@ GrGLProgram::GrGLProgram(GrGpuGL* gpu,
 , fGpu(gpu)
 , fUniformManager(SkRef(uman))
 , fUniformHandles(builderOutput.fUniformHandles)
-, fHasVertexShader(builderOutput.fHasVS)
-, fNumTexCoordSets(builderOutput.fNumTexCoordSets) {
+, fHasVertexShader(builderOutput.fHasVertexShader)
+, fTexCoordSetCnt(builderOutput.fTexCoordSetCnt) {
     this->initSamplerUniforms();
 }
 
@@ -151,7 +151,7 @@ void GrGLProgram::setData(GrDrawState::BlendOptFlags blendOpts,
     // custom shaders, it's ignored, so we don't need to change the texgen
     // settings in that case.
     if (!fHasVertexShader) {
-        fGpu->flushPathTexGenSettings(fNumTexCoordSets);
+        fGpu->flushPathTexGenSettings(fTexCoordSetCnt);
     }
 }