Move GrGLInterface function pointers into a nested struct

src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp

Index: src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
diff --git a/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp b/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
index 35de7f4d36e3f78c0a7e76fb2dd80e1de2016f9c..1f911653043adfcd4b3b64cc7506bc66118fc7b3 100644
--- a/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
+++ b/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
@@ -25,168 +25,169 @@ static GrGLInterface* create_es_interface(GrGLVersion version,
 
     GrGLInterface* interface = SkNEW(GrGLInterface);
     interface->fStandard = kGLES_GrGLStandard;
+    GrGLInterface::Functions* functions = &interface->fFunctions;
 
-    interface->fActiveTexture = glActiveTexture;
-    interface->fAttachShader = glAttachShader;
-    interface->fBindAttribLocation = glBindAttribLocation;
-    interface->fBindBuffer = glBindBuffer;
-    interface->fBindTexture = glBindTexture;
-    interface->fBindVertexArray = glBindVertexArrayOES;
-    interface->fBlendColor = glBlendColor;
-    interface->fBlendFunc = glBlendFunc;
-    interface->fBufferData = glBufferData;
-    interface->fBufferSubData = glBufferSubData;
-    interface->fClear = glClear;
-    interface->fClearColor = glClearColor;
-    interface->fClearStencil = glClearStencil;
-    interface->fColorMask = glColorMask;
-    interface->fCompileShader = glCompileShader;
-    interface->fCompressedTexImage2D = glCompressedTexImage2D;
-    interface->fCopyTexSubImage2D = glCopyTexSubImage2D;
-    interface->fCreateProgram = glCreateProgram;
-    interface->fCreateShader = glCreateShader;
-    interface->fCullFace = glCullFace;
-    interface->fDeleteBuffers = glDeleteBuffers;
-    interface->fDeleteProgram = glDeleteProgram;
-    interface->fDeleteShader = glDeleteShader;
-    interface->fDeleteTextures = glDeleteTextures;
-    interface->fDeleteVertexArrays = glDeleteVertexArraysOES;
-    interface->fDepthMask = glDepthMask;
-    interface->fDisable = glDisable;
-    interface->fDisableVertexAttribArray = glDisableVertexAttribArray;
-    interface->fDrawArrays = glDrawArrays;
-    interface->fDrawElements = glDrawElements;
-    interface->fEnable = glEnable;
-    interface->fEnableVertexAttribArray = glEnableVertexAttribArray;
-    interface->fFinish = glFinish;
-    interface->fFlush = glFlush;
-    interface->fFrontFace = glFrontFace;
-    interface->fGenBuffers = glGenBuffers;
-    interface->fGenerateMipmap = glGenerateMipmap;
-    interface->fGenTextures = glGenTextures;
-    interface->fGenVertexArrays = glGenVertexArraysOES;
-    interface->fGetBufferParameteriv = glGetBufferParameteriv;
-    interface->fGetError = glGetError;
-    interface->fGetIntegerv = glGetIntegerv;
-    interface->fGetProgramInfoLog = glGetProgramInfoLog;
-    interface->fGetProgramiv = glGetProgramiv;
-    interface->fGetShaderInfoLog = glGetShaderInfoLog;
-    interface->fGetShaderiv = glGetShaderiv;
-    interface->fGetString = glGetString;
+    functions->fActiveTexture = glActiveTexture;
+    functions->fAttachShader = glAttachShader;
+    functions->fBindAttribLocation = glBindAttribLocation;
+    functions->fBindBuffer = glBindBuffer;
+    functions->fBindTexture = glBindTexture;
+    functions->fBindVertexArray = glBindVertexArrayOES;
+    functions->fBlendColor = glBlendColor;
+    functions->fBlendFunc = glBlendFunc;
+    functions->fBufferData = glBufferData;
+    functions->fBufferSubData = glBufferSubData;
+    functions->fClear = glClear;
+    functions->fClearColor = glClearColor;
+    functions->fClearStencil = glClearStencil;
+    functions->fColorMask = glColorMask;
+    functions->fCompileShader = glCompileShader;
+    functions->fCompressedTexImage2D = glCompressedTexImage2D;
+    functions->fCopyTexSubImage2D = glCopyTexSubImage2D;
+    functions->fCreateProgram = glCreateProgram;
+    functions->fCreateShader = glCreateShader;
+    functions->fCullFace = glCullFace;
+    functions->fDeleteBuffers = glDeleteBuffers;
+    functions->fDeleteProgram = glDeleteProgram;
+    functions->fDeleteShader = glDeleteShader;
+    functions->fDeleteTextures = glDeleteTextures;
+    functions->fDeleteVertexArrays = glDeleteVertexArraysOES;
+    functions->fDepthMask = glDepthMask;
+    functions->fDisable = glDisable;
+    functions->fDisableVertexAttribArray = glDisableVertexAttribArray;
+    functions->fDrawArrays = glDrawArrays;
+    functions->fDrawElements = glDrawElements;
+    functions->fEnable = glEnable;
+    functions->fEnableVertexAttribArray = glEnableVertexAttribArray;
+    functions->fFinish = glFinish;
+    functions->fFlush = glFlush;
+    functions->fFrontFace = glFrontFace;
+    functions->fGenBuffers = glGenBuffers;
+    functions->fGenerateMipmap = glGenerateMipmap;
+    functions->fGenTextures = glGenTextures;
+    functions->fGenVertexArrays = glGenVertexArraysOES;
+    functions->fGetBufferParameteriv = glGetBufferParameteriv;
+    functions->fGetError = glGetError;
+    functions->fGetIntegerv = glGetIntegerv;
+    functions->fGetProgramInfoLog = glGetProgramInfoLog;
+    functions->fGetProgramiv = glGetProgramiv;
+    functions->fGetShaderInfoLog = glGetShaderInfoLog;
+    functions->fGetShaderiv = glGetShaderiv;
+    functions->fGetString = glGetString;
 #if GL_ES_VERSION_30
-    interface->fGetStringi = glGetStringi;
+    functions->fGetStringi = glGetStringi;
 #else
-    interface->fGetStringi = (GrGLGetStringiProc) eglGetProcAddress("glGetStringi");
+    functions->fGetStringi = (GrGLGetStringiProc) eglGetProcAddress("glGetStringi");
 #endif
-    interface->fGetUniformLocation = glGetUniformLocation;
-    interface->fLineWidth = glLineWidth;
-    interface->fLinkProgram = glLinkProgram;
-    interface->fPixelStorei = glPixelStorei;
-    interface->fReadPixels = glReadPixels;
-    interface->fScissor = glScissor;
+    functions->fGetUniformLocation = glGetUniformLocation;
+    functions->fLineWidth = glLineWidth;
+    functions->fLinkProgram = glLinkProgram;
+    functions->fPixelStorei = glPixelStorei;
+    functions->fReadPixels = glReadPixels;
+    functions->fScissor = glScissor;
 #if GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE
-    interface->fShaderSource = (GrGLShaderSourceProc) glShaderSource;
+    functions->fShaderSource = (GrGLShaderSourceProc) glShaderSource;
 #else
-    interface->fShaderSource = glShaderSource;
+    functions->fShaderSource = glShaderSource;
 #endif
-    interface->fStencilFunc = glStencilFunc;
-    interface->fStencilFuncSeparate = glStencilFuncSeparate;
-    interface->fStencilMask = glStencilMask;
-    interface->fStencilMaskSeparate = glStencilMaskSeparate;
-    interface->fStencilOp = glStencilOp;
-    interface->fStencilOpSeparate = glStencilOpSeparate;
-    interface->fTexImage2D = glTexImage2D;
-    interface->fTexParameteri = glTexParameteri;
-    interface->fTexParameteriv = glTexParameteriv;
-    interface->fTexSubImage2D = glTexSubImage2D;
+    functions->fStencilFunc = glStencilFunc;
+    functions->fStencilFuncSeparate = glStencilFuncSeparate;
+    functions->fStencilMask = glStencilMask;
+    functions->fStencilMaskSeparate = glStencilMaskSeparate;
+    functions->fStencilOp = glStencilOp;
+    functions->fStencilOpSeparate = glStencilOpSeparate;
+    functions->fTexImage2D = glTexImage2D;
+    functions->fTexParameteri = glTexParameteri;
+    functions->fTexParameteriv = glTexParameteriv;
+    functions->fTexSubImage2D = glTexSubImage2D;
 
     if (version >= GR_GL_VER(3,0)) {
 #if GL_ES_VERSION_3_0
-        interface->fTexStorage2D = glTexStorage2D;
+        functions->fTexStorage2D = glTexStorage2D;
 #else
-        interface->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexStorage2D");
+        functions->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexStorage2D");
 #endif
     } else {
 #if GL_EXT_texture_storage
-        interface->fTexStorage2D = glTexStorage2DEXT;
+        functions->fTexStorage2D = glTexStorage2DEXT;
 #else
-        interface->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexStorage2DEXT");
+        functions->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexStorage2DEXT");
 #endif
     }
 
 #if GL_EXT_discard_framebuffer
-    interface->fDiscardFramebuffer = glDiscardFramebufferEXT;
+    functions->fDiscardFramebuffer = glDiscardFramebufferEXT;
 #endif
-    interface->fUniform1f = glUniform1f;
-    interface->fUniform1i = glUniform1i;
-    interface->fUniform1fv = glUniform1fv;
-    interface->fUniform1iv = glUniform1iv;
-    interface->fUniform2f = glUniform2f;
-    interface->fUniform2i = glUniform2i;
-    interface->fUniform2fv = glUniform2fv;
-    interface->fUniform2iv = glUniform2iv;
-    interface->fUniform3f = glUniform3f;
-    interface->fUniform3i = glUniform3i;
-    interface->fUniform3fv = glUniform3fv;
-    interface->fUniform3iv = glUniform3iv;
-    interface->fUniform4f = glUniform4f;
-    interface->fUniform4i = glUniform4i;
-    interface->fUniform4fv = glUniform4fv;
-    interface->fUniform4iv = glUniform4iv;
-    interface->fUniformMatrix2fv = glUniformMatrix2fv;
-    interface->fUniformMatrix3fv = glUniformMatrix3fv;
-    interface->fUniformMatrix4fv = glUniformMatrix4fv;
-    interface->fUseProgram = glUseProgram;
-    interface->fVertexAttrib4fv = glVertexAttrib4fv;
-    interface->fVertexAttribPointer = glVertexAttribPointer;
-    interface->fViewport = glViewport;
-    interface->fBindFramebuffer = glBindFramebuffer;
-    interface->fBindRenderbuffer = glBindRenderbuffer;
-    interface->fCheckFramebufferStatus = glCheckFramebufferStatus;
-    interface->fDeleteFramebuffers = glDeleteFramebuffers;
-    interface->fDeleteRenderbuffers = glDeleteRenderbuffers;
-    interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
-    interface->fFramebufferTexture2D = glFramebufferTexture2D;
+    functions->fUniform1f = glUniform1f;
+    functions->fUniform1i = glUniform1i;
+    functions->fUniform1fv = glUniform1fv;
+    functions->fUniform1iv = glUniform1iv;
+    functions->fUniform2f = glUniform2f;
+    functions->fUniform2i = glUniform2i;
+    functions->fUniform2fv = glUniform2fv;
+    functions->fUniform2iv = glUniform2iv;
+    functions->fUniform3f = glUniform3f;
+    functions->fUniform3i = glUniform3i;
+    functions->fUniform3fv = glUniform3fv;
+    functions->fUniform3iv = glUniform3iv;
+    functions->fUniform4f = glUniform4f;
+    functions->fUniform4i = glUniform4i;
+    functions->fUniform4fv = glUniform4fv;
+    functions->fUniform4iv = glUniform4iv;
+    functions->fUniformMatrix2fv = glUniformMatrix2fv;
+    functions->fUniformMatrix3fv = glUniformMatrix3fv;
+    functions->fUniformMatrix4fv = glUniformMatrix4fv;
+    functions->fUseProgram = glUseProgram;
+    functions->fVertexAttrib4fv = glVertexAttrib4fv;
+    functions->fVertexAttribPointer = glVertexAttribPointer;
+    functions->fViewport = glViewport;
+    functions->fBindFramebuffer = glBindFramebuffer;
+    functions->fBindRenderbuffer = glBindRenderbuffer;
+    functions->fCheckFramebufferStatus = glCheckFramebufferStatus;
+    functions->fDeleteFramebuffers = glDeleteFramebuffers;
+    functions->fDeleteRenderbuffers = glDeleteRenderbuffers;
+    functions->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
+    functions->fFramebufferTexture2D = glFramebufferTexture2D;
 
     if (version >= GR_GL_VER(3,0)) {
 #if GL_ES_VERSION_3_0
-        interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultisample;
-        interface->fBlitFramebuffer = glBlitFramebuffer;
+        functions->fRenderbufferStorageMultisample = glRenderbufferStorageMultisample;
+        functions->fBlitFramebuffer = glBlitFramebuffer;
 #else
-        interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample");
-        interface->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("glBlitFramebuffer");
+        functions->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample");
+        functions->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("glBlitFramebuffer");
 #endif
     }
 
     if (extensions.has("GL_EXT_multisampled_render_to_texture")) {
 #if GL_EXT_multisampled_render_to_texture
-        interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleEXT;
-        interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleEXT;
+        functions->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleEXT;
+        functions->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleEXT;
 #else
-        interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleEXT");
-        interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT");
+        functions->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleEXT");
+        functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT");
 #endif
     } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) {
 #if GL_IMG_multisampled_render_to_texture
-        interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleIMG;
-        interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleIMG;
+        functions->fFramebufferTexture2DMultisample = glFramebufferTexture2DMultisampleIMG;
+        functions->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleIMG;
 #else
-        interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleIMG");
-        interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG");
+        functions->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleIMG");
+        functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG");
 #endif
     }
 
