Move GrGLInterface function pointers into a nested struct

src/gpu/gl/GrGLUniformManager.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 "gl/GrGLShaderBuilder.h"
 #include "gl/GrGLProgram.h"
 #include "gl/GrGLUniformHandle.h"
 #include "gl/GrGpuGL.h"
 #include "SkMatrix.h"
 
 #define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, COUNT) \
          SkASSERT(arrayCount <= uni.fArrayCount || \
                   (1 == arrayCount && GrGLShaderVar::kNonArray == uni.fArrayCount))
 
 GrGLUniformManager::GrGLUniformManager(GrGpuGL* gpu) : fGpu(gpu) {
-    fUsingBindUniform = fGpu->glInterface()->fBindUniformLocation != NULL;
+    // skbug.com/2056
+    fUsingBindUniform = fGpu->glInterface()->fFunctions.fBindUniformLocation != NULL;
 }
 
 GrGLUniformManager::UniformHandle GrGLUniformManager::appendUniform(GrSLType type, int arrayCount) {
     int idx = fUniforms.count();
     Uniform& uni = fUniforms.push_back();
     SkASSERT(GrGLShaderVar::kNonArray == arrayCount || arrayCount > 0);
     uni.fArrayCount = arrayCount;
     uni.fType = type;
     uni.fVSLocation = kUnusedUniform;
     uni.fFSLocation = kUnusedUniform;
@@ skipping 240 matching lines @@
         if (GrGLShaderBuilder::kFragment_Visibility & uniforms[i].fVisibility) {
             fUniforms[i].fFSLocation = location;
         }
     }
 }
 
 const GrGLUniformManager::BuilderUniform&
 GrGLUniformManager::getBuilderUniform(const BuilderUniformArray& array, UniformHandle handle) const {
     return array[handle.toUniformIndex()];
 }