Move GrGLInterface function pointers into a nested struct

src/gpu/gl/GrGLInterface.cpp

Index: src/gpu/gl/GrGLInterface.cpp
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 72c9178db42d265941c15aa44b3781934b4a35d6..0a0ff59408b255f1938b5305bf92f6115f2ae0da 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -18,7 +18,195 @@ void GrGLDefaultInterfaceCallback(const GrGLInterface*) {}
 }
 #endif
 
-GrGLInterface::GrGLInterface() {
+GrGLInterface::GrGLInterface()
+    // TODO: Remove this madness ASAP.
+    : fActiveTexture(&fFunctions.fActiveTexture)
+    , fAttachShader(&fFunctions.fAttachShader)
+    , fBeginQuery(&fFunctions.fBeginQuery)
+    , fBindAttribLocation(&fFunctions.fBindAttribLocation)
+    , fBindBuffer(&fFunctions.fBindBuffer)
+    , fBindFragDataLocation(&fFunctions.fBindFragDataLocation)
+    , fBindFragDataLocationIndexed(&fFunctions.fBindFragDataLocationIndexed)
+    , fBindFramebuffer(&fFunctions.fBindFramebuffer)
+    , fBindRenderbuffer(&fFunctions.fBindRenderbuffer)
+    , fBindTexture(&fFunctions.fBindTexture)
+    , fBindVertexArray(&fFunctions.fBindVertexArray)
+    , fBlendColor(&fFunctions.fBlendColor)
+    , fBlendFunc(&fFunctions.fBlendFunc)
+    , fBlitFramebuffer(&fFunctions.fBlitFramebuffer)
+    , fBufferData(&fFunctions.fBufferData)
+    , fBufferSubData(&fFunctions.fBufferSubData)
+    , fCheckFramebufferStatus(&fFunctions.fCheckFramebufferStatus)
+    , fClear(&fFunctions.fClear)
+    , fClearColor(&fFunctions.fClearColor)
+    , fClearStencil(&fFunctions.fClearStencil)
+    , fClientActiveTexture(&fFunctions.fClientActiveTexture)
+    , fColorMask(&fFunctions.fColorMask)
+    , fCompileShader(&fFunctions.fCompileShader)
+    , fCompressedTexImage2D(&fFunctions.fCompressedTexImage2D)
+    , fCopyTexSubImage2D(&fFunctions.fCopyTexSubImage2D)
+    , fCreateProgram(&fFunctions.fCreateProgram)
+    , fCreateShader(&fFunctions.fCreateShader)
+    , fCullFace(&fFunctions.fCullFace)
+    , fDeleteBuffers(&fFunctions.fDeleteBuffers)
+    , fDeleteFramebuffers(&fFunctions.fDeleteFramebuffers)
+    , fDeleteProgram(&fFunctions.fDeleteProgram)
+    , fDeleteQueries(&fFunctions.fDeleteQueries)
+    , fDeleteRenderbuffers(&fFunctions.fDeleteRenderbuffers)
+    , fDeleteShader(&fFunctions.fDeleteShader)
+    , fDeleteTextures(&fFunctions.fDeleteTextures)
+    , fDeleteVertexArrays(&fFunctions.fDeleteVertexArrays)
+    , fDepthMask(&fFunctions.fDepthMask)
+    , fDisable(&fFunctions.fDisable)
+    , fDisableClientState(&fFunctions.fDisableClientState)
+    , fDisableVertexAttribArray(&fFunctions.fDisableVertexAttribArray)
+    , fDrawArrays(&fFunctions.fDrawArrays)
+    , fDrawBuffer(&fFunctions.fDrawBuffer)
+    , fDrawBuffers(&fFunctions.fDrawBuffers)
+    , fDrawElements(&fFunctions.fDrawElements)
+    , fEnable(&fFunctions.fEnable)
+    , fEnableClientState(&fFunctions.fEnableClientState)
+    , fEnableVertexAttribArray(&fFunctions.fEnableVertexAttribArray)
+    , fEndQuery(&fFunctions.fEndQuery)
+    , fFinish(&fFunctions.fFinish)
+    , fFlush(&fFunctions.fFlush)
+    , fFramebufferRenderbuffer(&fFunctions.fFramebufferRenderbuffer)
+    , fFramebufferTexture2D(&fFunctions.fFramebufferTexture2D)
+    , fFramebufferTexture2DMultisample(&fFunctions.fFramebufferTexture2DMultisample)
+    , fFrontFace(&fFunctions.fFrontFace)
+    , fGenBuffers(&fFunctions.fGenBuffers)
+    , fGenFramebuffers(&fFunctions.fGenFramebuffers)
+    , fGenerateMipmap(&fFunctions.fGenerateMipmap)
+    , fGenQueries(&fFunctions.fGenQueries)
+    , fGenRenderbuffers(&fFunctions.fGenRenderbuffers)
+    , fGenTextures(&fFunctions.fGenTextures)
+    , fGenVertexArrays(&fFunctions.fGenVertexArrays)
+    , fGetBufferParameteriv(&fFunctions.fGetBufferParameteriv)
+    , fGetError(&fFunctions.fGetError)
+    , fGetFramebufferAttachmentParameteriv(&fFunctions.fGetFramebufferAttachmentParameteriv)
+    , fGetIntegerv(&fFunctions.fGetIntegerv)
+    , fGetQueryObjecti64v(&fFunctions.fGetQueryObjecti64v)
+    , fGetQueryObjectiv(&fFunctions.fGetQueryObjectiv)
+    , fGetQueryObjectui64v(&fFunctions.fGetQueryObjectui64v)
+    , fGetQueryObjectuiv(&fFunctions.fGetQueryObjectuiv)
+    , fGetQueryiv(&fFunctions.fGetQueryiv)
+    , fGetProgramInfoLog(&fFunctions.fGetProgramInfoLog)
+    , fGetProgramiv(&fFunctions.fGetProgramiv)
+    , fGetRenderbufferParameteriv(&fFunctions.fGetRenderbufferParameteriv)
+    , fGetShaderInfoLog(&fFunctions.fGetShaderInfoLog)
+    , fGetShaderiv(&fFunctions.fGetShaderiv)
+    , fGetString(&fFunctions.fGetString)
+    , fGetStringi(&fFunctions.fGetStringi)
+    , fGetTexLevelParameteriv(&fFunctions.fGetTexLevelParameteriv)
+    , fGetUniformLocation(&fFunctions.fGetUniformLocation)
+    , fLineWidth(&fFunctions.fLineWidth)
+    , fLinkProgram(&fFunctions.fLinkProgram)
+    , fLoadIdentity(&fFunctions.fLoadIdentity)
+    , fLoadMatrixf(&fFunctions.fLoadMatrixf)
+    , fMapBuffer(&fFunctions.fMapBuffer)
+    , fMatrixMode(&fFunctions.fMatrixMode)
+    , fPixelStorei(&fFunctions.fPixelStorei)
+    , fQueryCounter(&fFunctions.fQueryCounter)
+    , fReadBuffer(&fFunctions.fReadBuffer)
+    , fReadPixels(&fFunctions.fReadPixels)
+    , fRenderbufferStorage(&fFunctions.fRenderbufferStorage)
+    , fRenderbufferStorageMultisampleES2EXT(&fFunctions.fRenderbufferStorageMultisampleES2EXT)
+    , fRenderbufferStorageMultisampleES2APPLE(&fFunctions.fRenderbufferStorageMultisampleES2APPLE)
+    , fRenderbufferStorageMultisample(&fFunctions.fRenderbufferStorageMultisample)
+    , fBindUniformLocation(&fFunctions.fBindUniformLocation)
+    , fResolveMultisampleFramebuffer(&fFunctions.fResolveMultisampleFramebuffer)
+    , fScissor(&fFunctions.fScissor)
+    , fShaderSource(&fFunctions.fShaderSource)
+    , fStencilFunc(&fFunctions.fStencilFunc)
+    , fStencilFuncSeparate(&fFunctions.fStencilFuncSeparate)
+    , fStencilMask(&fFunctions.fStencilMask)
+    , fStencilMaskSeparate(&fFunctions.fStencilMaskSeparate)
+    , fStencilOp(&fFunctions.fStencilOp)
+    , fStencilOpSeparate(&fFunctions.fStencilOpSeparate)
+    , fTexGenf(&fFunctions.fTexGenf)
+    , fTexGenfv(&fFunctions.fTexGenfv)
+    , fTexGeni(&fFunctions.fTexGeni)
+    , fTexImage2D(&fFunctions.fTexImage2D)
+    , fTexParameteri(&fFunctions.fTexParameteri)
+    , fTexParameteriv(&fFunctions.fTexParameteriv)
+    , fTexSubImage2D(&fFunctions.fTexSubImage2D)
+    , fTexStorage2D(&fFunctions.fTexStorage2D)
+    , fDiscardFramebuffer(&fFunctions.fDiscardFramebuffer)
+    , fUniform1f(&fFunctions.fUniform1f)
+    , fUniform1i(&fFunctions.fUniform1i)
+    , fUniform1fv(&fFunctions.fUniform1fv)
+    , fUniform1iv(&fFunctions.fUniform1iv)
+    , fUniform2f(&fFunctions.fUniform2f)
+    , fUniform2i(&fFunctions.fUniform2i)
+    , fUniform2fv(&fFunctions.fUniform2fv)
+    , fUniform2iv(&fFunctions.fUniform2iv)
+    , fUniform3f(&fFunctions.fUniform3f)
+    , fUniform3i(&fFunctions.fUniform3i)
+    , fUniform3fv(&fFunctions.fUniform3fv)
+    , fUniform3iv(&fFunctions.fUniform3iv)
+    , fUniform4f(&fFunctions.fUniform4f)
+    , fUniform4i(&fFunctions.fUniform4i)
+    , fUniform4fv(&fFunctions.fUniform4fv)
+    , fUniform4iv(&fFunctions.fUniform4iv)
+    , fUniformMatrix2fv(&fFunctions.fUniformMatrix2fv)
+    , fUniformMatrix3fv(&fFunctions.fUniformMatrix3fv)
+    , fUniformMatrix4fv(&fFunctions.fUniformMatrix4fv)
+    , fUnmapBuffer(&fFunctions.fUnmapBuffer)
+    , fUseProgram(&fFunctions.fUseProgram)
+    , fVertexAttrib4fv(&fFunctions.fVertexAttrib4fv)
+    , fVertexAttribPointer(&fFunctions.fVertexAttribPointer)
+    , fVertexPointer(&fFunctions.fVertexPointer)
+    , fViewport(&fFunctions.fViewport)
+    , fPathCommands(&fFunctions.fPathCommands)
+    , fPathCoords(&fFunctions.fPathCoords)
+    , fPathSubCommands(&fFunctions.fPathSubCommands)
+    , fPathSubCoords(&fFunctions.fPathSubCoords)
+    , fPathString(&fFunctions.fPathString)
+    , fPathGlyphs(&fFunctions.fPathGlyphs)
+    , fPathGlyphRange(&fFunctions.fPathGlyphRange)
+    , fWeightPaths(&fFunctions.fWeightPaths)
+    , fCopyPath(&fFunctions.fCopyPath)
+    , fInterpolatePaths(&fFunctions.fInterpolatePaths)
+    , fTransformPath(&fFunctions.fTransformPath)
+    , fPathParameteriv(&fFunctions.fPathParameteriv)
+    , fPathParameteri(&fFunctions.fPathParameteri)
+    , fPathParameterfv(&fFunctions.fPathParameterfv)
+    , fPathParameterf(&fFunctions.fPathParameterf)
+    , fPathDashArray(&fFunctions.fPathDashArray)
+    , fGenPaths(&fFunctions.fGenPaths)
+    , fDeletePaths(&fFunctions.fDeletePaths)
+    , fIsPath(&fFunctions.fIsPath)
+    , fPathStencilFunc(&fFunctions.fPathStencilFunc)
+    , fPathStencilDepthOffset(&fFunctions.fPathStencilDepthOffset)
+    , fStencilFillPath(&fFunctions.fStencilFillPath)
+    , fStencilStrokePath(&fFunctions.fStencilStrokePath)
+    , fStencilFillPathInstanced(&fFunctions.fStencilFillPathInstanced)
+    , fStencilStrokePathInstanced(&fFunctions.fStencilStrokePathInstanced)
+    , fPathCoverDepthFunc(&fFunctions.fPathCoverDepthFunc)
+    , fPathColorGen(&fFunctions.fPathColorGen)
+    , fPathTexGen(&fFunctions.fPathTexGen)
+    , fPathFogGen(&fFunctions.fPathFogGen)
+    , fCoverFillPath(&fFunctions.fCoverFillPath)
+    , fCoverStrokePath(&fFunctions.fCoverStrokePath)
+    , fCoverFillPathInstanced(&fFunctions.fCoverFillPathInstanced)
+    , fCoverStrokePathInstanced(&fFunctions.fCoverStrokePathInstanced)
+    , fGetPathParameteriv(&fFunctions.fGetPathParameteriv)
+    , fGetPathParameterfv(&fFunctions.fGetPathParameterfv)
+    , fGetPathCommands(&fFunctions.fGetPathCommands)
+    , fGetPathCoords(&fFunctions.fGetPathCoords)
+    , fGetPathDashArray(&fFunctions.fGetPathDashArray)
+    , fGetPathMetrics(&fFunctions.fGetPathMetrics)
+    , fGetPathMetricRange(&fFunctions.fGetPathMetricRange)
+    , fGetPathSpacing(&fFunctions.fGetPathSpacing)
+    , fGetPathColorGeniv(&fFunctions.fGetPathColorGeniv)
+    , fGetPathColorGenfv(&fFunctions.fGetPathColorGenfv)
+    , fGetPathTexGeniv(&fFunctions.fGetPathTexGeniv)
+    , fGetPathTexGenfv(&fFunctions.fGetPathTexGenfv)
+    , fIsPointInFillPath(&fFunctions.fIsPointInFillPath)
+    , fIsPointInStrokePath(&fFunctions.fIsPointInStrokePath)
+    , fGetPathLength(&fFunctions.fGetPathLength)
+    , fPointAlongPath(&fFunctions.fPointAlongPath)
+{
     fStandard = kNone_GrGLStandard;
 
 #if GR_GL_PER_GL_FUNC_CALLBACK
@@ -37,104 +225,105 @@ bool GrGLInterface::validate() const {
     // fExtensions.
     if (!fExtensions.isInitialized()) {
         GrGLExtensions* extensions = const_cast<GrGLExtensions*>(&fExtensions);
-        if (!extensions->init(fStandard, fGetString, fGetStringi, fGetIntegerv)) {
+        if (!extensions->init(fStandard, fFunctions.fGetString, fFunctions.fGetStringi,
+                              fFunctions.fGetIntegerv)) {
             return false;
         }
     }
 
     // functions that are always required
-    if (NULL == fActiveTexture ||
-        NULL == fAttachShader ||
-        NULL == fBindAttribLocation ||
-        NULL == fBindBuffer ||
-        NULL == fBindTexture ||
-        NULL == fBlendFunc ||
-        NULL == fBlendColor ||      // -> GL >= 1.4, ES >= 2.0 or extension
-        NULL == fBufferData ||
-        NULL == fBufferSubData ||
-        NULL == fClear ||
-        NULL == fClearColor ||
-        NULL == fClearStencil ||
-        NULL == fColorMask ||
-        NULL == fCompileShader ||
-        NULL == fCopyTexSubImage2D ||
-        NULL == fCreateProgram ||
-        NULL == fCreateShader ||
-        NULL == fCullFace ||
-        NULL == fDeleteBuffers ||
-        NULL == fDeleteProgram ||
-        NULL == fDeleteShader ||
-        NULL == fDeleteTextures ||
-        NULL == fDepthMask ||
-        NULL == fDisable ||
-        NULL == fDisableVertexAttribArray ||
-        NULL == fDrawArrays ||
-        NULL == fDrawElements ||
-        NULL == fEnable ||
-        NULL == fEnableVertexAttribArray ||
-        NULL == fFrontFace ||
-        NULL == fGenBuffers ||
-        NULL == fGenTextures ||
-        NULL == fGetBufferParameteriv ||
-        NULL == fGenerateMipmap ||
-        NULL == fGetError ||
-        NULL == fGetIntegerv ||
-        NULL == fGetProgramInfoLog ||
-        NULL == fGetProgramiv ||
-        NULL == fGetShaderInfoLog ||
-        NULL == fGetShaderiv ||
-        NULL == fGetString ||
-        NULL == fGetUniformLocation ||
-        NULL == fLinkProgram ||
-        NULL == fLineWidth ||
-        NULL == fPixelStorei ||
-        NULL == fReadPixels ||
-        NULL == fScissor ||
-        NULL == fShaderSource ||
-        NULL == fStencilFunc ||
-        NULL == fStencilMask ||
-        NULL == fStencilOp ||
-        NULL == fTexImage2D ||
-        NULL == fTexParameteri ||
-        NULL == fTexParameteriv ||
-        NULL == fTexSubImage2D ||
-        NULL == fUniform1f ||
-        NULL == fUniform1i ||
-        NULL == fUniform1fv ||
-        NULL == fUniform1iv ||
-        NULL == fUniform2f ||
-        NULL == fUniform2i ||
-        NULL == fUniform2fv ||
-        NULL == fUniform2iv ||
-        NULL == fUniform3f ||
-        NULL == fUniform3i ||
-        NULL == fUniform3fv ||
-        NULL == fUniform3iv ||
-        NULL == fUniform4f ||
-        NULL == fUniform4i ||
-        NULL == fUniform4fv ||
-        NULL == fUniform4iv ||
-        NULL == fUniformMatrix2fv ||
-        NULL == fUniformMatrix3fv ||
-        NULL == fUniformMatrix4fv ||
-        NULL == fUseProgram ||
-        NULL == fVertexAttrib4fv ||
-        NULL == fVertexAttribPointer ||
-        NULL == fViewport ||
-        NULL == fBindFramebuffer ||
-        NULL == fBindRenderbuffer ||
-        NULL == fCheckFramebufferStatus ||
-        NULL == fDeleteFramebuffers ||
-        NULL == fDeleteRenderbuffers ||
-        NULL == fFinish ||
-        NULL == fFlush ||
-        NULL == fFramebufferRenderbuffer ||
-        NULL == fFramebufferTexture2D ||
-        NULL == fGetFramebufferAttachmentParameteriv ||
-        NULL == fGetRenderbufferParameteriv ||
-        NULL == fGenFramebuffers ||
-        NULL == fGenRenderbuffers ||
-        NULL == fRenderbufferStorage) {
+    if (NULL == fFunctions.fActiveTexture ||
+        NULL == fFunctions.fAttachShader ||
+        NULL == fFunctions.fBindAttribLocation ||
+        NULL == fFunctions.fBindBuffer ||
+        NULL == fFunctions.fBindTexture ||
+        NULL == fFunctions.fBlendFunc ||
+        NULL == fFunctions.fBlendColor ||      // -> GL >= 1.4, ES >= 2.0 or extension
+        NULL == fFunctions.fBufferData ||
+        NULL == fFunctions.fBufferSubData ||
+        NULL == fFunctions.fClear ||
+        NULL == fFunctions.fClearColor ||
+        NULL == fFunctions.fClearStencil ||
+        NULL == fFunctions.fColorMask ||
+        NULL == fFunctions.fCompileShader ||
+        NULL == fFunctions.fCopyTexSubImage2D ||
+        NULL == fFunctions.fCreateProgram ||
+        NULL == fFunctions.fCreateShader ||
+        NULL == fFunctions.fCullFace ||
+        NULL == fFunctions.fDeleteBuffers ||
+        NULL == fFunctions.fDeleteProgram ||
+        NULL == fFunctions.fDeleteShader ||
+        NULL == fFunctions.fDeleteTextures ||
+        NULL == fFunctions.fDepthMask ||
+        NULL == fFunctions.fDisable ||
+        NULL == fFunctions.fDisableVertexAttribArray ||
+        NULL == fFunctions.fDrawArrays ||
+        NULL == fFunctions.fDrawElements ||
+        NULL == fFunctions.fEnable ||
+        NULL == fFunctions.fEnableVertexAttribArray ||
+        NULL == fFunctions.fFrontFace ||
+        NULL == fFunctions.fGenBuffers ||
+        NULL == fFunctions.fGenTextures ||
+        NULL == fFunctions.fGetBufferParameteriv ||
+        NULL == fFunctions.fGenerateMipmap ||
+        NULL == fFunctions.fGetError ||
+        NULL == fFunctions.fGetIntegerv ||
+        NULL == fFunctions.fGetProgramInfoLog ||
+        NULL == fFunctions.fGetProgramiv ||
+        NULL == fFunctions.fGetShaderInfoLog ||
+        NULL == fFunctions.fGetShaderiv ||
+        NULL == fFunctions.fGetString ||
+        NULL == fFunctions.fGetUniformLocation ||
+        NULL == fFunctions.fLinkProgram ||
+        NULL == fFunctions.fLineWidth ||
+        NULL == fFunctions.fPixelStorei ||
+        NULL == fFunctions.fReadPixels ||
+        NULL == fFunctions.fScissor ||
+        NULL == fFunctions.fShaderSource ||
+        NULL == fFunctions.fStencilFunc ||
+        NULL == fFunctions.fStencilMask ||
+        NULL == fFunctions.fStencilOp ||
+        NULL == fFunctions.fTexImage2D ||
+        NULL == fFunctions.fTexParameteri ||
+        NULL == fFunctions.fTexParameteriv ||
+        NULL == fFunctions.fTexSubImage2D ||
+        NULL == fFunctions.fUniform1f ||
+        NULL == fFunctions.fUniform1i ||
+        NULL == fFunctions.fUniform1fv ||
+        NULL == fFunctions.fUniform1iv ||
+        NULL == fFunctions.fUniform2f ||
+        NULL == fFunctions.fUniform2i ||
+        NULL == fFunctions.fUniform2fv ||
+        NULL == fFunctions.fUniform2iv ||
+        NULL == fFunctions.fUniform3f ||
+        NULL == fFunctions.fUniform3i ||
+        NULL == fFunctions.fUniform3fv ||
+        NULL == fFunctions.fUniform3iv ||
+        NULL == fFunctions.fUniform4f ||
+        NULL == fFunctions.fUniform4i ||
+        NULL == fFunctions.fUniform4fv ||
+        NULL == fFunctions.fUniform4iv ||
+        NULL == fFunctions.fUniformMatrix2fv ||
+        NULL == fFunctions.fUniformMatrix3fv ||
+        NULL == fFunctions.fUniformMatrix4fv ||
+        NULL == fFunctions.fUseProgram ||
+        NULL == fFunctions.fVertexAttrib4fv ||
+        NULL == fFunctions.fVertexAttribPointer ||
+        NULL == fFunctions.fViewport ||
+        NULL == fFunctions.fBindFramebuffer ||
+        NULL == fFunctions.fBindRenderbuffer ||
+        NULL == fFunctions.fCheckFramebufferStatus ||
+        NULL == fFunctions.fDeleteFramebuffers ||
+        NULL == fFunctions.fDeleteRenderbuffers ||
+        NULL == fFunctions.fFinish ||
+        NULL == fFunctions.fFlush ||
+        NULL == fFunctions.fFramebufferRenderbuffer ||
+        NULL == fFunctions.fFramebufferTexture2D ||
+        NULL == fFunctions.fGetFramebufferAttachmentParameteriv ||
+        NULL == fFunctions.fGetRenderbufferParameteriv ||
+        NULL == fFunctions.fGenFramebuffers ||
+        NULL == fFunctions.fGenRenderbuffers ||
+        NULL == fFunctions.fRenderbufferStorage) {
         return false;
     }
 
@@ -155,117 +344,117 @@ bool GrGLInterface::validate() const {
     // On the desktop we assume they are available if the extension
     // is present or GL version is high enough.
     if (kGLES_GrGLStandard == fStandard) {
-        if (NULL == fStencilFuncSeparate ||
-            NULL == fStencilMaskSeparate ||
-            NULL == fStencilOpSeparate) {
+        if (NULL == fFunctions.fStencilFuncSeparate ||
+            NULL == fFunctions.fStencilMaskSeparate ||
+            NULL == fFunctions.fStencilOpSeparate) {
             return false;
         }
     } else if (kGL_GrGLStandard == fStandard) {
 
         if (glVer >= GR_GL_VER(2,0)) {
-            if (NULL == fStencilFuncSeparate ||
-                NULL == fStencilMaskSeparate ||
-                NULL == fStencilOpSeparate) {
+            if (NULL == fFunctions.fStencilFuncSeparate ||
+                NULL == fFunctions.fStencilMaskSeparate ||
+                NULL == fFunctions.fStencilOpSeparate) {
                 return false;
             }
         }
-        if (glVer >= GR_GL_VER(3,0) && NULL == fBindFragDataLocation) {
+        if (glVer >= GR_GL_VER(3,0) && NULL == fFunctions.fBindFragDataLocation) {
             return false;
         }
         if (glVer >= GR_GL_VER(2,0) || fExtensions.has("GL_ARB_draw_buffers")) {
-            if (NULL == fDrawBuffers) {
+            if (NULL == fFunctions.fDrawBuffers) {
                 return false;
             }
         }
 
         if (glVer >= GR_GL_VER(1,5) || fExtensions.has("GL_ARB_occlusion_query")) {
-            if (NULL == fGenQueries ||
-                NULL == fDeleteQueries ||
-                NULL == fBeginQuery ||
-                NULL == fEndQuery ||
-                NULL == fGetQueryiv ||
-                NULL == fGetQueryObjectiv ||
-                NULL == fGetQueryObjectuiv) {
+            if (NULL == fFunctions.fGenQueries ||
+                NULL == fFunctions.fDeleteQueries ||
+                NULL == fFunctions.fBeginQuery ||
+                NULL == fFunctions.fEndQuery ||
+                NULL == fFunctions.fGetQueryiv ||
+                NULL == fFunctions.fGetQueryObjectiv ||
+                NULL == fFunctions.fGetQueryObjectuiv) {
                 return false;
             }
         }
         if (glVer >= GR_GL_VER(3,3) ||
             fExtensions.has("GL_ARB_timer_query") ||
             fExtensions.has("GL_EXT_timer_query")) {
-            if (NULL == fGetQueryObjecti64v ||
-                NULL == fGetQueryObjectui64v) {
+            if (NULL == fFunctions.fGetQueryObjecti64v ||
+                NULL == fFunctions.fGetQueryObjectui64v) {
                 return false;
             }
         }
         if (glVer >= GR_GL_VER(3,3) || fExtensions.has("GL_ARB_timer_query")) {
-            if (NULL == fQueryCounter) {
+            if (NULL == fFunctions.fQueryCounter) {
                 return false;
             }
         }
         if (!isCoreProfile) {
-            if (NULL == fClientActiveTexture ||
-                NULL == fDisableClientState ||
-                NULL == fEnableClientState ||
-                NULL == fLoadIdentity ||
-                NULL == fLoadMatrixf ||
-                NULL == fMatrixMode ||
-                NULL == fTexGenf ||
-                NULL == fTexGenfv ||
-                NULL == fTexGeni ||
-                NULL == fVertexPointer) {
+            if (NULL == fFunctions.fClientActiveTexture ||
+                NULL == fFunctions.fDisableClientState ||
+                NULL == fFunctions.fEnableClientState ||
+                NULL == fFunctions.fLoadIdentity ||
+                NULL == fFunctions.fLoadMatrixf ||
+                NULL == fFunctions.fMatrixMode ||
+                NULL == fFunctions.fTexGenf ||
+                NULL == fFunctions.fTexGenfv ||
+                NULL == fFunctions.fTexGeni ||
+                NULL == fFunctions.fVertexPointer) {
                 return false;
             }
         }
         if (false && fExtensions.has("GL_NV_path_rendering")) {
-            if (NULL == fPathCommands ||
-                NULL == fPathCoords ||
-                NULL == fPathSubCommands ||
-                NULL == fPathSubCoords ||
-                NULL == fPathString ||
-                NULL == fPathGlyphs ||
-                NULL == fPathGlyphRange ||
-                NULL == fWeightPaths ||
-                NULL == fCopyPath ||
-                NULL == fInterpolatePaths ||
-                NULL == fTransformPath ||
-                NULL == fPathParameteriv ||
-                NULL == fPathParameteri ||
-                NULL == fPathParameterfv ||
-                NULL == fPathParameterf ||
-                NULL == fPathDashArray ||
-                NULL == fGenPaths ||
-                NULL == fDeletePaths ||
-                NULL == fIsPath ||
-                NULL == fPathStencilFunc ||
-                NULL == fPathStencilDepthOffset ||
-                NULL == fStencilFillPath ||
-                NULL == fStencilStrokePath ||
-                NULL == fStencilFillPathInstanced ||
-                NULL == fStencilStrokePathInstanced ||
-                NULL == fPathCoverDepthFunc ||
-                NULL == fPathColorGen ||
-                NULL == fPathTexGen ||
-                NULL == fPathFogGen ||
-                NULL == fCoverFillPath ||
-                NULL == fCoverStrokePath ||
-                NULL == fCoverFillPathInstanced ||
-                NULL == fCoverStrokePathInstanced ||
-                NULL == fGetPathParameteriv ||
-                NULL == fGetPathParameterfv ||
-                NULL == fGetPathCommands ||
-                NULL == fGetPathCoords ||
-                NULL == fGetPathDashArray ||
-                NULL == fGetPathMetrics ||
-                NULL == fGetPathMetricRange ||
-                NULL == fGetPathSpacing ||
-                NULL == fGetPathColorGeniv ||
-                NULL == fGetPathColorGenfv ||
-                NULL == fGetPathTexGeniv ||
-                NULL == fGetPathTexGenfv ||
-                NULL == fIsPointInFillPath ||
-                NULL == fIsPointInStrokePath ||
-                NULL == fGetPathLength ||
-                NULL == fPointAlongPath) {
+            if (NULL == fFunctions.fPathCommands ||
+                NULL == fFunctions.fPathCoords ||
+                NULL == fFunctions.fPathSubCommands ||
+                NULL == fFunctions.fPathSubCoords ||
+                NULL == fFunctions.fPathString ||
+                NULL == fFunctions.fPathGlyphs ||
+                NULL == fFunctions.fPathGlyphRange ||
+                NULL == fFunctions.fWeightPaths ||
+                NULL == fFunctions.fCopyPath ||
+                NULL == fFunctions.fInterpolatePaths ||
+                NULL == fFunctions.fTransformPath ||
+                NULL == fFunctions.fPathParameteriv ||
+                NULL == fFunctions.fPathParameteri ||
+                NULL == fFunctions.fPathParameterfv ||
+                NULL == fFunctions.fPathParameterf ||
+                NULL == fFunctions.fPathDashArray ||
+                NULL == fFunctions.fGenPaths ||
+                NULL == fFunctions.fDeletePaths ||
+                NULL == fFunctions.fIsPath ||
+                NULL == fFunctions.fPathStencilFunc ||
+                NULL == fFunctions.fPathStencilDepthOffset ||
+                NULL == fFunctions.fStencilFillPath ||
+                NULL == fFunctions.fStencilStrokePath ||
+                NULL == fFunctions.fStencilFillPathInstanced ||
+                NULL == fFunctions.fStencilStrokePathInstanced ||
+                NULL == fFunctions.fPathCoverDepthFunc ||
+                NULL == fFunctions.fPathColorGen ||
+                NULL == fFunctions.fPathTexGen ||
+                NULL == fFunctions.fPathFogGen ||
+                NULL == fFunctions.fCoverFillPath ||
+                NULL == fFunctions.fCoverStrokePath ||
+                NULL == fFunctions.fCoverFillPathInstanced ||
+                NULL == fFunctions.fCoverStrokePathInstanced ||
+                NULL == fFunctions.fGetPathParameteriv ||
+                NULL == fFunctions.fGetPathParameterfv ||
+                NULL == fFunctions.fGetPathCommands ||
+                NULL == fFunctions.fGetPathCoords ||
+                NULL == fFunctions.fGetPathDashArray ||
+                NULL == fFunctions.fGetPathMetrics ||
+                NULL == fFunctions.fGetPathMetricRange ||
+                NULL == fFunctions.fGetPathSpacing ||
+                NULL == fFunctions.fGetPathColorGeniv ||
+                NULL == fFunctions.fGetPathColorGenfv ||
+                NULL == fFunctions.fGetPathTexGeniv ||
+                NULL == fFunctions.fGetPathTexGenfv ||
+                NULL == fFunctions.fIsPointInFillPath ||
+                NULL == fFunctions.fIsPointInStrokePath ||
+                NULL == fFunctions.fGetPathLength ||
+                NULL == fFunctions.fPointAlongPath) {
                 return false;
             }
         }
@@ -275,16 +464,16 @@ bool GrGLInterface::validate() const {
     if (kGL_GrGLStandard != fStandard ||
         (glVer >= GR_GL_VER(1,3)) ||
         fExtensions.has("GL_ARB_texture_compression")) {
-        if (NULL == fCompressedTexImage2D) {
+        if (NULL == fFunctions.fCompressedTexImage2D) {
             return false;
         }
     }
 
     // part of desktop GL, but not ES
     if (kGL_GrGLStandard == fStandard &&
-        (NULL == fGetTexLevelParameteriv ||
-         NULL == fDrawBuffer ||
-         NULL == fReadBuffer)) {
+        (NULL == fFunctions.fGetTexLevelParameteriv ||
+         NULL == fFunctions.fDrawBuffer ||
+         NULL == fFunctions.fReadBuffer)) {
         return false;
     }
 
@@ -294,12 +483,12 @@ bool GrGLInterface::validate() const {
         if (glVer >= GR_GL_VER(4,2) ||
             fExtensions.has("GL_ARB_texture_storage") ||
             fExtensions.has("GL_EXT_texture_storage")) {
-            if (NULL == fTexStorage2D) {
+            if (NULL == fFunctions.fTexStorage2D) {
                 return false;
             }
         }
     } else if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_EXT_texture_storage")) {
-        if (NULL == fTexStorage2D) {
+        if (NULL == fFunctions.fTexStorage2D) {
             return false;
         }
     }
@@ -307,7 +496,7 @@ bool GrGLInterface::validate() const {
     if (fExtensions.has("GL_EXT_discard_framebuffer")) {
 // FIXME: Remove this once Chromium is updated to provide this function
 #if 0
-        if (NULL == fDiscardFramebuffer) {
+        if (NULL == fFunctions.fDiscardFramebuffer) {
             return false;
         }
 #endif
@@ -317,37 +506,37 @@ bool GrGLInterface::validate() const {
     if (kGL_GrGLStandard == fStandard) {
         // GL 3.0 and the ARB extension have multisample + blit
         if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_ARB_framebuffer_object")) {
-            if (NULL == fRenderbufferStorageMultisample ||
-                NULL == fBlitFramebuffer) {
+            if (NULL == fFunctions.fRenderbufferStorageMultisample ||
+                NULL == fFunctions.fBlitFramebuffer) {
                 return false;
             }
         } else {
             if (fExtensions.has("GL_EXT_framebuffer_blit") &&
-                NULL == fBlitFramebuffer) {
+                NULL == fFunctions.fBlitFramebuffer) {
                 return false;
             }
             if (fExtensions.has("GL_EXT_framebuffer_multisample") &&
-                NULL == fRenderbufferStorageMultisample) {
+                NULL == fFunctions.fRenderbufferStorageMultisample) {
                 return false;
             }
         }
     } else {
         if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_CHROMIUM_framebuffer_multisample")) {
-            if (NULL == fRenderbufferStorageMultisample ||
-                NULL == fBlitFramebuffer) {
+            if (NULL == fFunctions.fRenderbufferStorageMultisample ||
+                NULL == fFunctions.fBlitFramebuffer) {
                 return false;
             }
         }
         if (fExtensions.has("GL_APPLE_framebuffer_multisample")) {
-            if (NULL == fRenderbufferStorageMultisampleES2APPLE ||
-                NULL == fResolveMultisampleFramebuffer) {
+            if (NULL == fFunctions.fRenderbufferStorageMultisampleES2APPLE ||
+                NULL == fFunctions.fResolveMultisampleFramebuffer) {
                 return false;
             }
         }
         if (fExtensions.has("GL_IMG_multisampled_render_to_texture") ||
             fExtensions.has("GL_EXT_multisampled_render_to_texture")) {
-            if (NULL == fRenderbufferStorageMultisampleES2EXT ||
-                NULL == fFramebufferTexture2DMultisample) {
+            if (NULL == fFunctions.fRenderbufferStorageMultisampleES2EXT ||
+                NULL == fFunctions.fFramebufferTexture2DMultisample) {
                 return false;
             }
         }
@@ -357,8 +546,8 @@ bool GrGLInterface::validate() const {
     // buffer mapping was part of original VBO extension
     // which we require.
     if (kGL_GrGLStandard == fStandard || fExtensions.has("GL_OES_mapbuffer")) {
-        if (NULL == fMapBuffer ||
-            NULL == fUnmapBuffer) {
+        if (NULL == fFunctions.fMapBuffer ||
+            NULL == fFunctions.fUnmapBuffer) {
             return false;
         }
     }
@@ -366,35 +555,34 @@ bool GrGLInterface::validate() const {
     // Dual source blending
     if (kGL_GrGLStandard == fStandard &&
         (glVer >= GR_GL_VER(3,3) || fExtensions.has("GL_ARB_blend_func_extended"))) {
-        if (NULL == fBindFragDataLocationIndexed) {
+        if (NULL == fFunctions.fBindFragDataLocationIndexed) {
             return false;
         }
     }
 
     // glGetStringi was added in version 3.0 of both desktop and ES.
     if (glVer >= GR_GL_VER(3, 0)) {
-        if (NULL == fGetStringi) {
+        if (NULL == fFunctions.fGetStringi) {
             return false;
         }
     }
 
     if (kGL_GrGLStandard == fStandard) {
         if (glVer >= GR_GL_VER(3, 0) || fExtensions.has("GL_ARB_vertex_array_object")) {
-            if (NULL == fBindVertexArray ||
-                NULL == fDeleteVertexArrays ||
-                NULL == fGenVertexArrays) {
+            if (NULL == fFunctions.fBindVertexArray ||
+                NULL == fFunctions.fDeleteVertexArrays ||
+                NULL == fFunctions.fGenVertexArrays) {
                 return false;
             }
         }
     } else {
         if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_object")) {
-            if (NULL == fBindVertexArray ||
-                NULL == fDeleteVertexArrays ||
-                NULL == fGenVertexArrays) {
+            if (NULL == fFunctions.fBindVertexArray ||
+                NULL == fFunctions.fDeleteVertexArrays ||
+                NULL == fFunctions.fGenVertexArrays) {
                 return false;
             }
         }
     }
-
     return true;
 }