Synchronised file

author: marha <marha@users.sourceforge.net> 2013-07-22 14:40:04 +0200
committer: marha <marha@users.sourceforge.net> 2013-07-22 14:40:04 +0200
commit: cde797e5f774a44b89e51da0f32472329eac06cb (patch)
tree: 1f0fc9d914af052c7076f82ad491e72813fc06ea
parent: b9356a3668e013820e4a2b2fb1e19da216fc63be (diff)
download: vcxsrv-cde797e5f774a44b89e51da0f32472329eac06cb.tar.gz
vcxsrv-cde797e5f774a44b89e51da0f32472329eac06cb.tar.bz2
vcxsrv-cde797e5f774a44b89e51da0f32472329eac06cb.zip
2 files changed, 1448 insertions, 1445 deletions
diff --git a/filesthatshouldbethesame.py b/filesthatshouldbethesame.py
index c5fefb9cd..51e90a352 100755
--- a/filesthatshouldbethesame.py
+++ b/filesthatshouldbethesame.py
@@ -6,46 +6,46 @@ FilesStr=r"""
 libX11/include/X11/cursorfont.h                   X11/cursorfont.h
 libX11/include/X11/Xlocale.h                      X11/Xlocale.h
 libX11/include/X11/XKBlib.h                       X11/XKBlib.h
-libX11/include/X11/Xcms.h                         X11/Xcms.h   
+libX11/include/X11/Xcms.h                         X11/Xcms.h
 libX11/include/X11/Xregion.h                      X11/Xregion.h
-libX11/include/X11/ImUtil.h                       X11/ImUtil.h 
+libX11/include/X11/ImUtil.h                       X11/ImUtil.h
 libX11/include/X11/Xlib.h                         X11/Xlib.h
 libX11/include/X11/Xresource.h                    X11/Xresource.h
-libX11/include/X11/Xlib-xcb.h                     X11/Xlib-xcb.h 
+libX11/include/X11/Xlib-xcb.h                     X11/Xlib-xcb.h
 libX11/include/X11/Xutil.h                        X11/Xutil.h
 libX11/include/X11/Xlibint.h                      X11/Xlibint.h
 
 libXt/include/X11/CallbackI.h                     X11/CallbackI.h
-libXt/include/X11/Composite.h                     X11/Composite.h  
-libXt/include/X11/CompositeP.h                    X11/CompositeP.h 
-libXt/include/X11/ConstrainP.h                    X11/ConstrainP.h 
-libXt/include/X11/Constraint.h                    X11/Constraint.h 
-libXt/include/X11/ConvertI.h                      X11/ConvertI.h   
-libXt/include/X11/Core.h                          X11/Core.h       
-libXt/include/X11/CoreP.h                         X11/CoreP.h      
-libXt/include/X11/CreateI.h                       X11/CreateI.h    
-libXt/include/X11/EventI.h                        X11/EventI.h     
-libXt/include/X11/HookObjI.h                      X11/HookObjI.h   
-libXt/include/X11/InitialI.h                      X11/InitialI.h   
-libXt/include/X11/Intrinsic.h                     X11/Intrinsic.h  
-libXt/include/X11/IntrinsicI.h                    X11/IntrinsicI.h 
-libXt/include/X11/IntrinsicP.h                    X11/IntrinsicP.h 
-libXt/include/X11/Object.h                        X11/Object.h     
-libXt/include/X11/ObjectP.h                       X11/ObjectP.h    
-libXt/include/X11/PassivGraI.h                    X11/PassivGraI.h 
-libXt/include/X11/RectObj.h                       X11/RectObj.h    
-libXt/include/X11/RectObjP.h                      X11/RectObjP.h   
-libXt/include/X11/ResConfigP.h                    X11/ResConfigP.h 
-libXt/include/X11/ResourceI.h                     X11/ResourceI.h  
-libXt/include/X11/SelectionI.h                    X11/SelectionI.h 
-libXt/include/X11/ShellI.h                        X11/ShellI.h     
-libXt/include/X11/ShellP.h                        X11/ShellP.h     
-libXt/include/X11/ThreadsI.h                      X11/ThreadsI.h   
-libXt/include/X11/TranslateI.h                    X11/TranslateI.h 
-libXt/include/X11/VarargsI.h                      X11/VarargsI.h   
-libXt/include/X11/Vendor.h                        X11/Vendor.h     
-libXt/include/X11/VendorP.h                       X11/VendorP.h    
-libXt/include/X11/Xtos.h                          X11/Xtos.h       
+libXt/include/X11/Composite.h                     X11/Composite.h
+libXt/include/X11/CompositeP.h                    X11/CompositeP.h
+libXt/include/X11/ConstrainP.h                    X11/ConstrainP.h
+libXt/include/X11/Constraint.h                    X11/Constraint.h
+libXt/include/X11/ConvertI.h                      X11/ConvertI.h
+libXt/include/X11/Core.h                          X11/Core.h
+libXt/include/X11/CoreP.h                         X11/CoreP.h
+libXt/include/X11/CreateI.h                       X11/CreateI.h
+libXt/include/X11/EventI.h                        X11/EventI.h
+libXt/include/X11/HookObjI.h                      X11/HookObjI.h
+libXt/include/X11/InitialI.h                      X11/InitialI.h
+libXt/include/X11/Intrinsic.h                     X11/Intrinsic.h
+libXt/include/X11/IntrinsicI.h                    X11/IntrinsicI.h
+libXt/include/X11/IntrinsicP.h                    X11/IntrinsicP.h
+libXt/include/X11/Object.h                        X11/Object.h
+libXt/include/X11/ObjectP.h                       X11/ObjectP.h
+libXt/include/X11/PassivGraI.h                    X11/PassivGraI.h
+libXt/include/X11/RectObj.h                       X11/RectObj.h
+libXt/include/X11/RectObjP.h                      X11/RectObjP.h
+libXt/include/X11/ResConfigP.h                    X11/ResConfigP.h
+libXt/include/X11/ResourceI.h                     X11/ResourceI.h
+libXt/include/X11/SelectionI.h                    X11/SelectionI.h
+libXt/include/X11/ShellI.h                        X11/ShellI.h
+libXt/include/X11/ShellP.h                        X11/ShellP.h
+libXt/include/X11/ThreadsI.h                      X11/ThreadsI.h
+libXt/include/X11/TranslateI.h                    X11/TranslateI.h
+libXt/include/X11/VarargsI.h                      X11/VarargsI.h
+libXt/include/X11/Vendor.h                        X11/Vendor.h
+libXt/include/X11/VendorP.h                       X11/VendorP.h
+libXt/include/X11/Xtos.h                          X11/Xtos.h
 
 libXext/include/X11/extensions/dpms.h             X11/extensions/dpms.h
 libXext/include/X11/extensions/extutil.h          X11/extensions/extutil.h
@@ -66,7 +66,7 @@ libXext/include/X11/extensions/xtestext1.h        X11/extensions/xtestext1.h
 
 libXrender/include/X11/extensions/xrender.h       X11/extensions/xrender.h
 
-libXau/include/X11/Xauth.h                        X11/Xauth.h 
+libXau/include/X11/Xauth.h                        X11/Xauth.h
 
 libXdmcp/include/X11/Xdmcp.h                      X11/Xdmcp.h
 
@@ -86,28 +86,23 @@ gl/glx_mangle.h                                   mesalib/include/gl/glx_mangle.
 gl/gl_mangle.h                                    mesalib/include/gl/gl_mangle.h
 gl/internal/dri_interface.h                       mesalib/include/gl/internal/dri_interface.h
 
-xorg-server/glx/glapi.h                           mesalib/src/mapi/glapi/glapi.h
-xorg-server/glx/glapitable.h                      mesalib/src/mesa/main/glapitable.h
-xorg-server/glx/glprocs.h                         mesalib/src/mapi/glapi/gen/glprocs.h
-xorg-server/glx/dispatch.h                        mesalib/src/mapi/glapi/gen/dispatch.h
-xorg-server/glx/glapi_gentable.c                  mesalib/src/mapi/glapi/gen/glapi_gentable.c
-xorg-server/glx/indirect_dispatch.c               mesalib/src/mapi/glapi/gen/indirect_dispatch.c
-xorg-server/glx/indirect_dispatch.h               mesalib/src/mapi/glapi/gen/indirect_dispatch.h
-xorg-server/glx/indirect_dispatch_swap.c          mesalib/src/mapi/glapi/gen/indirect_dispatch_swap.c
-xorg-server/glx/indirect_reqsize.c                mesalib/src/mapi/glapi/gen/indirect_reqsize.c
-xorg-server/glx/indirect_reqsize.h                mesalib/src/mapi/glapi/gen/indirect_reqsize.h
-xorg-server/glx/indirect_size.h                   mesalib/src/mapi/glapi/gen/indirect_size.h
-xorg-server/glx/indirect_size_get.c               mesalib/src/mapi/glapi/gen/indirect_size_get.c
-xorg-server/glx/indirect_size_get.h               mesalib/src/mapi/glapi/gen/indirect_size_get.h
-xorg-server/glx/indirect_table.c                  mesalib/src/mapi/glapi/gen/indirect_table.c
-
-xorg-server/hw/xwin/glx/gl.spec                   xorg-server/hw/xwin/swrastwgl_dri/gl.spec
-xorg-server/hw/xwin/glx/gl.tm                     xorg-server/hw/xwin/swrastwgl_dri/gl.tm
-xorg-server/hw/xwin/glx/wgl.tm                    xorg-server/hw/xwin/swrastwgl_dri/wgl.tm
-xorg-server/hw/xwin/glx/wgl_ext_api.c             xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.c
-xorg-server/hw/xwin/glx/wgl_ext_api.h             xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h
-xorg-server/hw/xwin/glx/wglext.h                  xorg-server/hw/xwin/swrastwgl_dri/wglext.h
-xorg-server/hw/xwin/glx/wglext.spec               xorg-server/hw/xwin/swrastwgl_dri/wglext.spec
+mesalib/src/mapi/glapi/glapi.h                      xorg-server/glx/glapi.h
+mesalib/src/mapi/glapi/gen/glapitable.h             mesalib/src/mesa/main/glapitable.h
+mesalib/src/mesa/main/glapitable.h                  xorg-server/glx/glapitable.h
+mesalib/src/mapi/glapi/gen/glprocs.h                xorg-server/glx/glprocs.h
+mesalib/src/mapi/glapi/gen/dispatch.h               xorg-server/glx/dispatch.h
+mesalib/src/mapi/glapi/gen/glapi_gentable.c         xorg-server/glx/glapi_gentable.c
+mesalib/src/mapi/glapi/gen/indirect_dispatch.c      xorg-server/glx/indirect_dispatch.c
+mesalib/src/mapi/glapi/gen/indirect_dispatch.h      xorg-server/glx/indirect_dispatch.h
+mesalib/src/mapi/glapi/gen/indirect_dispatch_swap.c xorg-server/glx/indirect_dispatch_swap.c
+mesalib/src/mapi/glapi/gen/indirect_reqsize.c       xorg-server/glx/indirect_reqsize.c
+mesalib/src/mapi/glapi/gen/indirect_reqsize.h       xorg-server/glx/indirect_reqsize.h
+mesalib/src/mapi/glapi/gen/indirect_size.h          xorg-server/glx/indirect_size.h
+mesalib/src/mapi/glapi/gen/indirect_size_get.c      xorg-server/glx/indirect_size_get.c
+mesalib/src/mapi/glapi/gen/indirect_size_get.h      xorg-server/glx/indirect_size_get.h
+mesalib/src/mapi/glapi/gen/indirect_table.c         xorg-server/glx/indirect_table.c
+mesalib/src/mapi/glapi/gen/remap_helper.h           mesalib/src/mesa/main/remap_helper.h
+mesalib/src/mapi/glapi/gen/remap_helper.h           xorg-server/glx/remap_helper.h
 
 libXaw/include/X11/Xaw/AllWidgets.h               X11/Xaw/AllWidgets.h
 libXaw/include/X11/Xaw/AsciiSink.h                X11/Xaw/AsciiSink.h
diff --git a/xorg-server/glx/remap_helper.h b/xorg-server/glx/remap_helper.h
index 0fcde1faa..50cb3d77c 100644
--- a/xorg-server/glx/remap_helper.h
+++ b/xorg-server/glx/remap_helper.h
@@ -1674,3905 +1674,3911 @@ static const char _mesa_function_pool[] =
    /* _mesa_function_pool[11484]: BindFramebuffer (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
-   "glBindFramebufferEXT\0"
    "glBindFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[11548]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[11527]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[11566]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[11545]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[11592]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[11571]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[11626]: BlendFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[11605]: BlendFuncSeparate (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "glBlendFuncSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[11722]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[11701]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[11750]: ShaderSource (will be remapped) */
+   /* _mesa_function_pool[11729]: ShaderSource (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[11789]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[11768]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[11812]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[11791]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[11839]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[11818]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[11870]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[11849]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[11885]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[11864]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[11912]: Color3us (offset 23) */
+   /* _mesa_function_pool[11891]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[11928]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[11907]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[11963]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[11942]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[11980]: End (offset 43) */
+   /* _mesa_function_pool[11959]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[11988]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[11967]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[12014]: MultiTexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[11993]: MultiTexCoordP3uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[12040]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[12019]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[12066]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[12045]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[12111]: Color3ub (offset 19) */
+   /* _mesa_function_pool[12090]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[12127]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[12106]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[12159]: GetActiveUniformsiv (will be remapped) */
+   /* _mesa_function_pool[12138]: GetActiveUniformsiv (will be remapped) */
    "iipip\0"
    "glGetActiveUniformsiv\0"
    "\0"
-   /* _mesa_function_pool[12188]: BindBuffer (will be remapped) */
+   /* _mesa_function_pool[12167]: BindBuffer (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[12221]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[12200]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[12244]: DrawTexxOES (will be remapped) */
+   /* _mesa_function_pool[12223]: DrawTexxOES (will be remapped) */
    "iiiii\0"
    "glDrawTexxOES\0"
    "\0"
-   /* _mesa_function_pool[12265]: VertexAttrib2sv (will be remapped) */
+   /* _mesa_function_pool[12244]: VertexAttrib2sv (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[12308]: Color3ui (offset 21) */
+   /* _mesa_function_pool[12287]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[12324]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[12303]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[12341]: DrawTexxvOES (will be remapped) */
+   /* _mesa_function_pool[12320]: DrawTexxvOES (will be remapped) */
    "p\0"
    "glDrawTexxvOES\0"
    "\0"
-   /* _mesa_function_pool[12359]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[12338]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[12405]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[12384]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[12432]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12411]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12460]: GetTexParameterPointervAPPLE (dynamic) */
+   /* _mesa_function_pool[12439]: GetTexParameterPointervAPPLE (dynamic) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12496]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[12475]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "glTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[12526]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[12505]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[12549]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[12528]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[12573]: GetVertexAttribiv (will be remapped) */
+   /* _mesa_function_pool[12552]: GetVertexAttribiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[12621]: QueryMatrixxOES (will be remapped) */
+   /* _mesa_function_pool[12600]: QueryMatrixxOES (will be remapped) */
    "pp\0"
    "glQueryMatrixxOES\0"
    "\0"
-   /* _mesa_function_pool[12643]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[12622]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[12665]: TexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[12644]: TexCoordP2uiv (will be remapped) */
    "ip\0"
    "glTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[12685]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[12664]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[12715]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[12694]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[12748]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[12727]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[12772]: DrawBuffers (will be remapped) */
+   /* _mesa_function_pool[12751]: DrawBuffers (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "glDrawBuffersNV\0"
    "\0"
-   /* _mesa_function_pool[12840]: Lightxv (will be remapped) */
+   /* _mesa_function_pool[12819]: Lightxv (will be remapped) */
    "iip\0"
    "glLightxvOES\0"
    "glLightxv\0"
    "\0"
-   /* _mesa_function_pool[12868]: Uniform3fv (will be remapped) */
+   /* _mesa_function_pool[12847]: Uniform3fv (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[12902]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[12881]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "glBlendEquationOES\0"
    "\0"
-   /* _mesa_function_pool[12959]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[12938]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[12984]: Normal3x (will be remapped) */
+   /* _mesa_function_pool[12963]: Normal3x (will be remapped) */
    "iii\0"
    "glNormal3xOES\0"
    "glNormal3x\0"
    "\0"
-   /* _mesa_function_pool[13014]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12993]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13078]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[13057]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[13122]: GetError (offset 261) */
+   /* _mesa_function_pool[13101]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[13135]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[13114]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[13154]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[13133]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[13171]: Indexdv (offset 45) */
+   /* _mesa_function_pool[13150]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[13184]: InvalidateTexSubImage (will be remapped) */
+   /* _mesa_function_pool[13163]: InvalidateTexSubImage (will be remapped) */
    "iiiiiiii\0"
    "glInvalidateTexSubImage\0"
    "\0"
-   /* _mesa_function_pool[13218]: Normal3s (offset 60) */
+   /* _mesa_function_pool[13197]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[13234]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[13213]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[13268]: PushName (offset 201) */
+   /* _mesa_function_pool[13247]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[13282]: GetTexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[13261]: GetTexParameterIuiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[13334]: GetActiveUniformBlockName (will be remapped) */
+   /* _mesa_function_pool[13313]: GetActiveUniformBlockName (will be remapped) */
    "iiipp\0"
    "glGetActiveUniformBlockName\0"
    "\0"
-   /* _mesa_function_pool[13369]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[13348]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[13394]: Normal3i (offset 58) */
+   /* _mesa_function_pool[13373]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[13410]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[13389]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[13445]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[13424]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[13488]: VertexAttrib1dv (will be remapped) */
+   /* _mesa_function_pool[13467]: VertexAttrib1dv (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[13531]: PixelTexGenSGIX (dynamic) */
+   /* _mesa_function_pool[13510]: PixelTexGenSGIX (dynamic) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[13552]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[13531]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[13577]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[13556]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[13611]: Normal3b (offset 52) */
+   /* _mesa_function_pool[13590]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[13627]: WindowPos3dv (will be remapped) */
+   /* _mesa_function_pool[13606]: WindowPos3dv (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[13682]: Normal3d (offset 54) */
+   /* _mesa_function_pool[13661]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[13698]: TexGenxOES (will be remapped) */
+   /* _mesa_function_pool[13677]: TexGenxOES (will be remapped) */
    "iii\0"
    "glTexGenxOES\0"
    "\0"
-   /* _mesa_function_pool[13716]: Normal3f (offset 56) */
+   /* _mesa_function_pool[13695]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[13732]: FogCoordPointer (will be remapped) */
+   /* _mesa_function_pool[13711]: FogCoordPointer (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[13776]: Indexi (offset 48) */
+   /* _mesa_function_pool[13755]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[13788]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[13767]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[13821]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[13800]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[13867]: DeleteFencesNV (dynamic) */
+   /* _mesa_function_pool[13846]: DeleteFencesNV (dynamic) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[13888]: IsRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[13867]: IsRenderbuffer (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "glIsRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[13948]: DepthMask (offset 211) */
+   /* _mesa_function_pool[13927]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[13963]: SecondaryColor3us (will be remapped) */
+   /* _mesa_function_pool[13942]: SecondaryColor3us (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[14011]: Indexf (offset 46) */
+   /* _mesa_function_pool[13990]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[14023]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[14002]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[14061]: Indexd (offset 44) */
+   /* _mesa_function_pool[14040]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[14073]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[14052]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[14094]: StencilOp (offset 244) */
+   /* _mesa_function_pool[14073]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[14111]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[14090]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[14133]: FramebufferTextureLayer (will be remapped) */
+   /* _mesa_function_pool[14112]: FramebufferTextureLayer (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[14224]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[14203]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[14249]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[14228]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[14265]: DrawTexfOES (will be remapped) */
+   /* _mesa_function_pool[14244]: DrawTexfOES (will be remapped) */
    "fffff\0"
    "glDrawTexfOES\0"
    "\0"
-   /* _mesa_function_pool[14286]: Indexs (offset 50) */
+   /* _mesa_function_pool[14265]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[14298]: TexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[14277]: TexCoordP3ui (will be remapped) */
    "ii\0"
    "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[14317]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[14296]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[14339]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[14318]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[14365]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[14344]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[14426]: PixelTexGenParameteriSGIS (dynamic) */
+   /* _mesa_function_pool[14405]: PixelTexGenParameteriSGIS (dynamic) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[14458]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[14437]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[14484]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[14463]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[14511]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[14490]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[14526]: GetFragDataIndex (will be remapped) */
+   /* _mesa_function_pool[14505]: GetFragDataIndex (will be remapped) */
    "ip\0"
    "glGetFragDataIndex\0"
    "\0"
-   /* _mesa_function_pool[14549]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[14528]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[14566]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[14545]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[14581]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[14560]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14634]: Color4bv (offset 26) */
+   /* _mesa_function_pool[14613]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[14648]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[14627]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[14670]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[14649]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[14695]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14674]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14720]: LoadMatrixx (will be remapped) */
+   /* _mesa_function_pool[14699]: LoadMatrixx (will be remapped) */
    "p\0"
    "glLoadMatrixxOES\0"
    "glLoadMatrixx\0"
    "\0"
-   /* _mesa_function_pool[14754]: GetCompressedTexImage (will be remapped) */
+   /* _mesa_function_pool[14733]: GetCompressedTexImage (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[14810]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[14789]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[14834]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[14813]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[14869]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[14848]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[14887]: LogicOp (offset 242) */
+   /* _mesa_function_pool[14866]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[14900]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[14879]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[14924]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[14903]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[14939]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[14918]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[15015]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[14994]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[15032]: ActiveTexture (offset 374) */
+   /* _mesa_function_pool[15011]: ActiveTexture (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[15070]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[15049]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[15097]: VertexAttribP1uiv (will be remapped) */
+   /* _mesa_function_pool[15076]: VertexAttribP1uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[15123]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[15102]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[15138]: SecondaryColor3bv (will be remapped) */
+   /* _mesa_function_pool[15117]: SecondaryColor3bv (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[15184]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[15163]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[15212]: Uniform2uiv (will be remapped) */
+   /* _mesa_function_pool[15191]: Uniform2uiv (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[15248]: ColorP4uiv (will be remapped) */
+   /* _mesa_function_pool[15227]: ColorP4uiv (will be remapped) */
    "ip\0"
    "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[15265]: TextureRangeAPPLE (dynamic) */
+   /* _mesa_function_pool[15244]: TextureRangeAPPLE (dynamic) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15290]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[15269]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[15312]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[15291]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[15336]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[15315]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[15360]: Uniform1ui (will be remapped) */
+   /* _mesa_function_pool[15339]: Uniform1ui (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[15393]: GenTextures (offset 328) */
+   /* _mesa_function_pool[15372]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[15428]: MultiTexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[15407]: MultiTexCoordP4uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[15454]: GetCombinerOutputParameterivNV (dynamic) */
+   /* _mesa_function_pool[15433]: GetCombinerOutputParameterivNV (dynamic) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15493]: PixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[15472]: PixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[15526]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[15505]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[15548]: WindowPos3d (will be remapped) */
+   /* _mesa_function_pool[15527]: WindowPos3d (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[15602]: Enablei (will be remapped) */
+   /* _mesa_function_pool[15581]: Enablei (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[15635]: WindowPos3f (will be remapped) */
+   /* _mesa_function_pool[15614]: WindowPos3f (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[15689]: SecondaryColor3ub (will be remapped) */
+   /* _mesa_function_pool[15668]: SecondaryColor3ub (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[15737]: FinalCombinerInputNV (dynamic) */
+   /* _mesa_function_pool[15716]: FinalCombinerInputNV (dynamic) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[15766]: GenProgramsARB (will be remapped) */
+   /* _mesa_function_pool[15745]: GenProgramsARB (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[15803]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[15782]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[15828]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[15807]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[15853]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[15832]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[15871]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[15850]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[15886]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[15865]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[15902]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[15881]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[15919]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[15898]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[15946]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[15925]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[15970]: MultiTexCoord4iv (offset 405) */
+   /* _mesa_function_pool[15949]: MultiTexCoord4iv (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[16015]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[15994]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[16032]: WindowPos2i (will be remapped) */
+   /* _mesa_function_pool[16011]: WindowPos2i (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[16085]: WindowPos3s (will be remapped) */
+   /* _mesa_function_pool[16064]: WindowPos3s (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[16139]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[16118]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[16164]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[16143]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[16179]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[16158]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[16198]: GetSamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[16177]: GetSamplerParameterIiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[16228]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[16207]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[16243]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[16222]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[16259]: Uniform4i (will be remapped) */
+   /* _mesa_function_pool[16238]: Uniform4i (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[16293]: ColorP3ui (will be remapped) */
+   /* _mesa_function_pool[16272]: ColorP3ui (will be remapped) */
    "ii\0"
    "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[16309]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[16288]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[16338]: CompressedTexImage2D (will be remapped) */
+   /* _mesa_function_pool[16317]: CompressedTexImage2D (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[16397]: Materialxv (will be remapped) */
+   /* _mesa_function_pool[16376]: Materialxv (will be remapped) */
    "iip\0"
    "glMaterialxvOES\0"
    "glMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[16431]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[16410]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[16452]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[16431]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[16485]: GetBooleani_v (will be remapped) */
+   /* _mesa_function_pool[16464]: GetBooleani_v (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[16530]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[16509]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[16565]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[16544]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16584]: Flush (offset 217) */
+   /* _mesa_function_pool[16563]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[16594]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[16573]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[16609]: MultiTexCoord1sv (offset 383) */
+   /* _mesa_function_pool[16588]: MultiTexCoord1sv (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[16654]: FogCoordd (will be remapped) */
+   /* _mesa_function_pool[16633]: FogCoordd (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[16684]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[16663]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[16702]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[16681]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[16721]: Uniform1uiv (will be remapped) */
+   /* _mesa_function_pool[16700]: BindFramebufferEXT (will be remapped) */
+   "ii\0"
+   "glBindFramebufferEXT\0"
+   "\0"
+   /* _mesa_function_pool[16725]: Uniform1uiv (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[16757]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[16761]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[16781]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[16785]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[16797]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[16801]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[16815]: Uniform3iv (will be remapped) */
+   /* _mesa_function_pool[16819]: Uniform3iv (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16849]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[16853]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16875]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[16879]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16897]: GetAttribLocation (will be remapped) */
+   /* _mesa_function_pool[16901]: GetAttribLocation (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[16944]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16948]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16985]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[16989]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[17014]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[17018]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[17032]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[17036]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[17066]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[17070]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[17084]: VertexAttrib4iv (will be remapped) */
+   /* _mesa_function_pool[17088]: VertexAttrib4iv (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[17127]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[17131]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[17145]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[17149]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "glCopyTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[17222]: Color4ub (offset 35) */
+   /* _mesa_function_pool[17226]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[17239]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[17243]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[17259]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[17263]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[17288]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[17292]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[17306]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[17310]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[17366]: EndQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[17370]: EndQueryIndexed (will be remapped) */
    "ii\0"
    "glEndQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[17388]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[17392]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[17407]: Indexiv (offset 49) */
+   /* _mesa_function_pool[17411]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[17420]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[17424]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[17438]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[17442]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[17482]: PointParameterfv (will be remapped) */
+   /* _mesa_function_pool[17486]: PointParameterfv (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[17572]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[17576]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17632]: Frustum (offset 289) */
+   /* _mesa_function_pool[17636]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[17650]: GetString (offset 275) */
+   /* _mesa_function_pool[17654]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[17665]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[17669]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[17691]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[17695]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[17706]: GetTexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[17710]: GetTexGenxvOES (will be remapped) */
    "iip\0"
    "glGetTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[17728]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[17732]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[17746]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[17750]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[17776]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[17780]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[17794]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[17798]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[17821]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[17825]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[17862]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[17866]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[17890]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[17894]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[17925]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[17929]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[17943]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[17947]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[17974]: GetClipPlanef (will be remapped) */
+   /* _mesa_function_pool[17978]: GetClipPlanef (will be remapped) */
    "ip\0"
    "glGetClipPlanefOES\0"
    "glGetClipPlanef\0"
    "\0"
-   /* _mesa_function_pool[18013]: VertexAttribPointer (will be remapped) */
+   /* _mesa_function_pool[18017]: VertexAttribPointer (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[18068]: TexStorage2DMultisample (will be remapped) */
+   /* _mesa_function_pool[18072]: TexStorage2DMultisample (will be remapped) */
    "iiiiii\0"
    "glTexStorage2DMultisample\0"
    "\0"
-   /* _mesa_function_pool[18102]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[18106]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[18128]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[18132]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[18153]: SecondaryColor3s (will be remapped) */
+   /* _mesa_function_pool[18157]: SecondaryColor3s (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[18199]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[18203]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[18218]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[18222]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[18234]: InvalidateBufferSubData (will be remapped) */
+   /* _mesa_function_pool[18238]: InvalidateBufferSubData (will be remapped) */
    "iii\0"
    "glInvalidateBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[18265]: Uniform3i (will be remapped) */
+   /* _mesa_function_pool[18269]: Uniform3i (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[18298]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[18302]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[18315]: TexStorage3D (will be remapped) */
+   /* _mesa_function_pool[18319]: TexStorage3D (will be remapped) */
    "iiiiii\0"
    "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[18338]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[18342]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[18365]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[18369]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[18392]: WindowPos3i (will be remapped) */
+   /* _mesa_function_pool[18396]: WindowPos3i (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[18446]: SecondaryColor3b (will be remapped) */
+   /* _mesa_function_pool[18450]: SecondaryColor3b (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[18492]: FramebufferTexture3D (will be remapped) */
+   /* _mesa_function_pool[18496]: FramebufferTexture3D (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "glFramebufferTexture3DOES\0"
    "\0"
-   /* _mesa_function_pool[18575]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[18579]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[18602]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[18606]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[18622]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[18626]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "glBindVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[18664]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[18668]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[18691]: GetProgramBinary (will be remapped) */
+   /* _mesa_function_pool[18695]: GetProgramBinary (will be remapped) */
    "iippp\0"
    "glGetProgramBinary\0"
    "glGetProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[18739]: GetBufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[18743]: GetBufferParameteriv (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[18793]: Rectd (offset 86) */
+   /* _mesa_function_pool[18797]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[18807]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[18811]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[18833]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[18837]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[18859]: ProvokingVertex (will be remapped) */
+   /* _mesa_function_pool[18863]: ProvokingVertex (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[18901]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[18905]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[18927]: MultiTexCoord1i (offset 380) */
+   /* _mesa_function_pool[18931]: MultiTexCoord1i (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[18970]: WindowPos2dv (will be remapped) */
+   /* _mesa_function_pool[18974]: WindowPos2dv (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[19025]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[19029]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[19057]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[19061]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[19082]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[19086]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[19101]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[19105]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[19131]: PointParameterxv (will be remapped) */
+   /* _mesa_function_pool[19135]: PointParameterxv (will be remapped) */
    "ip\0"
    "glPointParameterxvOES\0"
    "glPointParameterxv\0"
    "\0"
-   /* _mesa_function_pool[19176]: MultiTexCoord1d (offset 376) */
+   /* _mesa_function_pool[19180]: MultiTexCoord1d (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[19219]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[19223]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[19244]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19248]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19274]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[19278]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[19321]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[19325]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "glFlushMappedBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[19379]: MultiTexCoord2dv (offset 385) */
+   /* _mesa_function_pool[19383]: MultiTexCoord2dv (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[19424]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[19428]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[19482]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[19486]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19509]: Lightfv (offset 160) */
+   /* _mesa_function_pool[19513]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[19524]: GetFramebufferAttachmentParameteriv (will be remapped) */
+   /* _mesa_function_pool[19528]: GetFramebufferAttachmentParameteriv (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "glGetFramebufferAttachmentParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[19650]: MultiTexCoord1s (offset 382) */
+   /* _mesa_function_pool[19654]: MultiTexCoord1s (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[19693]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[19697]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[19709]: GetFenceivNV (dynamic) */
+   /* _mesa_function_pool[19713]: GetFenceivNV (dynamic) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[19729]: GetVertexAttribPointerv (will be remapped) */
+   /* _mesa_function_pool[19733]: GetVertexAttribPointerv (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[19817]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[19821]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[19860]: Color4fv (offset 30) */
+   /* _mesa_function_pool[19864]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[19874]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[19878]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[19898]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[19902]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[19935]: BeginConditionalRender (will be remapped) */
+   /* _mesa_function_pool[19939]: BeginConditionalRender (will be remapped) */
    "ii\0"
    "glBeginConditionalRender\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[19991]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[19995]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[20047]: VertexAttribI1uiv (will be remapped) */
+   /* _mesa_function_pool[20051]: VertexAttribI1uiv (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[20094]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[20098]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[20115]: Rects (offset 92) */
+   /* _mesa_function_pool[20119]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[20129]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[20133]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[20163]: ClearColorx (will be remapped) */
+   /* _mesa_function_pool[20167]: ClearColorx (will be remapped) */
    "iiii\0"
    "glClearColorxOES\0"
    "glClearColorx\0"
    "\0"
-   /* _mesa_function_pool[20200]: MultiTexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[20204]: MultiTexCoordP2ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[20225]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[20229]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[20247]: Lightiv (offset 162) */
+   /* _mesa_function_pool[20251]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[20262]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[20266]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[20281]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[20285]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[20310]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[20314]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[20335]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[20339]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[20359]: TransformFeedbackVaryings (will be remapped) */
+   /* _mesa_function_pool[20363]: TransformFeedbackVaryings (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryings\0"
    "glTransformFeedbackVaryingsEXT\0"
    "\0"
-   /* _mesa_function_pool[20424]: VertexAttrib3sv (will be remapped) */
+   /* _mesa_function_pool[20428]: VertexAttrib3sv (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[20467]: IsQuery (will be remapped) */
+   /* _mesa_function_pool[20471]: IsQuery (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[20493]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[20497]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[20514]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[20518]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[20537]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[20541]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[20563]: IsVertexArray (will be remapped) */
+   /* _mesa_function_pool[20567]: IsVertexArray (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "glIsVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[20622]: GetMultisamplefv (will be remapped) */
+   /* _mesa_function_pool[20626]: GetMultisamplefv (will be remapped) */
    "iip\0"
    "glGetMultisamplefv\0"
    "\0"
-   /* _mesa_function_pool[20646]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[20650]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[20664]: Rectdv (offset 87) */
+   /* _mesa_function_pool[20668]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[20677]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[20681]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[20703]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[20707]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[20753]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20757]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20812]: VertexAttrib4dv (will be remapped) */
+   /* _mesa_function_pool[20816]: VertexAttrib4dv (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[20855]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[20859]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[20883]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[20887]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[20909]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[20913]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[20987]: GetTexParameterxv (will be remapped) */
+   /* _mesa_function_pool[20991]: GetTexParameterxv (will be remapped) */
    "iip\0"
    "glGetTexParameterxvOES\0"
    "glGetTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[21035]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[21039]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[21062]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[21066]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[21104]: Materialiv (offset 172) */
+   /* _mesa_function_pool[21108]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[21122]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[21126]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[21144]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[21148]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[21179]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[21183]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[21225]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[21229]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[21271]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[21275]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[21289]: SecondaryColor3iv (will be remapped) */
+   /* _mesa_function_pool[21293]: SecondaryColor3iv (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[21335]: DrawTexivOES (will be remapped) */
+   /* _mesa_function_pool[21339]: DrawTexivOES (will be remapped) */
    "p\0"
    "glDrawTexivOES\0"
    "\0"
-   /* _mesa_function_pool[21353]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[21357]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[21396]: VertexAttrib4Niv (will be remapped) */
+   /* _mesa_function_pool[21400]: VertexAttrib4Niv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[21441]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[21445]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[21468]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[21472]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[21495]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[21499]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[21520]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[21524]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[21562]: LinkProgram (will be remapped) */
+   /* _mesa_function_pool[21566]: LinkProgram (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[21596]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[21600]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[21624]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[21628]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[21643]: Uniform1f (will be remapped) */
+   /* _mesa_function_pool[21647]: Uniform1f (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[21674]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[21678]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[21698]: TexGeni (offset 192) */
+   /* _mesa_function_pool[21702]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "glTexGeniOES\0"
    "\0"
-   /* _mesa_function_pool[21726]: TexGenf (offset 190) */
+   /* _mesa_function_pool[21730]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "glTexGenfOES\0"
    "\0"
-   /* _mesa_function_pool[21754]: TexGend (offset 188) */
+   /* _mesa_function_pool[21758]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[21769]: Uniform1i (will be remapped) */
+   /* _mesa_function_pool[21773]: Uniform1i (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[21800]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[21804]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[21823]: VertexAttrib4d (will be remapped) */
+   /* _mesa_function_pool[21827]: VertexAttrib4d (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[21867]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[21871]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[21894]: DrawArraysInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[21898]: DrawArraysInstancedBaseInstance (will be remapped) */
    "iiiii\0"
    "glDrawArraysInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[21935]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[21939]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[21959]: MultMatrixx (will be remapped) */
+   /* _mesa_function_pool[21963]: MultMatrixx (will be remapped) */
    "p\0"
    "glMultMatrixxOES\0"
    "glMultMatrixx\0"
    "\0"
-   /* _mesa_function_pool[21993]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[21997]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[22011]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[22015]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[22037]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[22041]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[22063]: DrawTexsvOES (will be remapped) */
+   /* _mesa_function_pool[22067]: DrawTexsvOES (will be remapped) */
    "p\0"
    "glDrawTexsvOES\0"
    "\0"
-   /* _mesa_function_pool[22081]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[22085]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[22105]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[22109]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[22131]: VertexAttrib4s (will be remapped) */
+   /* _mesa_function_pool[22135]: VertexAttrib4s (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[22175]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[22179]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[22206]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[22210]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[22233]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[22237]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[22257]: UseProgram (will be remapped) */
+   /* _mesa_function_pool[22261]: UseProgram (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[22295]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[22299]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[22322]: CompileShader (will be remapped) */
+   /* _mesa_function_pool[22326]: CompileShader (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[22360]: Color4sv (offset 34) */
+   /* _mesa_function_pool[22364]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[22374]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[22378]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[22406]: MultiTexCoord3d (offset 392) */
+   /* _mesa_function_pool[22410]: MultiTexCoord3d (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[22451]: LoadTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[22455]: LoadTransposeMatrixf (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[22503]: LoadTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[22507]: LoadTransposeMatrixd (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[22555]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[22559]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[22590]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[22594]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[22606]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[22610]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[22639]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[22643]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[22697]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[22701]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[22753]: GetFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[22757]: GetFragDataLocation (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[22804]: TexStorage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[22808]: TexStorage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexStorage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[22839]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[22843]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[22859]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[22863]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[22878]: Color3dv (offset 12) */
+   /* _mesa_function_pool[22882]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[22892]: IsTexture (offset 330) */
+   /* _mesa_function_pool[22896]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[22922]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[22926]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[22946]: BeginQuery (will be remapped) */
+   /* _mesa_function_pool[22950]: BeginQuery (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[22979]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[22983]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[23004]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[23008]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23027]: VertexP3uiv (will be remapped) */
+   /* _mesa_function_pool[23031]: VertexP3uiv (will be remapped) */
    "ip\0"
    "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[23045]: VertexAttrib3s (will be remapped) */
+   /* _mesa_function_pool[23049]: VertexAttrib3s (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[23088]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[23092]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[23125]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[23129]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[23144]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[23148]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[23174]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[23178]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[23206]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[23210]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "glCurrentPaletteMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[23261]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[23265]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[23277]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[23281]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[23312]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[23316]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[23329]: MultiTexCoord3iv (offset 397) */
+   /* _mesa_function_pool[23333]: MultiTexCoord3iv (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[23374]: GetUniformLocation (will be remapped) */
+   /* _mesa_function_pool[23378]: GetUniformLocation (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[23423]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[23427]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[23441]: WindowPos2iv (will be remapped) */
+   /* _mesa_function_pool[23445]: WindowPos2iv (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[23496]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[23500]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[23517]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23521]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23566]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[23570]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[23584]: IsBuffer (will be remapped) */
+   /* _mesa_function_pool[23588]: IsBuffer (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[23612]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[23616]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[23636]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[23640]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[23665]: VertexAttribI4ubv (will be remapped) */
+   /* _mesa_function_pool[23669]: VertexAttribI4ubv (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[23712]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[23716]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[23730]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[23734]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "glGenVertexArraysOES\0"
    "\0"
-   /* _mesa_function_pool[23773]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[23777]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[23793]: InvalidateSubFramebuffer (will be remapped) */
+   /* _mesa_function_pool[23797]: InvalidateSubFramebuffer (will be remapped) */
    "iipiiii\0"
    "glInvalidateSubFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[23829]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[23833]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[23845]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[23849]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[23871]: DrawTexsOES (will be remapped) */
+   /* _mesa_function_pool[23875]: DrawTexsOES (will be remapped) */
    "iiiii\0"
    "glDrawTexsOES\0"
    "\0"
-   /* _mesa_function_pool[23892]: Uniform2ui (will be remapped) */
+   /* _mesa_function_pool[23896]: Uniform2ui (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[23926]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[23930]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[23972]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[23976]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[24000]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[24004]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[24053]: DeleteVertexArrays (will be remapped) */
+   /* _mesa_function_pool[24057]: DeleteVertexArrays (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "glDeleteVertexArraysOES\0"
    "\0"
-   /* _mesa_function_pool[24128]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[24132]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[24155]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[24159]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[24187]: TexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[24191]: TexCoordP3uiv (will be remapped) */
    "ip\0"
    "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[24207]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[24211]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[24233]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[24237]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[24255]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[24259]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[24273]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[24277]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[24296]: TexEnvxv (will be remapped) */
+   /* _mesa_function_pool[24300]: TexEnvxv (will be remapped) */
    "iip\0"
    "glTexEnvxvOES\0"
    "glTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[24326]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[24330]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[24353]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[24357]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[24403]: Color3s (offset 17) */
+   /* _mesa_function_pool[24407]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[24418]: MultiTexCoord3s (offset 398) */
+   /* _mesa_function_pool[24422]: MultiTexCoord3s (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[24463]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[24467]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[24482]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[24486]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[24509]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[24513]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[24533]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[24537]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[24568]: InvalidateBufferData (will be remapped) */
+   /* _mesa_function_pool[24572]: InvalidateBufferData (will be remapped) */
    "i\0"
    "glInvalidateBufferData\0"
    "\0"
-   /* _mesa_function_pool[24594]: Color3i (offset 15) */
+   /* _mesa_function_pool[24598]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[24609]: FrontFace (offset 157) */
+   /* _mesa_function_pool[24613]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[24624]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[24628]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[24642]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[24646]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[24660]: Color3b (offset 9) */
+   /* _mesa_function_pool[24664]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[24675]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[24679]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[24699]: Color3f (offset 13) */
+   /* _mesa_function_pool[24703]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[24714]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[24718]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[24734]: Color3d (offset 11) */
+   /* _mesa_function_pool[24738]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[24749]: GetVertexAttribdv (will be remapped) */
+   /* _mesa_function_pool[24753]: GetVertexAttribdv (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[24797]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[24801]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[24812]: Lightf (offset 159) */
+   /* _mesa_function_pool[24816]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[24826]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[24830]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[24848]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[24852]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[24864]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[24868]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[24885]: Lighti (offset 161) */
+   /* _mesa_function_pool[24889]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[24899]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[24903]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[24930]: GenFramebuffers (will be remapped) */
+   /* _mesa_function_pool[24934]: GenFramebuffers (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "glGenFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[24994]: GenBuffers (will be remapped) */
+   /* _mesa_function_pool[24998]: GenBuffers (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[25027]: ClearDepthx (will be remapped) */
+   /* _mesa_function_pool[25031]: ClearDepthx (will be remapped) */
    "i\0"
    "glClearDepthxOES\0"
    "glClearDepthx\0"
    "\0"
-   /* _mesa_function_pool[25061]: Uniform4uiv (will be remapped) */
+   /* _mesa_function_pool[25065]: Uniform4uiv (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[25097]: IsFramebuffer (will be remapped) */
+   /* _mesa_function_pool[25101]: IsFramebuffer (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "glIsFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[25154]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[25158]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[25189]: BlendEquationSeparate (will be remapped) */
+   /* _mesa_function_pool[25193]: BlendEquationSeparate (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "glBlendEquationSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[25298]: Lightx (will be remapped) */
+   /* _mesa_function_pool[25302]: Lightx (will be remapped) */
    "iii\0"
    "glLightxOES\0"
    "glLightx\0"
    "\0"
-   /* _mesa_function_pool[25324]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[25328]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[25359]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[25363]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[25376]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[25380]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[25401]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[25405]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[25418]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[25422]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[25435]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[25439]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[25460]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25464]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25503]: VertexAttrib1d (will be remapped) */
+   /* _mesa_function_pool[25507]: VertexAttrib1d (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[25544]: CompressedTexImage1D (will be remapped) */
+   /* _mesa_function_pool[25548]: CompressedTexImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[25602]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[25606]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[25622]: TexBufferRange (will be remapped) */
+   /* _mesa_function_pool[25626]: TexBufferRange (will be remapped) */
    "iiiii\0"
    "glTexBufferRange\0"
    "\0"
-   /* _mesa_function_pool[25646]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[25650]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[25691]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[25695]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[25715]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[25719]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[25742]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[25746]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[25767]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[25771]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[25792]: CombinerParameteriNV (dynamic) */
+   /* _mesa_function_pool[25796]: CombinerParameteriNV (dynamic) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[25819]: VertexAttrib1s (will be remapped) */
+   /* _mesa_function_pool[25823]: VertexAttrib1s (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[25860]: EnableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[25864]: EnableVertexAttribArray (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[25918]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[25922]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[25937]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[25941]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25964]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[25968]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[25983]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[25987]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[26009]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[26013]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[26027]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[26031]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[26070]: ClearColor (offset 206) */
+   /* _mesa_function_pool[26074]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[26089]: Materialx (will be remapped) */
+   /* _mesa_function_pool[26093]: Materialx (will be remapped) */
    "iii\0"
    "glMaterialxOES\0"
    "glMaterialx\0"
    "\0"
-   /* _mesa_function_pool[26121]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[26125]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[26140]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[26144]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[26164]: SecondaryColor3ubv (will be remapped) */
+   /* _mesa_function_pool[26168]: SecondaryColor3ubv (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[26212]: PointParameteri (will be remapped) */
+   /* _mesa_function_pool[26216]: PointParameteri (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[26254]: PointParameterf (will be remapped) */
+   /* _mesa_function_pool[26258]: PointParameterf (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[26340]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[26344]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[26367]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[26371]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[26383]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[26387]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "glTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[26450]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[26454]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[26470]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[26474]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[26509]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[26513]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[26533]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[26537]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[26574]: PixelTexGenParameterfSGIS (dynamic) */
+   /* _mesa_function_pool[26578]: PixelTexGenParameterfSGIS (dynamic) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[26606]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[26610]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[26624]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[26628]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[26716]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[26720]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[26747]: FramebufferTexture2D (will be remapped) */
+   /* _mesa_function_pool[26751]: FramebufferTexture2D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "glFramebufferTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[26829]: Bitmap (offset 8) */
+   /* _mesa_function_pool[26833]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[26847]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[26851]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[26892]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[26896]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[26923]: GetPixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[26927]: GetPixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[26959]: CheckFramebufferStatus (will be remapped) */
+   /* _mesa_function_pool[26963]: CheckFramebufferStatus (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "glCheckFramebufferStatusOES\0"
    "\0"
-   /* _mesa_function_pool[27043]: DrawTransformFeedbackStream (will be remapped) */
+   /* _mesa_function_pool[27047]: DrawTransformFeedbackStream (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackStream\0"
    "\0"
-   /* _mesa_function_pool[27078]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[27082]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[27093]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[27097]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[27111]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[27115]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[27138]: GetShaderSource (will be remapped) */
+   /* _mesa_function_pool[27142]: GetShaderSource (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[27183]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[27187]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[27214]: BindProgramARB (will be remapped) */
+   /* _mesa_function_pool[27218]: BindProgramARB (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[27251]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[27255]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[27272]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[27276]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[27297]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[27301]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[27344]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[27348]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[27379]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[27383]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[27406]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[27410]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[27430]: GetActiveUniform (will be remapped) */
+   /* _mesa_function_pool[27434]: GetActiveUniform (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[27480]: DeleteBuffers (will be remapped) */
+   /* _mesa_function_pool[27484]: DeleteBuffers (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[27519]: AlphaFuncx (will be remapped) */
+   /* _mesa_function_pool[27523]: AlphaFuncx (will be remapped) */
    "ii\0"
    "glAlphaFuncxOES\0"
    "glAlphaFuncx\0"
    "\0"
-   /* _mesa_function_pool[27552]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[27556]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[27594]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[27598]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[27613]: GetBufferSubData (will be remapped) */
+   /* _mesa_function_pool[27617]: GetBufferSubData (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[27660]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[27664]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[27703]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[27707]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[27748]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[27752]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[27768]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[27772]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[27839]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[27843]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[27861]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[27865]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[27881]: EndTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[27885]: EndTransformFeedback (will be remapped) */
    "\0"
    "glEndTransformFeedback\0"
    "glEndTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[27932]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[27936]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[27985]: GetQueryObjectuiv (will be remapped) */
+   /* _mesa_function_pool[27989]: GetQueryObjectuiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[28033]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28037]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28078]: Map1d (offset 220) */
+   /* _mesa_function_pool[28082]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[28094]: Map1f (offset 221) */
+   /* _mesa_function_pool[28098]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[28110]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[28114]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[28130]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[28134]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[28166]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[28170]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[28190]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[28194]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[28211]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[28215]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[28233]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[28237]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28287]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[28291]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[28308]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[28312]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[28354]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[28358]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[28369]: Fogiv (offset 156) */
+   /* _mesa_function_pool[28373]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[28381]: EndQuery (will be remapped) */
+   /* _mesa_function_pool[28385]: EndQuery (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[28409]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[28413]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[28426]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[28430]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[28462]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[28466]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[28483]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[28487]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[28510]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[28514]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[28534]: Rotatef (offset 300) */
+   /* _mesa_function_pool[28538]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[28550]: GetFinalCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[28554]: GetFinalCombinerInputParameterivNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28592]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[28596]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[28608]: GetTexEnvxv (will be remapped) */
+   /* _mesa_function_pool[28612]: GetTexEnvxv (will be remapped) */
    "iip\0"
    "glGetTexEnvxvOES\0"
    "glGetTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[28644]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[28648]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[28669]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[28673]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[28685]: Clear (offset 203) */
+   /* _mesa_function_pool[28689]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[28696]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[28700]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[28712]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[28716]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28739]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[28743]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[28762]: Disablei (will be remapped) */
+   /* _mesa_function_pool[28766]: Disablei (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[28797]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[28801]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "glReadBufferNV\0"
    "\0"
-   /* _mesa_function_pool[28828]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[28832]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[28884]: VertexAttrib4sv (will be remapped) */
+   /* _mesa_function_pool[28888]: VertexAttrib4sv (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[28927]: Ortho (offset 296) */
+   /* _mesa_function_pool[28931]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[28943]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[28947]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[28964]: ListBase (offset 6) */
+   /* _mesa_function_pool[28968]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[28978]: GetTexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[28982]: GetTexParameterIiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[29028]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[29032]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[29048]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[29052]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[29064]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[29068]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[29120]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[29124]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29212]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[29216]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29269]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[29273]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[29285]: Uniform3uiv (will be remapped) */
+   /* _mesa_function_pool[29289]: Uniform3uiv (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[29321]: GenerateMipmap (will be remapped) */
+   /* _mesa_function_pool[29325]: GenerateMipmap (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "glGenerateMipmapOES\0"
    "\0"
-   /* _mesa_function_pool[29381]: Rectiv (offset 91) */
+   /* _mesa_function_pool[29385]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[29394]: TexImage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[29398]: TexImage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexImage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[29427]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[29431]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "glMatrixIndexPointerOES\0"
    "\0"
-   /* _mesa_function_pool[29481]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[29485]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[29508]: MultiTexCoord1iv (offset 381) */
+   /* _mesa_function_pool[29512]: MultiTexCoord1iv (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[29553]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[29557]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[29576]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[29580]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[29595]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[29599]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[29624]: BindBufferRange (will be remapped) */
+   /* _mesa_function_pool[29628]: BindBufferRange (will be remapped) */
    "iiiii\0"
    "glBindBufferRange\0"
    "glBindBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[29670]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[29674]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[29690]: TexParameterxv (will be remapped) */
+   /* _mesa_function_pool[29694]: TexParameterxv (will be remapped) */
    "iip\0"
    "glTexParameterxvOES\0"
    "glTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[29732]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[29736]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "glBlendEquationSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[29799]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[29803]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[29832]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[29836]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[29847]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[29851]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[29884]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[29888]: BindRenderbufferEXT (will be remapped) */
+   "ii\0"
+   "glBindRenderbufferEXT\0"
+   "\0"
+   /* _mesa_function_pool[29914]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[29907]: Rotatex (will be remapped) */
+   /* _mesa_function_pool[29937]: Rotatex (will be remapped) */
    "iiii\0"
    "glRotatexOES\0"
    "glRotatex\0"
    "\0"
-   /* _mesa_function_pool[29936]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[29966]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[29971]: BindBufferBase (will be remapped) */
+   /* _mesa_function_pool[30001]: BindBufferBase (will be remapped) */
    "iii\0"
    "glBindBufferBase\0"
    "glBindBufferBaseEXT\0"
    "\0"
-   /* _mesa_function_pool[30013]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[30043]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[30028]: GetQueryObjectiv (will be remapped) */
+   /* _mesa_function_pool[30058]: GetQueryObjectiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[30074]: VertexAttrib2s (will be remapped) */
+   /* _mesa_function_pool[30104]: VertexAttrib2s (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[30116]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[30146]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[30138]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[30168]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[30173]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[30203]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[30190]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[30220]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[30235]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[30265]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[30262]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[30292]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[30280]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[30310]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[30327]: Uniform2f (will be remapped) */
+   /* _mesa_function_pool[30357]: Uniform2f (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[30359]: VertexAttrib2d (will be remapped) */
+   /* _mesa_function_pool[30389]: VertexAttrib2d (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[30401]: CompressedTexSubImage3D (will be remapped) */
+   /* _mesa_function_pool[30431]: CompressedTexSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "glCompressedTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[30498]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[30528]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[30513]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[30543]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[30539]: VertexAttribP3uiv (will be remapped) */
+   /* _mesa_function_pool[30569]: VertexAttribP3uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[30565]: LineWidth (offset 168) */
+   /* _mesa_function_pool[30595]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[30580]: Uniform2i (will be remapped) */
+   /* _mesa_function_pool[30610]: Uniform2i (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[30612]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[30642]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[30650]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[30680]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[30668]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[30698]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[30688]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[30718]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[30718]: TexGendv (offset 189) */
+   /* _mesa_function_pool[30748]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[30734]: Uniform1fv (will be remapped) */
+   /* _mesa_function_pool[30764]: Uniform1fv (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[30768]: LightModelx (will be remapped) */
+   /* _mesa_function_pool[30798]: LightModelx (will be remapped) */
    "ii\0"
    "glLightModelxOES\0"
    "glLightModelx\0"
    "\0"
-   /* _mesa_function_pool[30803]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[30833]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[30848]: GetBufferPointerv (will be remapped) */
+   /* _mesa_function_pool[30878]: GetBufferPointerv (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "glGetBufferPointervOES\0"
    "\0"
-   /* _mesa_function_pool[30919]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[30949]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[30940]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[30970]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[30974]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[31004]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[31001]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[31031]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[31024]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[31054]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[31050]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[31080]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[31114]: GetActiveUniformName (will be remapped) */
+   /* _mesa_function_pool[31144]: GetActiveUniformName (will be remapped) */
    "iiipp\0"
    "glGetActiveUniformName\0"
    "\0"
-   /* _mesa_function_pool[31144]: Uniform1iv (will be remapped) */
+   /* _mesa_function_pool[31174]: Uniform1iv (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[31178]: MultiTexCoord4i (offset 404) */
+   /* _mesa_function_pool[31208]: MultiTexCoord4i (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[31224]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[31254]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[31258]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[31288]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[31295]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[31325]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[31316]: WindowPos3fv (will be remapped) */
+   /* _mesa_function_pool[31346]: WindowPos3fv (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[31371]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[31401]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[31409]: DeleteProgramsARB (will be remapped) */
+   /* _mesa_function_pool[31439]: DeleteProgramsARB (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[31452]: TexEnvx (will be remapped) */
+   /* _mesa_function_pool[31482]: TexEnvx (will be remapped) */
    "iii\0"
    "glTexEnvxOES\0"
    "glTexEnvx\0"
    "\0"
-   /* _mesa_function_pool[31480]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[31510]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[31515]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[31545]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[31536]: CallList (offset 2) */
+   /* _mesa_function_pool[31566]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[31550]: Materialfv (offset 170) */
+   /* _mesa_function_pool[31580]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[31568]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[31598]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[31585]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[31615]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[31603]: GetUniformBlockIndex (will be remapped) */
+   /* _mesa_function_pool[31633]: GetUniformBlockIndex (will be remapped) */
    "ip\0"
    "glGetUniformBlockIndex\0"
    "\0"
-   /* _mesa_function_pool[31630]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[31660]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[31662]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[31692]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[31681]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[31711]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "glClearDepthfOES\0"
    "\0"
-   /* _mesa_function_pool[31715]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[31745]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[31768]: SampleCoverage (will be remapped) */
+   /* _mesa_function_pool[31798]: SampleCoverage (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[31809]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[31839]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[31840]: Color3iv (offset 16) */
+   /* _mesa_function_pool[31870]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[31854]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[31884]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[31882]: VertexAttrib4ubv (will be remapped) */
+   /* _mesa_function_pool[31912]: VertexAttrib4ubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[31927]: MultiDrawArrays (will be remapped) */
+   /* _mesa_function_pool[31957]: MultiDrawArrays (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[31972]: DrawElements (offset 311) */
+   /* _mesa_function_pool[32002]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[31993]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[32023]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[32019]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[32049]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[32056]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[32086]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[32116]: TexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[32146]: TexGenxvOES (will be remapped) */
    "iip\0"
    "glTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[32135]: PointParameteriv (will be remapped) */
+   /* _mesa_function_pool[32165]: PointParameteriv (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[32179]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[32209]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[32206]: SecondaryColor3d (will be remapped) */
+   /* _mesa_function_pool[32236]: SecondaryColor3d (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[32252]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[32282]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[32307]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[32337]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[32330]: FlushVertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[32360]: FlushVertexArrayRangeNV (dynamic) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[32358]: Uniform2iv (will be remapped) */
+   /* _mesa_function_pool[32388]: Uniform2iv (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[32392]: GetFixedv (will be remapped) */
+   /* _mesa_function_pool[32422]: GetFixedv (will be remapped) */
    "ip\0"
    "glGetFixedvOES\0"
    "glGetFixedv\0"
    "\0"
-   /* _mesa_function_pool[32423]: BindRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[32453]: BindRenderbuffer (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
-   "glBindRenderbufferEXT\0"
    "glBindRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[32490]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[32498]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[32521]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[32529]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[32558]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[32566]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[32575]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[32583]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[32591]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[32599]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[32611]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[32619]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[32625]: FinishFenceNV (dynamic) */
+   /* _mesa_function_pool[32633]: FinishFenceNV (dynamic) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[32644]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[32652]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[32664]: DeleteFramebuffers (will be remapped) */
+   /* _mesa_function_pool[32672]: DeleteFramebuffers (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "glDeleteFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[32737]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[32745]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[32783]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[32791]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "glGetTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[32819]: CombinerInputNV (dynamic) */
+   /* _mesa_function_pool[32827]: CombinerInputNV (dynamic) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[32845]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[32853]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[32866]: FramebufferRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[32874]: FramebufferRenderbuffer (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "glFramebufferRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[32956]: IsProgramARB (will be remapped) */
+   /* _mesa_function_pool[32964]: IsProgramARB (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[32988]: VertexAttrib4uiv (will be remapped) */
+   /* _mesa_function_pool[32996]: VertexAttrib4uiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[33033]: VertexAttrib4Nsv (will be remapped) */
+   /* _mesa_function_pool[33041]: VertexAttrib4Nsv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[33078]: Map2d (offset 222) */
+   /* _mesa_function_pool[33086]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[33098]: Map2f (offset 223) */
+   /* _mesa_function_pool[33106]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[33118]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[33126]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[33143]: MultiTexCoord4x (will be remapped) */
+   /* _mesa_function_pool[33151]: MultiTexCoord4x (will be remapped) */
    "iiiii\0"
    "glMultiTexCoord4xOES\0"
    "glMultiTexCoord4x\0"
    "\0"
-   /* _mesa_function_pool[33189]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[33197]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[33206]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[33214]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[33235]: UnmapBuffer (will be remapped) */
+   /* _mesa_function_pool[33243]: UnmapBuffer (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "glUnmapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[33286]: MultiTexCoord4s (offset 406) */
+   /* _mesa_function_pool[33294]: MultiTexCoord4s (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[33332]: VertexAttribI2iEXT (will be remapped) */
+   /* _mesa_function_pool[33340]: VertexAttribI2iEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2iEXT\0"
    "glVertexAttribI2i\0"
    "\0"
-   /* _mesa_function_pool[33376]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[33384]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[33393]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[33401]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[33410]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[33418]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[33427]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[33435]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[33445]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[33453]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[33475]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[33483]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[33501]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[33509]: VertexAttribP2uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[33527]: VertexAttrib4bv (will be remapped) */
+   /* _mesa_function_pool[33535]: VertexAttrib4bv (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[33570]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[33578]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[33596]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[33604]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "glGetTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[33632]: MultiTexCoord4d (offset 400) */
+   /* _mesa_function_pool[33640]: MultiTexCoord4d (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[33678]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[33686]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[33695]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[33703]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[33726]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[33734]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[33766]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[33774]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[33792]: Translatex (will be remapped) */
+   /* _mesa_function_pool[33800]: Translatex (will be remapped) */
    "iii\0"
    "glTranslatexOES\0"
    "glTranslatex\0"
    "\0"
-   /* _mesa_function_pool[33826]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[33834]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[33857]: Materialf (offset 169) */
+   /* _mesa_function_pool[33865]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[33874]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[33882]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[33895]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[33903]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[33920]: Materiali (offset 171) */
+   /* _mesa_function_pool[33928]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[33937]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[33945]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[33963]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[33971]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[33998]: Indexsv (offset 51) */
+   /* _mesa_function_pool[34006]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[34011]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[34019]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[34054]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[34062]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[34073]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[34081]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[34090]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[34098]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[34121]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[34129]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[34139]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[34147]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[34176]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[34184]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "glMapBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[34219]: Translated (offset 303) */
+   /* _mesa_function_pool[34227]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[34237]: Translatef (offset 304) */
+   /* _mesa_function_pool[34245]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[34255]: StencilMask (offset 209) */
+   /* _mesa_function_pool[34263]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[34272]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[34280]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[34292]: MultTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[34300]: MultTransposeMatrixd (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[34344]: MultTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[34352]: MultTransposeMatrixf (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[34396]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[34404]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[34414]: DrawElementsInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[34422]: DrawElementsInstancedBaseInstance (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[34458]: IsList (offset 287) */
+   /* _mesa_function_pool[34466]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[34470]: PointSizex (will be remapped) */
+   /* _mesa_function_pool[34478]: PointSizex (will be remapped) */
    "i\0"
    "glPointSizexOES\0"
    "glPointSizex\0"
    "\0"
-   /* _mesa_function_pool[34502]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[34510]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[34528]: IsSync (will be remapped) */
+   /* _mesa_function_pool[34536]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[34540]: RenderMode (offset 196) */
+   /* _mesa_function_pool[34548]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[34556]: PrimitiveRestartIndex (will be remapped) */
+   /* _mesa_function_pool[34564]: PrimitiveRestartIndex (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndex\0"
    "glPrimitiveRestartIndexNV\0"
    "\0"
-   /* _mesa_function_pool[34609]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[34617]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[34642]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[34650]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[34663]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[34671]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[34700]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[34708]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34728]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[34736]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[34771]: LoadName (offset 198) */
+   /* _mesa_function_pool[34779]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[34785]: GetInternalformativ (will be remapped) */
+   /* _mesa_function_pool[34793]: GetInternalformativ (will be remapped) */
    "iiiip\0"
    "glGetInternalformativ\0"
    "\0"
-   /* _mesa_function_pool[34814]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[34822]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[34841]: Frustumf (will be remapped) */
+   /* _mesa_function_pool[34849]: Frustumf (will be remapped) */
    "ffffff\0"
    "glFrustumfOES\0"
    "glFrustumf\0"
    "\0"
-   /* _mesa_function_pool[34874]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[34882]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[34892]: GetIntegeri_v (will be remapped) */
+   /* _mesa_function_pool[34900]: GetIntegeri_v (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[34937]: LightModelxv (will be remapped) */
+   /* _mesa_function_pool[34945]: LightModelxv (will be remapped) */
    "ip\0"
    "glLightModelxvOES\0"
    "glLightModelxv\0"
    "\0"
-   /* _mesa_function_pool[34974]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[34982]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[34999]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[35007]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[35035]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[35043]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[35086]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[35094]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[35130]: CullFace (offset 152) */
+   /* _mesa_function_pool[35138]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[35144]: BindTexture (offset 307) */
+   /* _mesa_function_pool[35152]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[35179]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[35187]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[35205]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[35213]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[35251]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[35259]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[35279]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[35287]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[35305]: SecondaryColor3i (will be remapped) */
+   /* _mesa_function_pool[35313]: SecondaryColor3i (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[35351]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[35359]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[35370]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[35378]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[35390]: Rectsv (offset 93) */
+   /* _mesa_function_pool[35398]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[35403]: WindowPos3iv (will be remapped) */
+   /* _mesa_function_pool[35411]: WindowPos3iv (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[35458]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[35466]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[35485]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[35493]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[35517]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[35525]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[35580]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[35588]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[35601]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[35609]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[35628]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[35636]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[35649]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[35657]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[35671]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[35679]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[35716]: GetCombinerOutputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[35724]: GetCombinerOutputParameterfvNV (dynamic) */
    "iiip\0"
    "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[35755]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[35763]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[35779]: VertexAttrib4Nubv (will be remapped) */
+   /* _mesa_function_pool[35787]: VertexAttrib4Nubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[35826]: SecondaryColor3ui (will be remapped) */
+   /* _mesa_function_pool[35834]: SecondaryColor3ui (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[35874]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[35882]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[35921]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[35929]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[35948]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[35956]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[35964]: Recti (offset 90) */
+   /* _mesa_function_pool[35972]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[35978]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[35986]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[36023]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[36031]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[36062]: VertexAttribIPointer (will be remapped) */
+   /* _mesa_function_pool[36070]: VertexAttribIPointer (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[36118]: SecondaryColor3usv (will be remapped) */
+   /* _mesa_function_pool[36126]: SecondaryColor3usv (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[36166]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[36174]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[36184]: Fogxv (will be remapped) */
+   /* _mesa_function_pool[36192]: Fogxv (will be remapped) */
    "ip\0"
    "glFogxvOES\0"
    "glFogxv\0"
    "\0"
-   /* _mesa_function_pool[36207]: MultiTexCoord3dv (offset 393) */
+   /* _mesa_function_pool[36215]: MultiTexCoord3dv (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[36252]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[36260]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[36274]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[36282]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[36295]: Rectf (offset 88) */
+   /* _mesa_function_pool[36303]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[36309]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[36317]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[36332]: Indexfv (offset 47) */
+   /* _mesa_function_pool[36340]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[36345]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[36353]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[36362]: TexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[36370]: TexParameterIuiv (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[36408]: BlitFramebuffer (will be remapped) */
+   /* _mesa_function_pool[36416]: BlitFramebuffer (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[36459]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[36467]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[36494]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[36502]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[36514]: CombinerParameterfNV (dynamic) */
+   /* _mesa_function_pool[36522]: CombinerParameterfNV (dynamic) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[36541]: IndexMask (offset 212) */
+   /* _mesa_function_pool[36549]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[36556]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[36564]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[36583]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[36591]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[36609]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[36617]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[36625]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[36633]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[36651]: CombinerOutputNV (dynamic) */
+   /* _mesa_function_pool[36659]: CombinerOutputNV (dynamic) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[36682]: MultiTexCoord3i (offset 396) */
+   /* _mesa_function_pool[36690]: MultiTexCoord3i (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[36727]: GetVertexAttribIiv (will be remapped) */
+   /* _mesa_function_pool[36735]: GetVertexAttribIiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[36777]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[36785]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[36799]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[36807]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[36818]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[36826]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[36835]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[36843]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[36859]: FogCoorddv (will be remapped) */
+   /* _mesa_function_pool[36867]: FogCoorddv (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[36891]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[36899]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[36905]: Fogfv (offset 154) */
+   /* _mesa_function_pool[36913]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[36917]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[36925]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[36945]: InitNames (offset 197) */
+   /* _mesa_function_pool[36953]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[36959]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[36967]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[36974]: Minmax (offset 368) */
+   /* _mesa_function_pool[36982]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[37000]: BufferData (will be remapped) */
+   /* _mesa_function_pool[37008]: BufferData (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[37035]: DeleteQueries (will be remapped) */
+   /* _mesa_function_pool[37043]: DeleteQueries (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[37074]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[37082]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[37093]: IsEnabledi (will be remapped) */
+   /* _mesa_function_pool[37101]: IsEnabledi (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[37132]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[37140]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[37151]: Uniform3ui (will be remapped) */
+   /* _mesa_function_pool[37159]: Uniform3ui (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[37186]: InvalidateFramebuffer (will be remapped) */
+   /* _mesa_function_pool[37194]: InvalidateFramebuffer (will be remapped) */
    "iip\0"
    "glInvalidateFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[37215]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[37223]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[37248]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[37256]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[37268]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[37276]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[37286]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[37294]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[37323]: Hint (offset 158) */
+   /* _mesa_function_pool[37331]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[37334]: Color4dv (offset 28) */
+   /* _mesa_function_pool[37342]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[37348]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[37356]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[37371]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[37379]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[37400]: DisableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[37408]: DisableVertexAttribArray (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[37460]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[37468]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[37510]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[37518]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[37528]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[37536]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[37553]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[37561]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[37577]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[37585]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[37608]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[37616]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[37623]: BufferSubData (will be remapped) */
+   /* _mesa_function_pool[37631]: BufferSubData (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[37664]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[37672]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[37681]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[37689]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[37701]: Begin (offset 7) */
+   /* _mesa_function_pool[37709]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[37712]: LightModeli (offset 165) */
+   /* _mesa_function_pool[37720]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[37730]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[37738]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[37761]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[37769]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[37785]: Rectfv (offset 89) */
+   /* _mesa_function_pool[37793]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[37798]: ClipPlanex (will be remapped) */
+   /* _mesa_function_pool[37806]: ClipPlanex (will be remapped) */
    "ip\0"
    "glClipPlanexOES\0"
    "glClipPlanex\0"
    "\0"
-   /* _mesa_function_pool[37831]: Uniform4f (will be remapped) */
+   /* _mesa_function_pool[37839]: Uniform4f (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[37865]: LightModelf (offset 163) */
+   /* _mesa_function_pool[37873]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[37883]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[37891]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[37908]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[37916]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[37926]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[37934]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[37962]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[37970]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[37988]: VertexP4uiv (will be remapped) */
+   /* _mesa_function_pool[37996]: VertexP4uiv (will be remapped) */
    "ip\0"
    "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[38006]: GetCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[38014]: GetCombinerInputParameterivNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[38045]: Disable (offset 214) */
+   /* _mesa_function_pool[38053]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[38058]: ClipPlanef (will be remapped) */
+   /* _mesa_function_pool[38066]: ClipPlanef (will be remapped) */
    "ip\0"
    "glClipPlanefOES\0"
    "glClipPlanef\0"
    "\0"
-   /* _mesa_function_pool[38091]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[38099]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[38136]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[38144]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[38157]: SecondaryColorPointer (will be remapped) */
+   /* _mesa_function_pool[38165]: SecondaryColorPointer (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[38214]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[38222]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[38248]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[38256]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[38267]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[38275]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[38293]: ColorMask (offset 210) */
+   /* _mesa_function_pool[38301]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[38311]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[38319]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[38336]: DebugMessageInsertARB (will be remapped) */
+   /* _mesa_function_pool[38344]: DebugMessageInsertARB (will be remapped) */
    "iiiiip\0"
    "glDebugMessageInsertARB\0"
    "\0"
-   /* _mesa_function_pool[38368]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[38376]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[38398]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[38406]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[38420]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[38428]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[38438]: Enable (offset 215) */
+   /* _mesa_function_pool[38446]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[38450]: GetRenderbufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[38458]: GetRenderbufferParameteriv (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "glGetRenderbufferParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[38548]: LineStipple (offset 167) */
+   /* _mesa_function_pool[38556]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[38566]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[38574]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[38592]: SetFenceNV (dynamic) */
+   /* _mesa_function_pool[38600]: SetFenceNV (dynamic) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[38609]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[38617]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[38635]: GenRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[38643]: GenRenderbuffers (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "glGenRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[38702]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[38710]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[38732]: UniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[38740]: UniformMatrix4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[38779]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[38787]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[38806]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[38814]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[38860]: VertexAttrib4Nuiv (will be remapped) */
+   /* _mesa_function_pool[38868]: VertexAttrib4Nuiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[38907]: ClientActiveTexture (offset 375) */
+   /* _mesa_function_pool[38915]: ClientActiveTexture (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[38957]: WindowPos2sv (will be remapped) */
+   /* _mesa_function_pool[38965]: WindowPos2sv (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[39012]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[39020]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[39027]: GetUniformIndices (will be remapped) */
+   /* _mesa_function_pool[39035]: GetUniformIndices (will be remapped) */
    "iipp\0"
    "glGetUniformIndices\0"
    "\0"
-   /* _mesa_function_pool[39053]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[39061]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[39084]: SecondaryColor3sv (will be remapped) */
+   /* _mesa_function_pool[39092]: SecondaryColor3sv (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[39130]: Fogx (will be remapped) */
+   /* _mesa_function_pool[39138]: Fogx (will be remapped) */
    "ii\0"
    "glFogxOES\0"
    "glFogx\0"
    "\0"
-   /* _mesa_function_pool[39151]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[39159]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[39172]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[39180]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[39202]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[39210]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[39218]: CombinerParameterivNV (dynamic) */
+   /* _mesa_function_pool[39226]: CombinerParameterivNV (dynamic) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[39246]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[39254]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[39268]: MultiTexCoord2sv (offset 391) */
+   /* _mesa_function_pool[39276]: MultiTexCoord2sv (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[39313]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[39321]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[39352]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[39360]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[39377]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[39385]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[39398]: Uniform4iv (will be remapped) */
+   /* _mesa_function_pool[39406]: Uniform4iv (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
@@ -5581,632 +5587,634 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   { 25544, CompressedTexImage1D_remap_index },
-   { 16338, CompressedTexImage2D_remap_index },
+   { 25548, CompressedTexImage1D_remap_index },
+   { 16317, CompressedTexImage2D_remap_index },
    {  2943, CompressedTexImage3D_remap_index },
    {  7546, CompressedTexSubImage1D_remap_index },
    {  3993, CompressedTexSubImage2D_remap_index },
-   { 30401, CompressedTexSubImage3D_remap_index },
-   { 14754, GetCompressedTexImage_remap_index },
-   { 22503, LoadTransposeMatrixd_remap_index },
-   { 22451, LoadTransposeMatrixf_remap_index },
-   { 34292, MultTransposeMatrixd_remap_index },
-   { 34344, MultTransposeMatrixf_remap_index },
-   { 31768, SampleCoverage_remap_index },
-   { 11626, BlendFuncSeparate_remap_index },
-   { 13732, FogCoordPointer_remap_index },
-   { 16654, FogCoordd_remap_index },
-   { 36859, FogCoorddv_remap_index },
-   { 31927, MultiDrawArrays_remap_index },
-   { 26254, PointParameterf_remap_index },
-   { 17482, PointParameterfv_remap_index },
-   { 26212, PointParameteri_remap_index },
-   { 32135, PointParameteriv_remap_index },
-   { 18446, SecondaryColor3b_remap_index },
-   { 15138, SecondaryColor3bv_remap_index },
-   { 32206, SecondaryColor3d_remap_index },
+   { 30431, CompressedTexSubImage3D_remap_index },
+   { 14733, GetCompressedTexImage_remap_index },
+   { 22507, LoadTransposeMatrixd_remap_index },
+   { 22455, LoadTransposeMatrixf_remap_index },
+   { 34300, MultTransposeMatrixd_remap_index },
+   { 34352, MultTransposeMatrixf_remap_index },
+   { 31798, SampleCoverage_remap_index },
+   { 11605, BlendFuncSeparate_remap_index },
+   { 13711, FogCoordPointer_remap_index },
+   { 16633, FogCoordd_remap_index },
+   { 36867, FogCoorddv_remap_index },
+   { 31957, MultiDrawArrays_remap_index },
+   { 26258, PointParameterf_remap_index },
+   { 17486, PointParameterfv_remap_index },
+   { 26216, PointParameteri_remap_index },
+   { 32165, PointParameteriv_remap_index },
+   { 18450, SecondaryColor3b_remap_index },
+   { 15117, SecondaryColor3bv_remap_index },
+   { 32236, SecondaryColor3d_remap_index },
    {  3254, SecondaryColor3dv_remap_index },
-   { 35305, SecondaryColor3i_remap_index },
-   { 21289, SecondaryColor3iv_remap_index },
-   { 18153, SecondaryColor3s_remap_index },
-   { 39084, SecondaryColor3sv_remap_index },
-   { 15689, SecondaryColor3ub_remap_index },
-   { 26164, SecondaryColor3ubv_remap_index },
-   { 35826, SecondaryColor3ui_remap_index },
+   { 35313, SecondaryColor3i_remap_index },
+   { 21293, SecondaryColor3iv_remap_index },
+   { 18157, SecondaryColor3s_remap_index },
+   { 39092, SecondaryColor3sv_remap_index },
+   { 15668, SecondaryColor3ub_remap_index },
+   { 26168, SecondaryColor3ubv_remap_index },
+   { 35834, SecondaryColor3ui_remap_index },
    {  4175, SecondaryColor3uiv_remap_index },
-   { 13963, SecondaryColor3us_remap_index },
-   { 36118, SecondaryColor3usv_remap_index },
-   { 38157, SecondaryColorPointer_remap_index },
+   { 13942, SecondaryColor3us_remap_index },
+   { 36126, SecondaryColor3usv_remap_index },
+   { 38165, SecondaryColorPointer_remap_index },
    {  2115, WindowPos2d_remap_index },
-   { 18970, WindowPos2dv_remap_index },
+   { 18974, WindowPos2dv_remap_index },
    {  2043, WindowPos2f_remap_index },
    {  1530, WindowPos2fv_remap_index },
-   { 16032, WindowPos2i_remap_index },
-   { 23441, WindowPos2iv_remap_index },
+   { 16011, WindowPos2i_remap_index },
+   { 23445, WindowPos2iv_remap_index },
    {  2477, WindowPos2s_remap_index },
-   { 38957, WindowPos2sv_remap_index },
-   { 15548, WindowPos3d_remap_index },
-   { 13627, WindowPos3dv_remap_index },
-   { 15635, WindowPos3f_remap_index },
-   { 31316, WindowPos3fv_remap_index },
-   { 18392, WindowPos3i_remap_index },
-   { 35403, WindowPos3iv_remap_index },
-   { 16085, WindowPos3s_remap_index },
+   { 38965, WindowPos2sv_remap_index },
+   { 15527, WindowPos3d_remap_index },
+   { 13606, WindowPos3dv_remap_index },
+   { 15614, WindowPos3f_remap_index },
+   { 31346, WindowPos3fv_remap_index },
+   { 18396, WindowPos3i_remap_index },
+   { 35411, WindowPos3iv_remap_index },
+   { 16064, WindowPos3s_remap_index },
    {  6981, WindowPos3sv_remap_index },
-   { 22946, BeginQuery_remap_index },
-   { 12188, BindBuffer_remap_index },
-   { 37000, BufferData_remap_index },
-   { 37623, BufferSubData_remap_index },
-   { 27480, DeleteBuffers_remap_index },
-   { 37035, DeleteQueries_remap_index },
-   { 28381, EndQuery_remap_index },
-   { 24994, GenBuffers_remap_index },
+   { 22950, BeginQuery_remap_index },
+   { 12167, BindBuffer_remap_index },
+   { 37008, BufferData_remap_index },
+   { 37631, BufferSubData_remap_index },
+   { 27484, DeleteBuffers_remap_index },
+   { 37043, DeleteQueries_remap_index },
+   { 28385, EndQuery_remap_index },
+   { 24998, GenBuffers_remap_index },
    {  2794, GenQueries_remap_index },
-   { 18739, GetBufferParameteriv_remap_index },
-   { 30848, GetBufferPointerv_remap_index },
-   { 27613, GetBufferSubData_remap_index },
-   { 30028, GetQueryObjectiv_remap_index },
-   { 27985, GetQueryObjectuiv_remap_index },
+   { 18743, GetBufferParameteriv_remap_index },
+   { 30878, GetBufferPointerv_remap_index },
+   { 27617, GetBufferSubData_remap_index },
+   { 30058, GetQueryObjectiv_remap_index },
+   { 27989, GetQueryObjectuiv_remap_index },
    {  3781, GetQueryiv_remap_index },
-   { 23584, IsBuffer_remap_index },
-   { 20467, IsQuery_remap_index },
+   { 23588, IsBuffer_remap_index },
+   { 20471, IsQuery_remap_index },
    {  4354, MapBuffer_remap_index },
-   { 33235, UnmapBuffer_remap_index },
+   { 33243, UnmapBuffer_remap_index },
    {  1265, AttachShader_remap_index },
    {  6435, BindAttribLocation_remap_index },
-   { 25189, BlendEquationSeparate_remap_index },
-   { 22322, CompileShader_remap_index },
-   { 11548, CreateProgram_remap_index },
-   { 26606, CreateShader_remap_index },
-   { 29576, DeleteProgram_remap_index },
-   { 30262, DeleteShader_remap_index },
-   { 31662, DetachShader_remap_index },
-   { 37400, DisableVertexAttribArray_remap_index },
-   { 12772, DrawBuffers_remap_index },
-   { 25860, EnableVertexAttribArray_remap_index },
+   { 25193, BlendEquationSeparate_remap_index },
+   { 22326, CompileShader_remap_index },
+   { 11527, CreateProgram_remap_index },
+   { 26610, CreateShader_remap_index },
+   { 29580, DeleteProgram_remap_index },
+   { 30292, DeleteShader_remap_index },
+   { 31692, DetachShader_remap_index },
+   { 37408, DisableVertexAttribArray_remap_index },
+   { 12751, DrawBuffers_remap_index },
+   { 25864, EnableVertexAttribArray_remap_index },
    {  8947, GetActiveAttrib_remap_index },
-   { 27430, GetActiveUniform_remap_index },
-   { 21035, GetAttachedShaders_remap_index },
-   { 16897, GetAttribLocation_remap_index },
+   { 27434, GetActiveUniform_remap_index },
+   { 21039, GetAttachedShaders_remap_index },
+   { 16901, GetAttribLocation_remap_index },
    {  6015, GetProgramInfoLog_remap_index },
    {   272, GetProgramiv_remap_index },
-   { 14224, GetShaderInfoLog_remap_index },
-   { 27138, GetShaderSource_remap_index },
+   { 14203, GetShaderInfoLog_remap_index },
+   { 27142, GetShaderSource_remap_index },
    {  1599, GetShaderiv_remap_index },
-   { 23374, GetUniformLocation_remap_index },
+   { 23378, GetUniformLocation_remap_index },
    {  7245, GetUniformfv_remap_index },
    {  7710, GetUniformiv_remap_index },
-   { 19729, GetVertexAttribPointerv_remap_index },
-   { 24749, GetVertexAttribdv_remap_index },
+   { 19733, GetVertexAttribPointerv_remap_index },
+   { 24753, GetVertexAttribdv_remap_index },
    {  2226, GetVertexAttribfv_remap_index },
-   { 12573, GetVertexAttribiv_remap_index },
-   { 15123, IsProgram_remap_index },
+   { 12552, GetVertexAttribiv_remap_index },
+   { 15102, IsProgram_remap_index },
    {  7363, IsShader_remap_index },
-   { 21562, LinkProgram_remap_index },
-   { 11750, ShaderSource_remap_index },
-   { 11722, StencilFuncSeparate_remap_index },
+   { 21566, LinkProgram_remap_index },
+   { 11729, ShaderSource_remap_index },
+   { 11701, StencilFuncSeparate_remap_index },
    {  4328, StencilMaskSeparate_remap_index },
    {  9371, StencilOpSeparate_remap_index },
-   { 21643, Uniform1f_remap_index },
-   { 30734, Uniform1fv_remap_index },
-   { 21769, Uniform1i_remap_index },
-   { 31144, Uniform1iv_remap_index },
-   { 30327, Uniform2f_remap_index },
+   { 21647, Uniform1f_remap_index },
+   { 30764, Uniform1fv_remap_index },
+   { 21773, Uniform1i_remap_index },
+   { 31174, Uniform1iv_remap_index },
+   { 30357, Uniform2f_remap_index },
    {   739, Uniform2fv_remap_index },
-   { 30580, Uniform2i_remap_index },
-   { 32358, Uniform2iv_remap_index },
+   { 30610, Uniform2i_remap_index },
+   { 32388, Uniform2iv_remap_index },
    {  3105, Uniform3f_remap_index },
-   { 12868, Uniform3fv_remap_index },
-   { 18265, Uniform3i_remap_index },
-   { 16815, Uniform3iv_remap_index },
-   { 37831, Uniform4f_remap_index },
+   { 12847, Uniform3fv_remap_index },
+   { 18269, Uniform3i_remap_index },
+   { 16819, Uniform3iv_remap_index },
+   { 37839, Uniform4f_remap_index },
    {  5538, Uniform4fv_remap_index },
-   { 16259, Uniform4i_remap_index },
-   { 39398, Uniform4iv_remap_index },
+   { 16238, Uniform4i_remap_index },
+   { 39406, Uniform4iv_remap_index },
    {  3138, UniformMatrix2fv_remap_index },
    {  3507, UniformMatrix3fv_remap_index },
-   { 38732, UniformMatrix4fv_remap_index },
-   { 22257, UseProgram_remap_index },
+   { 38740, UniformMatrix4fv_remap_index },
+   { 22261, UseProgram_remap_index },
    {  8508, ValidateProgram_remap_index },
-   { 25503, VertexAttrib1d_remap_index },
-   { 13488, VertexAttrib1dv_remap_index },
-   { 25819, VertexAttrib1s_remap_index },
+   { 25507, VertexAttrib1d_remap_index },
+   { 13467, VertexAttrib1dv_remap_index },
+   { 25823, VertexAttrib1s_remap_index },
    {  1730, VertexAttrib1sv_remap_index },
-   { 30359, VertexAttrib2d_remap_index },
+   { 30389, VertexAttrib2d_remap_index },
    {  5907, VertexAttrib2dv_remap_index },
-   { 30074, VertexAttrib2s_remap_index },
-   { 12265, VertexAttrib2sv_remap_index },
+   { 30104, VertexAttrib2s_remap_index },
+   { 12244, VertexAttrib2sv_remap_index },
    {  3840, VertexAttrib3d_remap_index },
    {   485, VertexAttrib3dv_remap_index },
-   { 23045, VertexAttrib3s_remap_index },
-   { 20424, VertexAttrib3sv_remap_index },
+   { 23049, VertexAttrib3s_remap_index },
+   { 20428, VertexAttrib3sv_remap_index },
    {  4441, VertexAttrib4Nbv_remap_index },
-   { 21396, VertexAttrib4Niv_remap_index },
-   { 33033, VertexAttrib4Nsv_remap_index },
+   { 21400, VertexAttrib4Niv_remap_index },
+   { 33041, VertexAttrib4Nsv_remap_index },
    {  5396, VertexAttrib4Nub_remap_index },
-   { 35779, VertexAttrib4Nubv_remap_index },
-   { 38860, VertexAttrib4Nuiv_remap_index },
+   { 35787, VertexAttrib4Nubv_remap_index },
+   { 38868, VertexAttrib4Nuiv_remap_index },
    {  5950, VertexAttrib4Nusv_remap_index },
-   { 33527, VertexAttrib4bv_remap_index },
-   { 21823, VertexAttrib4d_remap_index },
-   { 20812, VertexAttrib4dv_remap_index },
-   { 17084, VertexAttrib4iv_remap_index },
-   { 22131, VertexAttrib4s_remap_index },
-   { 28884, VertexAttrib4sv_remap_index },
-   { 31882, VertexAttrib4ubv_remap_index },
-   { 32988, VertexAttrib4uiv_remap_index },
+   { 33535, VertexAttrib4bv_remap_index },
+   { 21827, VertexAttrib4d_remap_index },
+   { 20816, VertexAttrib4dv_remap_index },
+   { 17088, VertexAttrib4iv_remap_index },
+   { 22135, VertexAttrib4s_remap_index },
+   { 28888, VertexAttrib4sv_remap_index },
+   { 31912, VertexAttrib4ubv_remap_index },
+   { 32996, VertexAttrib4uiv_remap_index },
    {  5148, VertexAttrib4usv_remap_index },
-   { 18013, VertexAttribPointer_remap_index },
-   { 25715, UniformMatrix2x3fv_remap_index },
-   { 32179, UniformMatrix2x4fv_remap_index },
-   { 38779, UniformMatrix3x2fv_remap_index },
-   { 35921, UniformMatrix3x4fv_remap_index },
-   { 18338, UniformMatrix4x2fv_remap_index },
+   { 18017, VertexAttribPointer_remap_index },
+   { 25719, UniformMatrix2x3fv_remap_index },
+   { 32209, UniformMatrix2x4fv_remap_index },
+   { 38787, UniformMatrix3x2fv_remap_index },
+   { 35929, UniformMatrix3x4fv_remap_index },
+   { 18342, UniformMatrix4x2fv_remap_index },
    {  3585, UniformMatrix4x3fv_remap_index },
-   { 19935, BeginConditionalRender_remap_index },
+   { 19939, BeginConditionalRender_remap_index },
    {  8747, BeginTransformFeedback_remap_index },
-   { 29971, BindBufferBase_remap_index },
-   { 29624, BindBufferRange_remap_index },
+   { 30001, BindBufferBase_remap_index },
+   { 29628, BindBufferRange_remap_index },
    {  1773, BindFragDataLocation_remap_index },
    {  6345, ClampColor_remap_index },
    {  6806, ClearBufferfi_remap_index },
-   { 20493, ClearBufferfv_remap_index },
-   { 34642, ClearBufferiv_remap_index },
-   { 15290, ClearBufferuiv_remap_index },
+   { 20497, ClearBufferfv_remap_index },
+   { 34650, ClearBufferiv_remap_index },
+   { 15269, ClearBufferuiv_remap_index },
    {  8905, ColorMaski_remap_index },
-   { 28762, Disablei_remap_index },
-   { 15602, Enablei_remap_index },
+   { 28766, Disablei_remap_index },
+   { 15581, Enablei_remap_index },
    {  8056, EndConditionalRender_remap_index },
-   { 27881, EndTransformFeedback_remap_index },
-   { 16485, GetBooleani_v_remap_index },
-   { 22753, GetFragDataLocation_remap_index },
-   { 34892, GetIntegeri_v_remap_index },
-   { 23312, GetStringi_remap_index },
-   { 28978, GetTexParameterIiv_remap_index },
-   { 13282, GetTexParameterIuiv_remap_index },
+   { 27885, EndTransformFeedback_remap_index },
+   { 16464, GetBooleani_v_remap_index },
+   { 22757, GetFragDataLocation_remap_index },
+   { 34900, GetIntegeri_v_remap_index },
+   { 23316, GetStringi_remap_index },
+   { 28982, GetTexParameterIiv_remap_index },
+   { 13261, GetTexParameterIuiv_remap_index },
    {  5723, GetTransformFeedbackVarying_remap_index },
    {  9786, GetUniformuiv_remap_index },
-   { 36727, GetVertexAttribIiv_remap_index },
+   { 36735, GetVertexAttribIiv_remap_index },
    {  2862, GetVertexAttribIuiv_remap_index },
-   { 37093, IsEnabledi_remap_index },
+   { 37101, IsEnabledi_remap_index },
    { 10188, TexParameterIiv_remap_index },
-   { 36362, TexParameterIuiv_remap_index },
-   { 20359, TransformFeedbackVaryings_remap_index },
-   { 15360, Uniform1ui_remap_index },
-   { 16721, Uniform1uiv_remap_index },
-   { 23892, Uniform2ui_remap_index },
-   { 15212, Uniform2uiv_remap_index },
-   { 37151, Uniform3ui_remap_index },
-   { 29285, Uniform3uiv_remap_index },
+   { 36370, TexParameterIuiv_remap_index },
+   { 20363, TransformFeedbackVaryings_remap_index },
+   { 15339, Uniform1ui_remap_index },
+   { 16725, Uniform1uiv_remap_index },
+   { 23896, Uniform2ui_remap_index },
+   { 15191, Uniform2uiv_remap_index },
+   { 37159, Uniform3ui_remap_index },
+   { 29289, Uniform3uiv_remap_index },
    {  4589, Uniform4ui_remap_index },
-   { 25061, Uniform4uiv_remap_index },
+   { 25065, Uniform4uiv_remap_index },
    {  7142, VertexAttribI1iv_remap_index },
-   { 20047, VertexAttribI1uiv_remap_index },
+   { 20051, VertexAttribI1uiv_remap_index },
    {  4978, VertexAttribI4bv_remap_index },
    {  8604, VertexAttribI4sv_remap_index },
-   { 23665, VertexAttribI4ubv_remap_index },
+   { 23669, VertexAttribI4ubv_remap_index },
    {  1827, VertexAttribI4usv_remap_index },
-   { 36062, VertexAttribIPointer_remap_index },
-   { 34556, PrimitiveRestartIndex_remap_index },
+   { 36070, VertexAttribIPointer_remap_index },
+   { 34564, PrimitiveRestartIndex_remap_index },
    {   344, TexBuffer_remap_index },
    {  6141, FramebufferTexture_remap_index },
-   { 30688, GetBufferParameteri64v_remap_index },
-   { 11789, GetInteger64i_v_remap_index },
+   { 30718, GetBufferParameteri64v_remap_index },
+   { 11768, GetInteger64i_v_remap_index },
    {  3709, VertexAttribDivisor_remap_index },
-   { 27214, BindProgramARB_remap_index },
-   { 31409, DeleteProgramsARB_remap_index },
-   { 15766, GenProgramsARB_remap_index },
+   { 27218, BindProgramARB_remap_index },
+   { 31439, DeleteProgramsARB_remap_index },
+   { 15745, GenProgramsARB_remap_index },
    { 11424, GetProgramEnvParameterdvARB_remap_index },
-   { 27344, GetProgramEnvParameterfvARB_remap_index },
-   { 32019, GetProgramLocalParameterdvARB_remap_index },
+   { 27348, GetProgramEnvParameterfvARB_remap_index },
+   { 32049, GetProgramLocalParameterdvARB_remap_index },
    {  9702, GetProgramLocalParameterfvARB_remap_index },
-   { 21468, GetProgramStringARB_remap_index },
-   { 32307, GetProgramivARB_remap_index },
-   { 32956, IsProgramARB_remap_index },
-   { 22639, ProgramEnvParameter4dARB_remap_index },
-   { 29212, ProgramEnvParameter4dvARB_remap_index },
-   { 19424, ProgramEnvParameter4fARB_remap_index },
+   { 21472, GetProgramStringARB_remap_index },
+   { 32337, GetProgramivARB_remap_index },
+   { 32964, IsProgramARB_remap_index },
+   { 22643, ProgramEnvParameter4dARB_remap_index },
+   { 29216, ProgramEnvParameter4dvARB_remap_index },
+   { 19428, ProgramEnvParameter4fARB_remap_index },
    { 10613, ProgramEnvParameter4fvARB_remap_index },
    {  4486, ProgramLocalParameter4dARB_remap_index },
-   { 14834, ProgramLocalParameter4dvARB_remap_index },
-   { 34663, ProgramLocalParameter4fARB_remap_index },
-   { 30138, ProgramLocalParameter4fvARB_remap_index },
-   { 33118, ProgramStringARB_remap_index },
+   { 14813, ProgramLocalParameter4dvARB_remap_index },
+   { 34671, ProgramLocalParameter4fARB_remap_index },
+   { 30168, ProgramLocalParameter4fvARB_remap_index },
+   { 33126, ProgramStringARB_remap_index },
    {  4784, VertexAttrib1fARB_remap_index },
-   { 34011, VertexAttrib1fvARB_remap_index },
+   { 34019, VertexAttrib1fvARB_remap_index },
    {  1371, VertexAttrib2fARB_remap_index },
    {  9629, VertexAttrib2fvARB_remap_index },
    {  1487, VertexAttrib3fARB_remap_index },
-   { 26027, VertexAttrib3fvARB_remap_index },
-   { 13078, VertexAttrib4fARB_remap_index },
-   { 13445, VertexAttrib4fvARB_remap_index },
+   { 26031, VertexAttrib3fvARB_remap_index },
+   { 13057, VertexAttrib4fARB_remap_index },
+   { 13424, VertexAttrib4fvARB_remap_index },
    {  9898, AttachObjectARB_remap_index },
    {  3480, CreateProgramObjectARB_remap_index },
-   { 36556, CreateShaderObjectARB_remap_index },
-   { 16431, DeleteObjectARB_remap_index },
-   { 27839, DetachObjectARB_remap_index },
+   { 36564, CreateShaderObjectARB_remap_index },
+   { 16410, DeleteObjectARB_remap_index },
+   { 27843, DetachObjectARB_remap_index },
    { 11037, GetAttachedObjectsARB_remap_index },
    { 11312, GetHandleARB_remap_index },
-   { 38398, GetInfoLogARB_remap_index },
-   { 37577, GetObjectParameterfvARB_remap_index },
-   { 31809, GetObjectParameterivARB_remap_index },
-   { 20909, DrawArraysInstancedARB_remap_index },
+   { 38406, GetInfoLogARB_remap_index },
+   { 37585, GetObjectParameterfvARB_remap_index },
+   { 31839, GetObjectParameterivARB_remap_index },
+   { 20913, DrawArraysInstancedARB_remap_index },
    {  7926, DrawElementsInstancedARB_remap_index },
    { 11484, BindFramebuffer_remap_index },
-   { 32423, BindRenderbuffer_remap_index },
-   { 36408, BlitFramebuffer_remap_index },
-   { 26959, CheckFramebufferStatus_remap_index },
-   { 32664, DeleteFramebuffers_remap_index },
+   { 32453, BindRenderbuffer_remap_index },
+   { 36416, BlitFramebuffer_remap_index },
+   { 26963, CheckFramebufferStatus_remap_index },
+   { 32672, DeleteFramebuffers_remap_index },
    {  4857, DeleteRenderbuffers_remap_index },
-   { 32866, FramebufferRenderbuffer_remap_index },
+   { 32874, FramebufferRenderbuffer_remap_index },
    {  1315, FramebufferTexture1D_remap_index },
-   { 26747, FramebufferTexture2D_remap_index },
-   { 18492, FramebufferTexture3D_remap_index },
-   { 14133, FramebufferTextureLayer_remap_index },
-   { 24930, GenFramebuffers_remap_index },
-   { 38635, GenRenderbuffers_remap_index },
-   { 29321, GenerateMipmap_remap_index },
-   { 19524, GetFramebufferAttachmentParameteriv_remap_index },
-   { 38450, GetRenderbufferParameteriv_remap_index },
-   { 25097, IsFramebuffer_remap_index },
-   { 13888, IsRenderbuffer_remap_index },
+   { 26751, FramebufferTexture2D_remap_index },
+   { 18496, FramebufferTexture3D_remap_index },
+   { 14112, FramebufferTextureLayer_remap_index },
+   { 24934, GenFramebuffers_remap_index },
+   { 38643, GenRenderbuffers_remap_index },
+   { 29325, GenerateMipmap_remap_index },
+   { 19528, GetFramebufferAttachmentParameteriv_remap_index },
+   { 38458, GetRenderbufferParameteriv_remap_index },
+   { 25101, IsFramebuffer_remap_index },
+   { 13867, IsRenderbuffer_remap_index },
    {  2545, RenderbufferStorage_remap_index },
-   { 14939, RenderbufferStorageMultisample_remap_index },
-   { 29936, FramebufferTextureFaceARB_remap_index },
-   { 19321, FlushMappedBufferRange_remap_index },
-   { 34176, MapBufferRange_remap_index },
-   { 18622, BindVertexArray_remap_index },
-   { 24053, DeleteVertexArrays_remap_index },
-   { 23730, GenVertexArrays_remap_index },
-   { 20563, IsVertexArray_remap_index },
-   { 13334, GetActiveUniformBlockName_remap_index },
+   { 14918, RenderbufferStorageMultisample_remap_index },
+   { 29966, FramebufferTextureFaceARB_remap_index },
+   { 19325, FlushMappedBufferRange_remap_index },
+   { 34184, MapBufferRange_remap_index },
+   { 18626, BindVertexArray_remap_index },
+   { 24057, DeleteVertexArrays_remap_index },
+   { 23734, GenVertexArrays_remap_index },
+   { 20567, IsVertexArray_remap_index },
+   { 13313, GetActiveUniformBlockName_remap_index },
    {  6242, GetActiveUniformBlockiv_remap_index },
-   { 31114, GetActiveUniformName_remap_index },
-   { 12159, GetActiveUniformsiv_remap_index },
-   { 31603, GetUniformBlockIndex_remap_index },
-   { 39027, GetUniformIndices_remap_index },
+   { 31144, GetActiveUniformName_remap_index },
+   { 12138, GetActiveUniformsiv_remap_index },
+   { 31633, GetUniformBlockIndex_remap_index },
+   { 39035, GetUniformIndices_remap_index },
    {  5839, UniformBlockBinding_remap_index },
-   { 35601, CopyBufferSubData_remap_index },
-   { 36777, ClientWaitSync_remap_index },
+   { 35609, CopyBufferSubData_remap_index },
+   { 36785, ClientWaitSync_remap_index },
    {  2778, DeleteSync_remap_index },
    {  8803, FenceSync_remap_index },
-   { 17239, GetInteger64v_remap_index },
-   { 26121, GetSynciv_remap_index },
-   { 34528, IsSync_remap_index },
-   { 39202, WaitSync_remap_index },
-   { 35485, DrawElementsBaseVertex_remap_index },
-   { 21520, DrawElementsInstancedBaseVertex_remap_index },
-   { 36023, DrawRangeElementsBaseVertex_remap_index },
-   { 30612, MultiDrawElementsBaseVertex_remap_index },
-   { 18859, ProvokingVertex_remap_index },
-   { 20622, GetMultisamplefv_remap_index },
+   { 17243, GetInteger64v_remap_index },
+   { 26125, GetSynciv_remap_index },
+   { 34536, IsSync_remap_index },
+   { 39210, WaitSync_remap_index },
+   { 35493, DrawElementsBaseVertex_remap_index },
+   { 21524, DrawElementsInstancedBaseVertex_remap_index },
+   { 36031, DrawRangeElementsBaseVertex_remap_index },
+   { 30642, MultiDrawElementsBaseVertex_remap_index },
+   { 18863, ProvokingVertex_remap_index },
+   { 20626, GetMultisamplefv_remap_index },
    {  5997, SampleMaski_remap_index },
    {  7408, TexImage2DMultisample_remap_index },
-   { 29394, TexImage3DMultisample_remap_index },
-   { 29732, BlendEquationSeparateiARB_remap_index },
-   { 20703, BlendEquationiARB_remap_index },
-   { 14365, BlendFuncSeparateiARB_remap_index },
+   { 29398, TexImage3DMultisample_remap_index },
+   { 29736, BlendEquationSeparateiARB_remap_index },
+   { 20707, BlendEquationiARB_remap_index },
+   { 14344, BlendFuncSeparateiARB_remap_index },
    { 11381, BlendFunciARB_remap_index },
    {  6485, BindFragDataLocationIndexed_remap_index },
-   { 14526, GetFragDataIndex_remap_index },
+   { 14505, GetFragDataIndex_remap_index },
    {  9768, BindSampler_remap_index },
    {  4763, DeleteSamplers_remap_index },
    {  9501, GenSamplers_remap_index },
-   { 16198, GetSamplerParameterIiv_remap_index },
-   { 22175, GetSamplerParameterIuiv_remap_index },
+   { 16177, GetSamplerParameterIiv_remap_index },
+   { 22179, GetSamplerParameterIuiv_remap_index },
    {  5878, GetSamplerParameterfv_remap_index },
-   { 29595, GetSamplerParameteriv_remap_index },
-   { 16228, IsSampler_remap_index },
-   { 18575, SamplerParameterIiv_remap_index },
+   { 29599, GetSamplerParameteriv_remap_index },
+   { 16207, IsSampler_remap_index },
+   { 18579, SamplerParameterIiv_remap_index },
    {  6058, SamplerParameterIuiv_remap_index },
-   { 25767, SamplerParameterf_remap_index },
-   { 18901, SamplerParameterfv_remap_index },
-   { 25742, SamplerParameteri_remap_index },
-   { 16849, SamplerParameteriv_remap_index },
+   { 25771, SamplerParameterf_remap_index },
+   { 18905, SamplerParameterfv_remap_index },
+   { 25746, SamplerParameteri_remap_index },
+   { 16853, SamplerParameteriv_remap_index },
    {  6192, GetQueryObjecti64v_remap_index },
    {   292, GetQueryObjectui64v_remap_index },
    {  7610, QueryCounter_remap_index },
-   { 16293, ColorP3ui_remap_index },
-   { 36345, ColorP3uiv_remap_index },
-   { 23829, ColorP4ui_remap_index },
-   { 15248, ColorP4uiv_remap_index },
+   { 16272, ColorP3ui_remap_index },
+   { 36353, ColorP3uiv_remap_index },
+   { 23833, ColorP4ui_remap_index },
+   { 15227, ColorP4uiv_remap_index },
    { 11012, MultiTexCoordP1ui_remap_index },
-   { 14339, MultiTexCoordP1uiv_remap_index },
-   { 20200, MultiTexCoordP2ui_remap_index },
-   { 14458, MultiTexCoordP2uiv_remap_index },
-   { 15803, MultiTexCoordP3ui_remap_index },
-   { 12014, MultiTexCoordP3uiv_remap_index },
-   { 25376, MultiTexCoordP4ui_remap_index },
-   { 15428, MultiTexCoordP4uiv_remap_index },
-   { 11963, NormalP3ui_remap_index },
-   { 21993, NormalP3uiv_remap_index },
-   { 28644, SecondaryColorP3ui_remap_index },
-   { 22011, SecondaryColorP3uiv_remap_index },
+   { 14318, MultiTexCoordP1uiv_remap_index },
+   { 20204, MultiTexCoordP2ui_remap_index },
+   { 14437, MultiTexCoordP2uiv_remap_index },
+   { 15782, MultiTexCoordP3ui_remap_index },
+   { 11993, MultiTexCoordP3uiv_remap_index },
+   { 25380, MultiTexCoordP4ui_remap_index },
+   { 15407, MultiTexCoordP4uiv_remap_index },
+   { 11942, NormalP3ui_remap_index },
+   { 21997, NormalP3uiv_remap_index },
+   { 28648, SecondaryColorP3ui_remap_index },
+   { 22015, SecondaryColorP3uiv_remap_index },
    {   773, TexCoordP1ui_remap_index },
    {  2413, TexCoordP1uiv_remap_index },
-   { 16702, TexCoordP2ui_remap_index },
-   { 12665, TexCoordP2uiv_remap_index },
-   { 14298, TexCoordP3ui_remap_index },
-   { 24187, TexCoordP3uiv_remap_index },
+   { 16681, TexCoordP2ui_remap_index },
+   { 12644, TexCoordP2uiv_remap_index },
+   { 14277, TexCoordP3ui_remap_index },
+   { 24191, TexCoordP3uiv_remap_index },
    {  1675, TexCoordP4ui_remap_index },
    {  6683, TexCoordP4uiv_remap_index },
-   { 14670, VertexAttribP1ui_remap_index },
-   { 15097, VertexAttribP1uiv_remap_index },
+   { 14649, VertexAttribP1ui_remap_index },
+   { 15076, VertexAttribP1uiv_remap_index },
    {  9476, VertexAttribP2ui_remap_index },
-   { 33501, VertexAttribP2uiv_remap_index },
+   { 33509, VertexAttribP2uiv_remap_index },
    {  5487, VertexAttribP3ui_remap_index },
-   { 30539, VertexAttribP3uiv_remap_index },
-   { 16139, VertexAttribP4ui_remap_index },
-   { 18102, VertexAttribP4uiv_remap_index },
+   { 30569, VertexAttribP3uiv_remap_index },
+   { 16118, VertexAttribP4ui_remap_index },
+   { 18106, VertexAttribP4uiv_remap_index },
    {  6041, VertexP2ui_remap_index },
-   { 36166, VertexP2uiv_remap_index },
+   { 36174, VertexP2uiv_remap_index },
    {  3338, VertexP3ui_remap_index },
-   { 23027, VertexP3uiv_remap_index },
+   { 23031, VertexP3uiv_remap_index },
    { 10995, VertexP4ui_remap_index },
-   { 37988, VertexP4uiv_remap_index },
+   { 37996, VertexP4uiv_remap_index },
    {  6550, BindTransformFeedback_remap_index },
-   { 11839, DeleteTransformFeedbacks_remap_index },
+   { 11818, DeleteTransformFeedbacks_remap_index },
    {  7898, DrawTransformFeedback_remap_index },
    { 11202, GenTransformFeedbacks_remap_index },
-   { 34974, IsTransformFeedback_remap_index },
-   { 30235, PauseTransformFeedback_remap_index },
-   { 35251, ResumeTransformFeedback_remap_index },
+   { 34982, IsTransformFeedback_remap_index },
+   { 30265, PauseTransformFeedback_remap_index },
+   { 35259, ResumeTransformFeedback_remap_index },
    {  2433, BeginQueryIndexed_remap_index },
-   { 27043, DrawTransformFeedbackStream_remap_index },
-   { 17366, EndQueryIndexed_remap_index },
+   { 27047, DrawTransformFeedbackStream_remap_index },
+   { 17370, EndQueryIndexed_remap_index },
    {   228, GetQueryIndexediv_remap_index },
-   { 31681, ClearDepthf_remap_index },
+   { 31711, ClearDepthf_remap_index },
    {  8207, DepthRangef_remap_index },
-   { 16452, GetShaderPrecisionFormat_remap_index },
-   { 11566, ReleaseShaderCompiler_remap_index },
-   { 12643, ShaderBinary_remap_index },
-   { 18691, GetProgramBinary_remap_index },
+   { 16431, GetShaderPrecisionFormat_remap_index },
+   { 11545, ReleaseShaderCompiler_remap_index },
+   { 12622, ShaderBinary_remap_index },
+   { 18695, GetProgramBinary_remap_index },
    {  4523, ProgramBinary_remap_index },
    {  5100, ProgramParameteri_remap_index },
    {  1102, DebugMessageCallbackARB_remap_index },
    { 11330, DebugMessageControlARB_remap_index },
-   { 38336, DebugMessageInsertARB_remap_index },
+   { 38344, DebugMessageInsertARB_remap_index },
    {  3029, GetDebugMessageLogARB_remap_index },
-   { 33445, GetGraphicsResetStatusARB_remap_index },
-   { 28483, GetnColorTableARB_remap_index },
+   { 33453, GetGraphicsResetStatusARB_remap_index },
+   { 28487, GetnColorTableARB_remap_index },
    {  9550, GetnCompressedTexImageARB_remap_index },
    {  4223, GetnConvolutionFilterARB_remap_index },
-   { 17794, GetnHistogramARB_remap_index },
-   { 27251, GetnMapdvARB_remap_index },
-   { 33874, GetnMapfvARB_remap_index },
+   { 17798, GetnHistogramARB_remap_index },
+   { 27255, GetnMapdvARB_remap_index },
+   { 33882, GetnMapfvARB_remap_index },
    {  2002, GetnMapivARB_remap_index },
-   { 19874, GetnMinmaxARB_remap_index },
-   { 13552, GetnPixelMapfvARB_remap_index },
-   { 22105, GetnPixelMapuivARB_remap_index },
-   { 34502, GetnPixelMapusvARB_remap_index },
+   { 19878, GetnMinmaxARB_remap_index },
+   { 13531, GetnPixelMapfvARB_remap_index },
+   { 22109, GetnPixelMapuivARB_remap_index },
+   { 34510, GetnPixelMapusvARB_remap_index },
    {  1024, GetnPolygonStippleARB_remap_index },
-   { 24533, GetnSeparableFilterARB_remap_index },
-   { 38267, GetnTexImageARB_remap_index },
-   { 21495, GetnUniformdvARB_remap_index },
+   { 24537, GetnSeparableFilterARB_remap_index },
+   { 38275, GetnTexImageARB_remap_index },
+   { 21499, GetnUniformdvARB_remap_index },
    {  8834, GetnUniformfvARB_remap_index },
    { 11459, GetnUniformivARB_remap_index },
-   { 25983, GetnUniformuivARB_remap_index },
+   { 25987, GetnUniformuivARB_remap_index },
    {  3185, ReadnPixelsARB_remap_index },
-   { 21894, DrawArraysInstancedBaseInstance_remap_index },
-   { 34414, DrawElementsInstancedBaseInstance_remap_index },
+   { 21898, DrawArraysInstancedBaseInstance_remap_index },
+   { 34422, DrawElementsInstancedBaseInstance_remap_index },
    {  9299, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
    {  6828, DrawTransformFeedbackInstanced_remap_index },
    {  9584, DrawTransformFeedbackStreamInstanced_remap_index },
-   { 34785, GetInternalformativ_remap_index },
+   { 34793, GetInternalformativ_remap_index },
    {   957, TexStorage1D_remap_index },
    {  5040, TexStorage2D_remap_index },
-   { 18315, TexStorage3D_remap_index },
+   { 18319, TexStorage3D_remap_index },
    {  5341, TextureStorage1DEXT_remap_index },
    {  6578, TextureStorage2DEXT_remap_index },
    {  1284, TextureStorage3DEXT_remap_index },
-   { 25622, TexBufferRange_remap_index },
-   { 18068, TexStorage2DMultisample_remap_index },
-   { 22804, TexStorage3DMultisample_remap_index },
-   { 24568, InvalidateBufferData_remap_index },
-   { 18234, InvalidateBufferSubData_remap_index },
-   { 37186, InvalidateFramebuffer_remap_index },
-   { 23793, InvalidateSubFramebuffer_remap_index },
+   { 25626, TexBufferRange_remap_index },
+   { 18072, TexStorage2DMultisample_remap_index },
+   { 22808, TexStorage3DMultisample_remap_index },
+   { 24572, InvalidateBufferData_remap_index },
+   { 18238, InvalidateBufferSubData_remap_index },
+   { 37194, InvalidateFramebuffer_remap_index },
+   { 23797, InvalidateSubFramebuffer_remap_index },
    {  4564, InvalidateTexImage_remap_index },
-   { 13184, InvalidateTexSubImage_remap_index },
+   { 13163, InvalidateTexSubImage_remap_index },
    {  6866, PolygonOffsetEXT_remap_index },
-   { 14265, DrawTexfOES_remap_index },
+   { 14244, DrawTexfOES_remap_index },
    { 11363, DrawTexfvOES_remap_index },
    {  3300, DrawTexiOES_remap_index },
-   { 21335, DrawTexivOES_remap_index },
-   { 23871, DrawTexsOES_remap_index },
-   { 22063, DrawTexsvOES_remap_index },
-   { 12244, DrawTexxOES_remap_index },
-   { 12341, DrawTexxvOES_remap_index },
+   { 21339, DrawTexivOES_remap_index },
+   { 23875, DrawTexsOES_remap_index },
+   { 22067, DrawTexsvOES_remap_index },
+   { 12223, DrawTexxOES_remap_index },
+   { 12320, DrawTexxvOES_remap_index },
    {  2327, PointSizePointerOES_remap_index },
-   { 12621, QueryMatrixxOES_remap_index },
-   { 29847, SampleMaskSGIS_remap_index },
-   { 21062, SamplePatternSGIS_remap_index },
-   { 22979, ColorPointerEXT_remap_index },
-   { 20537, EdgeFlagPointerEXT_remap_index },
+   { 12600, QueryMatrixxOES_remap_index },
+   { 29851, SampleMaskSGIS_remap_index },
+   { 21066, SamplePatternSGIS_remap_index },
+   { 22983, ColorPointerEXT_remap_index },
+   { 20541, EdgeFlagPointerEXT_remap_index },
    {  7118, IndexPointerEXT_remap_index },
    {  7685, NormalPointerEXT_remap_index },
-   { 17862, TexCoordPointerEXT_remap_index },
+   { 17866, TexCoordPointerEXT_remap_index },
    {  8550, VertexPointerEXT_remap_index },
    {  6521, DiscardFramebufferEXT_remap_index },
-   { 37681, LockArraysEXT_remap_index },
-   { 25602, UnlockArraysEXT_remap_index },
-   { 32737, SecondaryColor3fEXT_remap_index },
-   { 21225, SecondaryColor3fvEXT_remap_index },
-   { 24353, MultiDrawElementsEXT_remap_index },
+   { 37689, LockArraysEXT_remap_index },
+   { 25606, UnlockArraysEXT_remap_index },
+   { 32745, SecondaryColor3fEXT_remap_index },
+   { 21229, SecondaryColor3fvEXT_remap_index },
+   { 24357, MultiDrawElementsEXT_remap_index },
    {  5603, FogCoordfEXT_remap_index },
-   { 31630, FogCoordfvEXT_remap_index },
-   { 14317, ResizeBuffersMESA_remap_index },
-   { 12748, WindowPos4dMESA_remap_index },
-   { 39246, WindowPos4dvMESA_remap_index },
-   { 15946, WindowPos4fMESA_remap_index },
-   { 36252, WindowPos4fvMESA_remap_index },
-   { 35755, WindowPos4iMESA_remap_index },
-   { 14111, WindowPos4ivMESA_remap_index },
-   { 22081, WindowPos4sMESA_remap_index },
+   { 31660, FogCoordfvEXT_remap_index },
+   { 14296, ResizeBuffersMESA_remap_index },
+   { 12727, WindowPos4dMESA_remap_index },
+   { 39254, WindowPos4dvMESA_remap_index },
+   { 15925, WindowPos4fMESA_remap_index },
+   { 36260, WindowPos4fvMESA_remap_index },
+   { 35763, WindowPos4iMESA_remap_index },
+   { 14090, WindowPos4ivMESA_remap_index },
+   { 22085, WindowPos4sMESA_remap_index },
    {  3458, WindowPos4svMESA_remap_index },
-   { 22374, MultiModeDrawArraysIBM_remap_index },
-   { 33963, MultiModeDrawElementsIBM_remap_index },
-   { 37371, AreProgramsResidentNV_remap_index },
-   { 24675, ExecuteProgramNV_remap_index },
-   { 19025, GetProgramParameterdvNV_remap_index },
-   { 12127, GetProgramParameterfvNV_remap_index },
-   { 30513, GetProgramStringNV_remap_index },
-   { 28211, GetProgramivNV_remap_index },
-   { 27379, GetTrackMatrixivNV_remap_index },
-   { 11812, GetVertexAttribdvNV_remap_index },
-   { 21867, GetVertexAttribfvNV_remap_index },
-   { 21441, GetVertexAttribivNV_remap_index },
+   { 22378, MultiModeDrawArraysIBM_remap_index },
+   { 33971, MultiModeDrawElementsIBM_remap_index },
+   { 37379, AreProgramsResidentNV_remap_index },
+   { 24679, ExecuteProgramNV_remap_index },
+   { 19029, GetProgramParameterdvNV_remap_index },
+   { 12106, GetProgramParameterfvNV_remap_index },
+   { 30543, GetProgramStringNV_remap_index },
+   { 28215, GetProgramivNV_remap_index },
+   { 27383, GetTrackMatrixivNV_remap_index },
+   { 11791, GetVertexAttribdvNV_remap_index },
+   { 21871, GetVertexAttribfvNV_remap_index },
+   { 21445, GetVertexAttribivNV_remap_index },
    { 10961, LoadProgramNV_remap_index },
-   { 32490, ProgramParameters4dvNV_remap_index },
-   { 34090, ProgramParameters4fvNV_remap_index },
-   { 24155, RequestResidentProgramsNV_remap_index },
+   { 32498, ProgramParameters4dvNV_remap_index },
+   { 34098, ProgramParameters4fvNV_remap_index },
+   { 24159, RequestResidentProgramsNV_remap_index },
    {   463, TrackMatrixNV_remap_index },
-   { 12526, VertexAttrib1dNV_remap_index },
-   { 15312, VertexAttrib1dvNV_remap_index },
-   { 29884, VertexAttrib1fNV_remap_index },
-   { 15336, VertexAttrib1fvNV_remap_index },
-   { 36309, VertexAttrib1sNV_remap_index },
-   { 26140, VertexAttrib1svNV_remap_index },
-   { 36835, VertexAttrib2dNV_remap_index },
-   { 22233, VertexAttrib2dvNV_remap_index },
-   { 23612, VertexAttrib2fNV_remap_index },
-   { 14810, VertexAttrib2fvNV_remap_index },
+   { 12505, VertexAttrib1dNV_remap_index },
+   { 15291, VertexAttrib1dvNV_remap_index },
+   { 29914, VertexAttrib1fNV_remap_index },
+   { 15315, VertexAttrib1fvNV_remap_index },
+   { 36317, VertexAttrib1sNV_remap_index },
+   { 26144, VertexAttrib1svNV_remap_index },
+   { 36843, VertexAttrib2dNV_remap_index },
+   { 22237, VertexAttrib2dvNV_remap_index },
+   { 23616, VertexAttrib2fNV_remap_index },
+   { 14789, VertexAttrib2fvNV_remap_index },
    {  7456, VertexAttrib2sNV_remap_index },
-   { 21935, VertexAttrib2svNV_remap_index },
-   { 12959, VertexAttrib3dNV_remap_index },
-   { 37553, VertexAttrib3dvNV_remap_index },
-   { 19057, VertexAttrib3fNV_remap_index },
-   { 28510, VertexAttrib3fvNV_remap_index },
-   { 27272, VertexAttrib3sNV_remap_index },
-   { 27406, VertexAttrib3svNV_remap_index },
-   { 33937, VertexAttrib4dNV_remap_index },
-   { 12549, VertexAttrib4dvNV_remap_index },
+   { 21939, VertexAttrib2svNV_remap_index },
+   { 12938, VertexAttrib3dNV_remap_index },
+   { 37561, VertexAttrib3dvNV_remap_index },
+   { 19061, VertexAttrib3fNV_remap_index },
+   { 28514, VertexAttrib3fvNV_remap_index },
+   { 27276, VertexAttrib3sNV_remap_index },
+   { 27410, VertexAttrib3svNV_remap_index },
+   { 33945, VertexAttrib4dNV_remap_index },
+   { 12528, VertexAttrib4dvNV_remap_index },
    {  5270, VertexAttrib4fNV_remap_index },
-   { 22922, VertexAttrib4fvNV_remap_index },
-   { 31024, VertexAttrib4sNV_remap_index },
+   { 22926, VertexAttrib4fvNV_remap_index },
+   { 31054, VertexAttrib4sNV_remap_index },
    {  1132, VertexAttrib4svNV_remap_index },
    {  6274, VertexAttrib4ubNV_remap_index },
    {   579, VertexAttrib4ubvNV_remap_index },
-   { 24899, VertexAttribPointerNV_remap_index },
+   { 24903, VertexAttribPointerNV_remap_index },
    {  2200, VertexAttribs1dvNV_remap_index },
-   { 22037, VertexAttribs1fvNV_remap_index },
-   { 23845, VertexAttribs1svNV_remap_index },
-   { 12040, VertexAttribs2dvNV_remap_index },
-   { 35179, VertexAttribs2fvNV_remap_index },
+   { 22041, VertexAttribs1fvNV_remap_index },
+   { 23849, VertexAttribs1svNV_remap_index },
+   { 12019, VertexAttribs2dvNV_remap_index },
+   { 35187, VertexAttribs2fvNV_remap_index },
    {  4625, VertexAttribs2svNV_remap_index },
    {  6703, VertexAttribs3dvNV_remap_index },
    { 11258, VertexAttribs3fvNV_remap_index },
-   { 11988, VertexAttribs3svNV_remap_index },
-   { 33570, VertexAttribs4dvNV_remap_index },
+   { 11967, VertexAttribs3svNV_remap_index },
+   { 33578, VertexAttribs4dvNV_remap_index },
    {  6729, VertexAttribs4fvNV_remap_index },
-   { 38609, VertexAttribs4svNV_remap_index },
-   { 34814, VertexAttribs4ubvNV_remap_index },
-   { 27183, GetTexBumpParameterfvATI_remap_index },
-   { 39053, GetTexBumpParameterivATI_remap_index },
-   { 21596, TexBumpParameterfvATI_remap_index },
-   { 23972, TexBumpParameterivATI_remap_index },
-   { 17746, AlphaFragmentOp1ATI_remap_index },
-   { 29799, AlphaFragmentOp2ATI_remap_index },
-   { 28426, AlphaFragmentOp3ATI_remap_index },
-   { 15919, BeginFragmentShaderATI_remap_index },
-   { 24482, BindFragmentShaderATI_remap_index },
+   { 38617, VertexAttribs4svNV_remap_index },
+   { 34822, VertexAttribs4ubvNV_remap_index },
+   { 27187, GetTexBumpParameterfvATI_remap_index },
+   { 39061, GetTexBumpParameterivATI_remap_index },
+   { 21600, TexBumpParameterfvATI_remap_index },
+   { 23976, TexBumpParameterivATI_remap_index },
+   { 17750, AlphaFragmentOp1ATI_remap_index },
+   { 29803, AlphaFragmentOp2ATI_remap_index },
+   { 28430, AlphaFragmentOp3ATI_remap_index },
+   { 15898, BeginFragmentShaderATI_remap_index },
+   { 24486, BindFragmentShaderATI_remap_index },
    {  7214, ColorFragmentOp1ATI_remap_index },
    {  7329, ColorFragmentOp2ATI_remap_index },
-   { 37286, ColorFragmentOp3ATI_remap_index },
+   { 37294, ColorFragmentOp3ATI_remap_index },
    {  7036, DeleteFragmentShaderATI_remap_index },
-   { 39352, EndFragmentShaderATI_remap_index },
-   { 27111, GenFragmentShadersATI_remap_index },
-   { 29553, PassTexCoordATI_remap_index },
+   { 39360, EndFragmentShaderATI_remap_index },
+   { 27115, GenFragmentShadersATI_remap_index },
+   { 29557, PassTexCoordATI_remap_index },
    {  8488, SampleMapATI_remap_index },
-   { 31480, SetFragmentShaderConstantATI_remap_index },
-   { 33766, ActiveStencilFaceEXT_remap_index },
-   { 31993, BindVertexArrayAPPLE_remap_index },
-   { 19482, GenVertexArraysAPPLE_remap_index },
+   { 31510, SetFragmentShaderConstantATI_remap_index },
+   { 33774, ActiveStencilFaceEXT_remap_index },
+   { 32023, BindVertexArrayAPPLE_remap_index },
+   { 19486, GenVertexArraysAPPLE_remap_index },
    {   620, GetProgramNamedParameterdvNV_remap_index },
    {  3956, GetProgramNamedParameterfvNV_remap_index },
-   { 31258, ProgramNamedParameter4dNV_remap_index },
-   { 16530, ProgramNamedParameter4dvNV_remap_index },
+   { 31288, ProgramNamedParameter4dNV_remap_index },
+   { 16509, ProgramNamedParameter4dvNV_remap_index },
    { 10502, ProgramNamedParameter4fNV_remap_index },
-   { 13410, ProgramNamedParameter4fvNV_remap_index },
-   { 20514, PrimitiveRestartNV_remap_index },
-   { 17706, GetTexGenxvOES_remap_index },
-   { 13698, TexGenxOES_remap_index },
-   { 32116, TexGenxvOES_remap_index },
-   { 28190, DepthBoundsEXT_remap_index },
-   { 16309, BufferParameteriAPPLE_remap_index },
-   { 22555, FlushMappedBufferRangeAPPLE_remap_index },
-   { 21353, VertexAttribI1iEXT_remap_index },
+   { 13389, ProgramNamedParameter4fvNV_remap_index },
+   { 20518, PrimitiveRestartNV_remap_index },
+   { 17710, GetTexGenxvOES_remap_index },
+   { 13677, TexGenxOES_remap_index },
+   { 32146, TexGenxvOES_remap_index },
+   { 28194, DepthBoundsEXT_remap_index },
+   { 16700, BindFramebufferEXT_remap_index },
+   { 29888, BindRenderbufferEXT_remap_index },
+   { 16288, BufferParameteriAPPLE_remap_index },
+   { 22559, FlushMappedBufferRangeAPPLE_remap_index },
+   { 21357, VertexAttribI1iEXT_remap_index },
    {  2685, VertexAttribI1uiEXT_remap_index },
-   { 33332, VertexAttribI2iEXT_remap_index },
-   { 27703, VertexAttribI2ivEXT_remap_index },
-   { 13821, VertexAttribI2uiEXT_remap_index },
-   { 27297, VertexAttribI2uivEXT_remap_index },
-   { 30803, VertexAttribI3iEXT_remap_index },
-   { 35978, VertexAttribI3ivEXT_remap_index },
+   { 33340, VertexAttribI2iEXT_remap_index },
+   { 27707, VertexAttribI2ivEXT_remap_index },
+   { 13800, VertexAttribI2uiEXT_remap_index },
+   { 27301, VertexAttribI2uivEXT_remap_index },
+   { 30833, VertexAttribI3iEXT_remap_index },
+   { 35986, VertexAttribI3ivEXT_remap_index },
    {  3662, VertexAttribI3uiEXT_remap_index },
-   { 35874, VertexAttribI3uivEXT_remap_index },
-   { 23926, VertexAttribI4iEXT_remap_index },
-   { 30190, VertexAttribI4ivEXT_remap_index },
+   { 35882, VertexAttribI3uivEXT_remap_index },
+   { 23930, VertexAttribI4iEXT_remap_index },
+   { 30220, VertexAttribI4ivEXT_remap_index },
    {    54, VertexAttribI4uiEXT_remap_index },
    {  6889, VertexAttribI4uivEXT_remap_index },
-   { 37761, ClearColorIiEXT_remap_index },
+   { 37769, ClearColorIiEXT_remap_index },
    {  3815, ClearColorIuiEXT_remap_index },
    {  9826, BindBufferOffsetEXT_remap_index },
-   { 13234, GetObjectParameterivAPPLE_remap_index },
-   { 36917, ObjectPurgeableAPPLE_remap_index },
+   { 13213, GetObjectParameterivAPPLE_remap_index },
+   { 36925, ObjectPurgeableAPPLE_remap_index },
    {  7283, ObjectUnpurgeableAPPLE_remap_index },
-   { 20225, ActiveProgramEXT_remap_index },
+   { 20229, ActiveProgramEXT_remap_index },
    {  1973, CreateShaderProgramEXT_remap_index },
-   { 33475, UseShaderProgramEXT_remap_index },
-   { 38136, TextureBarrierNV_remap_index },
-   { 33826, StencilFuncSeparateATI_remap_index },
-   { 21144, ProgramEnvParameters4fvEXT_remap_index },
-   { 19898, ProgramLocalParameters4fvEXT_remap_index },
-   { 27660, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 13788, EGLImageTargetTexture2DOES_remap_index },
-   { 27519, AlphaFuncx_remap_index },
-   { 20163, ClearColorx_remap_index },
-   { 25027, ClearDepthx_remap_index },
+   { 33483, UseShaderProgramEXT_remap_index },
+   { 38144, TextureBarrierNV_remap_index },
+   { 33834, StencilFuncSeparateATI_remap_index },
+   { 21148, ProgramEnvParameters4fvEXT_remap_index },
+   { 19902, ProgramLocalParameters4fvEXT_remap_index },
+   { 27664, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 13767, EGLImageTargetTexture2DOES_remap_index },
+   { 27523, AlphaFuncx_remap_index },
+   { 20167, ClearColorx_remap_index },
+   { 25031, ClearDepthx_remap_index },
    { 10285, Color4x_remap_index },
    {  7828, DepthRangex_remap_index },
-   { 39130, Fogx_remap_index },
-   { 36184, Fogxv_remap_index },
-   { 34841, Frustumf_remap_index },
+   { 39138, Fogx_remap_index },
+   { 36192, Fogxv_remap_index },
+   { 34849, Frustumf_remap_index },
    {  3883, Frustumx_remap_index },
-   { 30768, LightModelx_remap_index },
-   { 34937, LightModelxv_remap_index },
-   { 25298, Lightx_remap_index },
-   { 12840, Lightxv_remap_index },
+   { 30798, LightModelx_remap_index },
+   { 34945, LightModelxv_remap_index },
+   { 25302, Lightx_remap_index },
+   { 12819, Lightxv_remap_index },
    {  2168, LineWidthx_remap_index },
-   { 14720, LoadMatrixx_remap_index },
-   { 26089, Materialx_remap_index },
-   { 16397, Materialxv_remap_index },
-   { 21959, MultMatrixx_remap_index },
-   { 33143, MultiTexCoord4x_remap_index },
-   { 12984, Normal3x_remap_index },
+   { 14699, LoadMatrixx_remap_index },
+   { 26093, Materialx_remap_index },
+   { 16376, Materialxv_remap_index },
+   { 21963, MultMatrixx_remap_index },
+   { 33151, MultiTexCoord4x_remap_index },
+   { 12963, Normal3x_remap_index },
    { 10539, Orthof_remap_index },
    {  1413, Orthox_remap_index },
-   { 34470, PointSizex_remap_index },
+   { 34478, PointSizex_remap_index },
    {  4400, PolygonOffsetx_remap_index },
-   { 29907, Rotatex_remap_index },
+   { 29937, Rotatex_remap_index },
    {  8268, SampleCoveragex_remap_index },
    {  6936, Scalex_remap_index },
-   { 31452, TexEnvx_remap_index },
-   { 24296, TexEnvxv_remap_index },
+   { 31482, TexEnvx_remap_index },
+   { 24300, TexEnvxv_remap_index },
    {  6086, TexParameterx_remap_index },
-   { 33792, Translatex_remap_index },
-   { 38058, ClipPlanef_remap_index },
-   { 37798, ClipPlanex_remap_index },
-   { 17974, GetClipPlanef_remap_index },
+   { 33800, Translatex_remap_index },
+   { 38066, ClipPlanef_remap_index },
+   { 37806, ClipPlanex_remap_index },
+   { 17978, GetClipPlanef_remap_index },
    {  4274, GetClipPlanex_remap_index },
-   { 32392, GetFixedv_remap_index },
+   { 32422, GetFixedv_remap_index },
    {  4665, GetLightxv_remap_index },
    {  4077, GetMaterialxv_remap_index },
-   { 28608, GetTexEnvxv_remap_index },
-   { 20987, GetTexParameterxv_remap_index },
+   { 28612, GetTexEnvxv_remap_index },
+   { 20991, GetTexParameterxv_remap_index },
    {  5444, PointParameterx_remap_index },
-   { 19131, PointParameterxv_remap_index },
-   { 29690, TexParameterxv_remap_index },
+   { 19135, PointParameterxv_remap_index },
+   { 29694, TexParameterxv_remap_index },
    {    -1, -1 }
 };
 
@@ -6215,10 +6223,10 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
    {  2827, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 12902, _gloffset_BlendEquation },
+   { 12881, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 19817, _gloffset_ColorSubTable },
-   { 37460, _gloffset_CopyColorSubTable },
+   { 19821, _gloffset_ColorSubTable },
+   { 37468, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   173, _gloffset_ConvolutionFilter1D },
    {  2623, _gloffset_CopyConvolutionFilter1D },
@@ -6226,77 +6234,77 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    { 10132, _gloffset_ConvolutionFilter2D },
    { 10328, _gloffset_ConvolutionParameteriv },
    { 10833, _gloffset_ConvolutionParameterfv },
-   { 24000, _gloffset_GetSeparableFilter },
-   { 27932, _gloffset_SeparableFilter2D },
-   { 28828, _gloffset_ConvolutionParameteri },
-   { 29064, _gloffset_ConvolutionParameterf },
-   { 31050, _gloffset_GetConvolutionParameterfv },
-   { 32252, _gloffset_GetConvolutionFilter },
-   { 35517, _gloffset_CopyConvolutionFilter2D },
+   { 24004, _gloffset_GetSeparableFilter },
+   { 27936, _gloffset_SeparableFilter2D },
+   { 28832, _gloffset_ConvolutionParameteri },
+   { 29068, _gloffset_ConvolutionParameterf },
+   { 31080, _gloffset_GetConvolutionParameterfv },
+   { 32282, _gloffset_GetConvolutionFilter },
+   { 35525, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 17145, _gloffset_CopyTexSubImage3D },
-   { 19274, _gloffset_CopyTexImage2D },
-   { 28308, _gloffset_CopyTexImage1D },
-   { 31715, _gloffset_CopyTexSubImage2D },
-   { 35035, _gloffset_CopyTexSubImage1D },
+   { 17149, _gloffset_CopyTexSubImage3D },
+   { 19278, _gloffset_CopyTexImage2D },
+   { 28312, _gloffset_CopyTexImage1D },
+   { 31745, _gloffset_CopyTexSubImage2D },
+   { 35043, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
    { 11085, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   657, _gloffset_Histogram },
    {  3916, _gloffset_ResetHistogram },
-   { 11592, _gloffset_GetMinmax },
-   { 17572, _gloffset_GetHistogramParameterfv },
-   { 28233, _gloffset_GetMinmaxParameteriv },
-   { 30940, _gloffset_ResetMinmax },
-   { 32056, _gloffset_GetHistogramParameteriv },
-   { 33726, _gloffset_GetHistogram },
-   { 36974, _gloffset_Minmax },
-   { 38806, _gloffset_GetMinmaxParameterfv },
+   { 11571, _gloffset_GetMinmax },
+   { 17576, _gloffset_GetHistogramParameterfv },
+   { 28237, _gloffset_GetMinmaxParameteriv },
+   { 30970, _gloffset_ResetMinmax },
+   { 32086, _gloffset_GetHistogramParameteriv },
+   { 33734, _gloffset_GetHistogram },
+   { 36982, _gloffset_Minmax },
+   { 38814, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
    {  9994, _gloffset_ColorTable },
-   { 17306, _gloffset_GetColorTable },
-   { 26624, _gloffset_GetColorTableParameterfv },
-   { 29120, _gloffset_GetColorTableParameteriv },
+   { 17310, _gloffset_GetColorTable },
+   { 26628, _gloffset_GetColorTableParameterfv },
+   { 29124, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
    {  8703, _gloffset_TexSubImage1D },
-   { 12359, _gloffset_TexSubImage2D },
+   { 12338, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
    {  1618, _gloffset_TexImage3D },
-   { 26383, _gloffset_TexSubImage3D },
+   { 26387, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
    {  3612, _gloffset_PrioritizeTextures },
    {  9247, _gloffset_AreTexturesResident },
-   { 15393, _gloffset_GenTextures },
-   { 17821, _gloffset_DeleteTextures },
-   { 22892, _gloffset_IsTexture },
-   { 35144, _gloffset_BindTexture },
+   { 15372, _gloffset_GenTextures },
+   { 17825, _gloffset_DeleteTextures },
+   { 22896, _gloffset_IsTexture },
+   { 35152, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 28130, _gloffset_ArrayElement },
-   { 36459, _gloffset_GetPointerv },
-   { 38214, _gloffset_DrawArrays },
+   { 28134, _gloffset_ArrayElement },
+   { 36467, _gloffset_GetPointerv },
+   { 38222, _gloffset_DrawArrays },
    /* from GL_NV_read_buffer */
-   { 28797, _gloffset_ReadBuffer },
+   { 28801, _gloffset_ReadBuffer },
    /* from GL_OES_blend_subtract */
-   { 12902, _gloffset_BlendEquation },
+   { 12881, _gloffset_BlendEquation },
    /* from GL_OES_texture_3D */
    {  1618, _gloffset_TexImage3D },
-   { 17145, _gloffset_CopyTexSubImage3D },
-   { 26383, _gloffset_TexSubImage3D },
+   { 17149, _gloffset_CopyTexSubImage3D },
+   { 26387, _gloffset_TexSubImage3D },
    /* from GL_OES_texture_cube_map */
    {  2383, _gloffset_TexGeniv },
-   { 12496, _gloffset_TexGenfv },
-   { 21698, _gloffset_TexGeni },
-   { 21726, _gloffset_TexGenf },
-   { 32783, _gloffset_GetTexGeniv },
-   { 33596, _gloffset_GetTexGenfv },
+   { 12475, _gloffset_TexGenfv },
+   { 21702, _gloffset_TexGeni },
+   { 21730, _gloffset_TexGenf },
+   { 32791, _gloffset_GetTexGeniv },
+   { 33604, _gloffset_GetTexGenfv },
    /* from GL_SGI_color_table */
    {  9420, _gloffset_ColorTableParameteriv },
    {  9994, _gloffset_ColorTable },
-   { 17306, _gloffset_GetColorTable },
-   { 17438, _gloffset_CopyColorTable },
-   { 22697, _gloffset_ColorTableParameterfv },
-   { 26624, _gloffset_GetColorTableParameterfv },
-   { 29120, _gloffset_GetColorTableParameteriv },
+   { 17310, _gloffset_GetColorTable },
+   { 17442, _gloffset_CopyColorTable },
+   { 22701, _gloffset_ColorTableParameterfv },
+   { 26628, _gloffset_GetColorTableParameterfv },
+   { 29124, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
author	marha <marha@users.sourceforge.net>	2013-07-22 14:40:04 +0200
committer	marha <marha@users.sourceforge.net>	2013-07-22 14:40:04 +0200
commit	cde797e5f774a44b89e51da0f32472329eac06cb (patch)
tree	1f0fc9d914af052c7076f82ad491e72813fc06ea
parent	b9356a3668e013820e4a2b2fb1e19da216fc63be (diff)
download	vcxsrv-cde797e5f774a44b89e51da0f32472329eac06cb.tar.gz vcxsrv-cde797e5f774a44b89e51da0f32472329eac06cb.tar.bz2 vcxsrv-cde797e5f774a44b89e51da0f32472329eac06cb.zip