Isolate VertexBuilder from GrGLShaderBuilder

src/effects/gradients/SkTwoPointConicalGradient.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTwoPointConicalGradient.h"
 
@@ skipping 488 matching lines @@
     // 2 copies of uniform array, 1 for each of vertex & fragment shader,
     // to work around Xoom bug. Doesn't seem to cause performance decrease
     // in test apps, but need to keep an eye on it.
     fVSParamUni = builder->addUniformArray(GrGLShaderBuilder::kVertex_Visibility,
                                            kFloat_GrSLType, "Conical2VSParams", 6);
     fFSParamUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility,
                                            kFloat_GrSLType, "Conical2FSParams", 6);
 
     // For radial gradients without perspective we can pass the linear
     // part of the quadratic as a varying.
-    if (kVec2f_GrSLType == coordsVaryingType) {
-        builder->addVarying(kFloat_GrSLType, "Conical2BCoeff",
-                            &fVSVaryingName, &fFSVaryingName);
+    GrGLShaderBuilder::VertexBuilder* conical2BBuilder =

[bsalomon, 2013/08/30 17:59:17]

Could we call this vsBuilder, vertexBuilder, or vBuilder? Seems clearer.

[Chris Dalton, 2013/08/30 19:10:30]

Done.

+        (kVec2f_GrSLType == coordsVaryingType) ? builder->getVertexBuilder() : NULL;
+    if (conical2BBuilder) {

[bsalomon, 2013/08/30 17:59:17]

Not really my pref, but at least in Gr code we tend to say

if (NULL != conical2BBuilder)

rather than

if (conical2BBuilder)

to emphasize that it's a ptr not a bool.

[Chris Dalton, 2013/08/30 19:10:30]

Done.

+        conical2BBuilder->addVarying(kFloat_GrSLType, "Conical2BCoeff",
+                                     &fVSVaryingName, &fFSVaryingName);
     }
 
     // VS
     {
         SkString p2; // distance between centers
         SkString p3; // start radius
         SkString p5; // difference in radii (r1 - r0)
         builder->getUniformVariable(fVSParamUni).appendArrayAccess(2, &p2);
         builder->getUniformVariable(fVSParamUni).appendArrayAccess(3, &p3);
         builder->getUniformVariable(fVSParamUni).appendArrayAccess(5, &p5);
 
         // For radial gradients without perspective we can pass the linear
         // part of the quadratic as a varying.
-        if (kVec2f_GrSLType == coordsVaryingType) {
+        if (conical2BBuilder) {
             // r2Var = -2 * (r2Parm[2] * varCoord.x - r2Param[3] * r2Param[5])
-            builder->vsCodeAppendf("\t%s = -2.0 * (%s * %s.x + %s * %s);\n",
-                                   fVSVaryingName, p2.c_str(),
-                                   vsCoordsVarying.c_str(), p3.c_str(), p5.c_str());
+            conical2BBuilder->vsCodeAppendf("\t%s = -2.0 * (%s * %s.x + %s * %s);\n",
+                                            fVSVaryingName, p2.c_str(),
+                                            vsCoordsVarying.c_str(), p3.c_str(), p5.c_str());
         }
     }
 
     // FS
     {
 
         SkString cName("c");
         SkString ac4Name("ac4");
         SkString dName("d");
         SkString qName("q");
@@ skipping 10 matching lines @@
         builder->getUniformVariable(fFSParamUni).appendArrayAccess(0, &p0);
         builder->getUniformVariable(fFSParamUni).appendArrayAccess(1, &p1);
         builder->getUniformVariable(fFSParamUni).appendArrayAccess(2, &p2);
         builder->getUniformVariable(fFSParamUni).appendArrayAccess(3, &p3);
         builder->getUniformVariable(fFSParamUni).appendArrayAccess(4, &p4);
         builder->getUniformVariable(fFSParamUni).appendArrayAccess(5, &p5);
 
         // If we we're able to interpolate the linear component,
         // bVar is the varying; otherwise compute it
         SkString bVar;
-        if (kVec2f_GrSLType == coordsVaryingType) {
+        if (conical2BBuilder) {
             bVar = fFSVaryingName;
         } else {
             bVar = "b";
             builder->fsCodeAppendf("\tfloat %s = -2.0 * (%s * %s.x + %s * %s);\n",
                                    bVar.c_str(), p2.c_str(), fsCoords.c_str(),
                                    p3.c_str(), p5.c_str());
         }
 
         // output will default to transparent black (we simply won't write anything
         // else to it if invalid, instead of discarding or returning prematurely)
@@ skipping 182 matching lines @@
     str->appendScalar(fCenter2.fY);
     str->append(") radius2: ");
     str->appendScalar(fRadius2);
     str->append(" ");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif