Move GrGLShaderVar to GrGLSL

src/gpu/gl/GrGLProgramDataManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLProgramDataManager_DEFINED
 #define GrGLProgramDataManager_DEFINED
 
 #include "GrAllocator.h"
-#include "gl/GrGLShaderVar.h"
 #include "gl/GrGLTypes.h"
+#include "glsl/GrGLSLShaderVar.h"
 
 #include "SkTArray.h"
 
 class GrGLGpu;
 class SkMatrix;
 class GrGLProgram;
 class GrGLProgramBuilder;
 
 /** Manages the resources used by a shader program.
  * The resources are objects the program uses to communicate with the
@@ skipping 18 matching lines @@
         int toIndex() const { SkASSERT(this->isValid()); return fValue; }
 
     private:
         static const int kInvalid_ShaderResourceHandle = -1;
         int fValue;
     };
 
     typedef ShaderResourceHandle UniformHandle;
 
     struct UniformInfo {
-        GrGLShaderVar fVariable;
-        uint32_t      fVisibility;
-        GrGLint       fLocation;
+        GrGLSLShaderVar fVariable;
+        uint32_t        fVisibility;
+        GrGLint         fLocation;
     };
 
     struct SeparableVaryingInfo {
-        GrGLShaderVar fVariable;
-        GrGLint       fLocation;
+        GrGLSLShaderVar fVariable;
+        GrGLint         fLocation;
     };
 
-    // This uses an allocator rather than array so that the GrGLShaderVars don't move in memory
+    // This uses an allocator rather than array so that the GrGLSLShaderVars don't move in memory
     // after they are inserted. Users of GrGLShaderBuilder get refs to the vars and ptrs to their
     // name strings. Otherwise, we'd have to hand out copies.
     typedef GrTAllocator<UniformInfo> UniformInfoArray;
     typedef GrTAllocator<SeparableVaryingInfo> SeparableVaryingInfoArray;
 
     GrGLProgramDataManager(GrGLGpu*, GrGLuint programID, const UniformInfoArray&,
                            const SeparableVaryingInfoArray&);
 
     /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
      *  array of uniforms. arrayCount must be <= the array count of the uniform.
@@ skipping 51 matching lines @@
 
     SkTArray<Uniform, true> fUniforms;
     SkTArray<SeparableVarying, true> fSeparableVaryings;
     GrGLGpu* fGpu;
     GrGLuint fProgramID;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif