Cleanup of shader building system

src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp

Index: src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp
diff --git a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp
index 4877071d77686beefc1d03d05a36ffe9be47a6f1..478fe767a929e1862bcc4937aef2f4eb2c643f37 100644
--- a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp
@@ -6,35 +6,73 @@
  */
 
 #include "GrGLVertexShaderBuilder.h"
-#include "GrGLFullProgramBuilder.h"
+#include "GrGLProgramBuilder.h"
 #include "GrGLShaderStringBuilder.h"
 #include "../GrGpuGL.h"
-#include "../../GrOptDrawState.h"
 
-#define GL_CALL(X) GR_GL_CALL(gpu->glInterface(), X)
-#define GL_CALL_RET(R, X) GR_GL_CALL_RET(gpu->glInterface(), R, X)
+#define GL_CALL(X) GR_GL_CALL(fProgramBuilder->gpu()->glInterface(), X)
+#define GL_CALL_RET(R, X) GR_GL_CALL_RET(fProgramBuilder->gpu()->glInterface(), R, X)
 
-namespace {
-inline const char* color_attribute_name() { return "inColor"; }
-inline const char* coverage_attribute_name() { return "inCoverage"; }
-}
+static const char* color_attribute_name() { return "inColor"; }
+static const char* coverage_attribute_name() { return "inCoverage"; }
 
-GrGLVertexShaderBuilder::GrGLVertexShaderBuilder(GrGLFullProgramBuilder* program)
+GrGLVertexShaderBuilder::GrGLVertexShaderBuilder(GrGLProgramBuilder* program)
     : INHERITED(program)
     , fPositionVar(NULL)
