Create GrGLSLVaryingHandler class for program building

src/gpu/glsl/GrGLSLGeometryProcessor.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLSLGeometryProcessor.h"
 
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLProcessorTypes.h"
 #include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLVarying.h"
 #include "glsl/GrGLSLVertexShaderBuilder.h"
 
 void GrGLSLGeometryProcessor::emitCode(EmitArgs& args) {
     GrGLSLVertexBuilder* vBuilder = args.fVertBuilder;
     GrGPArgs gpArgs;
     this->onEmitCode(args, &gpArgs);
     vBuilder->transformToNormalizedDeviceSpace(gpArgs.fPositionVar);
 }
 
 void GrGLSLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb,
                                              GrGLSLVertexBuilder* vb,
+                                             GrGLSLVaryingHandler* varyingHandler,
                                              const GrShaderVar& posVar,
                                              const char* localCoords,
                                              const SkMatrix& localMatrix,
                                              const TransformsIn& tin,
                                              TransformsOut* tout) {
     tout->push_back_n(tin.count());
     fInstalledTransforms.push_back_n(tin.count());
     for (int i = 0; i < tin.count(); i++) {
         const ProcCoords& coordTransforms = tin[i];
         fInstalledTransforms[i].push_back_n(coordTransforms.count());
@@ skipping 15 matching lines @@
             fInstalledTransforms[i][t].fHandle =
                     pb->addUniform(GrGLSLProgramBuilder::kVertex_Visibility,
                                    kMat33f_GrSLType, precision,
                                    strUniName.c_str(),
                                    &uniName).toIndex();
 
             SkString strVaryingName("MatrixCoord");
             strVaryingName.appendf("_%i_%i", i, t);
 
             GrGLSLVertToFrag v(varyingType);
-            pb->addVarying(strVaryingName.c_str(), &v, precision);
+            varyingHandler->addVarying(strVaryingName.c_str(), &v, precision);
 
             SkASSERT(kVec2f_GrSLType == varyingType || kVec3f_GrSLType == varyingType);
             SkNEW_APPEND_TO_TARRAY(&(*tout)[i], GrGLSLTransformedCoords,
                                    (SkString(v.fsIn()), varyingType));
 
             // varying = matrix * coords (logically)
             if (kDevice_GrCoordSet == coordType) {
                 if (kVec2f_GrSLType == varyingType) {
                     if (kVec2f_GrSLType == posVar.getType()) {
                         vb->codeAppendf("%s = (%s * vec3(%s, 1)).xy;",
@@ skipping 17 matching lines @@
                 } else {
                     vb->codeAppendf("%s = %s * vec3(%s, 1);", v.vsOut(), uniName, localCoords);
                 }
             }
         }
     }
 }
 
 void GrGLSLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb,
                                              GrGLSLVertexBuilder* vb,
+                                             GrGLSLVaryingHandler* varyingHandler,
                                              const char* localCoords,
                                              const TransformsIn& tin,
                                              TransformsOut* tout) {
     tout->push_back_n(tin.count());
     for (int i = 0; i < tin.count(); i++) {
         const ProcCoords& coordTransforms = tin[i];
         for (int t = 0; t < coordTransforms.count(); t++) {
             GrSLType varyingType = kVec2f_GrSLType;
 
             // Device coords aren't supported
             SkASSERT(kDevice_GrCoordSet != coordTransforms[t]->sourceCoords());
             GrSLPrecision precision = coordTransforms[t]->precision();
 
             SkString strVaryingName("MatrixCoord");
             strVaryingName.appendf("_%i_%i", i, t);
 
             GrGLSLVertToFrag v(varyingType);
-            pb->addVarying(strVaryingName.c_str(), &v, precision);
+            varyingHandler->addVarying(strVaryingName.c_str(), &v, precision);
             vb->codeAppendf("%s = %s;", v.vsOut(), localCoords);
 
             SkNEW_APPEND_TO_TARRAY(&(*tout)[i],
                                    GrGLSLTransformedCoords,
                                    (SkString(v.fsIn()), varyingType));
         }
     }
 }
 
 void GrGLSLGeometryProcessor::setupPosition(GrGLSLGPBuilder* pb,
@@ skipping 23 matching lines @@
             gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2");
             vertBuilder->codeAppendf("vec2 %s = vec2(%s * vec3(%s, 1));",
                                      gpArgs->fPositionVar.c_str(), viewMatrixName, posName);
         } else {
             gpArgs->fPositionVar.set(kVec3f_GrSLType, "pos3");
             vertBuilder->codeAppendf("vec3 %s = %s * vec3(%s, 1);",
                                      gpArgs->fPositionVar.c_str(), viewMatrixName, posName);
         }
     }
 }