Move GrGLInterface function pointers into a nested struct

src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLInterface.h"
 #include "../GrGLUtil.h"
 
 #define GL_GLEXT_PROTOTYPES
 #include "osmesa_wrapper.h"
 
-#define GR_GL_GET_PROC(F) interface->f ## F = (GrGL ## F ## Proc) \
+#define GR_GL_GET_PROC(F) interface->fFunctions.f ## F = (GrGL ## F ## Proc) \
         OSMesaGetProcAddress("gl" #F);
-#define GR_GL_GET_PROC_SUFFIX(F, S) interface->f ## F = (GrGL ## F ## Proc) \
+#define GR_GL_GET_PROC_SUFFIX(F, S) interface->fFunctions.f ## F = (GrGL ## F ## Proc) \
         OSMesaGetProcAddress("gl" #F #S);
 
 // We use OSMesaGetProcAddress for every gl function to avoid accidentally using
 // non-Mesa gl functions.
 
 const GrGLInterface* GrGLCreateMesaInterface() {
     if (NULL != OSMesaGetCurrentContext()) {
 
         GrGLGetStringProc getString = (GrGLGetStringProc) OSMesaGetProcAddress("glGetString");
         GrGLGetStringiProc getStringi = (GrGLGetStringiProc) OSMesaGetProcAddress("glGetStringi");
@@ skipping 105 matching lines @@
         GR_GL_GET_PROC(StencilMaskSeparate);
         GR_GL_GET_PROC(StencilOp);
         GR_GL_GET_PROC(StencilOpSeparate);
         GR_GL_GET_PROC(TexGenf);
         GR_GL_GET_PROC(TexGenfv);
         GR_GL_GET_PROC(TexGeni);
         GR_GL_GET_PROC(TexImage2D)
         GR_GL_GET_PROC(TexParameteri);
         GR_GL_GET_PROC(TexParameteriv);
         GR_GL_GET_PROC(TexStorage2D);
-        if (NULL == interface->fTexStorage2D) {
+        if (NULL == interface->fFunctions.fTexStorage2D) {
             GR_GL_GET_PROC_SUFFIX(TexStorage2D, EXT);
         }
         GR_GL_GET_PROC(TexSubImage2D);
         GR_GL_GET_PROC(Uniform1f);
         GR_GL_GET_PROC(Uniform1i);
         GR_GL_GET_PROC(Uniform1fv);
         GR_GL_GET_PROC(Uniform1iv);
         GR_GL_GET_PROC(Uniform2f);
         GR_GL_GET_PROC(Uniform2i);
         GR_GL_GET_PROC(Uniform2fv);
@@ skipping 67 matching lines @@
         GR_GL_GET_PROC(BindFragDataLocationIndexed);
 
         interface->fStandard = kGL_GrGLStandard;
         interface->fExtensions.swap(&extensions);
 
         return interface;
     } else {
         return NULL;
     }
 }