-    , fLocalCoordsVar(NULL) {
+    , fLocalCoordsVar(NULL)
+    , fEffectAttribOffset(0) {
 }
-bool GrGLVertexShaderBuilder::addAttribute(const GrShaderVar& var) {
-    SkASSERT(GrShaderVar::kAttribute_TypeModifier == var.getTypeModifier());
-    for (int i = 0; i < fInputs.count(); ++i) {
-        const GrGLShaderVar& attr = fInputs[i];
-        // if attribute already added, don't add it again
-        if (attr.getName().equals(var.getName())) {
-            return false;
-        }
+
+SkString* GrGLVertexShaderBuilder::addVarying(GrSLType type, const char* name,
+                                              const char** vsOutName) {
+    fOutputs.push_back();
+    fOutputs.back().setType(type);
+    fOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier);
+    fProgramBuilder->nameVariable(fOutputs.back().accessName(), 'v', name);
+
+    if (vsOutName) {
+        *vsOutName = fOutputs.back().getName().c_str();
     }
-    fInputs.push_back(var);
-    return true;
+    return fOutputs.back().accessName();
+}
+
+void GrGLVertexShaderBuilder::setupLocalCoords() {
+    fPositionVar = &fInputs.push_back();
+    fPositionVar->set(kVec2f_GrSLType, GrGLShaderVar::kAttribute_TypeModifier, "inPosition");
+    if (-1 != fProgramBuilder->header().fLocalCoordAttributeIndex) {
+        fLocalCoordsVar = &fInputs.push_back();
+        fLocalCoordsVar->set(kVec2f_GrSLType,
+                             GrGLShaderVar::kAttribute_TypeModifier,
+                             "inLocalCoords");
+    } else {
+        fLocalCoordsVar = fPositionVar;
+    }
+    fEffectAttribOffset = fInputs.count();
+}
+
+void GrGLVertexShaderBuilder::transformGLToSkiaCoords() {
+    const char* viewMName;
+    fProgramBuilder->fUniformHandles.fViewMatrixUni =
+            fProgramBuilder->addUniform(GrGLProgramBuilder::kVertex_Visibility,
+                                        kMat33f_GrSLType,
+                                        "ViewM",
+                                        &viewMName);
+
+    // Transform the position into Skia's device coords.
+    this->codeAppendf("vec3 pos3 = %s * vec3(%s, 1);", viewMName, fPositionVar->c_str());
+}
+
+void GrGLVertexShaderBuilder::setupBuiltinVertexAttribute(const char* inName, GrGLSLExpr4* out) {
+    SkString name(inName);
+    const char *vsName, *fsName;
+    fProgramBuilder->addVarying(kVec4f_GrSLType, name.c_str(), &vsName, &fsName);
+    name.prepend("in");
+    this->addAttribute(GrShaderVar(name.c_str(),
+                                   kVec4f_GrSLType,
+                                   GrShaderVar::kAttribute_TypeModifier));
+    this->codeAppendf("%s = %s;", vsName, name.c_str());
+    *out = fsName;
+    fEffectAttribOffset++;
 }
 
 void GrGLVertexShaderBuilder::emitAttributes(const GrGeometryProcessor& gp) {
@@ -45,39 +83,38 @@ void GrGLVertexShaderBuilder::emitAttributes(const GrGeometryProcessor& gp) {
     }
 }
 
-void GrGLVertexShaderBuilder::addVarying(GrSLType type, const char* name, const char** vsOutName) {
-    fOutputs.push_back();
-    fOutputs.back().setType(type);
-    fOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier);
-    fProgramBuilder->nameVariable(fOutputs.back().accessName(), 'v', name);
+void GrGLVertexShaderBuilder::transformSkiaToGLCoords() {
+    const char* rtAdjustName;
+    fProgramBuilder->fUniformHandles.fRTAdjustmentUni =
+            fProgramBuilder->addUniform(GrGLProgramBuilder::kVertex_Visibility,
+                                        kVec4f_GrSLType,
+                                        "rtAdjustment",
+                                        &rtAdjustName);
 
-    if (vsOutName) {
-        *vsOutName = fOutputs.back().getName().c_str();
-    }
+    // Transform from Skia's device coords to GL's normalized device coords.
+    this->codeAppendf("gl_Position = vec4(dot(pos3.xz, %s.xy), dot(pos3.yz, %s.zw), 0, pos3.z);",
+                    rtAdjustName, rtAdjustName);
 }
 
-
-void GrGLVertexShaderBuilder::bindProgramLocations(GrGLuint programId) {
-    const GrGLProgramDesc::KeyHeader& header = fProgramBuilder->desc().getHeader();
-    GrGpuGL* gpu = fProgramBuilder->gpu();
-
+void GrGLVertexShaderBuilder::bindVertexAttributes(GrGLuint programID) {
     // Bind the attrib locations to same values for all shaders
+    const GrGLProgramDesc::KeyHeader& header = fProgramBuilder->header();
     SkASSERT(-1 != header.fPositionAttributeIndex);
-    GL_CALL(BindAttribLocation(programId,
+    GL_CALL(BindAttribLocation(programID,
                                header.fPositionAttributeIndex,
                                fPositionVar->c_str()));
     if (-1 != header.fLocalCoordAttributeIndex) {
-        GL_CALL(BindAttribLocation(programId,
+        GL_CALL(BindAttribLocation(programID,
                                    header.fLocalCoordAttributeIndex,
                                    fLocalCoordsVar->c_str()));
     }
     if (-1 != header.fColorAttributeIndex) {
-        GL_CALL(BindAttribLocation(programId,
+        GL_CALL(BindAttribLocation(programID,
                                    header.fColorAttributeIndex,
                                    color_attribute_name()));
     }
     if (-1 != header.fCoverageAttributeIndex) {
-        GL_CALL(BindAttribLocation(programId,
+        GL_CALL(BindAttribLocation(programID,
                                    header.fCoverageAttributeIndex,
                                    coverage_attribute_name()));
     }
@@ -91,6 +128,7 @@ void GrGLVertexShaderBuilder::bindProgramLocations(GrGLuint programId) {
     const GrVertexAttrib* vaPtr = optState->getVertexAttribs();
     const int vaCount = optState->getVertexAttribCount();
 
+    // We start binding attributes after builtins
     int i = fEffectAttribOffset;
     for (int index = 0; index < vaCount; index++) {
         if (kGeometryProcessor_GrVertexAttribBinding != vaPtr[index].fBinding) {
@@ -102,7 +140,7 @@ void GrGLVertexShaderBuilder::bindProgramLocations(GrGLuint programId) {
                  index != header.fCoverageAttributeIndex);
         // We should never find another effect attribute if we have bound everything
         SkASSERT(i < fInputs.count());
-        GL_CALL(BindAttribLocation(programId, index, fInputs[i].c_str()));
+        GL_CALL(BindAttribLocation(programID, index, fInputs[i].c_str()));
         i++;
     }
     // Make sure we bound everything
@@ -116,8 +154,8 @@ bool GrGLVertexShaderBuilder::compileAndAttachShaders(GrGLuint programId,
     const GrGLContextInfo& ctxInfo = gpu->ctxInfo();
     SkString vertShaderSrc(GrGetGLSLVersionDecl(ctxInfo));
     fProgramBuilder->appendUniformDecls(GrGLProgramBuilder::kVertex_Visibility, &vertShaderSrc);
-    fProgramBuilder->appendDecls(fInputs, &vertShaderSrc);
-    fProgramBuilder->appendDecls(fOutputs, &vertShaderSrc);
+    this->appendDecls(fInputs, &vertShaderSrc);
+    this->appendDecls(fOutputs, &vertShaderSrc);
     vertShaderSrc.append("void main() {");
     vertShaderSrc.append(fCode);
     vertShaderSrc.append("}\n");
@@ -131,72 +169,15 @@ bool GrGLVertexShaderBuilder::compileAndAttachShaders(GrGLuint programId,
     return true;
 }
 
-void GrGLVertexShaderBuilder::emitCodeAfterEffects() {
-    const char* rtAdjustName;
-    fProgramBuilder->fUniformHandles.fRTAdjustmentUni =
-        fProgramBuilder->addUniform(GrGLProgramBuilder::kVertex_Visibility,
-                             kVec4f_GrSLType,
-                             "rtAdjustment",
-                             &rtAdjustName);
-
-    // Transform from Skia's device coords to GL's normalized device coords.
-    this->codeAppendf(
-        "gl_Position = vec4(dot(pos3.xz, %s.xy), dot(pos3.yz, %s.zw), 0, pos3.z);",
-        rtAdjustName, rtAdjustName);
-}
-
-void GrGLVertexShaderBuilder::emitCodeBeforeEffects(GrGLSLExpr4* color, GrGLSLExpr4* coverage) {
-    const GrGLProgramDesc::KeyHeader& header = fProgramBuilder->desc().getHeader();
-
-    fPositionVar = &fInputs.push_back();
-    fPositionVar->set(kVec2f_GrSLType, GrGLShaderVar::kAttribute_TypeModifier, "inPosition");
-    if (-1 != header.fLocalCoordAttributeIndex) {
-        fLocalCoordsVar = &fInputs.push_back();
-        fLocalCoordsVar->set(kVec2f_GrSLType,
-                             GrGLShaderVar::kAttribute_TypeModifier,
-                             "inLocalCoords");
-    } else {
-        fLocalCoordsVar = fPositionVar;
-    }
-
-    const char* viewMName;
-    fProgramBuilder->fUniformHandles.fViewMatrixUni =
-            fProgramBuilder->addUniform(GrGLProgramBuilder::kVertex_Visibility,
-                                 kMat33f_GrSLType,
-                                 "ViewM",
-                                 &viewMName);
-
-    // Transform the position into Skia's device coords.
-    this->codeAppendf("vec3 pos3 = %s * vec3(%s, 1);",
-                      viewMName, fPositionVar->c_str());
-
-    // we output point size in the GS if present
-    if (header.fEmitsPointSize
-#if GR_GL_EXPERIMENTAL_GS
-        && !header.fExperimentalGS
-#endif
-        ) {
-        this->codeAppend("gl_PointSize = 1.0;");
-    }
-
-    if (GrGLProgramDesc::kAttribute_ColorInput == header.fColorInput) {
-        this->addAttribute(GrShaderVar(color_attribute_name(),
-                                       kVec4f_GrSLType,
-                                       GrShaderVar::kAttribute_TypeModifier));
-        const char *vsName, *fsName;
-        fFullProgramBuilder->addVarying(kVec4f_GrSLType, "Color", &vsName, &fsName);
-        this->codeAppendf("%s = %s;", vsName, color_attribute_name());
-        *color = fsName;
-    }
-
-    if (GrGLProgramDesc::kAttribute_ColorInput == header.fCoverageInput) {
-        this->addAttribute(GrShaderVar(coverage_attribute_name(),
-                                       kVec4f_GrSLType,
-                                       GrShaderVar::kAttribute_TypeModifier));
-        const char *vsName, *fsName;
-        fFullProgramBuilder->addVarying(kVec4f_GrSLType, "Coverage", &vsName, &fsName);
-        this->codeAppendf("%s = %s;", vsName, coverage_attribute_name());
-        *coverage = fsName;
+bool GrGLVertexShaderBuilder::addAttribute(const GrShaderVar& var) {
+    SkASSERT(GrShaderVar::kAttribute_TypeModifier == var.getTypeModifier());
+    for (int i = 0; i < fInputs.count(); ++i) {
+        const GrGLShaderVar& attr = fInputs[i];
+        // if attribute already added, don't add it again
+        if (attr.getName().equals(var.getName())) {
+            return false;
+        }
     }
-    fEffectAttribOffset = fInputs.count();
+    fInputs.push_back(var);
+    return true;
 }