Move GrGLInterface function pointers into a nested struct

src/views/win/SkOSWindow_win.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 "SkTypes.h"
 
 #if defined(SK_BUILD_FOR_WIN)
 
 #include <GL/gl.h>
 #include <WindowsX.h>
 #include "SkWGL.h"
 #include "SkWindow.h"
 #include "SkCanvas.h"
 #include "SkOSMenu.h"
 #include "SkTime.h"
 #include "SkUtils.h"
 
 #include "SkGraphics.h"
 
 #if SK_ANGLE
 #include "gl/GrGLInterface.h"
 
 #include "GLES2/gl2.h"
 
 #define ANGLE_GL_CALL(IFACE, X)                                 \
     do {                                                        \
-        (IFACE)->f##X;                                          \
+        (IFACE)->fFunctions.f##X;                               \
     } while (false)
 
 #endif
 
 #define INVALIDATE_DELAY_MS 200
 
 static SkOSWindow* gCurrOSWin;
 static HWND gEventTarget;
 
 #define WM_EVENT_CALLBACK (WM_USER+0)
@@ skipping 568 matching lines @@
         break;
 #endif // SK_ANGLE
 #endif // SK_SUPPORT_GPU
     default:
         SkASSERT(false);
         break;
     }
 }
 
 #endif