-    interface->fGenFramebuffers = glGenFramebuffers;
-    interface->fGenRenderbuffers = glGenRenderbuffers;
-    interface->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameteriv;
-    interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
-    interface->fRenderbufferStorage = glRenderbufferStorage;
+    functions->fGenFramebuffers = glGenFramebuffers;
+    functions->fGenRenderbuffers = glGenRenderbuffers;
+    functions->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameteriv;
+    functions->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
+    functions->fRenderbufferStorage = glRenderbufferStorage;
 #if GL_OES_mapbuffer
-    interface->fMapBuffer = glMapBufferOES;
-    interface->fUnmapBuffer = glUnmapBufferOES;
+    functions->fMapBuffer = glMapBufferOES;
+    functions->fUnmapBuffer = glUnmapBufferOES;
 #else
-    interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES");
-    interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES");
+    functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES");
+    functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES");
 #endif
 
     return interface;
@@ -202,189 +203,190 @@ static GrGLInterface* create_desktop_interface(GrGLVersion version,
 
     GrGLInterface* interface = SkNEW(GrGLInterface);
     interface->fStandard = kGL_GrGLStandard;
+    GrGLInterface::Functions* functions = &interface->fFunctions;
 
-    interface->fActiveTexture = (GrGLActiveTextureProc) eglGetProcAddress("glActiveTexture");
-    interface->fAttachShader = (GrGLAttachShaderProc) eglGetProcAddress("glAttachShader");
-    interface->fBeginQuery = (GrGLBeginQueryProc) eglGetProcAddress("glBeginQuery");
-    interface->fBindAttribLocation = (GrGLBindAttribLocationProc) eglGetProcAddress("glBindAttribLocation");
-    interface->fBindBuffer = (GrGLBindBufferProc) eglGetProcAddress("glBindBuffer");
-    interface->fBindFragDataLocation = (GrGLBindFragDataLocationProc) eglGetProcAddress("glBindFragDataLocation");
-    interface->fBindFragDataLocationIndexed = (GrGLBindFragDataLocationIndexedProc) eglGetProcAddress("glBindFragDataLocationIndexed");
-    interface->fBindFramebuffer = (GrGLBindFramebufferProc) eglGetProcAddress("glBindFramebuffer");
-    interface->fBindRenderbuffer = (GrGLBindRenderbufferProc) eglGetProcAddress("glBindRenderbuffer");
-    interface->fBindTexture = (GrGLBindTextureProc) eglGetProcAddress("glBindTexture");
-    interface->fBindVertexArray = (GrGLBindVertexArrayProc) eglGetProcAddress("glBindVertexArray");
-    interface->fBlendColor = (GrGLBlendColorProc) eglGetProcAddress("glBlendColor");
-    interface->fBlendFunc = (GrGLBlendFuncProc) eglGetProcAddress("glBlendFunc");
-    interface->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("glBlitFramebuffer");
-    interface->fBufferData = (GrGLBufferDataProc) eglGetProcAddress("glBufferData");
-    interface->fBufferSubData = (GrGLBufferSubDataProc) eglGetProcAddress("glBufferSubData");
-    interface->fCheckFramebufferStatus = (GrGLCheckFramebufferStatusProc) eglGetProcAddress("glCheckFramebufferStatus");
-    interface->fClear = (GrGLClearProc) eglGetProcAddress("glClear");
-    interface->fClearColor = (GrGLClearColorProc) eglGetProcAddress("glClearColor");
-    interface->fClearStencil = (GrGLClearStencilProc) eglGetProcAddress("glClearStencil");
-    interface->fClientActiveTexture = (GrGLClientActiveTextureProc) eglGetProcAddress("glClientActiveTexture");
-    interface->fColorMask = (GrGLColorMaskProc) eglGetProcAddress("glColorMask");
-    interface->fCompileShader = (GrGLCompileShaderProc) eglGetProcAddress("glCompileShader");
-    interface->fCompressedTexImage2D = (GrGLCompressedTexImage2DProc) eglGetProcAddress("glCompressedTexImage2D");
-    interface->fCopyTexSubImage2D = (GrGLCopyTexSubImage2DProc) eglGetProcAddress("glCopyTexSubImage2D");
-    interface->fCreateProgram = (GrGLCreateProgramProc) eglGetProcAddress("glCreateProgram");
-    interface->fCreateShader = (GrGLCreateShaderProc) eglGetProcAddress("glCreateShader");
-    interface->fCullFace = (GrGLCullFaceProc) eglGetProcAddress("glCullFace");
-    interface->fDeleteBuffers = (GrGLDeleteBuffersProc) eglGetProcAddress("glDeleteBuffers");
-    interface->fDeleteFramebuffers = (GrGLDeleteFramebuffersProc) eglGetProcAddress("glDeleteFramebuffers");
-    interface->fDeleteProgram = (GrGLDeleteProgramProc) eglGetProcAddress("glDeleteProgram");
-    interface->fDeleteQueries = (GrGLDeleteQueriesProc) eglGetProcAddress("glDeleteQueries");
-    interface->fDeleteRenderbuffers = (GrGLDeleteRenderbuffersProc) eglGetProcAddress("glDeleteRenderbuffers");
-    interface->fDeleteShader = (GrGLDeleteShaderProc) eglGetProcAddress("glDeleteShader");
-    interface->fDeleteTextures = (GrGLDeleteTexturesProc) eglGetProcAddress("glDeleteTextures");
-    interface->fDeleteVertexArrays = (GrGLDeleteVertexArraysProc) eglGetProcAddress("glDeleteVertexArrays");
-    interface->fDepthMask = (GrGLDepthMaskProc) eglGetProcAddress("glDepthMask");
-    interface->fDisable = (GrGLDisableProc) eglGetProcAddress("glDisable");
-    interface->fDisableClientState = (GrGLDisableClientStateProc) eglGetProcAddress("glDisableClientState");
-    interface->fDisableVertexAttribArray = (GrGLDisableVertexAttribArrayProc) eglGetProcAddress("glDisableVertexAttribArray");
-    interface->fDrawArrays = (GrGLDrawArraysProc) eglGetProcAddress("glDrawArrays");
-    interface->fDrawBuffer = (GrGLDrawBufferProc) eglGetProcAddress("glDrawBuffer");
-    interface->fDrawBuffers = (GrGLDrawBuffersProc) eglGetProcAddress("glDrawBuffers");
-    interface->fDrawElements = (GrGLDrawElementsProc) eglGetProcAddress("glDrawElements");
-    interface->fEnable = (GrGLEnableProc) eglGetProcAddress("glEnable");
-    interface->fEnableClientState = (GrGLEnableClientStateProc) eglGetProcAddress("glEnableClientState");
-    interface->fEnableVertexAttribArray = (GrGLEnableVertexAttribArrayProc) eglGetProcAddress("glEnableVertexAttribArray");
-    interface->fEndQuery = (GrGLEndQueryProc) eglGetProcAddress("glEndQuery");
-    interface->fFinish = (GrGLFinishProc) eglGetProcAddress("glFinish");
-    interface->fFlush = (GrGLFlushProc) eglGetProcAddress("glFlush");
-    interface->fFramebufferRenderbuffer = (GrGLFramebufferRenderbufferProc) eglGetProcAddress("glFramebufferRenderbuffer");
-    interface->fFramebufferTexture2D = (GrGLFramebufferTexture2DProc) eglGetProcAddress("glFramebufferTexture2D");
-    interface->fFrontFace = (GrGLFrontFaceProc) eglGetProcAddress("glFrontFace");
-    interface->fGenBuffers = (GrGLGenBuffersProc) eglGetProcAddress("glGenBuffers");
-    interface->fGenFramebuffers = (GrGLGenFramebuffersProc) eglGetProcAddress("glGenFramebuffers");
-    interface->fGenerateMipmap = (GrGLGenerateMipmapProc) eglGetProcAddress("glGenerateMipmap");
-    interface->fGenQueries = (GrGLGenQueriesProc) eglGetProcAddress("glGenQueries");
-    interface->fGenRenderbuffers = (GrGLGenRenderbuffersProc) eglGetProcAddress("glGenRenderbuffers");
-    interface->fGenTextures = (GrGLGenTexturesProc) eglGetProcAddress("glGenTextures");
-    interface->fGenVertexArrays = (GrGLGenVertexArraysProc) eglGetProcAddress("glGenVertexArrays");
-    interface->fGetBufferParameteriv = (GrGLGetBufferParameterivProc) eglGetProcAddress("glGetBufferParameteriv");
-    interface->fGetError = (GrGLGetErrorProc) eglGetProcAddress("glGetError");
-    interface->fGetFramebufferAttachmentParameteriv = (GrGLGetFramebufferAttachmentParameterivProc) eglGetProcAddress("glGetFramebufferAttachmentParameteriv");
-    interface->fGetIntegerv = (GrGLGetIntegervProc) eglGetProcAddress("glGetIntegerv");
-    interface->fGetQueryObjecti64v = (GrGLGetQueryObjecti64vProc) eglGetProcAddress("glGetQueryObjecti64v");
-    interface->fGetQueryObjectiv = (GrGLGetQueryObjectivProc) eglGetProcAddress("glGetQueryObjectiv");
-    interface->fGetQueryObjectui64v = (GrGLGetQueryObjectui64vProc) eglGetProcAddress("glGetQueryObjectui64v");
-    interface->fGetQueryObjectuiv = (GrGLGetQueryObjectuivProc) eglGetProcAddress("glGetQueryObjectuiv");
-    interface->fGetQueryiv = (GrGLGetQueryivProc) eglGetProcAddress("glGetQueryiv");
-    interface->fGetProgramInfoLog = (GrGLGetProgramInfoLogProc) eglGetProcAddress("glGetProgramInfoLog");
-    interface->fGetProgramiv = (GrGLGetProgramivProc) eglGetProcAddress("glGetProgramiv");
-    interface->fGetRenderbufferParameteriv = (GrGLGetRenderbufferParameterivProc) eglGetProcAddress("glGetRenderbufferParameteriv");
-    interface->fGetShaderInfoLog = (GrGLGetShaderInfoLogProc) eglGetProcAddress("glGetShaderInfoLog");
-    interface->fGetShaderiv = (GrGLGetShaderivProc) eglGetProcAddress("glGetShaderiv");
-    interface->fGetString = (GrGLGetStringProc) eglGetProcAddress("glGetString");
-    interface->fGetStringi = (GrGLGetStringiProc) eglGetProcAddress("glGetStringi");
-    interface->fGetTexLevelParameteriv = (GrGLGetTexLevelParameterivProc) eglGetProcAddress("glGetTexLevelParameteriv");
-    interface->fGetUniformLocation = (GrGLGetUniformLocationProc) eglGetProcAddress("glGetUniformLocation");
-    interface->fLineWidth = (GrGLLineWidthProc) eglGetProcAddress("glLineWidth");
-    interface->fLinkProgram = (GrGLLinkProgramProc) eglGetProcAddress("glLinkProgram");
-    interface->fLoadIdentity = (GrGLLoadIdentityProc) eglGetProcAddress("glLoadIdentity");
-    interface->fLoadMatrixf = (GrGLLoadMatrixfProc) eglGetProcAddress("glLoadMatrixf");
-    interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBuffer");
-    interface->fMatrixMode = (GrGLMatrixModeProc) eglGetProcAddress("glMatrixMode");
-    interface->fPixelStorei = (GrGLPixelStoreiProc) eglGetProcAddress("glPixelStorei");
-    interface->fQueryCounter = (GrGLQueryCounterProc) eglGetProcAddress("glQueryCounter");
-    interface->fReadBuffer = (GrGLReadBufferProc) eglGetProcAddress("glReadBuffer");
-    interface->fReadPixels = (GrGLReadPixelsProc) eglGetProcAddress("glReadPixels");
-    interface->fRenderbufferStorage = (GrGLRenderbufferStorageProc) eglGetProcAddress("glRenderbufferStorage");
-    interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample");
-    interface->fScissor = (GrGLScissorProc) eglGetProcAddress("glScissor");
-    interface->fShaderSource = (GrGLShaderSourceProc) eglGetProcAddress("glShaderSource");
-    interface->fStencilFunc = (GrGLStencilFuncProc) eglGetProcAddress("glStencilFunc");
-    interface->fStencilFuncSeparate = (GrGLStencilFuncSeparateProc) eglGetProcAddress("glStencilFuncSeparate");
-    interface->fStencilMask = (GrGLStencilMaskProc) eglGetProcAddress("glStencilMask");
-    interface->fStencilMaskSeparate = (GrGLStencilMaskSeparateProc) eglGetProcAddress("glStencilMaskSeparate");
-    interface->fStencilOp = (GrGLStencilOpProc) eglGetProcAddress("glStencilOp");
-    interface->fStencilOpSeparate = (GrGLStencilOpSeparateProc) eglGetProcAddress("glStencilOpSeparate");
-    interface->fTexGenf = (GrGLTexGenfProc) eglGetProcAddress("glTexGenf");
-    interface->fTexGenfv = (GrGLTexGenfvProc) eglGetProcAddress("glTexGenfv");
-    interface->fTexGeni = (GrGLTexGeniProc) eglGetProcAddress("glTexGeni");
-    interface->fTexImage2D = (GrGLTexImage2DProc) eglGetProcAddress("glTexImage2D");
-    interface->fTexParameteri = (GrGLTexParameteriProc) eglGetProcAddress("glTexParameteri");
-    interface->fTexParameteriv = (GrGLTexParameterivProc) eglGetProcAddress("glTexParameteriv");
-    interface->fTexSubImage2D = (GrGLTexSubImage2DProc) eglGetProcAddress("glTexSubImage2D");
-    interface->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexStorage2D");
-    interface->fUniform1f = (GrGLUniform1fProc) eglGetProcAddress("glUniform1f");
-    interface->fUniform1i = (GrGLUniform1iProc) eglGetProcAddress("glUniform1i");
-    interface->fUniform1fv = (GrGLUniform1fvProc) eglGetProcAddress("glUniform1fv");
-    interface->fUniform1iv = (GrGLUniform1ivProc) eglGetProcAddress("glUniform1iv");
-    interface->fUniform2f = (GrGLUniform2fProc) eglGetProcAddress("glUniform2f");
-    interface->fUniform2i = (GrGLUniform2iProc) eglGetProcAddress("glUniform2i");
-    interface->fUniform2fv = (GrGLUniform2fvProc) eglGetProcAddress("glUniform2fv");
-    interface->fUniform2iv = (GrGLUniform2ivProc) eglGetProcAddress("glUniform2iv");
-    interface->fUniform3f = (GrGLUniform3fProc) eglGetProcAddress("glUniform3f");
-    interface->fUniform3i = (GrGLUniform3iProc) eglGetProcAddress("glUniform3i");
-    interface->fUniform3fv = (GrGLUniform3fvProc) eglGetProcAddress("glUniform3fv");
-    interface->fUniform3iv = (GrGLUniform3ivProc) eglGetProcAddress("glUniform3iv");
-    interface->fUniform4f = (GrGLUniform4fProc) eglGetProcAddress("glUniform4f");
-    interface->fUniform4i = (GrGLUniform4iProc) eglGetProcAddress("glUniform4i");
-    interface->fUniform4fv = (GrGLUniform4fvProc) eglGetProcAddress("glUniform4fv");
-    interface->fUniform4iv = (GrGLUniform4ivProc) eglGetProcAddress("glUniform4iv");
-    interface->fUniformMatrix2fv = (GrGLUniformMatrix2fvProc) eglGetProcAddress("glUniformMatrix2fv");
-    interface->fUniformMatrix3fv = (GrGLUniformMatrix3fvProc) eglGetProcAddress("glUniformMatrix3fv");
-    interface->fUniformMatrix4fv = (GrGLUniformMatrix4fvProc) eglGetProcAddress("glUniformMatrix4fv");
-    interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBuffer");
-    interface->fUseProgram = (GrGLUseProgramProc) eglGetProcAddress("glUseProgram");
-    interface->fVertexAttrib4fv = (GrGLVertexAttrib4fvProc) eglGetProcAddress("glVertexAttrib4fv");
-    interface->fVertexAttribPointer = (GrGLVertexAttribPointerProc) eglGetProcAddress("glVertexAttribPointer");
-    interface->fVertexPointer = (GrGLVertexPointerProc) eglGetProcAddress("glVertexPointer");
-    interface->fViewport = (GrGLViewportProc) eglGetProcAddress("glViewport");
+    functions->fActiveTexture = (GrGLActiveTextureProc) eglGetProcAddress("glActiveTexture");
+    functions->fAttachShader = (GrGLAttachShaderProc) eglGetProcAddress("glAttachShader");
+    functions->fBeginQuery = (GrGLBeginQueryProc) eglGetProcAddress("glBeginQuery");
+    functions->fBindAttribLocation = (GrGLBindAttribLocationProc) eglGetProcAddress("glBindAttribLocation");
+    functions->fBindBuffer = (GrGLBindBufferProc) eglGetProcAddress("glBindBuffer");
+    functions->fBindFragDataLocation = (GrGLBindFragDataLocationProc) eglGetProcAddress("glBindFragDataLocation");
+    functions->fBindFragDataLocationIndexed = (GrGLBindFragDataLocationIndexedProc) eglGetProcAddress("glBindFragDataLocationIndexed");
+    functions->fBindFramebuffer = (GrGLBindFramebufferProc) eglGetProcAddress("glBindFramebuffer");
+    functions->fBindRenderbuffer = (GrGLBindRenderbufferProc) eglGetProcAddress("glBindRenderbuffer");
+    functions->fBindTexture = (GrGLBindTextureProc) eglGetProcAddress("glBindTexture");
+    functions->fBindVertexArray = (GrGLBindVertexArrayProc) eglGetProcAddress("glBindVertexArray");
+    functions->fBlendColor = (GrGLBlendColorProc) eglGetProcAddress("glBlendColor");
+    functions->fBlendFunc = (GrGLBlendFuncProc) eglGetProcAddress("glBlendFunc");
+    functions->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("glBlitFramebuffer");
+    functions->fBufferData = (GrGLBufferDataProc) eglGetProcAddress("glBufferData");
+    functions->fBufferSubData = (GrGLBufferSubDataProc) eglGetProcAddress("glBufferSubData");
+    functions->fCheckFramebufferStatus = (GrGLCheckFramebufferStatusProc) eglGetProcAddress("glCheckFramebufferStatus");
+    functions->fClear = (GrGLClearProc) eglGetProcAddress("glClear");
+    functions->fClearColor = (GrGLClearColorProc) eglGetProcAddress("glClearColor");
+    functions->fClearStencil = (GrGLClearStencilProc) eglGetProcAddress("glClearStencil");
+    functions->fClientActiveTexture = (GrGLClientActiveTextureProc) eglGetProcAddress("glClientActiveTexture");
+    functions->fColorMask = (GrGLColorMaskProc) eglGetProcAddress("glColorMask");
+    functions->fCompileShader = (GrGLCompileShaderProc) eglGetProcAddress("glCompileShader");
+    functions->fCompressedTexImage2D = (GrGLCompressedTexImage2DProc) eglGetProcAddress("glCompressedTexImage2D");
+    functions->fCopyTexSubImage2D = (GrGLCopyTexSubImage2DProc) eglGetProcAddress("glCopyTexSubImage2D");
+    functions->fCreateProgram = (GrGLCreateProgramProc) eglGetProcAddress("glCreateProgram");
+    functions->fCreateShader = (GrGLCreateShaderProc) eglGetProcAddress("glCreateShader");
+    functions->fCullFace = (GrGLCullFaceProc) eglGetProcAddress("glCullFace");
+    functions->fDeleteBuffers = (GrGLDeleteBuffersProc) eglGetProcAddress("glDeleteBuffers");
+    functions->fDeleteFramebuffers = (GrGLDeleteFramebuffersProc) eglGetProcAddress("glDeleteFramebuffers");
+    functions->fDeleteProgram = (GrGLDeleteProgramProc) eglGetProcAddress("glDeleteProgram");
+    functions->fDeleteQueries = (GrGLDeleteQueriesProc) eglGetProcAddress("glDeleteQueries");
+    functions->fDeleteRenderbuffers = (GrGLDeleteRenderbuffersProc) eglGetProcAddress("glDeleteRenderbuffers");
+    functions->fDeleteShader = (GrGLDeleteShaderProc) eglGetProcAddress("glDeleteShader");
+    functions->fDeleteTextures = (GrGLDeleteTexturesProc) eglGetProcAddress("glDeleteTextures");
+    functions->fDeleteVertexArrays = (GrGLDeleteVertexArraysProc) eglGetProcAddress("glDeleteVertexArrays");
+    functions->fDepthMask = (GrGLDepthMaskProc) eglGetProcAddress("glDepthMask");
+    functions->fDisable = (GrGLDisableProc) eglGetProcAddress("glDisable");
+    functions->fDisableClientState = (GrGLDisableClientStateProc) eglGetProcAddress("glDisableClientState");
+    functions->fDisableVertexAttribArray = (GrGLDisableVertexAttribArrayProc) eglGetProcAddress("glDisableVertexAttribArray");
+    functions->fDrawArrays = (GrGLDrawArraysProc) eglGetProcAddress("glDrawArrays");
+    functions->fDrawBuffer = (GrGLDrawBufferProc) eglGetProcAddress("glDrawBuffer");
+    functions->fDrawBuffers = (GrGLDrawBuffersProc) eglGetProcAddress("glDrawBuffers");
+    functions->fDrawElements = (GrGLDrawElementsProc) eglGetProcAddress("glDrawElements");
+    functions->fEnable = (GrGLEnableProc) eglGetProcAddress("glEnable");
+    functions->fEnableClientState = (GrGLEnableClientStateProc) eglGetProcAddress("glEnableClientState");
+    functions->fEnableVertexAttribArray = (GrGLEnableVertexAttribArrayProc) eglGetProcAddress("glEnableVertexAttribArray");
+    functions->fEndQuery = (GrGLEndQueryProc) eglGetProcAddress("glEndQuery");
+    functions->fFinish = (GrGLFinishProc) eglGetProcAddress("glFinish");
+    functions->fFlush = (GrGLFlushProc) eglGetProcAddress("glFlush");
+    functions->fFramebufferRenderbuffer = (GrGLFramebufferRenderbufferProc) eglGetProcAddress("glFramebufferRenderbuffer");
+    functions->fFramebufferTexture2D = (GrGLFramebufferTexture2DProc) eglGetProcAddress("glFramebufferTexture2D");
+    functions->fFrontFace = (GrGLFrontFaceProc) eglGetProcAddress("glFrontFace");
+    functions->fGenBuffers = (GrGLGenBuffersProc) eglGetProcAddress("glGenBuffers");
+    functions->fGenFramebuffers = (GrGLGenFramebuffersProc) eglGetProcAddress("glGenFramebuffers");
+    functions->fGenerateMipmap = (GrGLGenerateMipmapProc) eglGetProcAddress("glGenerateMipmap");
+    functions->fGenQueries = (GrGLGenQueriesProc) eglGetProcAddress("glGenQueries");
+    functions->fGenRenderbuffers = (GrGLGenRenderbuffersProc) eglGetProcAddress("glGenRenderbuffers");
+    functions->fGenTextures = (GrGLGenTexturesProc) eglGetProcAddress("glGenTextures");
+    functions->fGenVertexArrays = (GrGLGenVertexArraysProc) eglGetProcAddress("glGenVertexArrays");
+    functions->fGetBufferParameteriv = (GrGLGetBufferParameterivProc) eglGetProcAddress("glGetBufferParameteriv");
+    functions->fGetError = (GrGLGetErrorProc) eglGetProcAddress("glGetError");
+    functions->fGetFramebufferAttachmentParameteriv = (GrGLGetFramebufferAttachmentParameterivProc) eglGetProcAddress("glGetFramebufferAttachmentParameteriv");
+    functions->fGetIntegerv = (GrGLGetIntegervProc) eglGetProcAddress("glGetIntegerv");
+    functions->fGetQueryObjecti64v = (GrGLGetQueryObjecti64vProc) eglGetProcAddress("glGetQueryObjecti64v");
+    functions->fGetQueryObjectiv = (GrGLGetQueryObjectivProc) eglGetProcAddress("glGetQueryObjectiv");
+    functions->fGetQueryObjectui64v = (GrGLGetQueryObjectui64vProc) eglGetProcAddress("glGetQueryObjectui64v");
+    functions->fGetQueryObjectuiv = (GrGLGetQueryObjectuivProc) eglGetProcAddress("glGetQueryObjectuiv");
+    functions->fGetQueryiv = (GrGLGetQueryivProc) eglGetProcAddress("glGetQueryiv");
+    functions->fGetProgramInfoLog = (GrGLGetProgramInfoLogProc) eglGetProcAddress("glGetProgramInfoLog");
+    functions->fGetProgramiv = (GrGLGetProgramivProc) eglGetProcAddress("glGetProgramiv");
+    functions->fGetRenderbufferParameteriv = (GrGLGetRenderbufferParameterivProc) eglGetProcAddress("glGetRenderbufferParameteriv");
+    functions->fGetShaderInfoLog = (GrGLGetShaderInfoLogProc) eglGetProcAddress("glGetShaderInfoLog");
+    functions->fGetShaderiv = (GrGLGetShaderivProc) eglGetProcAddress("glGetShaderiv");
+    functions->fGetString = (GrGLGetStringProc) eglGetProcAddress("glGetString");
+    functions->fGetStringi = (GrGLGetStringiProc) eglGetProcAddress("glGetStringi");
+    functions->fGetTexLevelParameteriv = (GrGLGetTexLevelParameterivProc) eglGetProcAddress("glGetTexLevelParameteriv");
+    functions->fGetUniformLocation = (GrGLGetUniformLocationProc) eglGetProcAddress("glGetUniformLocation");
+    functions->fLineWidth = (GrGLLineWidthProc) eglGetProcAddress("glLineWidth");
+    functions->fLinkProgram = (GrGLLinkProgramProc) eglGetProcAddress("glLinkProgram");
+    functions->fLoadIdentity = (GrGLLoadIdentityProc) eglGetProcAddress("glLoadIdentity");
+    functions->fLoadMatrixf = (GrGLLoadMatrixfProc) eglGetProcAddress("glLoadMatrixf");
+    functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBuffer");
+    functions->fMatrixMode = (GrGLMatrixModeProc) eglGetProcAddress("glMatrixMode");
+    functions->fPixelStorei = (GrGLPixelStoreiProc) eglGetProcAddress("glPixelStorei");
+    functions->fQueryCounter = (GrGLQueryCounterProc) eglGetProcAddress("glQueryCounter");
+    functions->fReadBuffer = (GrGLReadBufferProc) eglGetProcAddress("glReadBuffer");
+    functions->fReadPixels = (GrGLReadPixelsProc) eglGetProcAddress("glReadPixels");
+    functions->fRenderbufferStorage = (GrGLRenderbufferStorageProc) eglGetProcAddress("glRenderbufferStorage");
+    functions->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample");
+    functions->fScissor = (GrGLScissorProc) eglGetProcAddress("glScissor");
+    functions->fShaderSource = (GrGLShaderSourceProc) eglGetProcAddress("glShaderSource");
+    functions->fStencilFunc = (GrGLStencilFuncProc) eglGetProcAddress("glStencilFunc");
+    functions->fStencilFuncSeparate = (GrGLStencilFuncSeparateProc) eglGetProcAddress("glStencilFuncSeparate");
+    functions->fStencilMask = (GrGLStencilMaskProc) eglGetProcAddress("glStencilMask");
+    functions->fStencilMaskSeparate = (GrGLStencilMaskSeparateProc) eglGetProcAddress("glStencilMaskSeparate");
+    functions->fStencilOp = (GrGLStencilOpProc) eglGetProcAddress("glStencilOp");
+    functions->fStencilOpSeparate = (GrGLStencilOpSeparateProc) eglGetProcAddress("glStencilOpSeparate");
+    functions->fTexGenf = (GrGLTexGenfProc) eglGetProcAddress("glTexGenf");
+    functions->fTexGenfv = (GrGLTexGenfvProc) eglGetProcAddress("glTexGenfv");
+    functions->fTexGeni = (GrGLTexGeniProc) eglGetProcAddress("glTexGeni");
+    functions->fTexImage2D = (GrGLTexImage2DProc) eglGetProcAddress("glTexImage2D");
+    functions->fTexParameteri = (GrGLTexParameteriProc) eglGetProcAddress("glTexParameteri");
+    functions->fTexParameteriv = (GrGLTexParameterivProc) eglGetProcAddress("glTexParameteriv");
+    functions->fTexSubImage2D = (GrGLTexSubImage2DProc) eglGetProcAddress("glTexSubImage2D");
+    functions->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexStorage2D");
+    functions->fUniform1f = (GrGLUniform1fProc) eglGetProcAddress("glUniform1f");
+    functions->fUniform1i = (GrGLUniform1iProc) eglGetProcAddress("glUniform1i");
+    functions->fUniform1fv = (GrGLUniform1fvProc) eglGetProcAddress("glUniform1fv");
+    functions->fUniform1iv = (GrGLUniform1ivProc) eglGetProcAddress("glUniform1iv");
+    functions->fUniform2f = (GrGLUniform2fProc) eglGetProcAddress("glUniform2f");
+    functions->fUniform2i = (GrGLUniform2iProc) eglGetProcAddress("glUniform2i");
+    functions->fUniform2fv = (GrGLUniform2fvProc) eglGetProcAddress("glUniform2fv");
+    functions->fUniform2iv = (GrGLUniform2ivProc) eglGetProcAddress("glUniform2iv");
+    functions->fUniform3f = (GrGLUniform3fProc) eglGetProcAddress("glUniform3f");
+    functions->fUniform3i = (GrGLUniform3iProc) eglGetProcAddress("glUniform3i");
+    functions->fUniform3fv = (GrGLUniform3fvProc) eglGetProcAddress("glUniform3fv");
+    functions->fUniform3iv = (GrGLUniform3ivProc) eglGetProcAddress("glUniform3iv");
+    functions->fUniform4f = (GrGLUniform4fProc) eglGetProcAddress("glUniform4f");
+    functions->fUniform4i = (GrGLUniform4iProc) eglGetProcAddress("glUniform4i");
+    functions->fUniform4fv = (GrGLUniform4fvProc) eglGetProcAddress("glUniform4fv");
+    functions->fUniform4iv = (GrGLUniform4ivProc) eglGetProcAddress("glUniform4iv");
+    functions->fUniformMatrix2fv = (GrGLUniformMatrix2fvProc) eglGetProcAddress("glUniformMatrix2fv");
+    functions->fUniformMatrix3fv = (GrGLUniformMatrix3fvProc) eglGetProcAddress("glUniformMatrix3fv");
+    functions->fUniformMatrix4fv = (GrGLUniformMatrix4fvProc) eglGetProcAddress("glUniformMatrix4fv");
+    functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBuffer");
+    functions->fUseProgram = (GrGLUseProgramProc) eglGetProcAddress("glUseProgram");
+    functions->fVertexAttrib4fv = (GrGLVertexAttrib4fvProc) eglGetProcAddress("glVertexAttrib4fv");
+    functions->fVertexAttribPointer = (GrGLVertexAttribPointerProc) eglGetProcAddress("glVertexAttribPointer");
+    functions->fVertexPointer = (GrGLVertexPointerProc) eglGetProcAddress("glVertexPointer");
+    functions->fViewport = (GrGLViewportProc) eglGetProcAddress("glViewport");
 
     if (extensions.has("GL_NV_path_rendering")) {
-        interface->fPathCommands = (GrGLPathCommandsProc) eglGetProcAddress("glPathCommandsNV");
-        interface->fPathCoords = (GrGLPathCoordsProc) eglGetProcAddress("glPathCoordsNV");
-        interface->fPathSubCommands = (GrGLPathSubCommandsProc) eglGetProcAddress("glPathSubCommandsNV");
-        interface->fPathSubCoords = (GrGLPathSubCoordsProc) eglGetProcAddress("glPathSubCoordsNV");
-        interface->fPathString = (GrGLPathStringProc) eglGetProcAddress("glPathStringNV");
-        interface->fPathGlyphs = (GrGLPathGlyphsProc) eglGetProcAddress("glPathGlyphsNV");
-        interface->fPathGlyphRange = (GrGLPathGlyphRangeProc) eglGetProcAddress("glPathGlyphRangeNV");
-        interface->fWeightPaths = (GrGLWeightPathsProc) eglGetProcAddress("glWeightPathsNV");
-        interface->fCopyPath = (GrGLCopyPathProc) eglGetProcAddress("glCopyPathNV");
-        interface->fInterpolatePaths = (GrGLInterpolatePathsProc) eglGetProcAddress("glInterpolatePathsNV");
-        interface->fTransformPath = (GrGLTransformPathProc) eglGetProcAddress("glTransformPathNV");
-        interface->fPathParameteriv = (GrGLPathParameterivProc) eglGetProcAddress("glPathParameterivNV");
-        interface->fPathParameteri = (GrGLPathParameteriProc) eglGetProcAddress("glPathParameteriNV");
-        interface->fPathParameterfv = (GrGLPathParameterfvProc) eglGetProcAddress("glPathParameterfvNV");
-        interface->fPathParameterf = (GrGLPathParameterfProc) eglGetProcAddress("glPathParameterfNV");
-        interface->fPathDashArray = (GrGLPathDashArrayProc) eglGetProcAddress("glPathDashArrayNV");
-        interface->fGenPaths = (GrGLGenPathsProc) eglGetProcAddress("glGenPathsNV");
-        interface->fDeletePaths = (GrGLDeletePathsProc) eglGetProcAddress("glDeletePathsNV");
-        interface->fIsPath = (GrGLIsPathProc) eglGetProcAddress("glIsPathNV");
-        interface->fPathStencilFunc = (GrGLPathStencilFuncProc) eglGetProcAddress("glPathStencilFuncNV");
-        interface->fPathStencilDepthOffset = (GrGLPathStencilDepthOffsetProc) eglGetProcAddress("glPathStencilDepthOffsetNV");
-        interface->fStencilFillPath = (GrGLStencilFillPathProc) eglGetProcAddress("glStencilFillPathNV");
-        interface->fStencilStrokePath = (GrGLStencilStrokePathProc) eglGetProcAddress("glStencilStrokePathNV");
-        interface->fStencilFillPathInstanced = (GrGLStencilFillPathInstancedProc) eglGetProcAddress("glStencilFillPathInstancedNV");
-        interface->fStencilStrokePathInstanced = (GrGLStencilStrokePathInstancedProc) eglGetProcAddress("glStencilStrokePathInstancedNV");
-        interface->fPathCoverDepthFunc = (GrGLPathCoverDepthFuncProc) eglGetProcAddress("glPathCoverDepthFuncNV");
-        interface->fPathColorGen = (GrGLPathColorGenProc) eglGetProcAddress("glPathColorGenNV");
-        interface->fPathTexGen = (GrGLPathTexGenProc) eglGetProcAddress("glPathTexGenNV");
-        interface->fPathFogGen = (GrGLPathFogGenProc) eglGetProcAddress("glPathFogGenNV");
-        interface->fCoverFillPath = (GrGLCoverFillPathProc) eglGetProcAddress("glCoverFillPathNV");
-        interface->fCoverStrokePath = (GrGLCoverStrokePathProc) eglGetProcAddress("glCoverStrokePathNV");
-        interface->fCoverFillPathInstanced = (GrGLCoverFillPathInstancedProc) eglGetProcAddress("glCoverFillPathInstancedNV");
-        interface->fCoverStrokePathInstanced = (GrGLCoverStrokePathInstancedProc) eglGetProcAddress("glCoverStrokePathInstancedNV");
-        interface->fGetPathParameteriv = (GrGLGetPathParameterivProc) eglGetProcAddress("glGetPathParameterivNV");
-        interface->fGetPathParameterfv = (GrGLGetPathParameterfvProc) eglGetProcAddress("glGetPathParameterfvNV");
-        interface->fGetPathCommands = (GrGLGetPathCommandsProc) eglGetProcAddress("glGetPathCommandsNV");
-        interface->fGetPathCoords = (GrGLGetPathCoordsProc) eglGetProcAddress("glGetPathCoordsNV");
-        interface->fGetPathDashArray = (GrGLGetPathDashArrayProc) eglGetProcAddress("glGetPathDashArrayNV");
-        interface->fGetPathMetrics = (GrGLGetPathMetricsProc) eglGetProcAddress("glGetPathMetricsNV");
-        interface->fGetPathMetricRange = (GrGLGetPathMetricRangeProc) eglGetProcAddress("glGetPathMetricRangeNV");
-        interface->fGetPathSpacing = (GrGLGetPathSpacingProc) eglGetProcAddress("glGetPathSpacingNV");
-        interface->fGetPathColorGeniv = (GrGLGetPathColorGenivProc) eglGetProcAddress("glGetPathColorGenivNV");
-        interface->fGetPathColorGenfv = (GrGLGetPathColorGenfvProc) eglGetProcAddress("glGetPathColorGenfvNV");
-        interface->fGetPathTexGeniv = (GrGLGetPathTexGenivProc) eglGetProcAddress("glGetPathTexGenivNV");
-        interface->fGetPathTexGenfv = (GrGLGetPathTexGenfvProc) eglGetProcAddress("glGetPathTexGenfvNV");
-        interface->fIsPointInFillPath = (GrGLIsPointInFillPathProc) eglGetProcAddress("glIsPointInFillPathNV");
-        interface->fIsPointInStrokePath = (GrGLIsPointInStrokePathProc) eglGetProcAddress("glIsPointInStrokePathNV");
-        interface->fGetPathLength = (GrGLGetPathLengthProc) eglGetProcAddress("glGetPathLengthNV");
-        interface->fPointAlongPath = (GrGLPointAlongPathProc) eglGetProcAddress("glPointAlongPathNV");
+        functions->fPathCommands = (GrGLPathCommandsProc) eglGetProcAddress("glPathCommandsNV");
+        functions->fPathCoords = (GrGLPathCoordsProc) eglGetProcAddress("glPathCoordsNV");
+        functions->fPathSubCommands = (GrGLPathSubCommandsProc) eglGetProcAddress("glPathSubCommandsNV");
+        functions->fPathSubCoords = (GrGLPathSubCoordsProc) eglGetProcAddress("glPathSubCoordsNV");
+        functions->fPathString = (GrGLPathStringProc) eglGetProcAddress("glPathStringNV");
+        functions->fPathGlyphs = (GrGLPathGlyphsProc) eglGetProcAddress("glPathGlyphsNV");
+        functions->fPathGlyphRange = (GrGLPathGlyphRangeProc) eglGetProcAddress("glPathGlyphRangeNV");
+        functions->fWeightPaths = (GrGLWeightPathsProc) eglGetProcAddress("glWeightPathsNV");
+        functions->fCopyPath = (GrGLCopyPathProc) eglGetProcAddress("glCopyPathNV");
+        functions->fInterpolatePaths = (GrGLInterpolatePathsProc) eglGetProcAddress("glInterpolatePathsNV");
+        functions->fTransformPath = (GrGLTransformPathProc) eglGetProcAddress("glTransformPathNV");
+        functions->fPathParameteriv = (GrGLPathParameterivProc) eglGetProcAddress("glPathParameterivNV");
+        functions->fPathParameteri = (GrGLPathParameteriProc) eglGetProcAddress("glPathParameteriNV");
+        functions->fPathParameterfv = (GrGLPathParameterfvProc) eglGetProcAddress("glPathParameterfvNV");
+        functions->fPathParameterf = (GrGLPathParameterfProc) eglGetProcAddress("glPathParameterfNV");
+        functions->fPathDashArray = (GrGLPathDashArrayProc) eglGetProcAddress("glPathDashArrayNV");
+        functions->fGenPaths = (GrGLGenPathsProc) eglGetProcAddress("glGenPathsNV");
+        functions->fDeletePaths = (GrGLDeletePathsProc) eglGetProcAddress("glDeletePathsNV");
+        functions->fIsPath = (GrGLIsPathProc) eglGetProcAddress("glIsPathNV");
+        functions->fPathStencilFunc = (GrGLPathStencilFuncProc) eglGetProcAddress("glPathStencilFuncNV");
+        functions->fPathStencilDepthOffset = (GrGLPathStencilDepthOffsetProc) eglGetProcAddress("glPathStencilDepthOffsetNV");
+        functions->fStencilFillPath = (GrGLStencilFillPathProc) eglGetProcAddress("glStencilFillPathNV");
+        functions->fStencilStrokePath = (GrGLStencilStrokePathProc) eglGetProcAddress("glStencilStrokePathNV");
+        functions->fStencilFillPathInstanced = (GrGLStencilFillPathInstancedProc) eglGetProcAddress("glStencilFillPathInstancedNV");
+        functions->fStencilStrokePathInstanced = (GrGLStencilStrokePathInstancedProc) eglGetProcAddress("glStencilStrokePathInstancedNV");
+        functions->fPathCoverDepthFunc = (GrGLPathCoverDepthFuncProc) eglGetProcAddress("glPathCoverDepthFuncNV");
+        functions->fPathColorGen = (GrGLPathColorGenProc) eglGetProcAddress("glPathColorGenNV");
+        functions->fPathTexGen = (GrGLPathTexGenProc) eglGetProcAddress("glPathTexGenNV");
+        functions->fPathFogGen = (GrGLPathFogGenProc) eglGetProcAddress("glPathFogGenNV");
+        functions->fCoverFillPath = (GrGLCoverFillPathProc) eglGetProcAddress("glCoverFillPathNV");
+        functions->fCoverStrokePath = (GrGLCoverStrokePathProc) eglGetProcAddress("glCoverStrokePathNV");
+        functions->fCoverFillPathInstanced = (GrGLCoverFillPathInstancedProc) eglGetProcAddress("glCoverFillPathInstancedNV");
+        functions->fCoverStrokePathInstanced = (GrGLCoverStrokePathInstancedProc) eglGetProcAddress("glCoverStrokePathInstancedNV");
+        functions->fGetPathParameteriv = (GrGLGetPathParameterivProc) eglGetProcAddress("glGetPathParameterivNV");
+        functions->fGetPathParameterfv = (GrGLGetPathParameterfvProc) eglGetProcAddress("glGetPathParameterfvNV");
+        functions->fGetPathCommands = (GrGLGetPathCommandsProc) eglGetProcAddress("glGetPathCommandsNV");
+        functions->fGetPathCoords = (GrGLGetPathCoordsProc) eglGetProcAddress("glGetPathCoordsNV");
+        functions->fGetPathDashArray = (GrGLGetPathDashArrayProc) eglGetProcAddress("glGetPathDashArrayNV");
+        functions->fGetPathMetrics = (GrGLGetPathMetricsProc) eglGetProcAddress("glGetPathMetricsNV");
+        functions->fGetPathMetricRange = (GrGLGetPathMetricRangeProc) eglGetProcAddress("glGetPathMetricRangeNV");
+        functions->fGetPathSpacing = (GrGLGetPathSpacingProc) eglGetProcAddress("glGetPathSpacingNV");
+        functions->fGetPathColorGeniv = (GrGLGetPathColorGenivProc) eglGetProcAddress("glGetPathColorGenivNV");
+        functions->fGetPathColorGenfv = (GrGLGetPathColorGenfvProc) eglGetProcAddress("glGetPathColorGenfvNV");
+        functions->fGetPathTexGeniv = (GrGLGetPathTexGenivProc) eglGetProcAddress("glGetPathTexGenivNV");
+        functions->fGetPathTexGenfv = (GrGLGetPathTexGenfvProc) eglGetProcAddress("glGetPathTexGenfvNV");
+        functions->fIsPointInFillPath = (GrGLIsPointInFillPathProc) eglGetProcAddress("glIsPointInFillPathNV");
+        functions->fIsPointInStrokePath = (GrGLIsPointInStrokePathProc) eglGetProcAddress("glIsPointInStrokePathNV");
+        functions->fGetPathLength = (GrGLGetPathLengthProc) eglGetProcAddress("glGetPathLengthNV");
+        functions->fPointAlongPath = (GrGLPointAlongPathProc) eglGetProcAddress("glPointAlongPathNV");
     }
 
     return interface;