Move GrGLInterface function pointers into a nested struct

src/gpu/gl/mac/GrGLCreateNativeInterface_mac.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/GrGLInterface.h"
@@ skipping 20 matching lines @@
     }
 private:
     void* fLibrary;
 };
 
 static void* GetProcAddress(const char* name) {
     static GLLoader gLoader;
     return dlsym(gLoader.handle(), name);
 }
 
-#define GET_PROC(name) (interface->f ## name = ((GrGL ## name ## Proc) GetProcAddress("gl" #name)))
-#define GET_PROC_SUFFIX(name, suffix) (interface->f ## name = ((GrGL ## name ## Proc) GetProcAddress("gl" #name #suffix)))
+#define GET_PROC(name) (interface->fFunctions.f ## name = ((GrGL ## name ## Proc) GetProcAddress("gl" #name)))
+#define GET_PROC_SUFFIX(name, suffix) (interface->fFunctions.f ## name = ((GrGL ## name ## Proc) GetProcAddress("gl" #name #suffix)))
 
 const GrGLInterface* GrGLCreateNativeInterface() {
 
     GrGLGetStringProc glGetString = (GrGLGetStringProc) GetProcAddress("glGetString");
     GrGLGetStringiProc glGetStringi = (GrGLGetStringiProc) GetProcAddress("glGetStringi");
     GrGLGetIntegervProc glGetIntegerv = (GrGLGetIntegervProc) GetProcAddress("glGetIntegerv");
 
     const char* verStr = (const char*) glGetString(GR_GL_VERSION);
     GrGLVersion ver = GrGLGetVersionFromString(verStr);
     GrGLExtensions extensions;
@@ skipping 184 matching lines @@
         }
     }
     if (ver >= GR_GL_VER(3,3) || extensions.has("GL_ARB_blend_func_extended")) {
         // ARB extension doesn't use the ARB suffix on the function name
         GET_PROC(BindFragDataLocationIndexed);
     }
 
     interface->fExtensions.swap(&extensions);
     return interface;
 }