Move GrGLShaderVar to GrGLSL

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 "GrGLProgramBuilder.h"
 #include "GrGLShaderStringBuilder.h"
 #include "gl/GrGLCaps.h"
 #include "gl/GrGLContext.h"
 #include "gl/GrGLGpu.h"
-#include "gl/GrGLShaderVar.h"
 #include "glsl/GrGLSLCaps.h"
+#include "glsl/GrGLSLShaderVar.h"
 
 namespace {
 void append_texture_lookup(SkString* out,
                            GrGLGpu* gpu,
                            const char* samplerName,
                            const char* coordName,
                            uint32_t configComponentMask,
                            const char* swizzle,
                            GrSLType varyingType = kVec2f_GrSLType) {
     SkASSERT(coordName);
@@ skipping 34 matching lines @@
     // 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);
     }
 
     this->main() = "void main() {";
 }
 
-void GrGLShaderBuilder::declAppend(const GrGLShaderVar& var) {
+void GrGLShaderBuilder::declAppend(const GrGLSLShaderVar& var) {
     SkString tempDecl;
     var.appendDecl(fProgramBuilder->glslCaps(), &tempDecl);
     this->codeAppendf("%s;", tempDecl.c_str());
 }
 
 void GrGLShaderBuilder::emitFunction(GrSLType returnType,
                                      const char* name,
                                      int argCnt,
-                                     const GrGLShaderVar* args,
+                                     const GrGLSLShaderVar* args,
                                      const char* body,
                                      SkString* outName) {
     this->functions().append(GrGLSLTypeString(returnType));
     fProgramBuilder->nameVariable(outName, '\0', name);
     this->functions().appendf(" %s", outName->c_str());
     this->functions().append("(");
     for (int i = 0; i < argCnt; ++i) {
         args[i].appendDecl(fProgramBuilder->glslCaps(), &this->functions());
         if (i < argCnt - 1) {
             this->functions().append(", ");
@@ skipping 126 matching lines @@
     fFinalized = true;
 
     if (!shaderId) {
         return false;
     }
 
     *shaderIds->append() = shaderId;
 
     return true;
 }