Make GrGLSLProgramBuilder base class for ProgramBuilder

src/gpu/gl/builders/GrGLShaderBuilder.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 "GrGLShaderBuilder.h"
-#include "gl/builders/GrGLProgramBuilder.h"
 #include "glsl/GrGLSLCaps.h"
 #include "glsl/GrGLSLShaderVar.h"
 #include "glsl/GrGLSLTextureSampler.h"
+#include "glsl/GrGLSLProgramBuilder.h"
 
 static void map_swizzle(const char* swizzleMap, const char* swizzle, char* mangledSwizzle) {
     int i;
     for (i = 0; '\0' != swizzle[i]; ++i) {
         switch (swizzle[i]) {
             case 'r':
                 mangledSwizzle[i] = swizzleMap[0];
                 break;
             case 'g':
                 mangledSwizzle[i] = swizzleMap[1];
@@ skipping 39 matching lines @@
             swizzle = mangledSwizzle;
         }
     }
 
     // For shader prettiness we omit the swizzle rather than appending ".rgba".
     if (memcmp(swizzle, "rgba", 4)) {
         out->appendf(".%s", swizzle);
     }
 }
 
-GrGLShaderBuilder::GrGLShaderBuilder(GrGLProgramBuilder* program)
+GrGLShaderBuilder::GrGLShaderBuilder(GrGLSLProgramBuilder* program)
     : fProgramBuilder(program)
-    , fInputs(GrGLProgramBuilder::kVarsPerBlock)
-    , fOutputs(GrGLProgramBuilder::kVarsPerBlock)
+    , fInputs(GrGLSLProgramBuilder::kVarsPerBlock)
+    , fOutputs(GrGLSLProgramBuilder::kVarsPerBlock)
     , fFeaturesAddedMask(0)
     , fCodeIndex(kCode)
     , fFinalized(false) {
     // We push back some dummy pointers which will later become our header
     for (int i = 0; i <= kCode; i++) {
         fShaderStrings.push_back();
         fCompilerStrings.push_back(nullptr);
         fCompilerStringLengths.push_back(0);
     }
 
@@ skipping 94 matching lines @@
 
     GR_STATIC_ASSERT(0 == GrGLShaderBuilder::kOut_InterfaceQualifier);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(interfaceQualifierNames) == kLastInterfaceQualifier + 1);
 }
 
 void GrGLShaderBuilder::finalize(uint32_t visibility) {
     SkASSERT(!fFinalized);
     this->versionDecl() = fProgramBuilder->glslCaps()->versionDeclString();
     this->compileAndAppendLayoutQualifiers();
     SkASSERT(visibility);
-    fProgramBuilder->appendUniformDecls((GrGLProgramBuilder::ShaderVisibility) visibility,
+    fProgramBuilder->appendUniformDecls((GrGLSLProgramBuilder::ShaderVisibility) visibility,
                                         &this->uniforms());
     this->appendDecls(fInputs, &this->inputs());
     // We should not have any outputs in the fragment shader when using version 1.10
-    SkASSERT(GrGLProgramBuilder::kFragment_Visibility != visibility ||
+    SkASSERT(GrGLSLProgramBuilder::kFragment_Visibility != visibility ||
              k110_GrGLSLGeneration != fProgramBuilder->glslCaps()->generation() ||
              fOutputs.empty());
     this->appendDecls(fOutputs, &this->outputs());
     this->onFinalize();
     // append the 'footer' to code
     this->code().append("}");
 
     for (int i = 0; i <= fCodeIndex; i++) {
         fCompilerStrings[i] = fShaderStrings[i].c_str();
         fCompilerStringLengths[i] = (int)fShaderStrings[i].size();
     }
 
     fFinalized = true;
 }