Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/dlopen.h
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/randr/rrxinerama.c

93 files changed, 6924 insertions, 7183 deletions

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 280c3692a..606298bdc 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -782,7 +782,7 @@ LIBXSHMFENCE="xshmfence >= 1.1"
 
 dnl Required modules
 XPROTO="xproto >= 7.0.26"
-RANDRPROTO="randrproto >= 1.4.0"
+RANDRPROTO="randrproto >= 1.5.0"
 RENDERPROTO="renderproto >= 0.11"
 XEXTPROTO="xextproto >= 7.2.99.901"
 INPUTPROTO="inputproto >= 2.3"
diff --git a/xorg-server/glamor/glamor.c b/xorg-server/glamor/glamor.c
index 017266a85..6f4f30927 100644
--- a/xorg-server/glamor/glamor.c
+++ b/xorg-server/glamor/glamor.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 
 #include "glamor_priv.h"
+#include "mipict.h"
 
 DevPrivateKeyRec glamor_screen_private_key;
 DevPrivateKeyRec glamor_pixmap_private_key;
@@ -59,26 +60,34 @@ glamor_get_drawable_pixmap(DrawablePtr drawable)
         return (PixmapPtr) drawable;
 }
 
+static void
+glamor_init_pixmap_private_small(PixmapPtr pixmap, glamor_pixmap_private *pixmap_priv)
+{
+    pixmap_priv->box.x1 = 0;
+    pixmap_priv->box.x2 = pixmap->drawable.width;
+    pixmap_priv->box.y1 = 0;
+    pixmap_priv->box.y2 = pixmap->drawable.height;
+    pixmap_priv->block_w = pixmap->drawable.width;
+    pixmap_priv->block_h = pixmap->drawable.height;
+    pixmap_priv->block_hcnt = 1;
+    pixmap_priv->block_wcnt = 1;
+    pixmap_priv->box_array = &pixmap_priv->box;
+    pixmap_priv->fbo_array = &pixmap_priv->fbo;
+}
+
 _X_EXPORT void
 glamor_set_pixmap_type(PixmapPtr pixmap, glamor_pixmap_type_t type)
 {
     glamor_pixmap_private *pixmap_priv;
-    glamor_screen_private *glamor_priv =
-        glamor_get_screen_private(pixmap->drawable.pScreen);
 
     pixmap_priv = dixLookupPrivate(&pixmap->devPrivates,
                                    &glamor_pixmap_private_key);
     if (pixmap_priv == NULL) {
         pixmap_priv = calloc(sizeof(*pixmap_priv), 1);
         glamor_set_pixmap_private(pixmap, pixmap_priv);
-        pixmap_priv->base.pixmap = pixmap;
-        pixmap_priv->base.glamor_priv = glamor_priv;
     }
     pixmap_priv->type = type;
-    pixmap_priv->base.box.x1 = 0;
-    pixmap_priv->base.box.x2 = pixmap->drawable.width;
-    pixmap_priv->base.box.y1 = 0;
-    pixmap_priv->base.box.y2 = pixmap->drawable.height;
+    glamor_init_pixmap_private_small(pixmap, pixmap_priv);
 }
 
 _X_EXPORT void
@@ -93,9 +102,9 @@ glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex)
     glamor_priv = glamor_get_screen_private(screen);
     pixmap_priv = glamor_get_pixmap_private(pixmap);
 
-    if (pixmap_priv->base.fbo) {
+    if (pixmap_priv->fbo) {
         fbo = glamor_pixmap_detach_fbo(pixmap_priv);
-        glamor_destroy_fbo(fbo);
+        glamor_destroy_fbo(glamor_priv, fbo);
     }
 
     format = gl_iformat_for_pixmap(pixmap);
@@ -119,10 +128,10 @@ glamor_set_screen_pixmap(PixmapPtr screen_pixmap, PixmapPtr *back_pixmap)
 
     glamor_priv = glamor_get_screen_private(screen_pixmap->drawable.pScreen);
     pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
-    glamor_priv->screen_fbo = pixmap_priv->base.fbo->fb;
+    glamor_priv->screen_fbo = pixmap_priv->fbo->fb;
 
-    pixmap_priv->base.fbo->width = screen_pixmap->drawable.width;
-    pixmap_priv->base.fbo->height = screen_pixmap->drawable.height;
+    pixmap_priv->fbo->width = screen_pixmap->drawable.width;
+    pixmap_priv->fbo->height = screen_pixmap->drawable.height;
 }
 
 uint32_t
@@ -133,7 +142,7 @@ glamor_get_pixmap_texture(PixmapPtr pixmap)
     if (pixmap_priv->type != GLAMOR_TEXTURE_ONLY)
         return 0;
 
-    return pixmap_priv->base.fbo->tex;
+    return pixmap_priv->fbo->tex;
 }
 
 PixmapPtr
@@ -141,7 +150,6 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
                      unsigned int usage)
 {
     PixmapPtr pixmap;
-    glamor_pixmap_type_t type = GLAMOR_TEXTURE_ONLY;
     glamor_pixmap_private *pixmap_priv;
     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
     glamor_pixmap_fbo *fbo = NULL;
@@ -169,38 +177,26 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
     }
     glamor_set_pixmap_private(pixmap, pixmap_priv);
 
-    if (usage == GLAMOR_CREATE_PIXMAP_MAP)
-        type = GLAMOR_MEMORY_MAP;
-
-    pixmap_priv->base.pixmap = pixmap;
-    pixmap_priv->base.glamor_priv = glamor_priv;
-
     format = gl_iformat_for_pixmap(pixmap);
 
     pitch = (((w * pixmap->drawable.bitsPerPixel + 7) / 8) + 3) & ~3;
     screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, pitch, NULL);
 
+    pixmap_priv->type = GLAMOR_TEXTURE_ONLY;
+
     if (usage == GLAMOR_CREATE_PIXMAP_NO_TEXTURE) {
-        pixmap_priv->type = GLAMOR_TEXTURE_ONLY;
-        pixmap_priv->base.box.x1 = 0;
-        pixmap_priv->base.box.y1 = 0;
-        pixmap_priv->base.box.x2 = w;
-        pixmap_priv->base.box.y2 = h;
+        glamor_init_pixmap_private_small(pixmap, pixmap_priv);
         return pixmap;
     }
-    else if (type == GLAMOR_MEMORY_MAP || usage == GLAMOR_CREATE_NO_LARGE ||
+    else if (usage == GLAMOR_CREATE_NO_LARGE ||
         glamor_check_fbo_size(glamor_priv, w, h))
     {
-        pixmap_priv->type = type;
-        pixmap_priv->base.box.x1 = 0;
-        pixmap_priv->base.box.y1 = 0;
-        pixmap_priv->base.box.x2 = w;
-        pixmap_priv->base.box.y2 = h;
+        glamor_init_pixmap_private_small(pixmap, pixmap_priv);
         fbo = glamor_create_fbo(glamor_priv, w, h, format, usage);
     } else {
         int tile_size = glamor_priv->max_fbo_size;
-        DEBUGF("Create LARGE pixmap %p width %d height %d, tile size %d\n", pixmap, w, h, tile_size);
-        pixmap_priv->type = GLAMOR_TEXTURE_LARGE;
+        DEBUGF("Create LARGE pixmap %p width %d height %d, tile size %d\n",
+               pixmap, w, h, tile_size);
         fbo = glamor_create_fbo_array(glamor_priv, w, h, format, usage,
                                       tile_size, tile_size, pixmap_priv);
     }
@@ -305,6 +301,35 @@ glamor_create_screen_resources(ScreenPtr screen)
     return ret;
 }
 
+static Bool
+glamor_check_instruction_count(int gl_version)
+{
+    GLint max_native_alu_instructions;
+
+    /* Avoid using glamor if the reported instructions limit is too low,
+     * as this would cause glamor to fallback on sw due to large shaders
+     * which ends up being unbearably slow.
+     */
+    if (gl_version < 30) {
+        if (!epoxy_has_gl_extension("GL_ARB_fragment_program")) {
+            ErrorF("GL_ARB_fragment_program required\n");
+            return FALSE;
+        }
+
+        glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB,
+                          GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB,
+                          &max_native_alu_instructions);
+        if (max_native_alu_instructions < GLAMOR_MIN_ALU_INSTRUCTIONS) {
+            LogMessage(X_WARNING,
+                       "glamor requires at least %d instructions (%d reported)\n",
+                       GLAMOR_MIN_ALU_INSTRUCTIONS, max_native_alu_instructions);
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
 /** Set up glamor for an already-configured GL context. */
 Bool
 glamor_init(ScreenPtr screen, unsigned int flags)
@@ -312,10 +337,8 @@ glamor_init(ScreenPtr screen, unsigned int flags)
     glamor_screen_private *glamor_priv;
     int gl_version;
     int max_viewport_size[2];
-
-#ifdef RENDER
     PictureScreenPtr ps = GetPictureScreenIfSet(screen);
-#endif
+
     if (flags & ~GLAMOR_VALID_FLAGS) {
         ErrorF("glamor_init: Invalid flags %x\n", flags);
         return FALSE;
@@ -384,6 +407,9 @@ glamor_init(ScreenPtr screen, unsigned int flags)
             ErrorF("Require OpenGL version 2.1 or later.\n");
             goto fail;
         }
+
+        if (!glamor_check_instruction_count(gl_version))
+            goto fail;
     } else {
         if (gl_version < 20) {
             ErrorF("Require Open GLES2.0 or later.\n");
@@ -411,6 +437,14 @@ glamor_init(ScreenPtr screen, unsigned int flags)
         epoxy_has_gl_extension("GL_ARB_buffer_storage");
     glamor_priv->has_nv_texture_barrier =
         epoxy_has_gl_extension("GL_NV_texture_barrier");
+    glamor_priv->has_unpack_subimage =
+        glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP ||
+        epoxy_gl_version() >= 30 ||
+        epoxy_has_gl_extension("GL_EXT_unpack_subimage");
+    glamor_priv->has_pack_subimage =
+        glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP ||
+        epoxy_gl_version() >= 30 ||
+        epoxy_has_gl_extension("GL_NV_pack_subimage");
 
     glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &glamor_priv->max_fbo_size);
     glGetIntegerv(GL_MAX_TEXTURE_SIZE, &glamor_priv->max_fbo_size);
@@ -442,54 +476,48 @@ glamor_init(ScreenPtr screen, unsigned int flags)
     if (!glamor_font_init(screen))
         goto fail;
 
-    if (flags & GLAMOR_USE_SCREEN) {
+    glamor_priv->saved_procs.block_handler = screen->BlockHandler;
+    screen->BlockHandler = _glamor_block_handler;
 
-        glamor_priv->saved_procs.block_handler = screen->BlockHandler;
-        screen->BlockHandler = _glamor_block_handler;
+    glamor_priv->saved_procs.create_gc = screen->CreateGC;
+    screen->CreateGC = glamor_create_gc;
 
-        glamor_priv->saved_procs.create_gc = screen->CreateGC;
-        screen->CreateGC = glamor_create_gc;
+    glamor_priv->saved_procs.create_pixmap = screen->CreatePixmap;
+    screen->CreatePixmap = glamor_create_pixmap;
 
-        glamor_priv->saved_procs.create_pixmap = screen->CreatePixmap;
-        screen->CreatePixmap = glamor_create_pixmap;
+    glamor_priv->saved_procs.destroy_pixmap = screen->DestroyPixmap;
+    screen->DestroyPixmap = glamor_destroy_pixmap;
 
-        glamor_priv->saved_procs.destroy_pixmap = screen->DestroyPixmap;
-        screen->DestroyPixmap = glamor_destroy_pixmap;
+    glamor_priv->saved_procs.get_spans = screen->GetSpans;
+    screen->GetSpans = glamor_get_spans;
 
-        glamor_priv->saved_procs.get_spans = screen->GetSpans;
-        screen->GetSpans = glamor_get_spans;
+    glamor_priv->saved_procs.get_image = screen->GetImage;
+    screen->GetImage = glamor_get_image;
 
-        glamor_priv->saved_procs.get_image = screen->GetImage;
-        screen->GetImage = glamor_get_image;
+    glamor_priv->saved_procs.change_window_attributes =
+        screen->ChangeWindowAttributes;
+    screen->ChangeWindowAttributes = glamor_change_window_attributes;
 
-        glamor_priv->saved_procs.change_window_attributes =
-            screen->ChangeWindowAttributes;
-        screen->ChangeWindowAttributes = glamor_change_window_attributes;
+    glamor_priv->saved_procs.copy_window = screen->CopyWindow;
+    screen->CopyWindow = glamor_copy_window;
 
-        glamor_priv->saved_procs.copy_window = screen->CopyWindow;
-        screen->CopyWindow = glamor_copy_window;
+    glamor_priv->saved_procs.bitmap_to_region = screen->BitmapToRegion;
+    screen->BitmapToRegion = glamor_bitmap_to_region;
 
-        glamor_priv->saved_procs.bitmap_to_region = screen->BitmapToRegion;
-        screen->BitmapToRegion = glamor_bitmap_to_region;
-    }
-#ifdef RENDER
-    if (flags & GLAMOR_USE_PICTURE_SCREEN) {
-        glamor_priv->saved_procs.composite = ps->Composite;
-        ps->Composite = glamor_composite;
+    glamor_priv->saved_procs.composite = ps->Composite;
+    ps->Composite = glamor_composite;
 
-        glamor_priv->saved_procs.trapezoids = ps->Trapezoids;
-        ps->Trapezoids = glamor_trapezoids;
+    glamor_priv->saved_procs.trapezoids = ps->Trapezoids;
+    ps->Trapezoids = glamor_trapezoids;
 
-        glamor_priv->saved_procs.triangles = ps->Triangles;
-        ps->Triangles = glamor_triangles;
+    glamor_priv->saved_procs.triangles = ps->Triangles;
+    ps->Triangles = glamor_triangles;
 
-        glamor_priv->saved_procs.addtraps = ps->AddTraps;
-        ps->AddTraps = glamor_add_traps;
-
-    }
+    glamor_priv->saved_procs.addtraps = ps->AddTraps;
+    ps->AddTraps = glamor_add_traps;
 
     glamor_priv->saved_procs.composite_rects = ps->CompositeRects;
-    ps->CompositeRects = glamor_composite_rectangles;
+    ps->CompositeRects = miCompositeRects;
 
     glamor_priv->saved_procs.glyphs = ps->Glyphs;
     ps->Glyphs = glamor_glyphs;
@@ -503,13 +531,14 @@ glamor_init(ScreenPtr screen, unsigned int flags)
     glamor_priv->saved_procs.destroy_picture = ps->DestroyPicture;
     ps->DestroyPicture = glamor_destroy_picture;
     glamor_init_composite_shaders(screen);
-#endif
+
     glamor_priv->saved_procs.set_window_pixmap = screen->SetWindowPixmap;
     screen->SetWindowPixmap = glamor_set_window_pixmap;
 
     glamor_init_vbo(screen);
     glamor_init_pixmap_fbo(screen);
     glamor_init_finish_access_shaders(screen);
+
 #ifdef GLAMOR_GRADIENT_SHADER
     glamor_init_gradient_shader(screen);
 #endif
@@ -532,9 +561,7 @@ glamor_release_screen_priv(ScreenPtr screen)
     glamor_screen_private *glamor_priv;
 
     glamor_priv = glamor_get_screen_private(screen);
-#ifdef RENDER
     glamor_fini_composite_shaders(screen);
-#endif
     glamor_fini_vbo(screen);
     glamor_fini_pixmap_fbo(screen);
     glamor_fini_finish_access_shaders(screen);
@@ -560,8 +587,8 @@ glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv)
     else {
         if (old_priv == NULL)
             return;
-
-        glamor_pixmap_destroy_fbo(old_priv);
+        glamor_pixmap_destroy_fbo(glamor_get_screen_private(pixmap->drawable.pScreen),
+                                  old_priv);
         free(old_priv);
     }
 
@@ -573,43 +600,34 @@ glamor_close_screen(ScreenPtr screen)
 {
     glamor_screen_private *glamor_priv;
     PixmapPtr screen_pixmap;
-    int flags;
-
-#ifdef RENDER
     PictureScreenPtr ps = GetPictureScreenIfSet(screen);
-#endif
+
     glamor_priv = glamor_get_screen_private(screen);
-    flags = glamor_priv->flags;
     glamor_sync_close(screen);
     glamor_glyphs_fini(screen);
     screen->CloseScreen = glamor_priv->saved_procs.close_screen;
     screen->CreateScreenResources =
         glamor_priv->saved_procs.create_screen_resources;
-    if (flags & GLAMOR_USE_SCREEN) {
-
-        screen->CreateGC = glamor_priv->saved_procs.create_gc;
-        screen->CreatePixmap = glamor_priv->saved_procs.create_pixmap;
-        screen->DestroyPixmap = glamor_priv->saved_procs.destroy_pixmap;
-        screen->GetSpans = glamor_priv->saved_procs.get_spans;
-        screen->ChangeWindowAttributes =
-            glamor_priv->saved_procs.change_window_attributes;
-        screen->CopyWindow = glamor_priv->saved_procs.copy_window;
-        screen->BitmapToRegion = glamor_priv->saved_procs.bitmap_to_region;
-        screen->BlockHandler = glamor_priv->saved_procs.block_handler;
-    }
-#ifdef RENDER
-    if (ps && (flags & GLAMOR_USE_PICTURE_SCREEN)) {
 
-        ps->Composite = glamor_priv->saved_procs.composite;
-        ps->Trapezoids = glamor_priv->saved_procs.trapezoids;
-        ps->Triangles = glamor_priv->saved_procs.triangles;
-        ps->CreatePicture = glamor_priv->saved_procs.create_picture;
-    }
+    screen->CreateGC = glamor_priv->saved_procs.create_gc;
+    screen->CreatePixmap = glamor_priv->saved_procs.create_pixmap;
+    screen->DestroyPixmap = glamor_priv->saved_procs.destroy_pixmap;
+    screen->GetSpans = glamor_priv->saved_procs.get_spans;
+    screen->ChangeWindowAttributes =
+        glamor_priv->saved_procs.change_window_attributes;
+    screen->CopyWindow = glamor_priv->saved_procs.copy_window;
+    screen->BitmapToRegion = glamor_priv->saved_procs.bitmap_to_region;
+    screen->BlockHandler = glamor_priv->saved_procs.block_handler;
+
+    ps->Composite = glamor_priv->saved_procs.composite;
+    ps->Trapezoids = glamor_priv->saved_procs.trapezoids;
+    ps->Triangles = glamor_priv->saved_procs.triangles;
+    ps->CreatePicture = glamor_priv->saved_procs.create_picture;
     ps->CompositeRects = glamor_priv->saved_procs.composite_rects;
     ps->Glyphs = glamor_priv->saved_procs.glyphs;
     ps->UnrealizeGlyph = glamor_priv->saved_procs.unrealize_glyph;
     screen->SetWindowPixmap = glamor_priv->saved_procs.set_window_pixmap;
-#endif
+
     screen_pixmap = screen->GetScreenPixmap(screen);
     glamor_set_pixmap_private(screen_pixmap, NULL);
 
@@ -658,7 +676,7 @@ glamor_fd_from_pixmap(ScreenPtr screen,
             return -1;
         return glamor_egl_dri3_fd_name_from_tex(screen,
                                                 pixmap,
-                                                pixmap_priv->base.fbo->tex,
+                                                pixmap_priv->fbo->tex,
                                                 FALSE, stride, size);
     default:
         break;
@@ -683,7 +701,7 @@ glamor_name_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
             return -1;
         return glamor_egl_dri3_fd_name_from_tex(pixmap->drawable.pScreen,
                                                 pixmap,
-                                                pixmap_priv->base.fbo->tex,
+                                                pixmap_priv->fbo->tex,
                                                 TRUE, stride, size);
     default:
         break;
diff --git a/xorg-server/glamor/glamor.h b/xorg-server/glamor/glamor.h
index 206158c02..d07182d9e 100644
--- a/xorg-server/glamor/glamor.h
+++ b/xorg-server/glamor/glamor.h
@@ -53,25 +53,15 @@ struct glamor_context;
  */
 typedef enum glamor_pixmap_type {
     GLAMOR_MEMORY,
-    GLAMOR_MEMORY_MAP,
     GLAMOR_TEXTURE_DRM,
-    GLAMOR_SEPARATE_TEXTURE,
     GLAMOR_DRM_ONLY,
     GLAMOR_TEXTURE_ONLY,
-    GLAMOR_TEXTURE_LARGE,
-    GLAMOR_TEXTURE_PACK
 } glamor_pixmap_type_t;
 
 #define GLAMOR_EGL_EXTERNAL_BUFFER 3
-#define GLAMOR_INVERTED_Y_AXIS         1 /* compat stub */
-#define GLAMOR_USE_SCREEN		(1 << 1)
-#define GLAMOR_USE_PICTURE_SCREEN 	(1 << 2)
-#define GLAMOR_USE_EGL_SCREEN		(1 << 3)
-#define GLAMOR_NO_DRI3			(1 << 4)
-#define GLAMOR_VALID_FLAGS      (GLAMOR_INVERTED_Y_AXIS  		\
-				 | GLAMOR_USE_SCREEN 			\
-                                 | GLAMOR_USE_PICTURE_SCREEN		\
-				 | GLAMOR_USE_EGL_SCREEN                \
+#define GLAMOR_USE_EGL_SCREEN		(1 << 0)
+#define GLAMOR_NO_DRI3			(1 << 1)
+#define GLAMOR_VALID_FLAGS      (GLAMOR_USE_EGL_SCREEN                \
                                  | GLAMOR_NO_DRI3)
 
 /* @glamor_init: Initialize glamor internal data structure.
@@ -79,23 +69,13 @@ typedef enum glamor_pixmap_type {
  * @screen: Current screen pointer.
  * @flags:  Please refer the flags description above.
  *
- * 	@GLAMOR_USE_SCREEN:
- *	If running in an pre-existing X environment, and the
- * 	gl context is GLX, then you should set this bit and
- * 	let the glamor to handle all the screen related
- * 	functions such as GC ops and CreatePixmap/DestroyPixmap.
- *
- * 	@GLAMOR_USE_PICTURE_SCREEN:
- * 	If don't use any other underlying DDX driver to handle
- * 	the picture related rendering functions, please set this
- * 	bit on. Otherwise, clear this bit. And then it is the DDX
- * 	driver's responsibility to determine how/when to jump to
- * 	glamor's picture compositing path.
- *
  * 	@GLAMOR_USE_EGL_SCREEN:
  * 	If you are using EGL layer, then please set this bit
  * 	on, otherwise, clear it.
  *
+ *      @GLAMOR_NO_DRI3
+ *      Disable the built-in DRI3 support
+ *
  * This function initializes necessary internal data structure
  * for glamor. And before calling into this function, the OpenGL
  * environment should be ready. Should be called before any real
@@ -142,7 +122,6 @@ extern _X_EXPORT Bool glamor_destroy_pixmap(PixmapPtr pixmap);
 #define GLAMOR_CREATE_PIXMAP_CPU        0x100
 #define GLAMOR_CREATE_PIXMAP_FIXUP      0x101
 #define GLAMOR_CREATE_FBO_NO_FBO        0x103
-#define GLAMOR_CREATE_PIXMAP_MAP        0x104
 #define GLAMOR_CREATE_NO_LARGE          0x105
 #define GLAMOR_CREATE_PIXMAP_NO_TEXTURE 0x106
 
@@ -326,146 +305,6 @@ extern _X_EXPORT void glamor_destroy_gc(GCPtr gc);
 extern Bool _X_EXPORT glamor_change_window_attributes(WindowPtr pWin, unsigned long mask);
 extern void _X_EXPORT glamor_copy_window(WindowPtr window, DDXPointRec old_origin, RegionPtr src_region);
 
-/* Glamor rendering/drawing functions with XXX_nf.
- * nf means no fallback within glamor internal if possible. If glamor
- * fail to accelerate the operation, glamor will return a false, and the
- * caller need to implement fallback method. Return a true means the
- * rendering request get done successfully. */
-extern _X_EXPORT Bool glamor_fill_spans_nf(DrawablePtr drawable,
-                                           GCPtr gc,
-                                           int n, DDXPointPtr points,
-                                           int *widths, int sorted);
-
-extern _X_EXPORT Bool glamor_poly_fill_rect_nf(DrawablePtr drawable,
-                                               GCPtr gc,
-                                               int nrect, xRectangle *prect);
-
-extern _X_EXPORT Bool glamor_put_image_nf(DrawablePtr drawable,
-                                          GCPtr gc, int depth, int x, int y,
-                                          int w, int h, int left_pad,
-                                          int image_format, char *bits);
-
-extern _X_EXPORT Bool glamor_copy_n_to_n_nf(DrawablePtr src,
-                                            DrawablePtr dst,
-                                            GCPtr gc,
-                                            BoxPtr box,
-                                            int nbox,
-                                            int dx,
-                                            int dy,
-                                            Bool reverse,
-                                            Bool upsidedown, Pixel bitplane,
-                                            void *closure);
-
-extern _X_EXPORT Bool glamor_copy_nf(DrawablePtr src,
-                                     DrawablePtr dst,
-                                     GCPtr gc,
-                                     BoxPtr box,
-                                     int nbox,
-                                     int dx,
-                                     int dy,
-                                     Bool reverse,
-                                     Bool upsidedown, Pixel bitplane,
-                                     void *closure);
-
-extern _X_EXPORT Bool glamor_composite_nf(CARD8 op,
-                                          PicturePtr source,
-                                          PicturePtr mask,
-                                          PicturePtr dest,
-                                          INT16 x_source,
-                                          INT16 y_source,
-                                          INT16 x_mask,
-                                          INT16 y_mask,
-                                          INT16 x_dest, INT16 y_dest,
-                                          CARD16 width, CARD16 height);
-
-extern _X_EXPORT Bool glamor_trapezoids_nf(CARD8 op,
-                                           PicturePtr src, PicturePtr dst,
-                                           PictFormatPtr mask_format,
-                                           INT16 x_src, INT16 y_src,
-                                           int ntrap, xTrapezoid *traps);
-
-extern _X_EXPORT Bool glamor_glyphs_nf(CARD8 op,
-                                       PicturePtr src,
-                                       PicturePtr dst,
-                                       PictFormatPtr mask_format,
-                                       INT16 x_src,
-                                       INT16 y_src, int nlist,
-                                       GlyphListPtr list, GlyphPtr *glyphs);
-
-extern _X_EXPORT Bool glamor_triangles_nf(CARD8 op,
-                                          PicturePtr pSrc,
-                                          PicturePtr pDst,
-                                          PictFormatPtr maskFormat,
-                                          INT16 xSrc, INT16 ySrc,
-                                          int ntris, xTriangle *tris);
-
-extern _X_EXPORT void glamor_glyph_unrealize(ScreenPtr screen, GlyphPtr glyph);
-
-extern _X_EXPORT Bool glamor_set_spans_nf(DrawablePtr drawable, GCPtr gc,
-                                          char *src, DDXPointPtr points,
-                                          int *widths, int n, int sorted);
-
-extern _X_EXPORT Bool glamor_get_spans_nf(DrawablePtr drawable, int wmax,
-                                          DDXPointPtr points, int *widths,
-                                          int count, char *dst);
-
-extern _X_EXPORT Bool glamor_composite_rects_nf(CARD8 op,
-                                                PicturePtr pDst,
-                                                xRenderColor *color,
-                                                int nRect, xRectangle *rects);
-
-extern _X_EXPORT Bool glamor_get_image_nf(DrawablePtr pDrawable, int x, int y,
-                                          int w, int h, unsigned int format,
-                                          unsigned long planeMask, char *d);
-
-extern _X_EXPORT Bool glamor_add_traps_nf(PicturePtr pPicture,
-                                          INT16 x_off,
-                                          INT16 y_off, int ntrap,
-                                          xTrap *traps);
-
-extern _X_EXPORT Bool glamor_copy_plane_nf(DrawablePtr pSrc, DrawablePtr pDst,
-                                           GCPtr pGC, int srcx, int srcy, int w,
-                                           int h, int dstx, int dsty,
-                                           unsigned long bitPlane,
-                                           RegionPtr *pRegion);
-
-extern _X_EXPORT Bool glamor_image_glyph_blt_nf(DrawablePtr pDrawable,
-                                                GCPtr pGC, int x, int y,
-                                                unsigned int nglyph,
-                                                CharInfoPtr *ppci,
-                                                void *pglyphBase);
-
-extern _X_EXPORT Bool glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC,
-                                               int x, int y,
-                                               unsigned int nglyph,
-                                               CharInfoPtr *ppci,
-                                               void *pglyphBase);
-
-extern _X_EXPORT Bool glamor_push_pixels_nf(GCPtr pGC, PixmapPtr pBitmap,
-                                            DrawablePtr pDrawable, int w, int h,
-                                            int x, int y);
-
-extern _X_EXPORT Bool glamor_poly_point_nf(DrawablePtr pDrawable, GCPtr pGC,
-                                           int mode, int npt, DDXPointPtr ppt);
-
-extern _X_EXPORT Bool glamor_poly_segment_nf(DrawablePtr pDrawable, GCPtr pGC,
-                                             int nseg, xSegment *pSeg);
-
-extern _X_EXPORT Bool glamor_poly_lines_nf(DrawablePtr drawable, GCPtr gc,
-                                           int mode, int n, DDXPointPtr points);
-
-extern _X_EXPORT Bool glamor_poly_text8_nf(DrawablePtr drawable, GCPtr gc,
-                                           int x, int y, int count, char *chars, int *final_pos);
-
-extern _X_EXPORT Bool glamor_poly_text16_nf(DrawablePtr drawable, GCPtr gc,
-                                            int x, int y, int count, unsigned short *chars, int *final_pos);
-
-extern _X_EXPORT Bool glamor_image_text8_nf(DrawablePtr drawable, GCPtr gc,
-                                            int x, int y, int count, char *chars);
-
-extern _X_EXPORT Bool glamor_image_text16_nf(DrawablePtr drawable, GCPtr gc,
-                                             int x, int y, int count, unsigned short *chars);
-
 #define HAS_GLAMOR_TEXT 1
 
 #ifdef GLAMOR_FOR_XORG
diff --git a/xorg-server/glamor/glamor_addtraps.c b/xorg-server/glamor/glamor_addtraps.c
index fdc0f4232..7ad9f3000 100644
--- a/xorg-server/glamor/glamor_addtraps.c
+++ b/xorg-server/glamor/glamor_addtraps.c
@@ -28,34 +28,13 @@
 
 #include "glamor_priv.h"
 
-static Bool
-_glamor_add_traps(PicturePtr pPicture,
-                  INT16 x_off,
-                  INT16 y_off, int ntrap, xTrap *traps, Bool fallback)
+void
+glamor_add_traps(PicturePtr pPicture,
+                 INT16 x_off,
+                 INT16 y_off, int ntrap, xTrap *traps)
 {
-    if (!fallback
-        && (!pPicture->pDrawable
-            || glamor_ddx_fallback_check_pixmap(pPicture->pDrawable)))
-        return FALSE;
-
     if (glamor_prepare_access_picture(pPicture, GLAMOR_ACCESS_RW)) {
         fbAddTraps(pPicture, x_off, y_off, ntrap, traps);
     }
     glamor_finish_access_picture(pPicture);
-
-    return TRUE;
-}
-
-void
-glamor_add_traps(PicturePtr pPicture,
-                 INT16 x_off, INT16 y_off, int ntrap, xTrap *traps)
-{
-    _glamor_add_traps(pPicture, x_off, y_off, ntrap, traps, TRUE);
-}
-
-Bool
-glamor_add_traps_nf(PicturePtr pPicture,
-                    INT16 x_off, INT16 y_off, int ntrap, xTrap *traps)
-{
-    return _glamor_add_traps(pPicture, x_off, y_off, ntrap, traps, FALSE);
 }
diff --git a/xorg-server/glamor/glamor_compositerects.c b/xorg-server/glamor/glamor_compositerects.c
index 3b6b2ed07..e188d8a3f 100644
--- a/xorg-server/glamor/glamor_compositerects.c
+++ b/xorg-server/glamor/glamor_compositerects.c
@@ -246,7 +246,7 @@ glamor_composite_rectangles(CARD8 op,
         goto done;
     }
     else {
-        if (_X_LIKELY(priv->type != GLAMOR_TEXTURE_LARGE)) {
+        if (_X_LIKELY(glamor_pixmap_priv_is_small(priv))) {
             int error;
 
             source = CreateSolidPicture(0, color, &error);
@@ -254,7 +254,7 @@ glamor_composite_rectangles(CARD8 op,
                 goto done;
             if (glamor_composite_clipped_region(op, source,
                                                 NULL, dst,
-                                                NULL, NULL, priv,
+                                                NULL, NULL, pixmap,
                                                 &region, 0, 0, 0, 0, 0, 0))
                 goto done;
         }
diff --git a/xorg-server/glamor/glamor_copy.c b/xorg-server/glamor/glamor_copy.c
index 3320935f0..75fe8a700 100644
--- a/xorg-server/glamor/glamor_copy.c
+++ b/xorg-server/glamor/glamor_copy.c
@@ -42,7 +42,7 @@ use_copyarea(PixmapPtr dst, GCPtr gc, glamor_program *prog, void *arg)
     glBindTexture(GL_TEXTURE_2D, src->tex);
 
     glUniform2f(prog->fill_offset_uniform, args->dx, args->dy);
-    glUniform2f(prog->fill_size_uniform, src->width, src->height);
+    glUniform2f(prog->fill_size_inv_uniform, 1.0f/src->width, 1.0f/src->height);
 
     return TRUE;
 }
@@ -51,7 +51,7 @@ static const glamor_facet glamor_facet_copyarea = {
     "copy_area",
     .vs_vars = "attribute vec2 primitive;\n",
     .vs_exec = (GLAMOR_POS(gl_Position, primitive.xy)
-                "       fill_pos = (fill_offset + primitive.xy) / fill_size;\n"),
+                "       fill_pos = (fill_offset + primitive.xy) * fill_size_inv;\n"),
     .fs_exec = "       gl_FragColor = texture2D(sampler, fill_pos);\n",
     .locations = glamor_program_location_fill,
     .use = use_copyarea,
@@ -71,7 +71,7 @@ use_copyplane(PixmapPtr dst, GCPtr gc, glamor_program *prog, void *arg)
     glBindTexture(GL_TEXTURE_2D, src->tex);
 
     glUniform2f(prog->fill_offset_uniform, args->dx, args->dy);
-    glUniform2f(prog->fill_size_uniform, src->width, src->height);
+    glUniform2f(prog->fill_size_inv_uniform, 1.0f/src->width, 1.0f/src->height);
 
     glamor_set_color(dst, gc->fgPixel, prog->fg_uniform);
     glamor_set_color(dst, gc->bgPixel, prog->bg_uniform);
@@ -134,7 +134,7 @@ static const glamor_facet glamor_facet_copyplane = {
     .version = 130,
     .vs_vars = "attribute vec2 primitive;\n",
     .vs_exec = (GLAMOR_POS(gl_Position, (primitive.xy))
-                "       fill_pos = (fill_offset + primitive.xy) / fill_size;\n"),
+                "       fill_pos = (fill_offset + primitive.xy) * fill_size_inv;\n"),
     .fs_exec = ("       uvec4 bits = uvec4(round(texture2D(sampler, fill_pos) * bitmul));\n"
                 "       if ((bits & bitplane) != uvec4(0,0,0,0))\n"
                 "               gl_FragColor = fg;\n"
@@ -315,7 +315,6 @@ glamor_copy_fbo_fbo_draw(DrawablePtr src,
     struct copy_args args;
     glamor_program *prog;
     const glamor_facet *copy_facet;
-    Bool set_scissor;
     int n;
 
     glamor_make_current(glamor_priv);
@@ -367,9 +366,7 @@ glamor_copy_fbo_fbo_draw(DrawablePtr src,
 
     glamor_get_drawable_deltas(src, src_pixmap, &src_off_x, &src_off_y);
 
-    set_scissor = src_priv->type == GLAMOR_TEXTURE_LARGE;
-    if (set_scissor)
-        glEnable(GL_SCISSOR_TEST);
+    glEnable(GL_SCISSOR_TEST);
 
     glamor_pixmap_loop(src_priv, src_box_x, src_box_y) {
         BoxPtr src_box = glamor_pixmap_box_at(src_priv, src_box_x, src_box_y);
@@ -385,30 +382,20 @@ glamor_copy_fbo_fbo_draw(DrawablePtr src,
             glamor_set_destination_drawable(dst, dst_box_x, dst_box_y, FALSE, FALSE,
                                             prog->matrix_uniform, &dst_off_x, &dst_off_y);
 
-            if (set_scissor)
-                glScissor(dst_off_x - args.dx,
-                          dst_off_y - args.dy,
-                          src_box->x2 - src_box->x1,
-                          src_box->y2 - src_box->y1);
-
-            if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
-                glDrawArrays(GL_QUADS, 0, nbox * 4);
-            else {
-                int i;
-                for (i = 0; i < nbox; i++)
-                    glDrawArrays(GL_TRIANGLE_FAN, i*4, 4);
-            }
+            glScissor(dst_off_x - args.dx,
+                      dst_off_y - args.dy,
+                      src_box->x2 - src_box->x1,
+                      src_box->y2 - src_box->y1);
+
+            glamor_glDrawArrays_GL_QUADS(glamor_priv, nbox);
         }
     }
-    if (set_scissor)
-        glDisable(GL_SCISSOR_TEST);
+    glDisable(GL_SCISSOR_TEST);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 
-    glDisable(GL_COLOR_LOGIC_OP);
     return TRUE;
 
 bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
     return FALSE;
 }
 
@@ -452,7 +439,6 @@ glamor_copy_fbo_fbo_temp(DrawablePtr src,
 
     if (!glamor_set_alu(screen, gc ? gc->alu : GXcopy))
         goto bail_ctx;
-    glDisable(GL_COLOR_LOGIC_OP);
 
     /* Find the size of the area to copy
      */
@@ -521,7 +507,6 @@ bail:
     return FALSE;
 
 bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
     return FALSE;
 }
 
@@ -709,39 +694,3 @@ glamor_copy_window(WindowPtr window, DDXPointRec old_origin, RegionPtr src_regio
 
     RegionUninit(&dst_region);
 }
-
-Bool
-glamor_copy_n_to_n_nf(DrawablePtr src,
-                      DrawablePtr dst,
-                      GCPtr gc,
-                      BoxPtr box,
-                      int nbox,
-                      int dx,
-                      int dy,
-                      Bool reverse,
-                      Bool upsidedown, Pixel bitplane,
-                      void *closure)
-{
-    if (glamor_copy_gl(src, dst, gc, box, nbox, dx, dy, reverse, upsidedown, bitplane, closure))
-        return TRUE;
-    if (glamor_ddx_fallback_check_pixmap(src) && glamor_ddx_fallback_check_pixmap(dst))
-        return FALSE;
-    glamor_copy_bail(src, dst, gc, box, nbox, dx, dy, reverse, upsidedown, bitplane, closure);
-    return TRUE;
-}
-
-Bool
-glamor_copy_plane_nf(DrawablePtr src, DrawablePtr dst, GCPtr gc,
-                     int srcx, int srcy, int w, int h, int dstx, int dsty,
-                     unsigned long bitplane, RegionPtr *region)
-{
-    if (glamor_ddx_fallback_check_pixmap(src) &&
-        glamor_ddx_fallback_check_pixmap(dst) &&
-        glamor_ddx_fallback_check_gc(gc))
-        return FALSE;
-
-    *region = glamor_copy_plane(src, dst, gc,
-                                srcx, srcy, w, h, dstx, dsty,
-                                bitplane);
-    return TRUE;
-}
diff --git a/xorg-server/glamor/glamor_core.c b/xorg-server/glamor/glamor_core.c
index 737b2744b..55174541f 100644
--- a/xorg-server/glamor/glamor_core.c
+++ b/xorg-server/glamor/glamor_core.c
@@ -43,9 +43,9 @@ glamor_get_drawable_location(const DrawablePtr drawable)
     glamor_screen_private *glamor_priv =
         glamor_get_screen_private(drawable->pScreen);
     if (pixmap_priv == NULL ||
-        pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED)
+        pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
         return 'm';
-    if (pixmap_priv->base.fbo->fb == glamor_priv->screen_fbo)
+    if (pixmap_priv->fbo->fb == glamor_priv->screen_fbo)
         return 's';
     else
         return 'f';
@@ -173,46 +173,48 @@ glamor_init_finish_access_shaders(ScreenPtr screen)
     const char *fs_source =
         "void main()\n"
         "{\n"
+        "   vec4 color = texture2D(sampler, source_texture);\n"
         "   if (revert == REVERT_NONE) \n"
         "    { \n"
         "     if ((swap_rb != SWAP_NONE_DOWNLOADING) && (swap_rb != SWAP_NONE_UPLOADING))   \n"
-        "	  	gl_FragColor = texture2D(sampler, source_texture).bgra;\n"
+        "		gl_FragColor = color.bgra;\n"
         "     else \n"
-        "	  	gl_FragColor = texture2D(sampler, source_texture).rgba;\n"
+        "		gl_FragColor = color.rgba;\n"
         "    } \n"
         "   else \n"
         "    { \n"
         "     if (swap_rb == SWAP_DOWNLOADING)   \n"
-        "	  	gl_FragColor = texture2D(sampler, source_texture).argb;\n"
+        "		gl_FragColor = color.argb;\n"
         "     else if (swap_rb == SWAP_NONE_DOWNLOADING)\n"
-        "	  	gl_FragColor = texture2D(sampler, source_texture).abgr;\n"
+        "		gl_FragColor = color.abgr;\n"
         "     else if (swap_rb == SWAP_UPLOADING)\n"
-        "	  	gl_FragColor = texture2D(sampler, source_texture).gbar;\n"
+        "		gl_FragColor = color.gbar;\n"
         "     else if (swap_rb == SWAP_NONE_UPLOADING)\n"
-        "	  	gl_FragColor = texture2D(sampler, source_texture).abgr;\n"
+        "		gl_FragColor = color.abgr;\n"
         "    } \n"
         "}\n";
 
     const char *set_alpha_source =
         "void main()\n"
         "{\n"
+        "   vec4 color = texture2D(sampler, source_texture);\n"
         "   if (revert == REVERT_NONE) \n"
         "    { \n"
         "     if ((swap_rb != SWAP_NONE_DOWNLOADING) && (swap_rb != SWAP_NONE_UPLOADING))   \n"
-        "	  	gl_FragColor = vec4(texture2D(sampler, source_texture).bgr, 1);\n"
+        "		gl_FragColor = vec4(color.bgr, 1);\n"
         "     else \n"
-        "	  	gl_FragColor = vec4(texture2D(sampler, source_texture).rgb, 1);\n"
+        "		gl_FragColor = vec4(color.rgb, 1);\n"
         "    } \n"
         "   else \n"
         "    { \n"
         "     if (swap_rb == SWAP_DOWNLOADING)   \n"
-        "	  	gl_FragColor = vec4(1, texture2D(sampler, source_texture).rgb);\n"
+        "		gl_FragColor = vec4(1, color.rgb);\n"
         "     else if (swap_rb == SWAP_NONE_DOWNLOADING)\n"
-        "	  	gl_FragColor = vec4(1, texture2D(sampler, source_texture).bgr);\n"
+        "		gl_FragColor = vec4(1, color.bgr);\n"
         "     else if (swap_rb == SWAP_UPLOADING)\n"
-        "	  	gl_FragColor = vec4(texture2D(sampler, source_texture).gba, 1);\n"
+        "		gl_FragColor = vec4(color.gba, 1);\n"
         "     else if (swap_rb == SWAP_NONE_UPLOADING)\n"
-        "	  	gl_FragColor = vec4(texture2D(sampler, source_texture).abg, 1);\n"
+        "		gl_FragColor = vec4(color.abg, 1);\n"
         "    } \n"
         "}\n";
     GLint fs_prog, vs_prog, avs_prog, set_alpha_prog;
diff --git a/xorg-server/glamor/glamor_dash.c b/xorg-server/glamor/glamor_dash.c
index e8f60fa10..4281ff0a8 100644
--- a/xorg-server/glamor/glamor_dash.c
+++ b/xorg-server/glamor/glamor_dash.c
@@ -159,11 +159,11 @@ glamor_dash_setup(DrawablePtr drawable, GCPtr gc)
                                        &glamor_priv->on_off_dash_line_progs,
                                        &glamor_facet_on_off_dash_lines);
         if (!prog)
-            goto bail_ctx;
+            goto bail;
         break;
     case LineDoubleDash:
         if (gc->fillStyle != FillSolid)
-            goto bail_ctx;
+            goto bail;
 
         prog = &glamor_priv->double_dash_line_prog;
 
@@ -171,32 +171,30 @@ glamor_dash_setup(DrawablePtr drawable, GCPtr gc)
             if (!glamor_build_program(screen, prog,
                                       &glamor_facet_double_dash_lines,
                                       NULL))
-                goto bail_ctx;
+                goto bail;
         }
 
         if (!glamor_use_program(pixmap, gc, prog, NULL))
-            goto bail_ctx;
+            goto bail;
 
         glamor_set_color(pixmap, gc->fgPixel, prog->fg_uniform);
         glamor_set_color(pixmap, gc->bgPixel, prog->bg_uniform);
         break;
 
     default:
-        goto bail_ctx;
+        goto bail;
     }
 
 
     /* Set the dash pattern as texture 1 */
 
     glActiveTexture(GL_TEXTURE1);
-    glBindTexture(GL_TEXTURE_2D, dash_priv->base.fbo->tex);
+    glBindTexture(GL_TEXTURE_2D, dash_priv->fbo->tex);
     glUniform1i(prog->dash_uniform, 1);
     glUniform1f(prog->dash_length_uniform, dash_pixmap->drawable.width);
 
     return prog;
 
-bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return NULL;
 }
@@ -230,7 +228,6 @@ glamor_dash_loop(DrawablePtr drawable, GCPtr gc, glamor_program *prog,
     }
 
     glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_COLOR_LOGIC_OP);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 }
 
diff --git a/xorg-server/glamor/glamor_egl.c b/xorg-server/glamor/glamor_egl.c
index 113450c8d..6033780f8 100644
--- a/xorg-server/glamor/glamor_egl.c
+++ b/xorg-server/glamor/glamor_egl.c
@@ -239,7 +239,6 @@ glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
                    "Failed to create textured screen.");
         return FALSE;
     }
-
     glamor_set_screen_pixmap(screen_pixmap, NULL);
     return TRUE;
 }
@@ -272,7 +271,7 @@ glamor_egl_set_pixmap_image(PixmapPtr pixmap, EGLImageKHR image)
         glamor_get_pixmap_private(pixmap);
     EGLImageKHR old;
 
-    old = pixmap_priv->base.image;
+    old = pixmap_priv->image;
     if (old) {
         ScreenPtr                               screen = pixmap->drawable.pScreen;
         ScrnInfoPtr                             scrn = xf86ScreenToScrn(screen);
@@ -280,7 +279,7 @@ glamor_egl_set_pixmap_image(PixmapPtr pixmap, EGLImageKHR image)
 
         eglDestroyImageKHR(glamor_egl->display, old);
     }
-    pixmap_priv->base.image = image;
+    pixmap_priv->image = image;
 }
 
 Bool
@@ -420,7 +419,7 @@ glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
 
     glamor_make_current(glamor_priv);
 
-    image = pixmap_priv->base.image;
+    image = pixmap_priv->image;
     if (!image) {
         image = eglCreateImageKHR(glamor_egl->display,
                                   glamor_egl->context,
@@ -536,7 +535,7 @@ glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
     struct glamor_pixmap_private *pixmap_priv =
         glamor_get_pixmap_private(pixmap);
 
-    if (pixmap_priv && pixmap_priv->base.image) {
+    if (pixmap_priv && pixmap_priv->image) {
         ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
         struct glamor_egl_screen_private *glamor_egl =
             glamor_egl_get_screen_private(scrn);
@@ -545,8 +544,8 @@ glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
          * a texture. we must call glFlush to make sure the
          * operation on that texture has been done.*/
         glamor_block_handler(pixmap->drawable.pScreen);
-        eglDestroyImageKHR(glamor_egl->display, pixmap_priv->base.image);
-        pixmap_priv->base.image = NULL;
+        eglDestroyImageKHR(glamor_egl->display, pixmap_priv->image);
+        pixmap_priv->image = NULL;
     }
 }
 
@@ -561,13 +560,12 @@ glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
 
     glamor_pixmap_exchange_fbos(front, back);
 
-    temp = back_priv->base.image;
-    back_priv->base.image = front_priv->base.image;
-    front_priv->base.image = temp;
+    temp = back_priv->image;
+    back_priv->image = front_priv->image;
+    front_priv->image = temp;
 
     glamor_set_pixmap_type(front, GLAMOR_TEXTURE_DRM);
     glamor_set_pixmap_type(back, GLAMOR_TEXTURE_DRM);
-
 }
 
 void
@@ -589,8 +587,8 @@ glamor_egl_close_screen(ScreenPtr screen)
     screen_pixmap = screen->GetScreenPixmap(screen);
     pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
 
-    eglDestroyImageKHR(glamor_egl->display, pixmap_priv->base.image);
-    pixmap_priv->base.image = NULL;
+    eglDestroyImageKHR(glamor_egl->display, pixmap_priv->image);
+    pixmap_priv->image = NULL;
 
     screen->CloseScreen = glamor_egl->saved_close_screen;
 
diff --git a/xorg-server/glamor/glamor_fbo.c b/xorg-server/glamor/glamor_fbo.c
index 8d73e4765..ea0e80102 100644
--- a/xorg-server/glamor/glamor_fbo.c
+++ b/xorg-server/glamor/glamor_fbo.c
@@ -72,7 +72,7 @@ cache_hbucket(int size)
 
 static glamor_pixmap_fbo *
 glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
-                            int w, int h, GLenum format, int flag)
+                            int w, int h, GLenum format)
 {
     struct xorg_list *cache;
     glamor_pixmap_fbo *fbo_entry, *ret_fbo = NULL;
@@ -87,33 +87,18 @@ glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
     cache = &glamor_priv->fbo_cache[n_format]
         [cache_wbucket(w)]
         [cache_hbucket(h)];
-    if (!(flag & GLAMOR_CACHE_EXACT_SIZE)) {
-        xorg_list_for_each_entry(fbo_entry, cache, list) {
-            if (fbo_entry->width >= w && fbo_entry->height >= h) {
-
-                DEBUGF("Request w %d h %d format %x \n", w, h, format);
-                DEBUGF("got cache entry %p w %d h %d fbo %d tex %d format %x\n",
-                       fbo_entry, fbo_entry->width, fbo_entry->height,
-                       fbo_entry->fb, fbo_entry->tex);
-                xorg_list_del(&fbo_entry->list);
-                ret_fbo = fbo_entry;
-                break;
-            }
-        }
-    }
-    else {
-        xorg_list_for_each_entry(fbo_entry, cache, list) {
-            if (fbo_entry->width == w && fbo_entry->height == h) {
-
-                DEBUGF("Request w %d h %d format %x \n", w, h, format);
-                DEBUGF("got cache entry %p w %d h %d fbo %d tex %d format %x\n",
-                       fbo_entry, fbo_entry->width, fbo_entry->height,
-                       fbo_entry->fb, fbo_entry->tex, fbo_entry->format);
-                assert(format == fbo_entry->format);
-                xorg_list_del(&fbo_entry->list);
-                ret_fbo = fbo_entry;
-                break;
-            }
+
+    xorg_list_for_each_entry(fbo_entry, cache, list) {
+        if (fbo_entry->width == w && fbo_entry->height == h) {
+
+            DEBUGF("Request w %d h %d format %x \n", w, h, format);
+            DEBUGF("got cache entry %p w %d h %d fbo %d tex %d format %x\n",
+                   fbo_entry, fbo_entry->width, fbo_entry->height,
+                   fbo_entry->fb, fbo_entry->tex, fbo_entry->format);
+            assert(format == fbo_entry->format);
+            xorg_list_del(&fbo_entry->list);
+            ret_fbo = fbo_entry;
+            break;
         }
     }
 
@@ -127,9 +112,10 @@ glamor_pixmap_fbo_cache_get(glamor_screen_private *glamor_priv,
 }
 
 static void
-glamor_purge_fbo(glamor_pixmap_fbo *fbo)
+glamor_purge_fbo(glamor_screen_private *glamor_priv,
+                 glamor_pixmap_fbo *fbo)
 {
-    glamor_make_current(fbo->glamor_priv);
+    glamor_make_current(glamor_priv);
 
     if (fbo->fb)
         glDeleteFramebuffers(1, &fbo->fb);
@@ -142,7 +128,8 @@ glamor_purge_fbo(glamor_pixmap_fbo *fbo)
 }
 
 static void
-glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo)
+glamor_pixmap_fbo_cache_put(glamor_screen_private *glamor_priv,
+                            glamor_pixmap_fbo *fbo)
 {
     struct xorg_list *cache;
     int n_format;
@@ -154,32 +141,33 @@ glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo)
     n_format = cache_format(fbo->format);
 
     if (fbo->fb == 0 || fbo->external || n_format == -1
-        || fbo->glamor_priv->fbo_cache_watermark >= FBO_CACHE_THRESHOLD) {
-        fbo->glamor_priv->tick += GLAMOR_CACHE_EXPIRE_MAX;
-        glamor_fbo_expire(fbo->glamor_priv);
-        glamor_purge_fbo(fbo);
+        || glamor_priv->fbo_cache_watermark >= FBO_CACHE_THRESHOLD) {
+        glamor_priv->tick += GLAMOR_CACHE_EXPIRE_MAX;
+        glamor_fbo_expire(glamor_priv);
+        glamor_purge_fbo(glamor_priv, fbo);
         return;
     }
 
-    cache = &fbo->glamor_priv->fbo_cache[n_format]
+    cache = &glamor_priv->fbo_cache[n_format]
         [cache_wbucket(fbo->width)]
         [cache_hbucket(fbo->height)];
     DEBUGF
         ("Put cache entry %p to cache %p w %d h %d format %x fbo %d tex %d \n",
          fbo, cache, fbo->width, fbo->height, fbo->format, fbo->fb, fbo->tex);
 
-    fbo->glamor_priv->fbo_cache_watermark += fbo->width * fbo->height;
+    glamor_priv->fbo_cache_watermark += fbo->width * fbo->height;
     xorg_list_add(&fbo->list, cache);
-    fbo->expire = fbo->glamor_priv->tick + GLAMOR_CACHE_EXPIRE_MAX;
+    fbo->expire = glamor_priv->tick + GLAMOR_CACHE_EXPIRE_MAX;
 #endif
 }
 
 static int
-glamor_pixmap_ensure_fb(glamor_pixmap_fbo *fbo)
+glamor_pixmap_ensure_fb(glamor_screen_private *glamor_priv,
+                        glamor_pixmap_fbo *fbo)
 {
     int status, err = 0;
 
-    glamor_make_current(fbo->glamor_priv);
+    glamor_make_current(glamor_priv);
 
     if (fbo->fb == 0)
         glGenFramebuffers(1, &fbo->fb);
@@ -239,22 +227,14 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
     fbo->height = h;
     fbo->external = FALSE;
     fbo->format = format;
-    fbo->glamor_priv = glamor_priv;
-
-    if (flag == GLAMOR_CREATE_PIXMAP_MAP) {
-        glamor_make_current(glamor_priv);
-        glGenBuffers(1, &fbo->pbo);
-        goto done;
-    }
 
     if (flag != GLAMOR_CREATE_FBO_NO_FBO) {
-        if (glamor_pixmap_ensure_fb(fbo) != 0) {
-            glamor_purge_fbo(fbo);
+        if (glamor_pixmap_ensure_fb(glamor_priv, fbo) != 0) {
+            glamor_purge_fbo(glamor_priv, fbo);
             fbo = NULL;
         }
     }
 
- done:
     return fbo;
 }
 
@@ -280,7 +260,7 @@ glamor_fbo_expire(glamor_screen_private *glamor_priv)
                     xorg_list_del(&fbo_entry->list);
                     DEBUGF("cache %p fbo %p expired %d current %d \n", cache,
                            fbo_entry, fbo_entry->expire, glamor_priv->tick);
-                    glamor_purge_fbo(fbo_entry);
+                    glamor_purge_fbo(glamor_priv, fbo_entry);
                 }
             }
 
@@ -317,16 +297,17 @@ glamor_fini_pixmap_fbo(ScreenPtr screen)
                 xorg_list_for_each_entry_safe_reverse(fbo_entry, tmp, cache,
                                                       list) {
                     xorg_list_del(&fbo_entry->list);
-                    glamor_purge_fbo(fbo_entry);
+                    glamor_purge_fbo(glamor_priv, fbo_entry);
                 }
             }
 }
 
 void
-glamor_destroy_fbo(glamor_pixmap_fbo *fbo)
+glamor_destroy_fbo(glamor_screen_private *glamor_priv,
+                   glamor_pixmap_fbo *fbo)
 {
     xorg_list_del(&fbo->list);
-    glamor_pixmap_fbo_cache_put(fbo);
+    glamor_pixmap_fbo_cache_put(glamor_priv, fbo);
 
 }
 
@@ -348,7 +329,6 @@ _glamor_create_tex(glamor_screen_private *glamor_priv,
         glamor_make_current(glamor_priv);
         glGenTextures(1, &tex);
         glBindTexture(GL_TEXTURE_2D, tex);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0,
@@ -363,26 +343,15 @@ glamor_create_fbo(glamor_screen_private *glamor_priv,
 {
     glamor_pixmap_fbo *fbo;
     GLint tex = 0;
-    int cache_flag;
 
     if (flag == GLAMOR_CREATE_FBO_NO_FBO)
         goto new_fbo;
 
-    if (flag == GLAMOR_CREATE_PIXMAP_MAP)
-        goto no_tex;
-
-    /* Tiling from textures requires exact pixmap sizes. As we don't
-     * know which pixmaps will be used as tiles, just allocate
-     * everything at the requested size
-     */
-    cache_flag = GLAMOR_CACHE_EXACT_SIZE;
-
-    fbo = glamor_pixmap_fbo_cache_get(glamor_priv, w, h, format, cache_flag);
+    fbo = glamor_pixmap_fbo_cache_get(glamor_priv, w, h, format);
     if (fbo)
         return fbo;
  new_fbo:
     tex = _glamor_create_tex(glamor_priv, w, h, format);
- no_tex:
     fbo = glamor_create_fbo_from_tex(glamor_priv, w, h, format, tex, flag);
 
     return fbo;
@@ -399,9 +368,9 @@ _glamor_create_fbo_array(glamor_screen_private *glamor_priv,
     glamor_pixmap_fbo **fbo_array;
     BoxPtr box_array;
     int i, j;
-    glamor_pixmap_private_large_t *priv;
+    glamor_pixmap_private *priv;
 
-    priv = &pixmap_priv->large;
+    priv = pixmap_priv;
 
     block_wcnt = (w + block_w - 1) / block_w;
     block_hcnt = (h + block_h - 1) / block_h;
@@ -438,7 +407,7 @@ _glamor_create_fbo_array(glamor_screen_private *glamor_priv,
                                                                   format,
                                                                   GLAMOR_CREATE_PIXMAP_FIXUP);
             else
-                fbo_array[i * block_wcnt + j] = priv->base.fbo;
+                fbo_array[i * block_wcnt + j] = priv->fbo;
             if (fbo_array[i * block_wcnt + j] == NULL)
                 goto cleanup;
         }
@@ -454,7 +423,7 @@ _glamor_create_fbo_array(glamor_screen_private *glamor_priv,
  cleanup:
     for (i = 0; i < block_wcnt * block_hcnt; i++)
         if ((fbo_array)[i])
-            glamor_destroy_fbo((fbo_array)[i]);
+            glamor_destroy_fbo(glamor_priv, (fbo_array)[i]);
     free(box_array);
     free(fbo_array);
     return NULL;
@@ -468,8 +437,8 @@ glamor_create_fbo_array(glamor_screen_private *glamor_priv,
                         int block_w, int block_h,
                         glamor_pixmap_private *pixmap_priv)
 {
-    pixmap_priv->large.block_w = block_w;
-    pixmap_priv->large.block_h = block_h;
+    pixmap_priv->block_w = block_w;
+    pixmap_priv->block_h = block_h;
     return _glamor_create_fbo_array(glamor_priv, w, h, format, flag,
                                     block_w, block_h, pixmap_priv, 0);
 }
@@ -482,11 +451,11 @@ glamor_pixmap_detach_fbo(glamor_pixmap_private *pixmap_priv)
     if (pixmap_priv == NULL)
         return NULL;
 
-    fbo = pixmap_priv->base.fbo;
+    fbo = pixmap_priv->fbo;
     if (fbo == NULL)
         return NULL;
 
-    pixmap_priv->base.fbo = NULL;
+    pixmap_priv->fbo = NULL;
     return fbo;
 }
 
@@ -498,47 +467,44 @@ glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo)
 
     pixmap_priv = glamor_get_pixmap_private(pixmap);
 
-    if (pixmap_priv->base.fbo)
+    if (pixmap_priv->fbo)
         return;
 
-    pixmap_priv->base.fbo = fbo;
+    pixmap_priv->fbo = fbo;
 
     switch (pixmap_priv->type) {
-    case GLAMOR_TEXTURE_LARGE:
     case GLAMOR_TEXTURE_ONLY:
     case GLAMOR_TEXTURE_DRM:
-        pixmap_priv->base.gl_fbo = GLAMOR_FBO_NORMAL;
+        pixmap_priv->gl_fbo = GLAMOR_FBO_NORMAL;
         if (fbo->tex != 0)
-            pixmap_priv->base.gl_tex = 1;
+            pixmap_priv->gl_tex = 1;
         else {
             /* XXX For the Xephyr only, may be broken now. */
-            pixmap_priv->base.gl_tex = 0;
+            pixmap_priv->gl_tex = 0;
         }
-    case GLAMOR_MEMORY_MAP:
         pixmap->devPrivate.ptr = NULL;
-        break;
     default:
         break;
     }
 }
 
 void
-glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv)
+glamor_pixmap_destroy_fbo(glamor_screen_private *glamor_priv,
+                          glamor_pixmap_private *priv)
 {
     glamor_pixmap_fbo *fbo;
 
-    if (priv->type == GLAMOR_TEXTURE_LARGE) {
+    if (glamor_pixmap_priv_is_large(priv)) {
         int i;
-        glamor_pixmap_private_large_t *large = &priv->large;
 
-        for (i = 0; i < large->block_wcnt * large->block_hcnt; i++)
-            glamor_destroy_fbo(large->fbo_array[i]);
-        free(large->fbo_array);
+        for (i = 0; i < priv->block_wcnt * priv->block_hcnt; i++)
+            glamor_destroy_fbo(glamor_priv, priv->fbo_array[i]);
+        free(priv->fbo_array);
     }
     else {
         fbo = glamor_pixmap_detach_fbo(priv);
         if (fbo)
-            glamor_destroy_fbo(fbo);
+            glamor_destroy_fbo(glamor_priv, fbo);
     }
 }
 
@@ -551,7 +517,7 @@ glamor_pixmap_ensure_fbo(PixmapPtr pixmap, GLenum format, int flag)
 
     glamor_priv = glamor_get_screen_private(pixmap->drawable.pScreen);
     pixmap_priv = glamor_get_pixmap_private(pixmap);
-    if (pixmap_priv->base.fbo == NULL) {
+    if (pixmap_priv->fbo == NULL) {
 
         fbo = glamor_create_fbo(glamor_priv, pixmap->drawable.width,
                                 pixmap->drawable.height, format, flag);
@@ -562,13 +528,13 @@ glamor_pixmap_ensure_fbo(PixmapPtr pixmap, GLenum format, int flag)
     }
     else {
         /* We do have a fbo, but it may lack of fb or tex. */
-        if (!pixmap_priv->base.fbo->tex)
-            pixmap_priv->base.fbo->tex =
+        if (!pixmap_priv->fbo->tex)
+            pixmap_priv->fbo->tex =
                 _glamor_create_tex(glamor_priv, pixmap->drawable.width,
                                    pixmap->drawable.height, format);
 
-        if (flag != GLAMOR_CREATE_FBO_NO_FBO && pixmap_priv->base.fbo->fb == 0)
-            if (glamor_pixmap_ensure_fb(pixmap_priv->base.fbo) != 0)
+        if (flag != GLAMOR_CREATE_FBO_NO_FBO && pixmap_priv->fbo->fb == 0)
+            if (glamor_pixmap_ensure_fb(glamor_priv, pixmap_priv->fbo) != 0)
                 return FALSE;
     }
 
@@ -583,7 +549,7 @@ glamor_pixmap_exchange_fbos(PixmapPtr front, PixmapPtr back)
 
     front_priv = glamor_get_pixmap_private(front);
     back_priv = glamor_get_pixmap_private(back);
-    temp_fbo = front_priv->base.fbo;
-    front_priv->base.fbo = back_priv->base.fbo;
-    back_priv->base.fbo = temp_fbo;
+    temp_fbo = front_priv->fbo;
+    front_priv->fbo = back_priv->fbo;
+    back_priv->fbo = temp_fbo;
 }
diff --git a/xorg-server/glamor/glamor_font.c b/xorg-server/glamor/glamor_font.c
index 0ca91fa2e..cc0fecf7a 100644
--- a/xorg-server/glamor/glamor_font.c
+++ b/xorg-server/glamor/glamor_font.c
@@ -97,7 +97,6 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, glamor_font->texture_id);
 
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
diff --git a/xorg-server/glamor/glamor_glyphblt.c b/xorg-server/glamor/glamor_glyphblt.c
index 73b1df51e..1791f6dca 100644
--- a/xorg-server/glamor/glamor_glyphblt.c
+++ b/xorg-server/glamor/glamor_glyphblt.c
@@ -60,7 +60,7 @@ glamor_poly_glyph_blt_gl(DrawablePtr drawable, GCPtr gc,
                                    &glamor_priv->poly_glyph_blt_progs,
                                    &glamor_facet_poly_glyph_blt);
     if (!prog)
-        goto bail_ctx;
+        goto bail;
 
     glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
 
@@ -138,12 +138,9 @@ glamor_poly_glyph_blt_gl(DrawablePtr drawable, GCPtr gc,
         }
     }
 
-    glDisable(GL_COLOR_LOGIC_OP);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 
     return TRUE;
-bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return FALSE;
 }
@@ -160,32 +157,6 @@ glamor_poly_glyph_blt(DrawablePtr drawable, GCPtr gc,
                    ppci, pglyph_base);
 }
 
-Bool
-glamor_poly_glyph_blt_nf(DrawablePtr drawable, GCPtr gc,
-                         int start_x, int y, unsigned int nglyph,
-                         CharInfoPtr *ppci, void *pglyph_base)
-{
-    if (glamor_poly_glyph_blt_gl(drawable, gc, start_x, y, nglyph, ppci,
-                                 pglyph_base))
-        return TRUE;
-    if (glamor_ddx_fallback_check_pixmap(drawable) &&
-        glamor_ddx_fallback_check_gc(gc)) {
-        return FALSE;
-    }
-    miPolyGlyphBlt(drawable, gc, start_x, y, nglyph,
-                   ppci, pglyph_base);
-    return TRUE;
-}
-
-Bool
-glamor_image_glyph_blt_nf(DrawablePtr drawable, GCPtr gc,
-                          int start_x, int y, unsigned int nglyph,
-                          CharInfoPtr *ppci, void *pglyph_base)
-{
-    miImageGlyphBlt(drawable, gc, start_x, y, nglyph, ppci, pglyph_base);
-    return TRUE;
-}
-
 static Bool
 glamor_push_pixels_gl(GCPtr gc, PixmapPtr bitmap,
                       DrawablePtr drawable, int w, int h, int x, int y)
@@ -217,7 +188,7 @@ glamor_push_pixels_gl(GCPtr gc, PixmapPtr bitmap,
                                    &glamor_priv->poly_glyph_blt_progs,
                                    &glamor_facet_poly_glyph_blt);
     if (!prog)
-        goto bail_ctx;
+        goto bail;
 
     glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
 
@@ -256,12 +227,9 @@ glamor_push_pixels_gl(GCPtr gc, PixmapPtr bitmap,
         glDrawArrays(GL_POINTS, 0, num_points);
     }
 
-    glDisable(GL_COLOR_LOGIC_OP);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
     return TRUE;
 
-bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return FALSE;
 }
@@ -275,21 +243,3 @@ glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
 
     miPushPixels(pGC, pBitmap, pDrawable, w, h, x, y);
 }
-
-Bool
-glamor_push_pixels_nf(GCPtr gc, PixmapPtr bitmap,
-                      DrawablePtr drawable, int w, int h, int x, int y)
-{
-    if (glamor_push_pixels_gl(gc, bitmap, drawable, w, h, x, y))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable) &&
-        glamor_ddx_fallback_check_pixmap(&bitmap->drawable) &&
-        glamor_ddx_fallback_check_gc(gc))
-    {
-        return FALSE;
-    }
-
-    miPushPixels(gc, bitmap, drawable, w, h, x, y);
-    return TRUE;
-}
diff --git a/xorg-server/glamor/glamor_glyphs.c b/xorg-server/glamor/glamor_glyphs.c
index 1f1362487..2cf0c7d16 100644
--- a/xorg-server/glamor/glamor_glyphs.c
+++ b/xorg-server/glamor/glamor_glyphs.c
@@ -1166,11 +1166,9 @@ static void
 glamor_glyphs_flush_mask(struct glyphs_flush_mask_arg *arg)
 {
     if (arg->buffer->count > 0) {
-#ifdef RENDER
         glamor_composite_glyph_rects(PictOpAdd, arg->buffer->source,
                                      NULL, arg->mask,
                                      arg->buffer->count, arg->buffer->rects);
-#endif
     }
     arg->buffer->count = 0;
     arg->buffer->source = NULL;
@@ -1769,15 +1767,3 @@ glamor_glyphs(CARD8 op,
     _glamor_glyphs(op, src, dst, mask_format, x_src,
                    y_src, nlist, list, glyphs, TRUE);
 }
-
-Bool
-glamor_glyphs_nf(CARD8 op,
-                 PicturePtr src,
-                 PicturePtr dst,
-                 PictFormatPtr mask_format,
-                 INT16 x_src,
-                 INT16 y_src, int nlist, GlyphListPtr list, GlyphPtr *glyphs)
-{
-    return _glamor_glyphs(op, src, dst, mask_format, x_src,
-                          y_src, nlist, list, glyphs, FALSE);
-}
diff --git a/xorg-server/glamor/glamor_gradient.c b/xorg-server/glamor/glamor_gradient.c
index 4ded89dcd..8ea645efc 100644
--- a/xorg-server/glamor/glamor_gradient.c
+++ b/xorg-server/glamor/glamor_gradient.c
@@ -32,8 +32,6 @@
 
 #include "glamor_priv.h"
 
-#ifdef RENDER
-
 #define LINEAR_SMALL_STOPS (6 + 2)
 #define LINEAR_LARGE_STOPS (16 + 2)
 
@@ -684,9 +682,9 @@ _glamor_gradient_set_pixmap_destination(ScreenPtr screen,
         return 0;
     }
 
-    glamor_set_destination_pixmap_priv_nc(pixmap_priv);
+    glamor_set_destination_pixmap_priv_nc(glamor_priv, pixmap, pixmap_priv);
 
-    pixmap_priv_get_dest_scale(pixmap_priv, xscale, yscale);
+    pixmap_priv_get_dest_scale(pixmap, pixmap_priv, xscale, yscale);
 
     DEBUGF("xscale = %f, yscale = %f,"
            " x_source = %d, y_source = %d, width = %d, height = %d\n",
@@ -995,6 +993,8 @@ glamor_generate_radial_gradient_picture(ScreenPtr screen,
          vertices, tex_vertices, 0))
         goto GRADIENT_FAIL;
 
+    glamor_set_alu(screen, GXcopy);
+
     /* Set all the stops and colors to shader. */
     if (stops_count > RADIAL_SMALL_STOPS) {
         stop_colors = malloc(4 * stops_count * sizeof(float));
@@ -1311,6 +1311,8 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
          vertices, tex_vertices, 1))
         goto GRADIENT_FAIL;
 
+    glamor_set_alu(screen, GXcopy);
+
     /* Normalize the PTs. */
     glamor_set_normalize_pt(xscale, yscale,
                             pixman_fixed_to_double(src_picture->pSourcePict->
@@ -1473,5 +1475,3 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
 }
 
 #endif                          /* End of GLAMOR_GRADIENT_SHADER */
-
-#endif                          /* End of RENDER */
diff --git a/xorg-server/glamor/glamor_image.c b/xorg-server/glamor/glamor_image.c
index b38b41212..5633da647 100644
--- a/xorg-server/glamor/glamor_image.c
+++ b/xorg-server/glamor/glamor_image.c
@@ -102,19 +102,6 @@ glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
     glamor_put_image_bail(drawable, gc, depth, x, y, w, h, leftPad, format, bits);
 }
 
-Bool
-glamor_put_image_nf(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
-                    int w, int h, int leftPad, int format, char *bits)
-{
-    if (glamor_put_image_gl(drawable, gc, depth, x, y, w, h, leftPad, format, bits))
-        return TRUE;
-    if (glamor_ddx_fallback_check_pixmap(drawable) &&
-        glamor_ddx_fallback_check_gc(gc))
-        return FALSE;
-    glamor_put_image_bail(drawable, gc, depth, x, y, w, h, leftPad, format, bits);
-    return TRUE;
-}
-
 static Bool
 glamor_get_image_gl(DrawablePtr drawable, int x, int y, int w, int h,
                     unsigned int format, unsigned long plane_mask, char *d)
@@ -163,17 +150,3 @@ glamor_get_image(DrawablePtr drawable, int x, int y, int w, int h,
         return;
     glamor_get_image_bail(drawable, x, y, w, h, format, plane_mask, d);
 }
-
-Bool
-glamor_get_image_nf(DrawablePtr drawable, int x, int y, int w, int h,
-                    unsigned int format, unsigned long plane_mask, char *d)
-{
-    if (glamor_get_image_gl(drawable, x, y, w, h, format, plane_mask, d))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable))
-        return FALSE;
-
-    glamor_get_image_bail(drawable, x, y, w, h, format, plane_mask, d);
-    return TRUE;
-}
diff --git a/xorg-server/glamor/glamor_largepixmap.c b/xorg-server/glamor/glamor_largepixmap.c
index 9b2458453..391f376e9 100644
--- a/xorg-server/glamor/glamor_largepixmap.c
+++ b/xorg-server/glamor/glamor_largepixmap.c
@@ -2,10 +2,10 @@
 
 #include "glamor_priv.h"
 
-static inline glamor_pixmap_private_large_t *
+static inline glamor_pixmap_private *
 __glamor_large(glamor_pixmap_private *pixmap_priv) {
-    assert(pixmap_priv->type == GLAMOR_TEXTURE_LARGE);
-    return &pixmap_priv->large;
+    assert(glamor_pixmap_priv_is_large(pixmap_priv));
+    return pixmap_priv;
 }
 
 /**
@@ -150,12 +150,13 @@ __glamor_compute_clipped_regions(int block_w,
  */
 
 glamor_pixmap_clipped_regions *
-glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
+glamor_compute_clipped_regions_ext(PixmapPtr pixmap,
                                    RegionPtr region,
                                    int *n_region,
                                    int inner_block_w, int inner_block_h,
                                    int reverse, int upsidedown)
 {
+    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
     glamor_pixmap_clipped_regions *clipped_regions, *inner_regions,
         *result_regions;
     int i, j, x, y, k, inner_n_regions;
@@ -166,7 +167,7 @@ glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
 
     DEBUGF("ext called \n");
 
-    if (pixmap_priv->type != GLAMOR_TEXTURE_LARGE) {
+    if (glamor_pixmap_priv_is_small(pixmap_priv)) {
         clipped_regions = calloc(1, sizeof(*clipped_regions));
         if (clipped_regions == NULL) {
             *n_region = 0;
@@ -176,24 +177,22 @@ glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
         clipped_regions[0].block_idx = 0;
         RegionCopy(clipped_regions[0].region, region);
         *n_region = 1;
-        block_w = pixmap_priv->base.pixmap->drawable.width;
-        block_h = pixmap_priv->base.pixmap->drawable.height;
+        block_w = pixmap->drawable.width;
+        block_h = pixmap->drawable.height;
         box_array = &small_box;
         small_box.x1 = small_box.y1 = 0;
         small_box.x2 = block_w;
         small_box.y2 = block_h;
     }
     else {
-        glamor_pixmap_private_large_t *priv = __glamor_large(pixmap_priv);
+        glamor_pixmap_private *priv = __glamor_large(pixmap_priv);
 
         clipped_regions = __glamor_compute_clipped_regions(priv->block_w,
                                                            priv->block_h,
                                                            priv->block_wcnt,
                                                            0, 0,
-                                                           priv->base.pixmap->
-                                                           drawable.width,
-                                                           priv->base.pixmap->
-                                                           drawable.height,
+                                                           pixmap->drawable.width,
+                                                           pixmap->drawable.height,
                                                            region, n_region,
                                                            reverse, upsidedown);
 
@@ -336,7 +335,8 @@ _glamor_largepixmap_reflect_fixup(short *xy1, short *xy2, int wh)
  *
  */
 static glamor_pixmap_clipped_regions *
-_glamor_compute_clipped_regions(glamor_pixmap_private *pixmap_priv,
+_glamor_compute_clipped_regions(PixmapPtr pixmap,
+                                glamor_pixmap_private *pixmap_priv,
                                 RegionPtr region, int *n_region,
                                 int repeat_type, int is_transform,
                                 int reverse, int upsidedown)
@@ -352,10 +352,10 @@ _glamor_compute_clipped_regions(glamor_pixmap_private *pixmap_priv,
     int right_shift = 0;
     int down_shift = 0;
     int x_center_shift = 0, y_center_shift = 0;
-    glamor_pixmap_private_large_t *priv;
+    glamor_pixmap_private *priv;
 
     DEBUGRegionPrint(region);
-    if (pixmap_priv->type != GLAMOR_TEXTURE_LARGE) {
+    if (glamor_pixmap_priv_is_small(pixmap_priv)) {
         clipped_regions = calloc(1, sizeof(*clipped_regions));
         clipped_regions[0].region = RegionCreate(NULL, 1);
         clipped_regions[0].block_idx = 0;
@@ -366,8 +366,8 @@ _glamor_compute_clipped_regions(glamor_pixmap_private *pixmap_priv,
 
     priv = __glamor_large(pixmap_priv);
 
-    pixmap_width = priv->base.pixmap->drawable.width;
-    pixmap_height = priv->base.pixmap->drawable.height;
+    pixmap_width = pixmap->drawable.width;
+    pixmap_height = pixmap->drawable.height;
     if (repeat_type == 0 || repeat_type == RepeatPad) {
         RegionPtr saved_region = NULL;
 
@@ -385,10 +385,8 @@ _glamor_compute_clipped_regions(glamor_pixmap_private *pixmap_priv,
                                                            priv->block_h,
                                                            priv->block_wcnt,
                                                            0, 0,
-                                                           priv->base.pixmap->
-                                                           drawable.width,
-                                                           priv->base.pixmap->
-                                                           drawable.height,
+                                                           pixmap->drawable.width,
+                                                           pixmap->drawable.height,
                                                            region, n_region,
                                                            reverse, upsidedown);
         if (saved_region)
@@ -670,11 +668,13 @@ _glamor_compute_clipped_regions(glamor_pixmap_private *pixmap_priv,
 }
 
 glamor_pixmap_clipped_regions *
-glamor_compute_clipped_regions(glamor_pixmap_private *priv, RegionPtr region,
+glamor_compute_clipped_regions(PixmapPtr pixmap,
+                               RegionPtr region,
                                int *n_region, int repeat_type,
                                int reverse, int upsidedown)
 {
-    return _glamor_compute_clipped_regions(priv, region, n_region, repeat_type,
+    glamor_pixmap_private       *priv = glamor_get_pixmap_private(pixmap);
+    return _glamor_compute_clipped_regions(pixmap, priv, region, n_region, repeat_type,
                                            0, reverse, upsidedown);
 }
 
@@ -682,12 +682,13 @@ glamor_compute_clipped_regions(glamor_pixmap_private *priv, RegionPtr region,
  * by default. Or just use region32 for repeat cases?
  **/
 glamor_pixmap_clipped_regions *
-glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv,
+glamor_compute_transform_clipped_regions(PixmapPtr pixmap,
                                          struct pixman_transform *transform,
                                          RegionPtr region, int *n_region,
                                          int dx, int dy, int repeat_type,
                                          int reverse, int upsidedown)
 {
+    glamor_pixmap_private *priv = glamor_get_pixmap_private(pixmap);
     BoxPtr temp_extent;
     struct pixman_box32 temp_box;
     struct pixman_box16 short_box;
@@ -714,8 +715,8 @@ glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv,
             temp_box.x1 = 0;
         if (temp_box.y1 < 0)
             temp_box.y1 = 0;
-        temp_box.x2 = MIN(temp_box.x2, priv->base.pixmap->drawable.width);
-        temp_box.y2 = MIN(temp_box.y2, priv->base.pixmap->drawable.height);
+        temp_box.x2 = MIN(temp_box.x2, pixmap->drawable.width);
+        temp_box.y2 = MIN(temp_box.y2, pixmap->drawable.height);
     }
     /* Now copy back the box32 to a box16 box. */
     short_box.x1 = temp_box.x1;
@@ -725,7 +726,8 @@ glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv,
     RegionInitBoxes(temp_region, &short_box, 1);
     DEBUGF("copy to temp source region \n");
     DEBUGRegionPrint(temp_region);
-    ret = _glamor_compute_clipped_regions(priv,
+    ret = _glamor_compute_clipped_regions(pixmap,
+                                          priv,
                                           temp_region,
                                           n_region,
                                           repeat_type, 1, reverse, upsidedown);
@@ -747,7 +749,8 @@ glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv,
  * if the clipped result cross the region boundary.
  */
 static void
-glamor_merge_clipped_regions(glamor_pixmap_private *pixmap_priv,
+glamor_merge_clipped_regions(PixmapPtr pixmap,
+                             glamor_pixmap_private *pixmap_priv,
                              int repeat_type,
                              glamor_pixmap_clipped_regions *clipped_regions,
                              int *n_regions, int *need_clean_fbo)
@@ -760,11 +763,11 @@ glamor_merge_clipped_regions(glamor_pixmap_private *pixmap_priv,
     int overlap;
     int i;
     int pixmap_width, pixmap_height;
-    glamor_pixmap_private_large_t *priv;
+    glamor_pixmap_private *priv;
 
     priv = __glamor_large(pixmap_priv);
-    pixmap_width = priv->base.pixmap->drawable.width;
-    pixmap_height = priv->base.pixmap->drawable.height;
+    pixmap_width = pixmap->drawable.width;
+    pixmap_height =pixmap->drawable.height;
 
     temp_region = RegionCreate(NULL, 4);
     for (i = 0; i < *n_regions; i++) {
@@ -784,10 +787,10 @@ glamor_merge_clipped_regions(glamor_pixmap_private *pixmap_priv,
     DEBUGF("%d %d %d %d \n", temp_box.x1, temp_box.y1, temp_box.x2,
            temp_box.y2);
     temp_pixmap =
-        glamor_create_pixmap(priv->base.pixmap->drawable.pScreen,
+        glamor_create_pixmap(pixmap->drawable.pScreen,
                              temp_box.x2 - temp_box.x1,
                              temp_box.y2 - temp_box.y1,
-                             priv->base.pixmap->drawable.depth,
+                             pixmap->drawable.depth,
                              GLAMOR_CREATE_PIXMAP_FIXUP);
     if (temp_pixmap == NULL) {
         assert(0);
@@ -795,7 +798,7 @@ glamor_merge_clipped_regions(glamor_pixmap_private *pixmap_priv,
     }
 
     temp_priv = glamor_get_pixmap_private(temp_pixmap);
-    assert(temp_priv->type != GLAMOR_TEXTURE_LARGE);
+    assert(glamor_pixmap_priv_is_small(temp_priv));
 
     priv->box = temp_box;
     if (temp_extent->x1 >= 0 && temp_extent->x2 <= pixmap_width
@@ -808,7 +811,7 @@ glamor_merge_clipped_regions(glamor_pixmap_private *pixmap_priv,
         copy_box.y2 = temp_extent->y2 - temp_extent->y1;
         dx = temp_extent->x1;
         dy = temp_extent->y1;
-        glamor_copy(&priv->base.pixmap->drawable,
+        glamor_copy(&pixmap->drawable,
                     &temp_pixmap->drawable,
                     NULL, &copy_box, 1, dx, dy, 0, 0, 0, NULL);
 //              glamor_solid(temp_pixmap, 0, 0, temp_pixmap->drawable.width,
@@ -840,7 +843,7 @@ glamor_merge_clipped_regions(glamor_pixmap_private *pixmap_priv,
                        copy_box.x1, copy_box.y1, copy_box.x2,
                        copy_box.y2, dx, dy);
 
-                glamor_copy(&priv->base.pixmap->drawable,
+                glamor_copy(&pixmap->drawable,
                             &temp_pixmap->drawable,
                             NULL, &copy_box, 1, dx, dy, 0, 0, 0, NULL);
 
@@ -855,7 +858,7 @@ glamor_merge_clipped_regions(glamor_pixmap_private *pixmap_priv,
         RegionDestroy(clipped_regions[i].region);
     RegionDestroy(temp_region);
     priv->box = temp_box;
-    priv->base.fbo = glamor_pixmap_detach_fbo(temp_priv);
+    priv->fbo = glamor_pixmap_detach_fbo(temp_priv);
     DEBUGF("priv box x1 %d y1 %d x2 %d y2 %d \n",
            priv->box.x1, priv->box.y1, priv->box.x2, priv->box.y2);
     glamor_destroy_pixmap(temp_pixmap);
@@ -920,10 +923,10 @@ glamor_get_transform_block_size(struct pixman_transform *transform,
     return TRUE;
 }
 
-#define VECTOR_FROM_POINT(p, x, y)	\
+#define VECTOR_FROM_POINT(p, x, y) do {\
 	p.v[0] = x;  \
 	p.v[1] = y;  \
-	p.v[2] = 1.0;
+	p.v[2] = 1.0; } while (0)
 void
 glamor_get_transform_extent_from_box(struct pixman_box32 *box,
                                      struct pixman_transform *transform)
@@ -933,12 +936,12 @@ glamor_get_transform_extent_from_box(struct pixman_box32 *box,
 
     struct pixman_f_transform ftransform;
 
-    VECTOR_FROM_POINT(p0, box->x1, box->y1)
-        VECTOR_FROM_POINT(p1, box->x2, box->y1)
-        VECTOR_FROM_POINT(p2, box->x2, box->y2)
-        VECTOR_FROM_POINT(p3, box->x1, box->y2)
+    VECTOR_FROM_POINT(p0, box->x1, box->y1);
+    VECTOR_FROM_POINT(p1, box->x2, box->y1);
+    VECTOR_FROM_POINT(p2, box->x2, box->y2);
+    VECTOR_FROM_POINT(p3, box->x1, box->y2);
 
-        pixman_f_transform_from_pixman_transform(&ftransform, transform);
+    pixman_f_transform_from_pixman_transform(&ftransform, transform);
     pixman_f_transform_point(&ftransform, &p0);
     pixman_f_transform_point(&ftransform, &p1);
     pixman_f_transform_point(&ftransform, &p2);
@@ -966,7 +969,8 @@ glamor_get_transform_extent_from_box(struct pixman_box32 *box,
 }
 
 static void
-_glamor_process_transformed_clipped_region(glamor_pixmap_private *priv,
+_glamor_process_transformed_clipped_region(PixmapPtr pixmap,
+                                           glamor_pixmap_private *priv,
                                            int repeat_type,
                                            glamor_pixmap_clipped_regions *
                                            clipped_regions, int *n_regions,
@@ -976,7 +980,7 @@ _glamor_process_transformed_clipped_region(glamor_pixmap_private *priv,
 
     if (*n_regions != 1) {
         /* Merge all source regions into one region. */
-        glamor_merge_clipped_regions(priv, repeat_type,
+        glamor_merge_clipped_regions(pixmap, priv, repeat_type,
                                      clipped_regions, n_regions,
                                      need_clean_fbo);
     }
@@ -990,22 +994,22 @@ _glamor_process_transformed_clipped_region(glamor_pixmap_private *priv,
             int rem;
 
             temp_box = RegionExtents(clipped_regions[0].region);
-            modulus(temp_box->x1, priv->base.pixmap->drawable.width, rem);
-            shift_x = (temp_box->x1 - rem) / priv->base.pixmap->drawable.width;
-            modulus(temp_box->y1, priv->base.pixmap->drawable.height, rem);
-            shift_y = (temp_box->y1 - rem) / priv->base.pixmap->drawable.height;
+            modulus(temp_box->x1, pixmap->drawable.width, rem);
+            shift_x = (temp_box->x1 - rem) / pixmap->drawable.width;
+            modulus(temp_box->y1, pixmap->drawable.height, rem);
+            shift_y = (temp_box->y1 - rem) / pixmap->drawable.height;
 
             if (shift_x != 0) {
                 __glamor_large(priv)->box.x1 +=
-                    shift_x * priv->base.pixmap->drawable.width;
+                    shift_x * pixmap->drawable.width;
                 __glamor_large(priv)->box.x2 +=
-                    shift_x * priv->base.pixmap->drawable.width;
+                    shift_x * pixmap->drawable.width;
             }
             if (shift_y != 0) {
                 __glamor_large(priv)->box.y1 +=
-                    shift_y * priv->base.pixmap->drawable.height;
+                    shift_y * pixmap->drawable.height;
                 __glamor_large(priv)->box.y2 +=
-                    shift_y * priv->base.pixmap->drawable.height;
+                    shift_y * pixmap->drawable.height;
             }
         }
     }
@@ -1016,9 +1020,9 @@ glamor_composite_largepixmap_region(CARD8 op,
                                     PicturePtr source,
                                     PicturePtr mask,
                                     PicturePtr dest,
-                                    glamor_pixmap_private *source_pixmap_priv,
-                                    glamor_pixmap_private *mask_pixmap_priv,
-                                    glamor_pixmap_private *dest_pixmap_priv,
+                                    PixmapPtr source_pixmap,
+                                    PixmapPtr mask_pixmap,
+                                    PixmapPtr dest_pixmap,
                                     RegionPtr region, Bool force_clip,
                                     INT16 x_source,
                                     INT16 y_source,
@@ -1027,6 +1031,11 @@ glamor_composite_largepixmap_region(CARD8 op,
                                     INT16 x_dest, INT16 y_dest,
                                     CARD16 width, CARD16 height)
 {
+    ScreenPtr screen = dest_pixmap->drawable.pScreen;
+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
+    glamor_pixmap_private *source_pixmap_priv = glamor_get_pixmap_private(source_pixmap);
+    glamor_pixmap_private *mask_pixmap_priv = glamor_get_pixmap_private(mask_pixmap);
+    glamor_pixmap_private *dest_pixmap_priv = glamor_get_pixmap_private(dest_pixmap);
     glamor_pixmap_clipped_regions *clipped_dest_regions;
     glamor_pixmap_clipped_regions *clipped_source_regions;
     glamor_pixmap_clipped_regions *clipped_mask_regions;
@@ -1056,12 +1065,12 @@ glamor_composite_largepixmap_region(CARD8 op,
     else
         mask_repeat_type = RepeatNone;
 
-    if (dest_pixmap_priv->type == GLAMOR_TEXTURE_LARGE) {
+    if (glamor_pixmap_priv_is_large(dest_pixmap_priv)) {
         dest_block_width = __glamor_large(dest_pixmap_priv)->block_w;
         dest_block_height = __glamor_large(dest_pixmap_priv)->block_h;
     } else {
-        dest_block_width = dest_pixmap_priv->base.pixmap->drawable.width;
-        dest_block_height = dest_pixmap_priv->base.pixmap->drawable.height;
+        dest_block_width = dest_pixmap->drawable.width;
+        dest_block_height = dest_pixmap->drawable.height;
     }
     fixed_block_width = dest_block_width;
     fixed_block_height = dest_block_height;
@@ -1087,7 +1096,7 @@ glamor_composite_largepixmap_region(CARD8 op,
      */
     if (source_pixmap_priv
         && source->transform
-        && source_pixmap_priv->type == GLAMOR_TEXTURE_LARGE) {
+        && glamor_pixmap_priv_is_large(source_pixmap_priv)) {
         int source_transformed_block_width, source_transformed_block_height;
 
         if (!glamor_get_transform_block_size(source->transform,
@@ -1109,7 +1118,7 @@ glamor_composite_largepixmap_region(CARD8 op,
     }
 
     if (mask_pixmap_priv
-        && mask->transform && mask_pixmap_priv->type == GLAMOR_TEXTURE_LARGE) {
+        && mask->transform && glamor_pixmap_priv_is_large(mask_pixmap_priv)) {
         int mask_transformed_block_width, mask_transformed_block_height;
 
         if (!glamor_get_transform_block_size(mask->transform,
@@ -1134,12 +1143,12 @@ glamor_composite_largepixmap_region(CARD8 op,
     if (force_clip || fixed_block_width < dest_block_width
         || fixed_block_height < dest_block_height)
         clipped_dest_regions =
-            glamor_compute_clipped_regions_ext(dest_pixmap_priv, region,
+            glamor_compute_clipped_regions_ext(dest_pixmap, region,
                                                &n_dest_regions,
                                                fixed_block_width,
                                                fixed_block_height, 0, 0);
     else
-        clipped_dest_regions = glamor_compute_clipped_regions(dest_pixmap_priv,
+        clipped_dest_regions = glamor_compute_clipped_regions(dest_pixmap,
                                                               region,
                                                               &n_dest_regions,
                                                               0, 0, 0);
@@ -1147,7 +1156,7 @@ glamor_composite_largepixmap_region(CARD8 op,
     if (source_pixmap_priv
         && (source_pixmap_priv == dest_pixmap_priv ||
             source_pixmap_priv == mask_pixmap_priv)
-        && source_pixmap_priv->type == GLAMOR_TEXTURE_LARGE) {
+        && glamor_pixmap_priv_is_large(source_pixmap_priv)) {
         /* XXX self-copy... */
         need_free_source_pixmap_priv = source_pixmap_priv;
         source_pixmap_priv = malloc(sizeof(*source_pixmap_priv));
@@ -1163,12 +1172,12 @@ glamor_composite_largepixmap_region(CARD8 op,
         glamor_set_pixmap_fbo_current(dest_pixmap_priv,
                                clipped_dest_regions[i].block_idx);
         if (source_pixmap_priv &&
-            source_pixmap_priv->type == GLAMOR_TEXTURE_LARGE) {
+            glamor_pixmap_priv_is_large(source_pixmap_priv)) {
             if (!source->transform && source_repeat_type != RepeatPad) {
                 RegionTranslate(clipped_dest_regions[i].region,
                                 x_source - x_dest, y_source - y_dest);
                 clipped_source_regions =
-                    glamor_compute_clipped_regions(source_pixmap_priv,
+                    glamor_compute_clipped_regions(source_pixmap,
                                                    clipped_dest_regions[i].
                                                    region, &n_source_regions,
                                                    source_repeat_type, 0, 0);
@@ -1176,7 +1185,7 @@ glamor_composite_largepixmap_region(CARD8 op,
             }
             else {
                 clipped_source_regions =
-                    glamor_compute_transform_clipped_regions(source_pixmap_priv,
+                    glamor_compute_transform_clipped_regions(source_pixmap,
                                                              source->transform,
                                                              clipped_dest_regions
                                                              [i].region,
@@ -1193,7 +1202,7 @@ glamor_composite_largepixmap_region(CARD8 op,
                 }
                 else
                     _glamor_process_transformed_clipped_region
-                        (source_pixmap_priv, source_repeat_type,
+                        (source_pixmap, source_pixmap_priv, source_repeat_type,
                          clipped_source_regions, &n_source_regions,
                          &need_clean_source_fbo);
             }
@@ -1204,7 +1213,7 @@ glamor_composite_largepixmap_region(CARD8 op,
                                            clipped_source_regions[j].block_idx);
 
                 if (mask_pixmap_priv &&
-                    mask_pixmap_priv->type == GLAMOR_TEXTURE_LARGE) {
+                    glamor_pixmap_priv_is_large(mask_pixmap_priv)) {
                     if (is_normal_mask_fbo && is_normal_source_fbo) {
                         /* both mask and source are normal fbo box without transform or repeatpad.
                          * The region is clipped against source and then we clip it against mask here.*/
@@ -1214,7 +1223,7 @@ glamor_composite_largepixmap_region(CARD8 op,
                         RegionTranslate(clipped_source_regions[j].region,
                                         -x_source + x_mask, -y_source + y_mask);
                         clipped_mask_regions =
-                            glamor_compute_clipped_regions(mask_pixmap_priv,
+                            glamor_compute_clipped_regions(mask_pixmap,
                                                            clipped_source_regions
                                                            [j].region,
                                                            &n_mask_regions,
@@ -1230,7 +1239,7 @@ glamor_composite_largepixmap_region(CARD8 op,
                         RegionTranslate(clipped_dest_regions[i].region,
                                         -x_dest + x_mask, -y_dest + y_mask);
                         clipped_mask_regions =
-                            glamor_compute_clipped_regions(mask_pixmap_priv,
+                            glamor_compute_clipped_regions(mask_pixmap,
                                                            clipped_dest_regions
                                                            [i].region,
                                                            &n_mask_regions,
@@ -1244,14 +1253,14 @@ glamor_composite_largepixmap_region(CARD8 op,
                         if (!is_normal_source_fbo)
                             clipped_mask_regions =
                                 glamor_compute_transform_clipped_regions
-                                (mask_pixmap_priv, mask->transform,
+                                (mask_pixmap, mask->transform,
                                  clipped_dest_regions[i].region,
                                  &n_mask_regions, x_mask - x_dest,
                                  y_mask - y_dest, mask_repeat_type, 0, 0);
                         else
                             clipped_mask_regions =
                                 glamor_compute_transform_clipped_regions
-                                (mask_pixmap_priv, mask->transform,
+                                (mask_pixmap, mask->transform,
                                  clipped_source_regions[j].region,
                                  &n_mask_regions, x_mask - x_source,
                                  y_mask - y_source, mask_repeat_type, 0, 0);
@@ -1263,7 +1272,7 @@ glamor_composite_largepixmap_region(CARD8 op,
                         }
                         else
                             _glamor_process_transformed_clipped_region
-                                (mask_pixmap_priv, mask_repeat_type,
+                                (mask_pixmap, mask_pixmap_priv, mask_repeat_type,
                                  clipped_mask_regions, &n_mask_regions,
                                  &need_clean_mask_fbo);
                     }
@@ -1273,9 +1282,9 @@ glamor_composite_largepixmap_region(CARD8 op,
 	if (!glamor_composite_clipped_region(op,		\
 			 null_source ? NULL : source,		\
 			 null_mask ? NULL : mask, dest,		\
-			 null_source ? NULL : source_pixmap_priv, \
-			 null_mask ? NULL : mask_pixmap_priv, 	\
-			 dest_pixmap_priv, region,		\
+			 null_source ? NULL : source_pixmap,    \
+			 null_mask ? NULL : mask_pixmap, 	\
+			 dest_pixmap, region,		        \
 			 x_source, y_source, x_mask, y_mask,	\
 			 x_dest, y_dest)) {			\
 		assert(0);					\
@@ -1326,8 +1335,8 @@ glamor_composite_largepixmap_region(CARD8 op,
                         null_mask = 0;
                     if (need_clean_mask_fbo) {
                         assert(is_normal_mask_fbo == 0);
-                        glamor_destroy_fbo(mask_pixmap_priv->base.fbo);
-                        mask_pixmap_priv->base.fbo = NULL;
+                        glamor_destroy_fbo(glamor_priv, mask_pixmap_priv->fbo);
+                        mask_pixmap_priv->fbo = NULL;
                         need_clean_mask_fbo = 0;
                     }
                 }
@@ -1355,19 +1364,19 @@ glamor_composite_largepixmap_region(CARD8 op,
                 null_source = 0;
             if (need_clean_source_fbo) {
                 assert(is_normal_source_fbo == 0);
-                glamor_destroy_fbo(source_pixmap_priv->base.fbo);
-                source_pixmap_priv->base.fbo = NULL;
+                glamor_destroy_fbo(glamor_priv, source_pixmap_priv->fbo);
+                source_pixmap_priv->fbo = NULL;
                 need_clean_source_fbo = 0;
             }
         }
         else {
             if (mask_pixmap_priv &&
-                mask_pixmap_priv->type == GLAMOR_TEXTURE_LARGE) {
+                glamor_pixmap_priv_is_large(mask_pixmap_priv)) {
                 if (!mask->transform && mask_repeat_type != RepeatPad) {
                     RegionTranslate(clipped_dest_regions[i].region,
                                     x_mask - x_dest, y_mask - y_dest);
                     clipped_mask_regions =
-                        glamor_compute_clipped_regions(mask_pixmap_priv,
+                        glamor_compute_clipped_regions(mask_pixmap,
                                                        clipped_dest_regions[i].
                                                        region, &n_mask_regions,
                                                        mask_repeat_type, 0, 0);
@@ -1376,7 +1385,7 @@ glamor_composite_largepixmap_region(CARD8 op,
                 else {
                     clipped_mask_regions =
                         glamor_compute_transform_clipped_regions
-                        (mask_pixmap_priv, mask->transform,
+                        (mask_pixmap, mask->transform,
                          clipped_dest_regions[i].region, &n_mask_regions,
                          x_mask - x_dest, y_mask - y_dest, mask_repeat_type, 0,
                          0);
@@ -1388,7 +1397,7 @@ glamor_composite_largepixmap_region(CARD8 op,
                     }
                     else
                         _glamor_process_transformed_clipped_region
-                            (mask_pixmap_priv, mask_repeat_type,
+                            (mask_pixmap, mask_pixmap_priv, mask_repeat_type,
                              clipped_mask_regions, &n_mask_regions,
                              &need_clean_mask_fbo);
                 }
@@ -1417,8 +1426,8 @@ glamor_composite_largepixmap_region(CARD8 op,
                 if (null_mask)
                     null_mask = 0;
                 if (need_clean_mask_fbo) {
-                    glamor_destroy_fbo(mask_pixmap_priv->base.fbo);
-                    mask_pixmap_priv->base.fbo = NULL;
+                    glamor_destroy_fbo(glamor_priv, mask_pixmap_priv->fbo);
+                    mask_pixmap_priv->fbo = NULL;
                     need_clean_mask_fbo = 0;
                 }
             }
diff --git a/xorg-server/glamor/glamor_lines.c b/xorg-server/glamor/glamor_lines.c
index e9a619505..2dd9c07db 100644
--- a/xorg-server/glamor/glamor_lines.c
+++ b/xorg-server/glamor/glamor_lines.c
@@ -65,7 +65,7 @@ glamor_poly_lines_solid_gl(DrawablePtr drawable, GCPtr gc,
                                    &glamor_facet_poly_lines);
 
     if (!prog)
-        goto bail_ctx;
+        goto bail;
 
     /* Set up the vertex buffers for the points */
 
@@ -117,12 +117,9 @@ glamor_poly_lines_solid_gl(DrawablePtr drawable, GCPtr gc,
     }
 
     glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_COLOR_LOGIC_OP);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 
     return TRUE;
-bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return FALSE;
 }
@@ -167,21 +164,3 @@ glamor_poly_lines(DrawablePtr drawable, GCPtr gc,
         return;
     glamor_poly_lines_bail(drawable, gc, mode, n, points);
 }
-
-Bool
-glamor_poly_lines_nf(DrawablePtr drawable, GCPtr gc,
-                     int mode, int n, DDXPointPtr points)
-{
-    if (glamor_poly_lines_gl(drawable, gc, mode, n, points))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable) &&
-        glamor_ddx_fallback_check_gc(gc))
-    {
-        return FALSE;
-    }
-
-    glamor_poly_lines_bail(drawable, gc, mode, n, points);
-    return TRUE;
-}
-
diff --git a/xorg-server/glamor/glamor_picture.c b/xorg-server/glamor/glamor_picture.c
index bc658f801..53b032c89 100644
--- a/xorg-server/glamor/glamor_picture.c
+++ b/xorg-server/glamor/glamor_picture.c
@@ -69,19 +69,9 @@ glamor_create_picture(PicturePtr picture)
         glamor_set_pixmap_type(pixmap, GLAMOR_MEMORY);
         pixmap_priv = glamor_get_pixmap_private(pixmap);
     }
-    else {
-        if (GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)) {
-            /* If the picture format is not compatible with glamor fbo format,
-             * we have to mark this pixmap as a separated texture, and don't
-             * fallback to DDX layer. */
-            if (pixmap_priv->type == GLAMOR_TEXTURE_DRM
-                && !glamor_pict_format_is_compatible(picture))
-                glamor_set_pixmap_type(pixmap, GLAMOR_SEPARATE_TEXTURE);
-        }
-    }
 
-    pixmap_priv->base.is_picture = 1;
-    pixmap_priv->base.picture = picture;
+    pixmap_priv->is_picture = 1;
+    pixmap_priv->picture = picture;
 
     return miCreatePicture(picture);
 }
@@ -99,8 +89,8 @@ glamor_destroy_picture(PicturePtr picture)
     pixmap_priv = glamor_get_pixmap_private(pixmap);
 
     if (pixmap_priv) {
-        pixmap_priv->base.is_picture = 0;
-        pixmap_priv->base.picture = NULL;
+        pixmap_priv->is_picture = 0;
+        pixmap_priv->picture = NULL;
     }
     miDestroyPicture(picture);
 }
@@ -109,5 +99,5 @@ void
 glamor_picture_format_fixup(PicturePtr picture,
                             glamor_pixmap_private *pixmap_priv)
 {
-    pixmap_priv->base.picture = picture;
+    pixmap_priv->picture = picture;
 }
diff --git a/xorg-server/glamor/glamor_pixmap.c b/xorg-server/glamor/glamor_pixmap.c
index 947113ee9..89b4c366b 100644
--- a/xorg-server/glamor/glamor_pixmap.c
+++ b/xorg-server/glamor/glamor_pixmap.c
@@ -63,31 +63,36 @@ glamor_pixmap_fini(ScreenPtr screen)
 }
 
 void
-glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *fbo, int x0, int y0,
+glamor_set_destination_pixmap_fbo(glamor_screen_private *glamor_priv,
+                                  glamor_pixmap_fbo *fbo, int x0, int y0,
                                   int width, int height)
 {
-    glamor_make_current(fbo->glamor_priv);
+    glamor_make_current(glamor_priv);
 
     glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb);
     glViewport(x0, y0, width, height);
 }
 
 void
-glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private *pixmap_priv)
+glamor_set_destination_pixmap_priv_nc(glamor_screen_private *glamor_priv,
+                                      PixmapPtr pixmap,
+                                      glamor_pixmap_private *pixmap_priv)
 {
     int w, h;
 
-    PIXMAP_PRIV_GET_ACTUAL_SIZE(pixmap_priv, w, h);
-    glamor_set_destination_pixmap_fbo(pixmap_priv->base.fbo, 0, 0, w, h);
+    PIXMAP_PRIV_GET_ACTUAL_SIZE(pixmap, pixmap_priv, w, h);
+    glamor_set_destination_pixmap_fbo(glamor_priv, pixmap_priv->fbo, 0, 0, w, h);
 }
 
 int
-glamor_set_destination_pixmap_priv(glamor_pixmap_private *pixmap_priv)
+glamor_set_destination_pixmap_priv(glamor_screen_private *glamor_priv,
+                                   PixmapPtr pixmap,
+                                   glamor_pixmap_private *pixmap_priv)
 {
     if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
         return -1;
 
-    glamor_set_destination_pixmap_priv_nc(pixmap_priv);
+    glamor_set_destination_pixmap_priv_nc(glamor_priv, pixmap, pixmap_priv);
     return 0;
 }
 
@@ -96,8 +101,10 @@ glamor_set_destination_pixmap(PixmapPtr pixmap)
 {
     int err;
     glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
+    ScreenPtr screen = pixmap->drawable.pScreen;
+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
 
-    err = glamor_set_destination_pixmap_priv(pixmap_priv);
+    err = glamor_set_destination_pixmap_priv(glamor_priv, pixmap, pixmap_priv);
     return err;
 }
 
@@ -471,7 +478,7 @@ glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap,
 
     pixmap_priv = glamor_get_pixmap_private(pixmap);
     if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
-        pict_format = pixmap_priv->base.picture->format;
+        pict_format = pixmap_priv->picture->format;
     else
         pict_format = format_for_depth(pixmap->drawable.depth);
 
@@ -717,7 +724,6 @@ __glamor_upload_pixmap_to_texture(PixmapPtr pixmap, unsigned int *tex,
     }
 
     glBindTexture(GL_TEXTURE_2D, *tex);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
@@ -742,6 +748,7 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format,
                                       int swap_rb, int x, int y, int w, int h,
                                       int stride, void *bits, int pbo)
 {
+    ScreenPtr screen = pixmap->drawable.pScreen;
     glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
     glamor_screen_private *glamor_priv =
         glamor_get_screen_private(pixmap->drawable.pScreen);
@@ -793,25 +800,25 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format,
     if (no_alpha == 0
         && revert == REVERT_NONE && swap_rb == SWAP_NONE_UPLOADING
 #ifdef WALKAROUND_LARGE_TEXTURE_MAP
-        && pixmap_priv->type != GLAMOR_TEXTURE_LARGE
+        && glamor_pixmap_priv_is_small(pixmap_priv)
 #endif
         ) {
         int fbo_x_off, fbo_y_off;
 
-        assert(pixmap_priv->base.fbo->tex);
+        assert(pixmap_priv->fbo->tex);
         pixmap_priv_get_fbo_off(pixmap_priv, &fbo_x_off, &fbo_y_off);
 
         assert(x + fbo_x_off >= 0 && y + fbo_y_off >= 0);
-        assert(x + fbo_x_off + w <= pixmap_priv->base.fbo->width);
-        assert(y + fbo_y_off + h <= pixmap_priv->base.fbo->height);
-        __glamor_upload_pixmap_to_texture(pixmap, &pixmap_priv->base.fbo->tex,
+        assert(x + fbo_x_off + w <= pixmap_priv->fbo->width);
+        assert(y + fbo_y_off + h <= pixmap_priv->fbo->height);
+        __glamor_upload_pixmap_to_texture(pixmap, &pixmap_priv->fbo->tex,
                                           format, type,
                                           x + fbo_x_off, y + fbo_y_off, w, h,
                                           bits, pbo);
     } else {
         ptexcoords = texcoords_inv;
 
-        pixmap_priv_get_dest_scale(pixmap_priv, &dst_xscale, &dst_yscale);
+        pixmap_priv_get_dest_scale(pixmap, pixmap_priv, &dst_xscale, &dst_yscale);
         glamor_set_normalize_vcoords(pixmap_priv, dst_xscale,
                                      dst_yscale,
                                      x, y,
@@ -826,7 +833,8 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format,
                               GL_FALSE, 2 * sizeof(float), ptexcoords);
         glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
 
-        glamor_set_destination_pixmap_priv_nc(pixmap_priv);
+        glamor_set_destination_pixmap_priv_nc(glamor_priv, pixmap, pixmap_priv);
+        glamor_set_alu(screen, GXcopy);
         __glamor_upload_pixmap_to_texture(pixmap, &tex,
                                           format, type, 0, 0, w, h, bits, pbo);
         glActiveTexture(GL_TEXTURE0);
@@ -868,17 +876,17 @@ glamor_pixmap_upload_prepare(PixmapPtr pixmap, GLenum format, int no_alpha,
     pixmap_priv = glamor_get_pixmap_private(pixmap);
     glamor_priv = glamor_get_screen_private(pixmap->drawable.pScreen);
 
-    if (pixmap_priv->base.gl_fbo != GLAMOR_FBO_UNATTACHED)
+    if (pixmap_priv->gl_fbo != GLAMOR_FBO_UNATTACHED)
         return 0;
 
-    if (pixmap_priv->base.fbo
-        && (pixmap_priv->base.fbo->width < pixmap->drawable.width
-            || pixmap_priv->base.fbo->height < pixmap->drawable.height)) {
+    if (pixmap_priv->fbo
+        && (pixmap_priv->fbo->width < pixmap->drawable.width
+            || pixmap_priv->fbo->height < pixmap->drawable.height)) {
         fbo = glamor_pixmap_detach_fbo(pixmap_priv);
-        glamor_destroy_fbo(fbo);
+        glamor_destroy_fbo(glamor_priv, fbo);
     }
 
-    if (pixmap_priv->base.fbo && pixmap_priv->base.fbo->fb)
+    if (pixmap_priv->fbo && pixmap_priv->fbo->fb)
         return 0;
 
     if (!(no_alpha || (revert == REVERT_NORMAL)
@@ -889,8 +897,8 @@ glamor_pixmap_upload_prepare(PixmapPtr pixmap, GLenum format, int no_alpha,
     }
 
     if ((flag == GLAMOR_CREATE_FBO_NO_FBO
-         && pixmap_priv->base.fbo && pixmap_priv->base.fbo->tex)
-        || (flag == 0 && pixmap_priv->base.fbo && pixmap_priv->base.fbo->fb))
+         && pixmap_priv->fbo && pixmap_priv->fbo->tex)
+        || (flag == 0 && pixmap_priv->fbo && pixmap_priv->fbo->fb))
         return 0;
 
     if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)
@@ -928,6 +936,8 @@ Bool
 glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w,
                                     int h, int stride, void *bits, int pbo)
 {
+    ScreenPtr screen = pixmap->drawable.pScreen;
+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
     GLenum format, type;
     int no_alpha, revert, swap_rb;
     glamor_pixmap_private *pixmap_priv;
@@ -945,10 +955,10 @@ glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w,
         return FALSE;
 
     pixmap_priv = glamor_get_pixmap_private(pixmap);
-    force_clip = pixmap_priv->base.glamor_priv->gl_flavor != GLAMOR_GL_DESKTOP
-        && !glamor_check_fbo_size(pixmap_priv->base.glamor_priv, w, h);
+    force_clip = glamor_priv->gl_flavor != GLAMOR_GL_DESKTOP
+        && !glamor_check_fbo_size(glamor_priv, w, h);
 
-    if (pixmap_priv->type == GLAMOR_TEXTURE_LARGE || force_clip) {
+    if (glamor_pixmap_priv_is_large(pixmap_priv) || force_clip) {
         RegionRec region;
         BoxRec box;
         int n_region;
@@ -966,14 +976,14 @@ glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w,
         RegionInitBoxes(&region, &box, 1);
         if (!force_clip)
             clipped_regions =
-                glamor_compute_clipped_regions(pixmap_priv, &region, &n_region,
+                glamor_compute_clipped_regions(pixmap, &region, &n_region,
                                                0, 0, 0);
         else
             clipped_regions =
-                glamor_compute_clipped_regions_ext(pixmap_priv, &region,
+                glamor_compute_clipped_regions_ext(pixmap, &region,
                                                    &n_region,
-                                                   pixmap_priv->large.block_w,
-                                                   pixmap_priv->large.block_h,
+                                                   pixmap_priv->block_w,
+                                                   pixmap_priv->block_h,
                                                    0,
                                                    0);
         DEBUGF("prepare upload %dx%d to a large pixmap %p\n", w, h, pixmap);
@@ -1044,10 +1054,10 @@ glamor_upload_pixmap_to_texture(PixmapPtr pixmap)
 
     pixmap_priv = glamor_get_pixmap_private(pixmap);
 
-    if ((pixmap_priv->base.fbo)
-        && (pixmap_priv->base.fbo->pbo_valid)) {
+    if ((pixmap_priv->fbo)
+        && (pixmap_priv->fbo->pbo_valid)) {
         data = NULL;
-        pbo = pixmap_priv->base.fbo->pbo;
+        pbo = pixmap_priv->fbo->pbo;
     }
     else {
         data = pixmap->devPrivate.ptr;
@@ -1118,11 +1128,12 @@ glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, int y, int w, int h,
     glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
 
     glActiveTexture(GL_TEXTURE0);
-    glBindTexture(GL_TEXTURE_2D, source_priv->base.fbo->tex);
+    glBindTexture(GL_TEXTURE_2D, source_priv->fbo->tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
-    glamor_set_destination_pixmap_fbo(temp_fbo, 0, 0, w, h);
+    glamor_set_destination_pixmap_fbo(glamor_priv, temp_fbo, 0, 0, w, h);
+    glamor_set_alu(screen, GXcopy);
     glUseProgram(glamor_priv->finish_access_prog[no_alpha]);
     glUniform1i(glamor_priv->finish_access_revert[no_alpha], revert);
     glUniform1i(glamor_priv->finish_access_swap_rb[no_alpha], swap_rb);
@@ -1133,62 +1144,3 @@ glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, int y, int w, int h,
     glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
     return temp_fbo;
 }
-
-/* fixup a fbo to the exact size as the pixmap. */
-/* XXX LARGE pixmap? */
-Bool
-glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv)
-{
-    glamor_pixmap_fbo *old_fbo;
-    glamor_pixmap_fbo *new_fbo = NULL;
-    PixmapPtr scratch = NULL;
-    glamor_pixmap_private *scratch_priv;
-    DrawablePtr drawable;
-    GCPtr gc = NULL;
-    int ret = FALSE;
-
-    drawable = &pixmap_priv->base.pixmap->drawable;
-
-    if (!GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE(pixmap_priv))
-        return TRUE;
-
-    old_fbo = pixmap_priv->base.fbo;
-
-    if (!old_fbo)
-        return FALSE;
-
-    gc = GetScratchGC(drawable->depth, screen);
-    if (!gc)
-        goto fail;
-
-    scratch = glamor_create_pixmap(screen, drawable->width, drawable->height,
-                                   drawable->depth, GLAMOR_CREATE_PIXMAP_FIXUP);
-
-    scratch_priv = glamor_get_pixmap_private(scratch);
-
-    if (!scratch_priv->base.fbo)
-        goto fail;
-
-    ValidateGC(&scratch->drawable, gc);
-    glamor_copy_area(drawable,
-                     &scratch->drawable,
-                     gc, 0, 0, drawable->width, drawable->height, 0, 0);
-    old_fbo = glamor_pixmap_detach_fbo(pixmap_priv);
-    new_fbo = glamor_pixmap_detach_fbo(scratch_priv);
-    glamor_pixmap_attach_fbo(pixmap_priv->base.pixmap, new_fbo);
-    glamor_pixmap_attach_fbo(scratch, old_fbo);
-
-    DEBUGF("old %dx%d type %d\n",
-           drawable->width, drawable->height, pixmap_priv->type);
-    DEBUGF("copy tex %d  %dx%d to tex %d %dx%d \n",
-           old_fbo->tex, old_fbo->width, old_fbo->height, new_fbo->tex,
-           new_fbo->width, new_fbo->height);
-    ret = TRUE;
- fail:
-    if (gc)
-        FreeScratchGC(gc);
-    if (scratch)
-        glamor_destroy_pixmap(scratch);
-
-    return ret;
-}
diff --git a/xorg-server/glamor/glamor_points.c b/xorg-server/glamor/glamor_points.c
index 84383d254..df7e5a23f 100644
--- a/xorg-server/glamor/glamor_points.c
+++ b/xorg-server/glamor/glamor_points.c
@@ -55,17 +55,17 @@ glamor_poly_point_gl(DrawablePtr drawable, GCPtr gc, int mode, int npt, DDXPoint
     glamor_make_current(glamor_priv);
 
     if (prog->failed)
-        goto bail_ctx;
+        goto bail;
 
     if (!prog->prog) {
         if (!glamor_build_program(screen, prog,
                                   &glamor_facet_point,
                                   &glamor_fill_solid))
-            goto bail_ctx;
+            goto bail;
     }
 
     if (!glamor_use_program(pixmap, gc, prog, NULL))
-        goto bail_ctx;
+        goto bail;
 
     vbo_ppt = glamor_get_vbo_space(screen, npt * (2 * sizeof (INT16)), &vbo_offset);
     glEnableVertexAttribArray(GLAMOR_VERTEX_POS);
@@ -102,13 +102,10 @@ glamor_poly_point_gl(DrawablePtr drawable, GCPtr gc, int mode, int npt, DDXPoint
     }
 
     glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_COLOR_LOGIC_OP);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 
     return TRUE;
 
-bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return FALSE;
 }
@@ -121,18 +118,3 @@ glamor_poly_point(DrawablePtr drawable, GCPtr gc, int mode, int npt,
         return;
     miPolyPoint(drawable, gc, mode, npt, ppt);
 }
-
-Bool
-glamor_poly_point_nf(DrawablePtr drawable, GCPtr gc, int mode, int npt,
-                     DDXPointPtr ppt)
-{
-    if (glamor_poly_point_gl(drawable, gc, mode, npt, ppt))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable) && glamor_ddx_fallback_check_gc(gc))
-        return FALSE;
-
-    miPolyPoint(drawable, gc, mode, npt, ppt);
-    return TRUE;
-}
-
diff --git a/xorg-server/glamor/glamor_prepare.c b/xorg-server/glamor/glamor_prepare.c
index fb85d9082..83ba7f16f 100644
--- a/xorg-server/glamor/glamor_prepare.c
+++ b/xorg-server/glamor/glamor_prepare.c
@@ -54,7 +54,7 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
          * we'll assume that it's directly mapped
          * by a lower level driver
          */
-        if (!priv->base.prepared)
+        if (!priv->prepared)
             return TRUE;
 
         /* In X, multiple Drawables can be stored in the same Pixmap (such as
@@ -65,28 +65,28 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
          * As a result, when doing a series of mappings for a fallback, we may
          * need to add more boxes to the set of data we've downloaded, as we go.
          */
-        RegionSubtract(&region, &region, &priv->base.prepare_region);
+        RegionSubtract(&region, &region, &priv->prepare_region);
         if (!RegionNotEmpty(&region))
             return TRUE;
 
         if (access == GLAMOR_ACCESS_RW)
             FatalError("attempt to remap buffer as writable");
 
-        if (priv->base.pbo) {
-            glBindBuffer(GL_PIXEL_PACK_BUFFER, priv->base.pbo);
+        if (priv->pbo) {
+            glBindBuffer(GL_PIXEL_PACK_BUFFER, priv->pbo);
             glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
             pixmap->devPrivate.ptr = NULL;
         }
     } else {
-        RegionInit(&priv->base.prepare_region, box, 1);
+        RegionInit(&priv->prepare_region, box, 1);
 
         if (glamor_priv->has_rw_pbo) {
-            if (priv->base.pbo == 0)
-                glGenBuffers(1, &priv->base.pbo);
+            if (priv->pbo == 0)
+                glGenBuffers(1, &priv->pbo);
 
             gl_usage = GL_STREAM_READ;
 
-            glBindBuffer(GL_PIXEL_PACK_BUFFER, priv->base.pbo);
+            glBindBuffer(GL_PIXEL_PACK_BUFFER, priv->pbo);
             glBufferData(GL_PIXEL_PACK_BUFFER,
                          pixmap->devKind * pixmap->drawable.height, NULL,
                          gl_usage);
@@ -96,7 +96,7 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
             if (!pixmap->devPrivate.ptr)
                 return FALSE;
         }
-        priv->base.map_access = access;
+        priv->map_access = access;
     }
 
     glamor_download_boxes(pixmap, RegionRects(&region), RegionNumRects(&region),
@@ -105,7 +105,7 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
     RegionUninit(&region);
 
     if (glamor_priv->has_rw_pbo) {
-        if (priv->base.map_access == GLAMOR_ACCESS_RW)
+        if (priv->map_access == GLAMOR_ACCESS_RW)
             gl_access = GL_READ_WRITE;
         else
             gl_access = GL_READ_ONLY;
@@ -114,7 +114,7 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
         glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
     }
 
-    priv->base.prepared = TRUE;
+    priv->prepared = TRUE;
     return TRUE;
 }
 
@@ -133,34 +133,34 @@ glamor_fini_pixmap(PixmapPtr pixmap)
     if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
         return;
 
-    if (!priv->base.prepared)
+    if (!priv->prepared)
         return;
 
     if (glamor_priv->has_rw_pbo) {
-        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, priv->base.pbo);
+        glBindBuffer(GL_PIXEL_UNPACK_BUFFER, priv->pbo);
         glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
         pixmap->devPrivate.ptr = NULL;
     }
 
-    if (priv->base.map_access == GLAMOR_ACCESS_RW) {
+    if (priv->map_access == GLAMOR_ACCESS_RW) {
         glamor_upload_boxes(pixmap,
-                            RegionRects(&priv->base.prepare_region),
-                            RegionNumRects(&priv->base.prepare_region),
+                            RegionRects(&priv->prepare_region),
+                            RegionNumRects(&priv->prepare_region),
                             0, 0, 0, 0, pixmap->devPrivate.ptr, pixmap->devKind);
     }
 
-    RegionUninit(&priv->base.prepare_region);
+    RegionUninit(&priv->prepare_region);
 
     if (glamor_priv->has_rw_pbo) {
         glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-        glDeleteBuffers(1, &priv->base.pbo);
-        priv->base.pbo = 0;
+        glDeleteBuffers(1, &priv->pbo);
+        priv->pbo = 0;
     } else {
         free(pixmap->devPrivate.ptr);
         pixmap->devPrivate.ptr = NULL;
     }
 
-    priv->base.prepared = FALSE;
+    priv->prepared = FALSE;
 }
 
 Bool
diff --git a/xorg-server/glamor/glamor_priv.h b/xorg-server/glamor/glamor_priv.h
index ed6e2d192..898a9348a 100644
--- a/xorg-server/glamor/glamor_priv.h
+++ b/xorg-server/glamor/glamor_priv.h
@@ -48,9 +48,7 @@
     "precision mediump float;\n"  \
     "#endif\n"
 
-#ifdef RENDER
 #include "glyphstr.h"
-#endif
 
 #include "glamor_debug.h"
 #include "glamor_context.h"
@@ -74,7 +72,7 @@ typedef struct glamor_composite_shader {
     union {
         float source_solid_color[4];
         struct {
-            struct glamor_pixmap_private *source_priv;
+            PixmapPtr source_pixmap;
             PicturePtr source;
         };
     };
@@ -82,7 +80,7 @@ typedef struct glamor_composite_shader {
     union {
         float mask_solid_color[4];
         struct {
-            struct glamor_pixmap_private *mask_priv;
+            PixmapPtr mask_pixmap;
             PicturePtr mask;
         };
     };
@@ -236,6 +234,8 @@ typedef struct glamor_screen_private {
     int has_buffer_storage;
     int has_khr_debug;
     int has_nv_texture_barrier;
+    int has_pack_subimage;
+    int has_unpack_subimage;
     int max_fbo_size;
     int has_rw_pbo;
 
@@ -369,7 +369,6 @@ typedef struct glamor_pixmap_fbo {
     Bool external;
     GLenum format;
     GLenum type;
-    glamor_screen_private *glamor_priv;
 } glamor_pixmap_fbo;
 
 /*
@@ -378,6 +377,14 @@ typedef struct glamor_pixmap_fbo {
  * @is_picture: The drawable is attached to a picture.
  * @pict_format: the corresponding picture's format.
  * @pixmap: The corresponding pixmap's pointer.
+ * @box: current fbo's coords in the whole pixmap.
+ * @block_w: block width of this large pixmap.
+ * @block_h: block height of this large pixmap.
+ * @block_wcnt: block count in one block row.
+ * @block_hcnt: block count in one block column.
+ * @nbox: total block count.
+ * @box_array: contains each block's corresponding box.
+ * @fbo_array: contains each block's fbo pointer.
  *
  * For GLAMOR_TEXTURE_LARGE, nbox should larger than 1.
  * And the box and fbo will both have nbox elements.
@@ -427,9 +434,6 @@ typedef struct glamor_pixmap_fbo {
  * to the box and fbo elements. Thus the inner routines
  * can handle it as normal, only the coords calculation need
  * to aware of it's large pixmap.
- *
- * Currently, we haven't implemented the atlas pixmap.
- *
  **/
 
 typedef struct glamor_pixmap_clipped_regions {
@@ -437,7 +441,7 @@ typedef struct glamor_pixmap_clipped_regions {
     RegionPtr region;
 } glamor_pixmap_clipped_regions;
 
-typedef struct glamor_pixmap_private_base {
+typedef struct glamor_pixmap_private {
     glamor_pixmap_type_t type;
     enum glamor_fbo_state gl_fbo;
     /**
@@ -449,10 +453,8 @@ typedef struct glamor_pixmap_private_base {
     unsigned char is_picture:1;
     unsigned char gl_tex:1;
     glamor_pixmap_fbo *fbo;
-    PixmapPtr pixmap;
     BoxRec box;
     int drm_stride;
-    glamor_screen_private *glamor_priv;
     PicturePtr picture;
     GLuint pbo;
     RegionRec prepare_region;
@@ -460,104 +462,125 @@ typedef struct glamor_pixmap_private_base {
 #if GLAMOR_HAS_GBM
     EGLImageKHR image;
 #endif
-} glamor_pixmap_private_base_t;
-
-/*
- * @base.fbo: current fbo.
- * @box: current fbo's coords in the whole pixmap.
- * @block_w: block width of this large pixmap.
- * @block_h: block height of this large pixmap.
- * @block_wcnt: block count in one block row.
- * @block_hcnt: block count in one block column.
- * @nbox: total block count.
- * @box_array: contains each block's corresponding box.
- * @fbo_array: contains each block's fbo pointer.
- *
- **/
-typedef struct glamor_pixmap_private_large {
-    union {
-        glamor_pixmap_type_t type;
-        glamor_pixmap_private_base_t base;
-    };
-    BoxRec box;
     int block_w;
     int block_h;
     int block_wcnt;
     int block_hcnt;
-    int nbox;
     BoxPtr box_array;
     glamor_pixmap_fbo **fbo_array;
-} glamor_pixmap_private_large_t;
+} glamor_pixmap_private;
+
+extern DevPrivateKeyRec glamor_pixmap_private_key;
+
+static inline glamor_pixmap_private *
+glamor_get_pixmap_private(PixmapPtr pixmap)
+{
+    glamor_pixmap_private *priv;
+
+    if (pixmap == NULL)
+        return NULL;
+
+    priv = dixLookupPrivate(&pixmap->devPrivates, &glamor_pixmap_private_key);
+    if (!priv) {
+        glamor_set_pixmap_type(pixmap, GLAMOR_MEMORY);
+        priv = dixLookupPrivate(&pixmap->devPrivates,
+                                &glamor_pixmap_private_key);
+    }
+    return priv;
+}
+
+void glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv);
 
 /*
- * @box: the relative coords in the corresponding fbo.
+ * Returns TRUE if pixmap has no image object
  */
-typedef struct glamor_pixmap_private_atlas {
-    union {
-        glamor_pixmap_type_t type;
-        glamor_pixmap_private_base_t base;
-    };
-    BoxRec box;
-} glamor_pixmap_private_atlas_t;
+static inline Bool
+glamor_pixmap_drm_only(PixmapPtr pixmap)
+{
+    glamor_pixmap_private *priv = glamor_get_pixmap_private(pixmap);
 
-typedef struct glamor_pixmap_private {
-    union {
-        glamor_pixmap_type_t type;
-        glamor_pixmap_private_base_t base;
-        glamor_pixmap_private_large_t large;
-        glamor_pixmap_private_atlas_t atlas;
-    };
-} glamor_pixmap_private;
+    return priv && priv->type == GLAMOR_DRM_ONLY;
+}
+
+/*
+ * Returns TRUE if pixmap is plain memory (not a GL object at all)
+ */
+static inline Bool
+glamor_pixmap_is_memory(PixmapPtr pixmap)
+{
+    glamor_pixmap_private *priv = glamor_get_pixmap_private(pixmap);
+
+    return !priv || priv->type == GLAMOR_MEMORY;
+}
+
+/*
+ * Returns TRUE if pixmap requires multiple textures to hold it
+ */
+static inline Bool
+glamor_pixmap_priv_is_large(glamor_pixmap_private *priv)
+{
+    return priv && (priv->block_wcnt > 1 || priv->block_hcnt > 1);
+}
+
+static inline Bool
+glamor_pixmap_priv_is_small(glamor_pixmap_private *priv)
+{
+    return priv && priv->block_wcnt <= 1 && priv->block_hcnt <= 1;
+}
+
+static inline Bool
+glamor_pixmap_is_large(PixmapPtr pixmap)
+{
+    glamor_pixmap_private *priv = glamor_get_pixmap_private(pixmap);
+
+    return priv && glamor_pixmap_priv_is_large(priv);
+}
+/*
+ * Returns TRUE if pixmap has an FBO
+ */
+static inline Bool
+glamor_pixmap_has_fbo(PixmapPtr pixmap)
+{
+    glamor_pixmap_private *priv = glamor_get_pixmap_private(pixmap);
+
+    return priv && priv->gl_fbo == GLAMOR_FBO_NORMAL;
+}
 
 static inline void
 glamor_set_pixmap_fbo_current(glamor_pixmap_private *priv, int idx)
 {
-    if (priv->type == GLAMOR_TEXTURE_LARGE) {
-        priv->large.base.fbo = priv->large.fbo_array[idx];
-        priv->large.box = priv->large.box_array[idx];
+    if (glamor_pixmap_priv_is_large(priv)) {
+        priv->fbo = priv->fbo_array[idx];
+        priv->box = priv->box_array[idx];
     }
 }
 
 static inline glamor_pixmap_fbo *
 glamor_pixmap_fbo_at(glamor_pixmap_private *priv, int x, int y)
 {
-    if (priv->type == GLAMOR_TEXTURE_LARGE) {
-        assert(x < priv->large.block_wcnt);
-        assert(y < priv->large.block_hcnt);
-        return priv->large.fbo_array[y * priv->large.block_wcnt + x];
-    }
-    assert (x == 0);
-    assert (y == 0);
-    return priv->base.fbo;
+    assert(x < priv->block_wcnt);
+    assert(y < priv->block_hcnt);
+    return priv->fbo_array[y * priv->block_wcnt + x];
 }
 
 static inline BoxPtr
 glamor_pixmap_box_at(glamor_pixmap_private *priv, int x, int y)
 {
-    if (priv->type == GLAMOR_TEXTURE_LARGE) {
-        assert(x < priv->large.block_wcnt);
-        assert(y < priv->large.block_hcnt);
-        return &priv->large.box_array[y * priv->large.block_wcnt + x];
-    }
-    assert (x == 0);
-    assert (y == 0);
-    return &priv->base.box;
+    assert(x < priv->block_wcnt);
+    assert(y < priv->block_hcnt);
+    return &priv->box_array[y * priv->block_wcnt + x];
 }
 
 static inline int
 glamor_pixmap_wcnt(glamor_pixmap_private *priv)
 {
-    if (priv->type == GLAMOR_TEXTURE_LARGE)
-        return priv->large.block_wcnt;
-    return 1;
+    return priv->block_wcnt;
 }
 
 static inline int
 glamor_pixmap_hcnt(glamor_pixmap_private *priv)
 {
-    if (priv->type == GLAMOR_TEXTURE_LARGE)
-        return priv->large.block_hcnt;
-    return 1;
+    return priv->block_hcnt;
 }
 
 #define glamor_pixmap_loop(priv, x, y)                  \
@@ -590,7 +613,6 @@ typedef struct {
 
 extern DevPrivateKeyRec glamor_gc_private_key;
 extern DevPrivateKeyRec glamor_screen_private_key;
-extern DevPrivateKeyRec glamor_pixmap_private_key;
 
 static inline glamor_screen_private *
 glamor_get_screen_private(ScreenPtr screen)
@@ -605,22 +627,6 @@ glamor_set_screen_private(ScreenPtr screen, glamor_screen_private *priv)
     dixSetPrivate(&screen->devPrivates, &glamor_screen_private_key, priv);
 }
 
-static inline glamor_pixmap_private *
-glamor_get_pixmap_private(PixmapPtr pixmap)
-{
-    glamor_pixmap_private *priv;
-
-    priv = dixLookupPrivate(&pixmap->devPrivates, &glamor_pixmap_private_key);
-    if (!priv) {
-        glamor_set_pixmap_type(pixmap, GLAMOR_MEMORY);
-        priv = dixLookupPrivate(&pixmap->devPrivates,
-                                &glamor_pixmap_private_key);
-    }
-    return priv;
-}
-
-void glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv);
-
 static inline glamor_gc_private *
 glamor_get_gc_private(GCPtr gc)
 {
@@ -652,9 +658,10 @@ glamor_pixmap_fbo *glamor_create_fbo_from_tex(glamor_screen_private *
                                               int flag);
 glamor_pixmap_fbo *glamor_create_fbo(glamor_screen_private *glamor_priv, int w,
                                      int h, GLenum format, int flag);
-void glamor_destroy_fbo(glamor_pixmap_fbo *fbo);
-void glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv);
-
+void glamor_destroy_fbo(glamor_screen_private *glamor_priv,
+                        glamor_pixmap_fbo *fbo);
+void glamor_pixmap_destroy_fbo(glamor_screen_private *glamor_priv,
+                               glamor_pixmap_private *priv);
 void glamor_init_pixmap_fbo(ScreenPtr screen);
 void glamor_fini_pixmap_fbo(ScreenPtr screen);
 Bool glamor_pixmap_fbo_fixup(ScreenPtr screen, PixmapPtr pixmap);
@@ -679,13 +686,13 @@ void glamor_get_color_4f_from_pixel(PixmapPtr pixmap,
                                     unsigned long fg_pixel, GLfloat *color);
 
 int glamor_set_destination_pixmap(PixmapPtr pixmap);
-int glamor_set_destination_pixmap_priv(glamor_pixmap_private *pixmap_priv);
-void glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *, int, int, int, int);
+int glamor_set_destination_pixmap_priv(glamor_screen_private *glamor_priv, PixmapPtr pixmap, glamor_pixmap_private *pixmap_priv);
+void glamor_set_destination_pixmap_fbo(glamor_screen_private *glamor_priv, glamor_pixmap_fbo *, int, int, int, int);
 
 /* nc means no check. caller must ensure this pixmap has valid fbo.
  * usually use the GLAMOR_PIXMAP_PRIV_HAS_FBO firstly.
  * */
-void glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private *pixmap_priv);
+void glamor_set_destination_pixmap_priv_nc(glamor_screen_private *glamor_priv, PixmapPtr pixmap, glamor_pixmap_private *pixmap_priv);
 
 glamor_pixmap_fbo *glamor_es2_pixmap_read_prepare(PixmapPtr source, int x,
                                                   int y, int w, int h,
@@ -702,6 +709,7 @@ glamor_track_stipple(GCPtr gc);
 
 /* glamor_glyphs.c */
 Bool glamor_realize_glyph_caches(ScreenPtr screen);
+void glamor_glyph_unrealize(ScreenPtr screen, GlyphPtr glyph);
 void glamor_glyphs_fini(ScreenPtr screen);
 void glamor_glyphs(CARD8 op,
                    PicturePtr pSrc,
@@ -715,9 +723,9 @@ Bool glamor_composite_clipped_region(CARD8 op,
                                      PicturePtr source,
                                      PicturePtr mask,
                                      PicturePtr dest,
-                                     glamor_pixmap_private *soruce_pixmap_priv,
-                                     glamor_pixmap_private *mask_pixmap_priv,
-                                     glamor_pixmap_private *dest_pixmap_priv,
+                                     PixmapPtr source_pixmap,
+                                     PixmapPtr mask_pixmap,
+                                     PixmapPtr dest_pixmap,
                                      RegionPtr region,
                                      int x_source,
                                      int y_source,
@@ -748,23 +756,6 @@ PicturePtr glamor_convert_gradient_picture(ScreenPtr screen,
                                            int x_source,
                                            int y_source, int width, int height);
 
-Bool glamor_composite_choose_shader(CARD8 op,
-                                    PicturePtr source,
-                                    PicturePtr mask,
-                                    PicturePtr dest,
-                                    glamor_pixmap_private *source_pixmap_priv,
-                                    glamor_pixmap_private *mask_pixmap_priv,
-                                    glamor_pixmap_private *dest_pixmap_priv,
-                                    struct shader_key *s_key,
-                                    glamor_composite_shader ** shader,
-                                    struct blendinfo *op_info,
-                                    PictFormatShort *psaved_source_format);
-
-void glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
-                                       struct shader_key *key,
-                                       glamor_composite_shader *shader,
-                                       struct blendinfo *op_info);
-
 void *glamor_setup_composite_vbo(ScreenPtr screen, int n_verts);
 
 /* glamor_trapezoid.c */
@@ -831,19 +822,19 @@ Bool glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w,
                                          int pbo);
 
 glamor_pixmap_clipped_regions *
-glamor_compute_clipped_regions(glamor_pixmap_private *priv,
+glamor_compute_clipped_regions(PixmapPtr pixmap,
                                RegionPtr region, int *clipped_nbox,
                                int repeat_type, int reverse,
                                int upsidedown);
 
 glamor_pixmap_clipped_regions *
-glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
+glamor_compute_clipped_regions_ext(PixmapPtr pixmap,
                                    RegionPtr region, int *n_region,
                                    int inner_block_w, int inner_block_h,
                                    int reverse, int upsidedown);
 
 glamor_pixmap_clipped_regions *
-glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv,
+glamor_compute_transform_clipped_regions(PixmapPtr pixmap,
                                          struct pixman_transform *transform,
                                          RegionPtr region,
                                          int *n_region, int dx, int dy,
@@ -854,9 +845,9 @@ Bool glamor_composite_largepixmap_region(CARD8 op,
                                          PicturePtr source,
                                          PicturePtr mask,
                                          PicturePtr dest,
-                                         glamor_pixmap_private *source_pixmap_priv,
-                                         glamor_pixmap_private *mask_pixmap_priv,
-                                         glamor_pixmap_private *dest_pixmap_priv,
+                                         PixmapPtr source_pixmap,
+                                         PixmapPtr mask_pixmap,
+                                         PixmapPtr dest_pixmap,
                                          RegionPtr region, Bool force_clip,
                                          INT16 x_source,
                                          INT16 y_source,
@@ -894,10 +885,6 @@ void glamor_set_window_pixmap(WindowPtr pWindow, PixmapPtr pPixmap);
 
 void glamor_destroy_picture(PicturePtr picture);
 
-/* fixup a fbo to the exact size as the pixmap. */
-Bool glamor_fixup_pixmap_priv(ScreenPtr screen,
-                              glamor_pixmap_private *pixmap_priv);
-
 void glamor_picture_format_fixup(PicturePtr picture,
                                  glamor_pixmap_private *pixmap_priv);
 
@@ -1095,4 +1082,6 @@ void glamor_xv_render(glamor_port_private *port_priv);
 
 #include "glamor_font.h"
 
+#define GLAMOR_MIN_ALU_INSTRUCTIONS 128 /* Minimum required number of native ALU instructions */
+
 #endif                          /* GLAMOR_PRIV_H */
diff --git a/xorg-server/glamor/glamor_program.c b/xorg-server/glamor/glamor_program.c
index 1d0328f2b..8aab53f4f 100644
--- a/xorg-server/glamor/glamor_program.c
+++ b/xorg-server/glamor/glamor_program.c
@@ -40,12 +40,12 @@ const glamor_facet glamor_fill_solid = {
 static Bool
 use_tile(PixmapPtr pixmap, GCPtr gc, glamor_program *prog, void *arg)
 {
-    return glamor_set_tiled(pixmap, gc, prog->fill_offset_uniform, prog->fill_size_uniform);
+    return glamor_set_tiled(pixmap, gc, prog->fill_offset_uniform, prog->fill_size_inv_uniform);
 }
 
 static const glamor_facet glamor_fill_tile = {
     .name = "tile",
-    .vs_exec =  "       fill_pos = (fill_offset + primitive.xy + pos) / fill_size;\n",
+    .vs_exec =  "       fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv;\n",
     .fs_exec =  "       gl_FragColor = texture2D(sampler, fill_pos);\n",
     .locations = glamor_program_location_fill,
     .use = use_tile,
@@ -56,12 +56,12 @@ use_stipple(PixmapPtr pixmap, GCPtr gc, glamor_program *prog, void *arg)
 {
     return glamor_set_stippled(pixmap, gc, prog->fg_uniform,
                                prog->fill_offset_uniform,
-                               prog->fill_size_uniform);
+                               prog->fill_size_inv_uniform);
 }
 
 static const glamor_facet glamor_fill_stipple = {
     .name = "stipple",
-    .vs_exec =  "       fill_pos = (fill_offset + primitive.xy + pos) / fill_size;\n",
+    .vs_exec =  "       fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv;\n",
     .fs_exec = ("       float a = texture2D(sampler, fill_pos).w;\n"
                 "       if (a == 0.0)\n"
                 "               discard;\n"
@@ -81,7 +81,7 @@ use_opaque_stipple(PixmapPtr pixmap, GCPtr gc, glamor_program *prog, void *arg)
 
 static const glamor_facet glamor_fill_opaque_stipple = {
     .name = "opaque_stipple",
-    .vs_exec =  "       fill_pos = (fill_offset + primitive.xy + pos) / fill_size;\n",
+    .vs_exec =  "       fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv;\n",
     .fs_exec = ("       float a = texture2D(sampler, fill_pos).w;\n"
                 "       if (a == 0.0)\n"
                 "               gl_FragColor = bg;\n"
@@ -116,10 +116,10 @@ static glamor_location_var location_vars[] = {
     {
         .location = glamor_program_location_fill,
         .vs_vars = ("uniform vec2 fill_offset;\n"
-                    "uniform vec2 fill_size;\n"
+                    "uniform vec2 fill_size_inv;\n"
                     "varying vec2 fill_pos;\n"),
         .fs_vars = ("uniform sampler2D sampler;\n"
-                    "uniform vec2 fill_size;\n"
+                    "uniform vec2 fill_size_inv;\n"
                     "varying vec2 fill_pos;\n")
     },
     {
@@ -336,16 +336,13 @@ glamor_build_program(ScreenPtr          screen,
     prog->fg_uniform = glamor_get_uniform(prog, glamor_program_location_fg, "fg");
     prog->bg_uniform = glamor_get_uniform(prog, glamor_program_location_bg, "bg");
     prog->fill_offset_uniform = glamor_get_uniform(prog, glamor_program_location_fill, "fill_offset");
-    prog->fill_size_uniform = glamor_get_uniform(prog, glamor_program_location_fill, "fill_size");
+    prog->fill_size_inv_uniform = glamor_get_uniform(prog, glamor_program_location_fill, "fill_size_inv");
     prog->font_uniform = glamor_get_uniform(prog, glamor_program_location_font, "font");
     prog->bitplane_uniform = glamor_get_uniform(prog, glamor_program_location_bitplane, "bitplane");
     prog->bitmul_uniform = glamor_get_uniform(prog, glamor_program_location_bitplane, "bitmul");
     prog->dash_uniform = glamor_get_uniform(prog, glamor_program_location_dash, "dash");
     prog->dash_length_uniform = glamor_get_uniform(prog, glamor_program_location_dash, "dash_length");
 
-    if (glGetError() != GL_NO_ERROR)
-        goto fail;
-
     free(version_string);
     free(fs_vars);
     free(vs_vars);
diff --git a/xorg-server/glamor/glamor_program.h b/xorg-server/glamor/glamor_program.h
index 56ba03aa8..fa3877c5d 100644
--- a/xorg-server/glamor/glamor_program.h
+++ b/xorg-server/glamor/glamor_program.h
@@ -60,7 +60,7 @@ struct _glamor_program {
     GLint                       matrix_uniform;
     GLint                       fg_uniform;
     GLint                       bg_uniform;
-    GLint                       fill_size_uniform;
+    GLint                       fill_size_inv_uniform;
     GLint                       fill_offset_uniform;
     GLint                       font_uniform;
     GLint                       bitplane_uniform;
diff --git a/xorg-server/glamor/glamor_rects.c b/xorg-server/glamor/glamor_rects.c
index 3a5c3f3f9..c378e4a30 100644
--- a/xorg-server/glamor/glamor_rects.c
+++ b/xorg-server/glamor/glamor_rects.c
@@ -65,7 +65,7 @@ glamor_poly_fill_rect_gl(DrawablePtr drawable,
                                        &glamor_facet_polyfillrect_130);
 
         if (!prog)
-            goto bail_ctx;
+            goto bail;
 
         /* Set up the vertex buffers for the points */
 
@@ -87,7 +87,7 @@ glamor_poly_fill_rect_gl(DrawablePtr drawable,
                                        &glamor_facet_polyfillrect_120);
 
         if (!prog)
-            goto bail_ctx;
+            goto bail;
 
         /* Set up the vertex buffers for the points */
 
@@ -126,27 +126,17 @@ glamor_poly_fill_rect_gl(DrawablePtr drawable,
             if (glamor_priv->glsl_version >= 130)
                 glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, nrect);
             else {
-                if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-                    glDrawArrays(GL_QUADS, 0, nrect * 4);
-                } else {
-                    int i;
-                    for (i = 0; i < nrect; i++) {
-                        glDrawArrays(GL_TRIANGLE_FAN, i * 4, 4);
-                    }
-                }
+                glamor_glDrawArrays_GL_QUADS(glamor_priv, nrect);
             }
         }
     }
 
     glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_COLOR_LOGIC_OP);
     if (glamor_priv->glsl_version >= 130)
         glVertexAttribDivisor(GLAMOR_VERTEX_POS, 0);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 
     return TRUE;
-bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return FALSE;
 }
@@ -173,15 +163,3 @@ glamor_poly_fill_rect(DrawablePtr drawable,
         return;
     glamor_poly_fill_rect_bail(drawable, gc, nrect, prect);
 }
-
-Bool
-glamor_poly_fill_rect_nf(DrawablePtr drawable,
-                         GCPtr gc, int nrect, xRectangle *prect)
-{
-    if (glamor_poly_fill_rect_gl(drawable, gc, nrect, prect))
-        return TRUE;
-    if (glamor_ddx_fallback_check_pixmap(drawable) && glamor_ddx_fallback_check_gc(gc))
-        return FALSE;
-    glamor_poly_fill_rect_bail(drawable, gc, nrect, prect);
-    return TRUE;
-}
diff --git a/xorg-server/glamor/glamor_render.c b/xorg-server/glamor/glamor_render.c
index 2386f2e2e..27c09fd48 100644
--- a/xorg-server/glamor/glamor_render.c
+++ b/xorg-server/glamor/glamor_render.c
@@ -34,7 +34,6 @@
 
 #include "glamor_priv.h"
 
-#ifdef RENDER
 #include "mipict.h"
 #include "fbpict.h"
 #if 0
@@ -483,15 +482,16 @@ glamor_set_composite_op(ScreenPtr screen,
 static void
 glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
                              PicturePtr picture,
-                             glamor_pixmap_private *pixmap_priv,
+                             PixmapPtr pixmap,
                              GLuint wh_location, GLuint repeat_location)
 {
+    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
     float wh[4];
     int repeat_type;
 
     glamor_make_current(glamor_priv);
     glActiveTexture(GL_TEXTURE0 + unit);
-    glBindTexture(GL_TEXTURE_2D, pixmap_priv->base.fbo->tex);
+    glBindTexture(GL_TEXTURE_2D, pixmap_priv->fbo->tex);
     repeat_type = picture->repeatType;
     switch (picture->repeatType) {
     case RepeatNone:
@@ -542,13 +542,12 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
     if (repeat_type != RepeatNone)
         repeat_type += RepeatFix;
     else if (glamor_priv->gl_flavor == GLAMOR_GL_ES2
-             || pixmap_priv->type == GLAMOR_TEXTURE_LARGE) {
-        if (picture->transform
-            || (GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE(pixmap_priv)))
+             || glamor_pixmap_priv_is_large(pixmap_priv)) {
+        if (picture->transform)
             repeat_type += RepeatFix;
     }
     if (repeat_type >= RepeatFix) {
-        glamor_pixmap_fbo_fix_wh_ratio(wh, pixmap_priv);
+        glamor_pixmap_fbo_fix_wh_ratio(wh, pixmap, pixmap_priv);
         if ((wh[0] != 1.0 || wh[1] != 1.0)
             || (glamor_priv->gl_flavor == GLAMOR_GL_ES2
                 && repeat_type == RepeatFix))
@@ -788,7 +787,8 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src,
 }
 
 static void
-glamor_set_normalize_tcoords_generic(glamor_pixmap_private *priv,
+glamor_set_normalize_tcoords_generic(PixmapPtr pixmap,
+                                     glamor_pixmap_private *priv,
                                      int repeat_type,
                                      float *matrix,
                                      float xscale, float yscale,
@@ -806,24 +806,27 @@ glamor_set_normalize_tcoords_generic(glamor_pixmap_private *priv,
                                                      x2, y2,
                                                      texcoords, stride);
     else if (!matrix && repeat_type != RepeatNone)
-        glamor_set_repeat_normalize_tcoords_ext(priv, repeat_type,
+        glamor_set_repeat_normalize_tcoords_ext(pixmap, priv, repeat_type,
                                                 xscale, yscale,
                                                 x1, y1,
                                                 x2, y2,
                                                 texcoords, stride);
     else if (matrix && repeat_type != RepeatNone)
-        glamor_set_repeat_transformed_normalize_tcoords_ext(priv, repeat_type,
+        glamor_set_repeat_transformed_normalize_tcoords_ext(pixmap, priv, repeat_type,
                                                             matrix, xscale,
                                                             yscale, x1, y1, x2,
                                                             y2,
                                                             texcoords, stride);
 }
 
-Bool
+static Bool
 glamor_composite_choose_shader(CARD8 op,
                                PicturePtr source,
                                PicturePtr mask,
                                PicturePtr dest,
+                               PixmapPtr source_pixmap,
+                               PixmapPtr mask_pixmap,
+                               PixmapPtr dest_pixmap,
                                glamor_pixmap_private *source_pixmap_priv,
                                glamor_pixmap_private *mask_pixmap_priv,
                                glamor_pixmap_private *dest_pixmap_priv,
@@ -833,9 +836,6 @@ glamor_composite_choose_shader(CARD8 op,
                                PictFormatShort *psaved_source_format)
 {
     ScreenPtr screen = dest->pDrawable->pScreen;
-    PixmapPtr dest_pixmap = dest_pixmap_priv->base.pixmap;
-    PixmapPtr source_pixmap = NULL;
-    PixmapPtr mask_pixmap = NULL;
     enum glamor_pixmap_status source_status = GLAMOR_NONE;
     enum glamor_pixmap_status mask_status = GLAMOR_NONE;
     PictFormatShort saved_source_format = 0;
@@ -928,13 +928,12 @@ glamor_composite_choose_shader(CARD8 op,
 
     if (key.source == SHADER_SOURCE_TEXTURE ||
         key.source == SHADER_SOURCE_TEXTURE_ALPHA) {
-        source_pixmap = source_pixmap_priv->base.pixmap;
         if (source_pixmap == dest_pixmap) {
             /* XXX source and the dest share the same texture.
              * Does it need special handle? */
             glamor_fallback("source == dest\n");
         }
-        if (source_pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED) {
+        if (source_pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED) {
 #ifdef GLAMOR_PIXMAP_DYNAMIC_UPLOAD
             source_status = GLAMOR_UPLOAD_PENDING;
 #else
@@ -946,12 +945,11 @@ glamor_composite_choose_shader(CARD8 op,
 
     if (key.mask == SHADER_MASK_TEXTURE ||
         key.mask == SHADER_MASK_TEXTURE_ALPHA) {
-        mask_pixmap = mask_pixmap_priv->base.pixmap;
         if (mask_pixmap == dest_pixmap) {
             glamor_fallback("mask == dest\n");
             goto fail;
         }
-        if (mask_pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED) {
+        if (mask_pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED) {
 #ifdef GLAMOR_PIXMAP_DYNAMIC_UPLOAD
             mask_status = GLAMOR_UPLOAD_PENDING;
 #else
@@ -1041,23 +1039,6 @@ glamor_composite_choose_shader(CARD8 op,
         goto fail;
     }
 
-    /*Before enter the rendering stage, we need to fixup
-     * transformed source and mask, if the transform is not int translate. */
-    if (key.source != SHADER_SOURCE_SOLID
-        && source->transform
-        && !pixman_transform_is_int_translate(source->transform)
-        && source_pixmap_priv->type != GLAMOR_TEXTURE_LARGE) {
-        if (!glamor_fixup_pixmap_priv(screen, source_pixmap_priv))
-            goto fail;
-    }
-    if (key.mask != SHADER_MASK_NONE && key.mask != SHADER_MASK_SOLID
-        && mask->transform
-        && !pixman_transform_is_int_translate(mask->transform)
-        && mask_pixmap_priv->type != GLAMOR_TEXTURE_LARGE) {
-        if (!glamor_fixup_pixmap_priv(screen, mask_pixmap_priv))
-            goto fail;
-    }
-
     if (!glamor_set_composite_op(screen, op, op_info, dest, mask))
         goto fail;
 
@@ -1071,7 +1052,7 @@ glamor_composite_choose_shader(CARD8 op,
         memcpy(&(*shader)->source_solid_color[0],
                source_solid_color, 4 * sizeof(float));
     else {
-        (*shader)->source_priv = source_pixmap_priv;
+        (*shader)->source_pixmap = source_pixmap;
         (*shader)->source = source;
     }
 
@@ -1079,7 +1060,7 @@ glamor_composite_choose_shader(CARD8 op,
         memcpy(&(*shader)->mask_solid_color[0],
                mask_solid_color, 4 * sizeof(float));
     else {
-        (*shader)->mask_priv = mask_pixmap_priv;
+        (*shader)->mask_pixmap = mask_pixmap;
         (*shader)->mask = mask;
     }
 
@@ -1095,16 +1076,13 @@ glamor_composite_choose_shader(CARD8 op,
     return ret;
 }
 
-void
-glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
+static void
+glamor_composite_set_shader_blend(glamor_screen_private *glamor_priv,
+                                  glamor_pixmap_private *dest_priv,
                                   struct shader_key *key,
                                   glamor_composite_shader *shader,
                                   struct blendinfo *op_info)
 {
-    glamor_screen_private *glamor_priv;
-
-    glamor_priv = dest_priv->base.glamor_priv;
-
     glamor_make_current(glamor_priv);
     glUseProgram(shader->prog);
 
@@ -1115,7 +1093,7 @@ glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
     else {
         glamor_set_composite_texture(glamor_priv, 0,
                                      shader->source,
-                                     shader->source_priv, shader->source_wh,
+                                     shader->source_pixmap, shader->source_wh,
                                      shader->source_repeat_mode);
     }
 
@@ -1127,7 +1105,7 @@ glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
         else {
             glamor_set_composite_texture(glamor_priv, 1,
                                          shader->mask,
-                                         shader->mask_priv, shader->mask_wh,
+                                         shader->mask_pixmap, shader->mask_wh,
                                          shader->mask_repeat_mode);
         }
     }
@@ -1146,6 +1124,9 @@ glamor_composite_with_shader(CARD8 op,
                              PicturePtr source,
                              PicturePtr mask,
                              PicturePtr dest,
+                             PixmapPtr source_pixmap,
+                             PixmapPtr mask_pixmap,
+                             PixmapPtr dest_pixmap,
                              glamor_pixmap_private *source_pixmap_priv,
                              glamor_pixmap_private *mask_pixmap_priv,
                              glamor_pixmap_private *dest_pixmap_priv,
@@ -1153,10 +1134,7 @@ glamor_composite_with_shader(CARD8 op,
                              Bool two_pass_ca)
 {
     ScreenPtr screen = dest->pDrawable->pScreen;
-    glamor_screen_private *glamor_priv = dest_pixmap_priv->base.glamor_priv;
-    PixmapPtr dest_pixmap = dest_pixmap_priv->base.pixmap;
-    PixmapPtr source_pixmap = NULL;
-    PixmapPtr mask_pixmap = NULL;
+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
     GLfloat dst_xscale, dst_yscale;
     GLfloat mask_xscale = 1, mask_yscale = 1, src_xscale = 1, src_yscale = 1;
     struct shader_key key, key_ca;
@@ -1172,6 +1150,7 @@ glamor_composite_with_shader(CARD8 op,
     struct blendinfo op_info, op_info_ca;
 
     if (!glamor_composite_choose_shader(op, source, mask, dest,
+                                        source_pixmap, mask_pixmap, dest_pixmap,
                                         source_pixmap_priv, mask_pixmap_priv,
                                         dest_pixmap_priv,
                                         &key, &shader, &op_info,
@@ -1181,6 +1160,7 @@ glamor_composite_with_shader(CARD8 op,
     }
     if (two_pass_ca) {
         if (!glamor_composite_choose_shader(PictOpAdd, source, mask, dest,
+                                            source_pixmap, mask_pixmap, dest_pixmap,
                                             source_pixmap_priv,
                                             mask_pixmap_priv, dest_pixmap_priv,
                                             &key_ca, &shader_ca, &op_info_ca,
@@ -1190,8 +1170,9 @@ glamor_composite_with_shader(CARD8 op,
         }
     }
 
-    glamor_set_destination_pixmap_priv_nc(dest_pixmap_priv);
-    glamor_composite_set_shader_blend(dest_pixmap_priv, &key, shader, &op_info);
+    glamor_set_destination_pixmap_priv_nc(glamor_priv, dest_pixmap, dest_pixmap_priv);
+    glamor_composite_set_shader_blend(glamor_priv, dest_pixmap_priv, &key, shader, &op_info);
+    glamor_set_alu(screen, GXcopy);
 
     glamor_make_current(glamor_priv);
 
@@ -1203,10 +1184,9 @@ glamor_composite_with_shader(CARD8 op,
     dest_pixmap_priv = glamor_get_pixmap_private(dest_pixmap);
     glamor_get_drawable_deltas(dest->pDrawable, dest_pixmap,
                                &dest_x_off, &dest_y_off);
-    pixmap_priv_get_dest_scale(dest_pixmap_priv, &dst_xscale, &dst_yscale);
+    pixmap_priv_get_dest_scale(dest_pixmap, dest_pixmap_priv, &dst_xscale, &dst_yscale);
 
     if (glamor_priv->has_source_coords) {
-        source_pixmap = source_pixmap_priv->base.pixmap;
         glamor_get_drawable_deltas(source->pDrawable,
                                    source_pixmap, &source_x_off, &source_y_off);
         pixmap_priv_get_scale(source_pixmap_priv, &src_xscale, &src_yscale);
@@ -1217,7 +1197,6 @@ glamor_composite_with_shader(CARD8 op,
     }
 
     if (glamor_priv->has_mask_coords) {
-        mask_pixmap = mask_pixmap_priv->base.pixmap;
         glamor_get_drawable_deltas(mask->pDrawable, mask_pixmap,
                                    &mask_x_off, &mask_y_off);
         pixmap_priv_get_scale(mask_pixmap_priv, &mask_xscale, &mask_yscale);
@@ -1269,7 +1248,8 @@ glamor_composite_with_shader(CARD8 op,
                                              vb_stride);
             vertices += 2;
             if (key.source != SHADER_SOURCE_SOLID) {
-                glamor_set_normalize_tcoords_generic(source_pixmap_priv,
+                glamor_set_normalize_tcoords_generic(source_pixmap,
+                                                     source_pixmap_priv,
                                                      source->repeatType,
                                                      psrc_matrix, src_xscale,
                                                      src_yscale, x_source,
@@ -1280,7 +1260,8 @@ glamor_composite_with_shader(CARD8 op,
             }
 
             if (key.mask != SHADER_MASK_NONE && key.mask != SHADER_MASK_SOLID) {
-                glamor_set_normalize_tcoords_generic(mask_pixmap_priv,
+                glamor_set_normalize_tcoords_generic(mask_pixmap,
+                                                     mask_pixmap_priv,
                                                      mask->repeatType,
                                                      pmask_matrix, mask_xscale,
                                                      mask_yscale, x_mask,
@@ -1299,11 +1280,11 @@ glamor_composite_with_shader(CARD8 op,
         glamor_flush_composite_rects(screen);
         nrect -= rect_processed;
         if (two_pass_ca) {
-            glamor_composite_set_shader_blend(dest_pixmap_priv,
+            glamor_composite_set_shader_blend(glamor_priv, dest_pixmap_priv,
                                               &key_ca, shader_ca, &op_info_ca);
             glamor_flush_composite_rects(screen);
             if (nrect)
-                glamor_composite_set_shader_blend(dest_pixmap_priv,
+                glamor_composite_set_shader_blend(glamor_priv, dest_pixmap_priv,
                                                   &key, shader, &op_info);
         }
     }
@@ -1390,17 +1371,21 @@ glamor_composite_clipped_region(CARD8 op,
                                 PicturePtr source,
                                 PicturePtr mask,
                                 PicturePtr dest,
-                                glamor_pixmap_private *source_pixmap_priv,
-                                glamor_pixmap_private *mask_pixmap_priv,
-                                glamor_pixmap_private *dest_pixmap_priv,
+                                PixmapPtr source_pixmap,
+                                PixmapPtr mask_pixmap,
+                                PixmapPtr dest_pixmap,
                                 RegionPtr region,
                                 int x_source,
                                 int y_source,
                                 int x_mask, int y_mask, int x_dest, int y_dest)
 {
+    glamor_pixmap_private *source_pixmap_priv = glamor_get_pixmap_private(source_pixmap);
+    glamor_pixmap_private *mask_pixmap_priv = glamor_get_pixmap_private(mask_pixmap);
+    glamor_pixmap_private *dest_pixmap_priv = glamor_get_pixmap_private(dest_pixmap);
     ScreenPtr screen = dest->pDrawable->pScreen;
-    PixmapPtr source_pixmap = NULL, mask_pixmap = NULL;
     PicturePtr temp_src = source, temp_mask = mask;
+    PixmapPtr temp_src_pixmap = source_pixmap;
+    PixmapPtr temp_mask_pixmap = mask_pixmap;
     glamor_pixmap_private *temp_src_priv = source_pixmap_priv;
     glamor_pixmap_private *temp_mask_priv = mask_pixmap_priv;
     int x_temp_src, y_temp_src, x_temp_mask, y_temp_mask;
@@ -1430,12 +1415,6 @@ glamor_composite_clipped_region(CARD8 op,
     DEBUGF("clipped (%d %d) (%d %d) (%d %d) width %d height %d \n",
            x_source, y_source, x_mask, y_mask, x_dest, y_dest, width, height);
 
-    if (source_pixmap_priv)
-        source_pixmap = source_pixmap_priv->base.pixmap;
-
-    if (mask_pixmap_priv)
-        mask_pixmap = mask_pixmap_priv->base.pixmap;
-
     /* XXX is it possible source mask have non-zero drawable.x/y? */
     if (source
         && ((!source->pDrawable
@@ -1453,8 +1432,8 @@ glamor_composite_clipped_region(CARD8 op,
             temp_src = source;
             goto out;
         }
-        temp_src_priv =
-            glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable));
+        temp_src_pixmap = (PixmapPtr) (temp_src->pDrawable);
+        temp_src_priv = glamor_get_pixmap_private(temp_src_pixmap);
         x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x;
         y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y;
     }
@@ -1477,8 +1456,8 @@ glamor_composite_clipped_region(CARD8 op,
             temp_mask = mask;
             goto out;
         }
-        temp_mask_priv =
-            glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable));
+        temp_mask_pixmap = (PixmapPtr) (temp_mask->pDrawable);
+        temp_mask_priv = glamor_get_pixmap_private(temp_mask_pixmap);
         x_temp_mask = -extent->x1 + x_dest + dest->pDrawable->x;
         y_temp_mask = -extent->y1 + y_dest + dest->pDrawable->y;
     }
@@ -1540,6 +1519,7 @@ glamor_composite_clipped_region(CARD8 op,
             DEBUGF("dest %d %d \n", prect[i].x_dst, prect[i].y_dst);
         }
         ok = glamor_composite_with_shader(op, temp_src, temp_mask, dest,
+                                          temp_src_pixmap, temp_mask_pixmap, dest_pixmap,
                                           temp_src_priv, temp_mask_priv,
                                           dest_pixmap_priv,
                                           box_cnt, prect, two_pass_ca);
@@ -1560,43 +1540,35 @@ glamor_composite_clipped_region(CARD8 op,
     return ok;
 }
 
-static Bool
-_glamor_composite(CARD8 op,
-                  PicturePtr source,
-                  PicturePtr mask,
-                  PicturePtr dest,
-                  INT16 x_source,
-                  INT16 y_source,
-                  INT16 x_mask,
-                  INT16 y_mask,
-                  INT16 x_dest, INT16 y_dest,
-                  CARD16 width, CARD16 height, Bool fallback)
+void
+glamor_composite(CARD8 op,
+                 PicturePtr source,
+                 PicturePtr mask,
+                 PicturePtr dest,
+                 INT16 x_source,
+                 INT16 y_source,
+                 INT16 x_mask,
+                 INT16 y_mask,
+                 INT16 x_dest, INT16 y_dest, CARD16 width, CARD16 height)
 {
     ScreenPtr screen = dest->pDrawable->pScreen;
-    glamor_pixmap_private *dest_pixmap_priv;
-    glamor_pixmap_private *source_pixmap_priv = NULL, *mask_pixmap_priv = NULL;
     PixmapPtr dest_pixmap = glamor_get_drawable_pixmap(dest->pDrawable);
     PixmapPtr source_pixmap = NULL, mask_pixmap = NULL;
     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-    Bool ret = TRUE;
     RegionRec region;
     BoxPtr extent;
     int nbox, ok = FALSE;
     int force_clip = 0;
 
-    dest_pixmap_priv = glamor_get_pixmap_private(dest_pixmap);
-
     if (source->pDrawable) {
         source_pixmap = glamor_get_drawable_pixmap(source->pDrawable);
-        source_pixmap_priv = glamor_get_pixmap_private(source_pixmap);
-        if (source_pixmap_priv && source_pixmap_priv->type == GLAMOR_DRM_ONLY)
+        if (glamor_pixmap_drm_only(source_pixmap))
             goto fail;
     }
 
     if (mask && mask->pDrawable) {
         mask_pixmap = glamor_get_drawable_pixmap(mask->pDrawable);
-        mask_pixmap_priv = glamor_get_pixmap_private(mask_pixmap);
-        if (mask_pixmap_priv && mask_pixmap_priv->type == GLAMOR_DRM_ONLY)
+        if (glamor_pixmap_drm_only(mask_pixmap))
             goto fail;
     }
 
@@ -1605,9 +1577,8 @@ _glamor_composite(CARD8 op,
          source_pixmap, x_source, y_source, x_mask, y_mask, x_dest, y_dest,
          width, height);
 
-    if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(dest_pixmap_priv)) {
+    if (!glamor_pixmap_has_fbo(dest_pixmap))
         goto fail;
-    }
 
     if (op >= ARRAY_SIZE(composite_op_info))
         goto fail;
@@ -1639,18 +1610,16 @@ _glamor_composite(CARD8 op,
                                   (mask_pixmap ? mask->pDrawable->y : 0),
                                   x_dest + dest->pDrawable->x,
                                   y_dest + dest->pDrawable->y, width, height)) {
-        ret = TRUE;
-        goto done;
+        return;
     }
 
     nbox = REGION_NUM_RECTS(&region);
     DEBUGF("first clipped when compositing.\n");
     DEBUGRegionPrint(&region);
     extent = RegionExtents(&region);
-    if (nbox == 0) {
-        ret = TRUE;
-        goto done;
-    }
+    if (nbox == 0)
+        return;
+
     /* If destination is not a large pixmap, but the region is larger
      * than texture size limitation, and source or mask is memory pixmap,
      * then there may be need to load a large memory pixmap to a
@@ -1659,28 +1628,28 @@ _glamor_composite(CARD8 op,
      * pixmap. */
     if (!glamor_check_fbo_size(glamor_priv,
                                extent->x2 - extent->x1, extent->y2 - extent->y1)
-        && (dest_pixmap_priv->type != GLAMOR_TEXTURE_LARGE)
-        && ((source_pixmap_priv
-             && (source_pixmap_priv->type == GLAMOR_MEMORY ||
+        && glamor_pixmap_is_large(dest_pixmap)
+        && ((source_pixmap
+             && (glamor_pixmap_is_memory(source_pixmap) ||
                  source->repeatType == RepeatPad))
-            || (mask_pixmap_priv &&
-                (mask_pixmap_priv->type == GLAMOR_MEMORY ||
+            || (mask_pixmap &&
+                (glamor_pixmap_is_memory(mask_pixmap) ||
                  mask->repeatType == RepeatPad))
-            || (!source_pixmap_priv &&
+            || (!source_pixmap &&
                 (source->pSourcePict->type != SourcePictTypeSolidFill))
-            || (!mask_pixmap_priv && mask &&
+            || (!mask_pixmap && mask &&
                 mask->pSourcePict->type != SourcePictTypeSolidFill)))
         force_clip = 1;
 
-    if (force_clip || dest_pixmap_priv->type == GLAMOR_TEXTURE_LARGE
-        || (source_pixmap_priv
-            && source_pixmap_priv->type == GLAMOR_TEXTURE_LARGE)
-        || (mask_pixmap_priv && mask_pixmap_priv->type == GLAMOR_TEXTURE_LARGE))
+    if (force_clip || glamor_pixmap_is_large(dest_pixmap)
+        || (source_pixmap
+            && glamor_pixmap_is_large(source_pixmap))
+        || (mask_pixmap && glamor_pixmap_is_large(mask_pixmap)))
         ok = glamor_composite_largepixmap_region(op,
                                                  source, mask, dest,
-                                                 source_pixmap_priv,
-                                                 mask_pixmap_priv,
-                                                 dest_pixmap_priv,
+                                                 source_pixmap,
+                                                 mask_pixmap,
+                                                 dest_pixmap,
                                                  &region, force_clip,
                                                  x_source, y_source,
                                                  x_mask, y_mask,
@@ -1688,9 +1657,9 @@ _glamor_composite(CARD8 op,
     else
         ok = glamor_composite_clipped_region(op, source,
                                              mask, dest,
-                                             source_pixmap_priv,
-                                             mask_pixmap_priv,
-                                             dest_pixmap_priv,
+                                             source_pixmap,
+                                             mask_pixmap,
+                                             dest_pixmap,
                                              &region,
                                              x_source, y_source,
                                              x_mask, y_mask, x_dest, y_dest);
@@ -1698,17 +1667,9 @@ _glamor_composite(CARD8 op,
     REGION_UNINIT(dest->pDrawable->pScreen, &region);
 
     if (ok)
-        goto done;
- fail:
+        return;
 
-    if (!fallback && glamor_ddx_fallback_check_pixmap(&dest_pixmap->drawable)
-        && (!source_pixmap
-            || glamor_ddx_fallback_check_pixmap(&source_pixmap->drawable))
-        && (!mask_pixmap
-            || glamor_ddx_fallback_check_pixmap(&mask_pixmap->drawable))) {
-        ret = FALSE;
-        goto done;
-    }
+ fail:
 
     glamor_fallback
         ("from picts %p:%p %dx%d / %p:%p %d x %d (%c,%c)  to pict %p:%p %dx%d (%c)\n",
@@ -1739,40 +1700,6 @@ _glamor_composite(CARD8 op,
     glamor_finish_access_picture(mask);
     glamor_finish_access_picture(source);
     glamor_finish_access_picture(dest);
-
- done:
-    return ret;
-}
-
-void
-glamor_composite(CARD8 op,
-                 PicturePtr source,
-                 PicturePtr mask,
-                 PicturePtr dest,
-                 INT16 x_source,
-                 INT16 y_source,
-                 INT16 x_mask,
-                 INT16 y_mask,
-                 INT16 x_dest, INT16 y_dest, CARD16 width, CARD16 height)
-{
-    _glamor_composite(op, source, mask, dest, x_source, y_source,
-                      x_mask, y_mask, x_dest, y_dest, width, height, TRUE);
-}
-
-Bool
-glamor_composite_nf(CARD8 op,
-                    PicturePtr source,
-                    PicturePtr mask,
-                    PicturePtr dest,
-                    INT16 x_source,
-                    INT16 y_source,
-                    INT16 x_mask,
-                    INT16 y_mask,
-                    INT16 x_dest, INT16 y_dest, CARD16 width, CARD16 height)
-{
-    return _glamor_composite(op, source, mask, dest, x_source, y_source,
-                             x_mask, y_mask, x_dest, y_dest, width, height,
-                             FALSE);
 }
 
 static void
@@ -1823,21 +1750,27 @@ glamor_composite_glyph_rects(CARD8 op,
     if (!(glamor_is_large_picture(src)
           || (mask && glamor_is_large_picture(mask))
           || glamor_is_large_picture(dst))) {
+        PixmapPtr src_pixmap = NULL;
+        PixmapPtr mask_pixmap = NULL;
+        PixmapPtr dst_pixmap = NULL;
+        PixmapPtr temp_src_pixmap = NULL;
         glamor_pixmap_private *src_pixmap_priv = NULL;
         glamor_pixmap_private *mask_pixmap_priv = NULL;
         glamor_pixmap_private *dst_pixmap_priv;
         glamor_pixmap_private *temp_src_priv = NULL;
         BoxRec src_extent;
 
-        dst_pixmap_priv = glamor_get_pixmap_private
-            (glamor_get_drawable_pixmap(dst->pDrawable));
+        dst_pixmap = glamor_get_drawable_pixmap(dst->pDrawable);
+        dst_pixmap_priv = glamor_get_pixmap_private(dst_pixmap);
 
-        if (mask && mask->pDrawable)
-            mask_pixmap_priv = glamor_get_pixmap_private
-                (glamor_get_drawable_pixmap(mask->pDrawable));
-        if (src->pDrawable)
-            src_pixmap_priv = glamor_get_pixmap_private
-                (glamor_get_drawable_pixmap(src->pDrawable));
+        if (mask && mask->pDrawable) {
+            mask_pixmap = glamor_get_drawable_pixmap(mask->pDrawable);
+            mask_pixmap_priv = glamor_get_pixmap_private(mask_pixmap);
+        }
+        if (src->pDrawable) {
+            src_pixmap = glamor_get_drawable_pixmap(src->pDrawable);
+            src_pixmap_priv = glamor_get_pixmap_private(src_pixmap);
+        }
 
         if (!src->pDrawable
             && (src->pSourcePict->type != SourcePictTypeSolidFill)) {
@@ -1853,13 +1786,14 @@ glamor_composite_glyph_rects(CARD8 op,
             if (!temp_src)
                 goto fallback;
 
-            temp_src_priv = glamor_get_pixmap_private
-                ((PixmapPtr) (temp_src->pDrawable));
+            temp_src_pixmap = (PixmapPtr) (temp_src->pDrawable);
+            temp_src_priv = glamor_get_pixmap_private(temp_src_pixmap);
             glamor_composite_src_rect_translate(nrect, rects,
                                                 -src_extent.x1, -src_extent.y1);
         }
         else {
             temp_src = src;
+            temp_src_pixmap = src_pixmap;
             temp_src_priv = src_pixmap_priv;
         }
 
@@ -1867,6 +1801,7 @@ glamor_composite_glyph_rects(CARD8 op,
             if (op == PictOpOver) {
                 if (glamor_composite_with_shader(PictOpOutReverse,
                                                  temp_src, mask, dst,
+                                                 temp_src_pixmap, mask_pixmap, dst_pixmap,
                                                  temp_src_priv,
                                                  mask_pixmap_priv,
                                                  dst_pixmap_priv, nrect, rects,
@@ -1876,7 +1811,9 @@ glamor_composite_glyph_rects(CARD8 op,
         }
         else {
             if (glamor_composite_with_shader
-                (op, temp_src, mask, dst, temp_src_priv, mask_pixmap_priv,
+                (op, temp_src, mask, dst,
+                 temp_src_pixmap, mask_pixmap, dst_pixmap,
+                 temp_src_priv, mask_pixmap_priv,
                  dst_pixmap_priv, nrect, rects, FALSE))
                 goto done;
         }
@@ -1900,31 +1837,3 @@ glamor_composite_glyph_rects(CARD8 op,
     if (temp_src && temp_src != src)
         FreePicture(temp_src, 0);
 }
-
-static Bool
-_glamor_composite_rects(CARD8 op,
-                        PicturePtr pDst,
-                        xRenderColor *color,
-                        int nRect, xRectangle *rects, Bool fallback)
-{
-    miCompositeRects(op, pDst, color, nRect, rects);
-    return TRUE;
-}
-
-void
-glamor_composite_rects(CARD8 op,
-                       PicturePtr pDst,
-                       xRenderColor *color, int nRect, xRectangle *rects)
-{
-    _glamor_composite_rects(op, pDst, color, nRect, rects, TRUE);
-}
-
-Bool
-glamor_composite_rects_nf(CARD8 op,
-                          PicturePtr pDst,
-                          xRenderColor *color, int nRect, xRectangle *rects)
-{
-    return _glamor_composite_rects(op, pDst, color, nRect, rects, FALSE);
-}
-
-#endif                          /* RENDER */
diff --git a/xorg-server/glamor/glamor_segs.c b/xorg-server/glamor/glamor_segs.c
index ff0daef10..e16732565 100644
--- a/xorg-server/glamor/glamor_segs.c
+++ b/xorg-server/glamor/glamor_segs.c
@@ -109,12 +109,10 @@ glamor_poly_segment_solid_gl(DrawablePtr drawable, GCPtr gc,
     }
 
     glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_COLOR_LOGIC_OP);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 
     return TRUE;
 bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return FALSE;
 }
@@ -168,21 +166,3 @@ glamor_poly_segment(DrawablePtr drawable, GCPtr gc,
 
     glamor_poly_segment_bail(drawable, gc, nseg, segs);
 }
-
-Bool
-glamor_poly_segment_nf(DrawablePtr drawable, GCPtr gc,
-                       int nseg, xSegment *segs)
-{
-    if (glamor_poly_segment_gl(drawable, gc, nseg, segs))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable) &&
-        glamor_ddx_fallback_check_gc(gc))
-    {
-        return FALSE;
-    }
-
-    glamor_poly_segment_bail(drawable, gc, nseg, segs);
-    return TRUE;
-}
-
diff --git a/xorg-server/glamor/glamor_spans.c b/xorg-server/glamor/glamor_spans.c
index 582d11df3..b358c60bd 100644
--- a/xorg-server/glamor/glamor_spans.c
+++ b/xorg-server/glamor/glamor_spans.c
@@ -68,7 +68,7 @@ glamor_fill_spans_gl(DrawablePtr drawable,
                                        &glamor_facet_fillspans_130);
 
         if (!prog)
-            goto bail_ctx;
+            goto bail;
 
         /* Set up the vertex buffers for the points */
 
@@ -93,7 +93,7 @@ glamor_fill_spans_gl(DrawablePtr drawable,
                                        &glamor_facet_fillspans_120);
 
         if (!prog)
-            goto bail_ctx;
+            goto bail;
 
         /* Set up the vertex buffers for the points */
 
@@ -134,27 +134,17 @@ glamor_fill_spans_gl(DrawablePtr drawable,
             if (glamor_priv->glsl_version >= 130)
                 glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, n);
             else {
-                if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
-                    glDrawArrays(GL_QUADS, 0, 4 * n);
-                } else {
-                    int i;
-                    for (i = 0; i < n; i++) {
-                        glDrawArrays(GL_TRIANGLE_FAN, i * 4, 4);
-                    }
-                }
+                glamor_glDrawArrays_GL_QUADS(glamor_priv, nbox);
             }
         }
     }
 
     glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_COLOR_LOGIC_OP);
     if (glamor_priv->glsl_version >= 130)
         glVertexAttribDivisor(GLAMOR_VERTEX_POS, 0);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 
     return TRUE;
-bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return FALSE;
 }
@@ -182,21 +172,6 @@ glamor_fill_spans(DrawablePtr drawable,
     glamor_fill_spans_bail(drawable, gc, n, points, widths, sorted);
 }
 
-Bool
-glamor_fill_spans_nf(DrawablePtr drawable,
-                     GCPtr gc,
-                     int n, DDXPointPtr points, int *widths, int sorted)
-{
-    if (glamor_fill_spans_gl(drawable, gc, n, points, widths, sorted))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable) && glamor_ddx_fallback_check_gc(gc))
-        return FALSE;
-
-    glamor_fill_spans_bail(drawable, gc, n, points, widths, sorted);
-    return TRUE;
-}
-
 static Bool
 glamor_get_spans_gl(DrawablePtr drawable, int wmax,
                     DDXPointPtr points, int *widths, int count, char *dst)
@@ -226,7 +201,7 @@ glamor_get_spans_gl(DrawablePtr drawable, int wmax,
         BoxPtr                  box = glamor_pixmap_box_at(pixmap_priv, box_x, box_y);
         glamor_pixmap_fbo       *fbo = glamor_pixmap_fbo_at(pixmap_priv, box_x, box_y);
 
-        glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo->fb);
+        glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb);
         glPixelStorei(GL_PACK_ALIGNMENT, 4);
 
         d = dst;
@@ -282,20 +257,6 @@ glamor_get_spans(DrawablePtr drawable, int wmax,
     glamor_get_spans_bail(drawable, wmax, points, widths, count, dst);
 }
 
-Bool
-glamor_get_spans_nf(DrawablePtr drawable, int wmax,
-                    DDXPointPtr points, int *widths, int count, char *dst)
-{
-    if (glamor_get_spans_gl(drawable, wmax, points, widths, count, dst))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable))
-        return FALSE;
-
-    glamor_get_spans_bail(drawable, wmax, points, widths, count, dst);
-    return TRUE;
-}
-
 static Bool
 glamor_set_spans_gl(DrawablePtr drawable, GCPtr gc, char *src,
                     DDXPointPtr points, int *widths, int numPoints, int sorted)
@@ -415,17 +376,3 @@ glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
         return;
     glamor_set_spans_bail(drawable, gc, src, points, widths, numPoints, sorted);
 }
-
-Bool
-glamor_set_spans_nf(DrawablePtr drawable, GCPtr gc, char *src,
-                    DDXPointPtr points, int *widths, int numPoints, int sorted)
-{
-    if (glamor_set_spans_gl(drawable, gc, src, points, widths, numPoints, sorted))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable) && glamor_ddx_fallback_check_gc(gc))
-        return FALSE;
-
-    glamor_set_spans_bail(drawable, gc, src, points, widths, numPoints, sorted);
-    return TRUE;
-}
diff --git a/xorg-server/glamor/glamor_sync.c b/xorg-server/glamor/glamor_sync.c
index 5e158c33a..fbc47d4b3 100644
--- a/xorg-server/glamor/glamor_sync.c
+++ b/xorg-server/glamor/glamor_sync.c
@@ -94,8 +94,10 @@ glamor_sync_init(ScreenPtr screen)
 			return FALSE;
 	}
 
+#ifdef HAVE_XSHMFENCE
 	if (!miSyncShmScreenInit(screen))
 		return FALSE;
+#endif
 
 	screen_funcs = miSyncGetScreenFuncs(screen);
 	glamor->saved_procs.sync_screen_funcs.CreateFence = screen_funcs->CreateFence;
diff --git a/xorg-server/glamor/glamor_text.c b/xorg-server/glamor/glamor_text.c
index 59cd0fdc8..c7c1ab738 100644
--- a/xorg-server/glamor/glamor_text.c
+++ b/xorg-server/glamor/glamor_text.c
@@ -210,7 +210,6 @@ glamor_text(DrawablePtr drawable, GCPtr gc,
     glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
     glVertexAttribDivisor(GLAMOR_VERTEX_POS, 0);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
-    glDisable(GL_COLOR_LOGIC_OP);
 
     return x;
 }
@@ -286,34 +285,18 @@ glamor_poly_text(DrawablePtr drawable, GCPtr gc,
     prog = glamor_use_program_fill(pixmap, gc, &glamor_priv->poly_text_progs, &glamor_facet_poly_text);
 
     if (!prog)
-        goto bail_ctx;
+        goto bail;
 
     x = glamor_text(drawable, gc, glamor_font, prog,
                     x, y, count, chars, charinfo, sixteen);
 
-    glDisable(GL_COLOR_LOGIC_OP);
-
     *final_pos = x;
     return TRUE;
 
-bail_ctx:
-    glDisable(GL_COLOR_LOGIC_OP);
 bail:
     return FALSE;
 }
 
-Bool
-glamor_poly_text8_nf(DrawablePtr drawable, GCPtr gc,
-                     int x, int y, int count, char *chars, int *final_pos)
-{
-    if (glamor_poly_text(drawable, gc, x, y, count, chars, FALSE, final_pos))
-        return TRUE;
-    if (glamor_ddx_fallback_check_pixmap(drawable) && glamor_ddx_fallback_check_gc(gc))
-        return FALSE;
-    *final_pos = miPolyText8(drawable, gc, x, y, count, chars);
-    return TRUE;
-}
-
 int
 glamor_poly_text8(DrawablePtr drawable, GCPtr gc,
                    int x, int y, int count, char *chars)
@@ -325,19 +308,6 @@ glamor_poly_text8(DrawablePtr drawable, GCPtr gc,
     return miPolyText8(drawable, gc, x, y, count, chars);
 }
 
-Bool
-glamor_poly_text16_nf(DrawablePtr drawable, GCPtr gc,
-                      int x, int y, int count, unsigned short *chars, int *final_pos)
-{
-    if (glamor_poly_text(drawable, gc, x, y, count, (char *) chars, TRUE, final_pos))
-        return TRUE;
-
-    if (glamor_ddx_fallback_check_pixmap(drawable) && glamor_ddx_fallback_check_gc(gc))
-        return FALSE;
-    *final_pos = miPolyText16(drawable, gc, x, y, count, chars);
-    return TRUE;
-}
-
 int
 glamor_poly_text16(DrawablePtr drawable, GCPtr gc,
                     int x, int y, int count, unsigned short *chars)
@@ -493,17 +463,9 @@ glamor_image_text(DrawablePtr drawable, GCPtr gc,
     return TRUE;
 
 bail:
-    glDisable(GL_COLOR_LOGIC_OP);
     return FALSE;
 }
 
-Bool
-glamor_image_text8_nf(DrawablePtr drawable, GCPtr gc,
-                   int x, int y, int count, char *chars)
-{
-    return glamor_image_text(drawable, gc, x, y, count, chars, FALSE);
-}
-
 void
 glamor_image_text8(DrawablePtr drawable, GCPtr gc,
                    int x, int y, int count, char *chars)
@@ -512,13 +474,6 @@ glamor_image_text8(DrawablePtr drawable, GCPtr gc,
         miImageText8(drawable, gc, x, y, count, chars);
 }
 
-Bool
-glamor_image_text16_nf(DrawablePtr drawable, GCPtr gc,
-                       int x, int y, int count, unsigned short *chars)
-{
-    return glamor_image_text(drawable, gc, x, y, count, (char *) chars, TRUE);
-}
-
 void
 glamor_image_text16(DrawablePtr drawable, GCPtr gc,
                     int x, int y, int count, unsigned short *chars)
diff --git a/xorg-server/glamor/glamor_transfer.c b/xorg-server/glamor/glamor_transfer.c
index 891415565..aa5e8616e 100644
--- a/xorg-server/glamor/glamor_transfer.c
+++ b/xorg-server/glamor/glamor_transfer.c
@@ -73,7 +73,9 @@ glamor_upload_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
     glamor_make_current(glamor_priv);
 
     glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-    glPixelStorei(GL_UNPACK_ROW_LENGTH, byte_stride / bytes_per_pixel);
+
+    if (glamor_priv->has_unpack_subimage)
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, byte_stride / bytes_per_pixel);
 
     glamor_pixmap_loop(priv, box_x, box_y) {
         BoxPtr                  box = glamor_pixmap_box_at(priv, box_x, box_y);
@@ -92,25 +94,34 @@ glamor_upload_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
             int y1 = MAX(boxes->y1 + dy_dst, box->y1);
             int y2 = MIN(boxes->y2 + dy_dst, box->y2);
 
+            size_t ofs = (y1 - dy_dst + dy_src) * byte_stride;
+            ofs += (x1 - dx_dst + dx_src) * bytes_per_pixel;
+
             boxes++;
 
             if (x2 <= x1 || y2 <= y1)
                 continue;
 
-            glPixelStorei(GL_UNPACK_SKIP_ROWS, y1 - dy_dst + dy_src);
-            glPixelStorei(GL_UNPACK_SKIP_PIXELS, x1 - dx_dst + dx_src);
-
-            glTexSubImage2D(GL_TEXTURE_2D, 0,
-                            x1 - box->x1, y1 - box->y1,
-                            x2 - x1, y2 - y1,
-                            format, type,
-                            bits);
+            if (glamor_priv->has_unpack_subimage ||
+                x2 - x1 == byte_stride / bytes_per_pixel) {
+                glTexSubImage2D(GL_TEXTURE_2D, 0,
+                                x1 - box->x1, y1 - box->y1,
+                                x2 - x1, y2 - y1,
+                                format, type,
+                                bits + ofs);
+            } else {
+                for (; y1 < y2; y1++, ofs += byte_stride)
+                    glTexSubImage2D(GL_TEXTURE_2D, 0,
+                                    x1 - box->x1, y1 - box->y1,
+                                    x2 - x1, 1,
+                                    format, type,
+                                    bits + ofs);
+            }
         }
     }
 
-    glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-    glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-    glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+    if (glamor_priv->has_unpack_subimage)
+        glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 }
 
 /*
@@ -166,7 +177,8 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
     glamor_make_current(glamor_priv);
 
     glPixelStorei(GL_PACK_ALIGNMENT, 4);
-    glPixelStorei(GL_PACK_ROW_LENGTH, byte_stride / bytes_per_pixel);
+    if (glamor_priv->has_pack_subimage)
+        glPixelStorei(GL_PACK_ROW_LENGTH, byte_stride / bytes_per_pixel);
 
     glamor_pixmap_loop(priv, box_x, box_y) {
         BoxPtr                  box = glamor_pixmap_box_at(priv, box_x, box_y);
@@ -174,7 +186,7 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
         BoxPtr                  boxes = in_boxes;
         int                     nbox = in_nbox;
 
-        glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo->fb);
+        glBindFramebuffer(GL_FRAMEBUFFER, fbo->fb);
 
         while (nbox--) {
 
@@ -183,20 +195,25 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox,
             int                     x2 = MIN(boxes->x2 + dx_src, box->x2);
             int                     y1 = MAX(boxes->y1 + dy_src, box->y1);
             int                     y2 = MIN(boxes->y2 + dy_src, box->y2);
+            size_t ofs = (y1 - dy_src + dy_dst) * byte_stride;
+            ofs += (x1 - dx_src + dx_dst) * bytes_per_pixel;
 
             boxes++;
 
             if (x2 <= x1 || y2 <= y1)
                 continue;
 
-            glPixelStorei(GL_PACK_SKIP_PIXELS, x1 - dx_src + dx_dst);
-            glPixelStorei(GL_PACK_SKIP_ROWS, y1 - dy_src + dy_dst);
-            glReadPixels(x1 - box->x1, y1 - box->y1, x2 - x1, y2 - y1, format, type, bits);
+            if (glamor_priv->has_pack_subimage ||
+                x2 - x1 == byte_stride / bytes_per_pixel) {
+                glReadPixels(x1 - box->x1, y1 - box->y1, x2 - x1, y2 - y1, format, type, bits + ofs);
+            } else {
+                for (; y1 < y2; y1++, ofs += byte_stride)
+                    glReadPixels(x1 - box->x1, y1 - box->y1, x2 - x1, 1, format, type, bits + ofs);
+            }
         }
     }
-    glPixelStorei(GL_PACK_ROW_LENGTH, 0);
-    glPixelStorei(GL_PACK_SKIP_ROWS, 0);
-    glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
+    if (glamor_priv->has_pack_subimage)
+        glPixelStorei(GL_PACK_ROW_LENGTH, 0);
 }
 
 /*
diff --git a/xorg-server/glamor/glamor_transform.c b/xorg-server/glamor/glamor_transform.c
index c1df56018..6d29e9eb6 100644
--- a/xorg-server/glamor/glamor_transform.c
+++ b/xorg-server/glamor/glamor_transform.c
@@ -43,6 +43,8 @@ glamor_set_destination_drawable(DrawablePtr     drawable,
                                 int             *p_off_x,
                                 int             *p_off_y)
 {
+    ScreenPtr screen = drawable->pScreen;
+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
     PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
     glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
     int off_x, off_y;
@@ -95,7 +97,7 @@ glamor_set_destination_drawable(DrawablePtr     drawable,
                 scale_x, (off_x + center_adjust) * scale_x - 1.0f,
                 scale_y, (off_y + center_adjust) * scale_y - 1.0f);
 
-    glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo_at(pixmap_priv, box_x, box_y),
+    glamor_set_destination_pixmap_fbo(glamor_priv, glamor_pixmap_fbo_at(pixmap_priv, box_x, box_y),
                                       0, 0, w, h);
 }
 
@@ -158,7 +160,7 @@ glamor_set_texture(PixmapPtr    pixmap,
                    int          off_x,
                    int          off_y,
                    GLint        offset_uniform,
-                   GLint        size_uniform)
+                   GLint        size_inv_uniform)
 {
     glamor_pixmap_private *texture_priv;
 
@@ -167,14 +169,14 @@ glamor_set_texture(PixmapPtr    pixmap,
     if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(texture_priv))
         return FALSE;
 
-    if (texture_priv->type == GLAMOR_TEXTURE_LARGE)
+    if (glamor_pixmap_priv_is_large(texture_priv))
         return FALSE;
 
     glActiveTexture(GL_TEXTURE0);
-    glBindTexture(GL_TEXTURE_2D, texture_priv->base.fbo->tex);
+    glBindTexture(GL_TEXTURE_2D, texture_priv->fbo->tex);
 
     glUniform2f(offset_uniform, off_x, off_y);
-    glUniform2f(size_uniform, texture->drawable.width, texture->drawable.height);
+    glUniform2f(size_inv_uniform, 1.0f/texture->drawable.width, 1.0f/texture->drawable.height);
     return TRUE;
 }
 
@@ -182,7 +184,7 @@ Bool
 glamor_set_tiled(PixmapPtr      pixmap,
                  GCPtr          gc,
                  GLint          offset_uniform,
-                 GLint          size_uniform)
+                 GLint          size_inv_uniform)
 {
     if (!glamor_set_alu(pixmap->drawable.pScreen, gc->alu))
         return FALSE;
@@ -195,7 +197,7 @@ glamor_set_tiled(PixmapPtr      pixmap,
                               -gc->patOrg.x,
                               -gc->patOrg.y,
                               offset_uniform,
-                              size_uniform);
+                              size_inv_uniform);
 }
 
 static PixmapPtr
diff --git a/xorg-server/glamor/glamor_trapezoid.c b/xorg-server/glamor/glamor_trapezoid.c
index f8bf6c97f..a448a6b3e 100644
--- a/xorg-server/glamor/glamor_trapezoid.c
+++ b/xorg-server/glamor/glamor_trapezoid.c
@@ -32,7 +32,6 @@
 
 #include "glamor_priv.h"
 
-#ifdef RENDER
 #include "mipict.h"
 #include "fbpict.h"
 
@@ -155,18 +154,3 @@ glamor_trapezoids(CARD8 op,
 
     FreePicture(picture, 0);
 }
-
-Bool
-glamor_trapezoids_nf(CARD8 op,
-                     PicturePtr src, PicturePtr dst,
-                     PictFormatPtr mask_format, INT16 x_src, INT16 y_src,
-                     int ntrap, xTrapezoid *traps)
-{
-    DEBUGF("x_src = %d, y_src = %d, ntrap = %d\n", x_src, y_src, ntrap);
-
-    glamor_trapezoids(op, src, dst, mask_format, x_src,
-                      y_src, ntrap, traps);
-    return TRUE;
-}
-
-#endif                          /* RENDER */
diff --git a/xorg-server/glamor/glamor_triangles.c b/xorg-server/glamor/glamor_triangles.c
index b89cb2de7..88a46c11f 100644
--- a/xorg-server/glamor/glamor_triangles.c
+++ b/xorg-server/glamor/glamor_triangles.c
@@ -28,29 +28,6 @@
 
 #include "glamor_priv.h"
 
-static Bool
-_glamor_triangles(CARD8 op,
-                  PicturePtr pSrc,
-                  PicturePtr pDst,
-                  PictFormatPtr maskFormat,
-                  INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris,
-                  Bool fallback)
-{
-    if (!fallback && glamor_ddx_fallback_check_pixmap(pDst->pDrawable)
-        && (!pSrc->pDrawable
-            || glamor_ddx_fallback_check_pixmap(pSrc->pDrawable)))
-        return FALSE;
-
-    if (glamor_prepare_access_picture(pDst, GLAMOR_ACCESS_RW) &&
-        glamor_prepare_access_picture(pSrc, GLAMOR_ACCESS_RO)) {
-        fbTriangles(op, pSrc, pDst, maskFormat, xSrc, ySrc, ntris, tris);
-    }
-    glamor_finish_access_picture(pSrc);
-    glamor_finish_access_picture(pDst);
-
-    return TRUE;
-}
-
 void
 glamor_triangles(CARD8 op,
                  PicturePtr pSrc,
@@ -58,17 +35,10 @@ glamor_triangles(CARD8 op,
                  PictFormatPtr maskFormat,
                  INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris)
 {
-    _glamor_triangles(op, pSrc, pDst, maskFormat,
-                      xSrc, ySrc, ntris, tris, TRUE);
-}
-
-Bool
-glamor_triangles_nf(CARD8 op,
-                    PicturePtr pSrc,
-                    PicturePtr pDst,
-                    PictFormatPtr maskFormat,
-                    INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris)
-{
-    return _glamor_triangles(op, pSrc, pDst, maskFormat,
-                             xSrc, ySrc, ntris, tris, FALSE);
+    if (glamor_prepare_access_picture(pDst, GLAMOR_ACCESS_RW) &&
+        glamor_prepare_access_picture(pSrc, GLAMOR_ACCESS_RO)) {
+        fbTriangles(op, pSrc, pDst, maskFormat, xSrc, ySrc, ntris, tris);
+    }
+    glamor_finish_access_picture(pSrc);
+    glamor_finish_access_picture(pDst);
 }
diff --git a/xorg-server/glamor/glamor_utils.h b/xorg-server/glamor/glamor_utils.h
index c15d17ca3..0927ffb06 100644
--- a/xorg-server/glamor/glamor_utils.h
+++ b/xorg-server/glamor/glamor_utils.h
@@ -41,50 +41,46 @@
 #define t_from_x_coord_y(_yscale_, _y_)          (1.0 - (_y_) * (_yscale_))
 #define t_from_x_coord_y_inverted(_yscale_, _y_) ((_y_) * (_yscale_))
 
-#define pixmap_priv_get_dest_scale(_pixmap_priv_, _pxscale_, _pyscale_)  \
+#define pixmap_priv_get_dest_scale(pixmap, _pixmap_priv_, _pxscale_, _pyscale_) \
   do {                                                                   \
     int _w_,_h_;                                                         \
-    PIXMAP_PRIV_GET_ACTUAL_SIZE(_pixmap_priv_, _w_, _h_);                \
+    PIXMAP_PRIV_GET_ACTUAL_SIZE(pixmap, _pixmap_priv_, _w_, _h_);        \
     *(_pxscale_) = 1.0 / _w_;                                            \
     *(_pyscale_) = 1.0 / _h_;                                            \
    } while(0)
 
 #define pixmap_priv_get_scale(_pixmap_priv_, _pxscale_, _pyscale_)	\
    do {									\
-    *(_pxscale_) = 1.0 / (_pixmap_priv_)->base.fbo->width;			\
-    *(_pyscale_) = 1.0 / (_pixmap_priv_)->base.fbo->height;			\
+    *(_pxscale_) = 1.0 / (_pixmap_priv_)->fbo->width;			\
+    *(_pyscale_) = 1.0 / (_pixmap_priv_)->fbo->height;			\
   } while(0)
 
-#define GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE(priv)			\
-   (priv->base.fbo->width != priv->base.pixmap->drawable.width 	\
-      || priv->base.fbo->height != priv->base.pixmap->drawable.height)	\
-
-#define PIXMAP_PRIV_GET_ACTUAL_SIZE(priv, w, h)			\
+#define PIXMAP_PRIV_GET_ACTUAL_SIZE(pixmap, priv, w, h)          \
   do {								\
-	if (_X_UNLIKELY(priv->type == GLAMOR_TEXTURE_LARGE)) {	\
-		w = priv->large.box.x2 - priv->large.box.x1;	\
-		h = priv->large.box.y2 - priv->large.box.y1;	\
+	if (_X_UNLIKELY(glamor_pixmap_priv_is_large(priv))) {	\
+		w = priv->box.x2 - priv->box.x1;	\
+		h = priv->box.y2 - priv->box.y1;	\
 	} else {						\
-		w = priv->base.pixmap->drawable.width;		\
-		h = priv->base.pixmap->drawable.height;		\
+		w = (pixmap)->drawable.width;		\
+		h = (pixmap)->drawable.height;		\
 	}							\
   } while(0)
 
-#define glamor_pixmap_fbo_fix_wh_ratio(wh, priv)  		\
+#define glamor_pixmap_fbo_fix_wh_ratio(wh, pixmap, priv)         \
   do {								\
 	int actual_w, actual_h;					\
-	PIXMAP_PRIV_GET_ACTUAL_SIZE(priv, actual_w, actual_h);	\
-	wh[0] = (float)priv->base.fbo->width / actual_w;	\
-	wh[1] = (float)priv->base.fbo->height / actual_h;	\
-	wh[2] = 1.0 / priv->base.fbo->width;			\
-	wh[3] = 1.0 / priv->base.fbo->height;			\
+	PIXMAP_PRIV_GET_ACTUAL_SIZE(pixmap, priv, actual_w, actual_h);	\
+	wh[0] = (float)priv->fbo->width / actual_w;	\
+	wh[1] = (float)priv->fbo->height / actual_h;	\
+	wh[2] = 1.0 / priv->fbo->width;			\
+	wh[3] = 1.0 / priv->fbo->height;			\
   } while(0)
 
 #define pixmap_priv_get_fbo_off(_priv_, _xoff_, _yoff_)		\
    do {								\
-	if (_X_UNLIKELY(_priv_ && (_priv_)->type == GLAMOR_TEXTURE_LARGE)) {  \
-		*(_xoff_) = - (_priv_)->large.box.x1;	\
-		*(_yoff_) = - (_priv_)->large.box.y1;	\
+        if (_X_UNLIKELY(_priv_ && glamor_pixmap_priv_is_large(_priv_))) { \
+		*(_xoff_) = - (_priv_)->box.x1;	\
+		*(_yoff_) = - (_priv_)->box.y1;	\
 	} else {						\
 		*(_xoff_) = 0;					\
 		*(_yoff_) = 0;					\
@@ -193,33 +189,33 @@
 		txy = xy - bxy1;			\
   } while(0)
 
-#define _glamor_get_reflect_transform_coords(priv, repeat_type,	\
+#define _glamor_get_reflect_transform_coords(pixmap, priv, repeat_type,	\
 					    tx1, ty1, 		\
 				            _x1_, _y1_)		\
   do {								\
 	int odd_x, odd_y;					\
 	float c, d;						\
 	fodd_repeat_mod(_x1_,priv->box.x2,			\
-		    priv->base.pixmap->drawable.width,		\
+		    (pixmap)->drawable.width,		\
 		    odd_x, c);					\
 	fodd_repeat_mod(_y1_,	priv->box.y2,			\
-		    priv->base.pixmap->drawable.height,		\
+		    (pixmap)->drawable.height,		\
 		    odd_y, d);					\
 	DEBUGF("c %f d %f oddx %d oddy %d \n",			\
 		c, d, odd_x, odd_y);				\
 	DEBUGF("x2 %d x1 %d fbo->width %d \n", priv->box.x2,	\
-		priv->box.x1, priv->base.fbo->width);		\
+		priv->box.x1, priv->fbo->width);		\
 	DEBUGF("y2 %d y1 %d fbo->height %d \n", priv->box.y2, 	\
-		priv->box.y1, priv->base.fbo->height);		\
+		priv->box.y1, priv->fbo->height);		\
 	_glamor_repeat_reflect_fixup(tx1, _x1_, c, odd_x,	\
-		priv->base.pixmap->drawable.width,		\
+		(pixmap)->drawable.width,		\
 		priv->box.x1, priv->box.x2);			\
 	_glamor_repeat_reflect_fixup(ty1, _y1_, d, odd_y,	\
-		priv->base.pixmap->drawable.height,		\
+		(pixmap)->drawable.height,		\
 		priv->box.y1, priv->box.y2);			\
    } while(0)
 
-#define _glamor_get_repeat_coords(priv, repeat_type, tx1,	\
+#define _glamor_get_repeat_coords(pixmap, priv, repeat_type, tx1,	\
 				  ty1, tx2, ty2,		\
 				  _x1_, _y1_, _x2_,		\
 				  _y2_, c, d, odd_x, odd_y)	\
@@ -228,10 +224,10 @@
 		DEBUGF("x1 y1 %d %d\n",				\
 			_x1_, _y1_ );				\
 		DEBUGF("width %d box.x1 %d \n",			\
-		       (priv)->base.pixmap->drawable.width,	\
+		       (pixmap)->drawable.width,	\
 		       priv->box.x1);				\
 		if (odd_x) {					\
-			c = (priv)->base.pixmap->drawable.width	\
+			c = (pixmap)->drawable.width	\
 				- c;				\
 			tx1 = c - priv->box.x1;			\
 			tx2 = tx1 - ((_x2_) - (_x1_));		\
@@ -240,7 +236,7 @@
 			tx2 = tx1 + ((_x2_) - (_x1_));		\
 		}						\
 		if (odd_y){					\
-			d = (priv)->base.pixmap->drawable.height\
+			d = (pixmap)->drawable.height\
 			    - d;				\
 			ty1 = d - priv->box.y1;			\
 			ty2 = ty1 - ((_y2_) - (_y1_));		\
@@ -257,11 +253,11 @@
    } while(0)
 
 /* _x1_ ... _y2_ may has fractional. */
-#define glamor_get_repeat_transform_coords(priv, repeat_type, tx1,	\
+#define glamor_get_repeat_transform_coords(pixmap, priv, repeat_type, tx1, \
 					   ty1, _x1_, _y1_)		\
   do {									\
 	DEBUGF("width %d box.x1 %d x2 %d y1 %d y2 %d\n",		\
-		(priv)->base.pixmap->drawable.width,			\
+		(pixmap)->drawable.width,			\
 		priv->box.x1, priv->box.x2, priv->box.y1,		\
 		priv->box.y2);						\
 	DEBUGF("x1 %f y1 %f \n", _x1_, _y1_);				\
@@ -269,33 +265,33 @@
 		tx1 = _x1_ - priv->box.x1;				\
 		ty1 = _y1_ - priv->box.y1;				\
 	} else			\
-		_glamor_get_reflect_transform_coords(priv, repeat_type, \
+                _glamor_get_reflect_transform_coords(pixmap, priv, repeat_type, \
 				  tx1, ty1, 				\
 				  _x1_, _y1_);				\
 	DEBUGF("tx1 %f ty1 %f \n", tx1, ty1);				\
    } while(0)
 
 /* _x1_ ... _y2_ must be integer. */
-#define glamor_get_repeat_coords(priv, repeat_type, tx1,		\
+#define glamor_get_repeat_coords(pixmap, priv, repeat_type, tx1,		\
 				 ty1, tx2, ty2, _x1_, _y1_, _x2_,	\
 				 _y2_) 					\
   do {									\
 	int c, d;							\
 	int odd_x = 0, odd_y = 0;					\
 	DEBUGF("width %d box.x1 %d x2 %d y1 %d y2 %d\n",		\
-		(priv)->base.pixmap->drawable.width,			\
+		(pixmap)->drawable.width,			\
 		priv->box.x1, priv->box.x2,				\
 		priv->box.y1, priv->box.y2);				\
-	modulus((_x1_), (priv)->base.pixmap->drawable.width, c); 	\
-	modulus((_y1_), (priv)->base.pixmap->drawable.height, d);	\
+	modulus((_x1_), (pixmap)->drawable.width, c); 	\
+	modulus((_y1_), (pixmap)->drawable.height, d);	\
 	DEBUGF("c %d d %d \n", c, d);					\
 	if (repeat_type == RepeatReflect) {				\
 		odd_x = abs((_x1_ - c)					\
-			/ (priv->base.pixmap->drawable.width)) & 1;	\
+                            / ((pixmap)->drawable.width)) & 1;            \
 		odd_y = abs((_y1_ - d)					\
-			/ (priv->base.pixmap->drawable.height)) & 1;	\
+                            / ((pixmap)->drawable.height)) & 1;           \
 	}								\
-	_glamor_get_repeat_coords(priv, repeat_type, tx1, ty1, tx2, ty2,\
+	_glamor_get_repeat_coords(pixmap, priv, repeat_type, tx1, ty1, tx2, ty2, \
 				  _x1_, _y1_, _x2_, _y2_, c, d,		\
 				  odd_x, odd_y);			\
    } while(0)
@@ -321,7 +317,7 @@
 		(texcoord)[1]);						\
   } while(0)
 
-#define glamor_set_transformed_point(priv, matrix, xscale,		\
+#define glamor_set_transformed_point(priv, matrix, xscale,              \
 				     yscale, texcoord,			\
                                      x, y)				\
   do {									\
@@ -404,7 +400,7 @@
 				texcoords+4);			\
     } while (0)
 
-#define glamor_set_repeat_transformed_normalize_tcoords_ext( priv,	\
+#define glamor_set_repeat_transformed_normalize_tcoords_ext(pixmap, priv, \
 							 repeat_type,	\
 							 matrix,	\
 							 xscale,	\
@@ -414,7 +410,7 @@
 							 texcoords,	\
 							 stride)	\
   do {									\
-    if (_X_LIKELY(priv->type != GLAMOR_TEXTURE_LARGE)) {		\
+    if (_X_LIKELY(glamor_pixmap_priv_is_small(priv))) {		\
 	glamor_set_transformed_normalize_tcoords_ext(priv, matrix, xscale,	\
 						 yscale, _x1_, _y1_,	\
 						 _x2_, _y2_,	\
@@ -429,16 +425,16 @@
     glamor_transform_point(matrix, tx4, ty4, _x1_, _y2_);		\
     DEBUGF("transformed %f %f %f %f %f %f %f %f\n",			\
 	   tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);			\
-    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
+    glamor_get_repeat_transform_coords(pixmap, priv, repeat_type, \
 				       ttx1, tty1, 			\
 				       tx1, ty1);			\
-    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
+    glamor_get_repeat_transform_coords(pixmap, priv, repeat_type, 	\
 				       ttx2, tty2, 			\
 				       tx2, ty2);			\
-    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
+    glamor_get_repeat_transform_coords(pixmap, priv, repeat_type, 	\
 				       ttx3, tty3, 			\
 				       tx3, ty3);			\
-    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
+    glamor_get_repeat_transform_coords(pixmap, priv, repeat_type, 	\
 				       ttx4, tty4, 			\
 				       tx4, ty4);			\
     DEBUGF("repeat transformed %f %f %f %f %f %f %f %f\n", ttx1, tty1, 	\
@@ -454,7 +450,8 @@
    }									\
   } while (0)
 
-#define glamor_set_repeat_transformed_normalize_tcoords( priv,		\
+#define glamor_set_repeat_transformed_normalize_tcoords( pixmap,        \
+                                                         priv,          \
 							 repeat_type,	\
 							 matrix,	\
 							 xscale,	\
@@ -463,7 +460,8 @@
 							 _x2_, _y2_,   	\
 							 texcoords)	\
   do {									\
-	glamor_set_repeat_transformed_normalize_tcoords_ext( priv,	\
+      glamor_set_repeat_transformed_normalize_tcoords_ext( pixmap,      \
+                                                           priv,	\
 							 repeat_type,	\
 							 matrix,	\
 							 xscale,	\
@@ -495,7 +493,7 @@
 				     x1, y1, x2, y2,			\
                                      vertices, stride)	\
   do {									\
-     if (_X_UNLIKELY(priv->type == GLAMOR_TEXTURE_LARGE)) {		\
+     if (_X_UNLIKELY(glamor_pixmap_priv_is_large(priv))) {		\
 	float tx1, tx2, ty1, ty2;					\
 	int fbo_x_off, fbo_y_off;					\
 	pixmap_priv_get_fbo_off(priv, &fbo_x_off, &fbo_y_off);		\
@@ -520,20 +518,20 @@
                                      vertices, 2);			\
  } while(0)
 
-#define glamor_set_repeat_normalize_tcoords_ext(priv, repeat_type,	\
+#define glamor_set_repeat_normalize_tcoords_ext(pixmap, priv, repeat_type, \
 					    xscale, yscale,		\
 					    _x1_, _y1_, _x2_, _y2_,	\
 	                                    vertices, stride)		\
   do {									\
-     if (_X_UNLIKELY(priv->type == GLAMOR_TEXTURE_LARGE)) {		\
+     if (_X_UNLIKELY(glamor_pixmap_priv_is_large(priv))) {		\
 	float tx1, tx2, ty1, ty2;					\
 	if (repeat_type == RepeatPad) {					\
-		tx1 = _x1_ - priv->large.box.x1;			\
-		ty1 = _y1_ - priv->large.box.y1;			\
+		tx1 = _x1_ - priv->box.x1;			        \
+		ty1 = _y1_ - priv->box.y1;			        \
 		tx2 = tx1 + ((_x2_) - (_x1_));				\
 		ty2 = ty1 + ((_y2_) - (_y1_));				\
 	} else {							\
-	glamor_get_repeat_coords((&priv->large), repeat_type,		\
+            glamor_get_repeat_coords(pixmap, priv, repeat_type,         \
 				 tx1, ty1, tx2, ty2,			\
 				 _x1_, _y1_, _x2_, _y2_);		\
 	}								\
@@ -758,9 +756,9 @@ glamor_translate_boxes(BoxPtr boxes, int nbox, int dx, int dy)
 						|| _depth_ == 30	\
 						|| _depth_ == 32)
 
-#define GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv) (pixmap_priv && pixmap_priv->base.is_picture == 1)
-#define GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)    (pixmap_priv && pixmap_priv->base.gl_fbo == GLAMOR_FBO_NORMAL)
-#define GLAMOR_PIXMAP_PRIV_HAS_FBO_DOWNLOADED(pixmap_priv)    (pixmap_priv && (pixmap_priv->base.gl_fbo == GLAMOR_FBO_DOWNLOADED))
+#define GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv) (pixmap_priv && pixmap_priv->is_picture == 1)
+#define GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)    (pixmap_priv && pixmap_priv->gl_fbo == GLAMOR_FBO_NORMAL)
+#define GLAMOR_PIXMAP_PRIV_HAS_FBO_DOWNLOADED(pixmap_priv)    (pixmap_priv && (pixmap_priv->gl_fbo == GLAMOR_FBO_DOWNLOADED))
 
 /**
  * Borrow from uxa.
@@ -795,10 +793,10 @@ static inline GLenum
 gl_iformat_for_pixmap(PixmapPtr pixmap)
 {
     glamor_screen_private *glamor_priv =
-        glamor_get_screen_private(pixmap->drawable.pScreen);
+        glamor_get_screen_private((pixmap)->drawable.pScreen);
 
     if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
-        (pixmap->drawable.depth == 1 || pixmap->drawable.depth == 8)) {
+        ((pixmap)->drawable.depth == 1 || (pixmap)->drawable.depth == 8)) {
         return GL_ALPHA;
     } else {
         return GL_RGBA;
@@ -813,9 +811,9 @@ format_for_pixmap(PixmapPtr pixmap)
 
     pixmap_priv = glamor_get_pixmap_private(pixmap);
     if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
-        pict_format = pixmap_priv->base.picture->format;
+        pict_format = pixmap_priv->picture->format;
     else
-        pict_format = format_for_depth(pixmap->drawable.depth);
+        pict_format = format_for_depth((pixmap)->drawable.depth);
 
     return pict_format;
 }
@@ -939,47 +937,13 @@ glamor_pict_format_is_compatible(PicturePtr picture)
     }
 }
 
-/* return TRUE if we can access this pixmap at DDX driver. */
-inline static Bool
-glamor_ddx_fallback_check_pixmap(DrawablePtr drawable)
-{
-    PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
-    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
-
-    return (!pixmap_priv
-            || (pixmap_priv->type == GLAMOR_TEXTURE_DRM
-                || pixmap_priv->type == GLAMOR_MEMORY
-                || pixmap_priv->type == GLAMOR_DRM_ONLY));
-}
-
-inline static Bool
-glamor_ddx_fallback_check_gc(GCPtr gc)
-{
-    PixmapPtr pixmap;
-
-    if (!gc)
-        return TRUE;
-    switch (gc->fillStyle) {
-    case FillStippled:
-    case FillOpaqueStippled:
-        pixmap = gc->stipple;
-        break;
-    case FillTiled:
-        pixmap = gc->tile.pixmap;
-        break;
-    default:
-        pixmap = NULL;
-    }
-    return (!pixmap || glamor_ddx_fallback_check_pixmap(&pixmap->drawable));
-}
-
 inline static Bool
 glamor_is_large_pixmap(PixmapPtr pixmap)
 {
     glamor_pixmap_private *priv;
 
     priv = glamor_get_pixmap_private(pixmap);
-    return (priv->type == GLAMOR_TEXTURE_LARGE);
+    return (glamor_pixmap_priv_is_large(priv));
 }
 
 inline static Bool
@@ -1005,8 +969,8 @@ static inline void
 _glamor_dump_pixmap_bits(PixmapPtr pixmap, int x, int y, int w, int h)
 {
     int i, j;
-    unsigned char *p = pixmap->devPrivate.ptr;
-    int stride = pixmap->devKind;
+    unsigned char *p = (pixmap)->devPrivate.ptr;
+    int stride = (pixmap)->devKind;
 
     p = p + y * stride + x;
 
@@ -1023,8 +987,8 @@ static inline void
 _glamor_dump_pixmap_byte(PixmapPtr pixmap, int x, int y, int w, int h)
 {
     int i, j;
-    unsigned char *p = pixmap->devPrivate.ptr;
-    int stride = pixmap->devKind;
+    unsigned char *p = (pixmap)->devPrivate.ptr;
+    int stride = (pixmap)->devKind;
 
     p = p + y * stride + x;
 
@@ -1041,8 +1005,8 @@ static inline void
 _glamor_dump_pixmap_sword(PixmapPtr pixmap, int x, int y, int w, int h)
 {
     int i, j;
-    unsigned short *p = pixmap->devPrivate.ptr;
-    int stride = pixmap->devKind / 2;
+    unsigned short *p = (pixmap)->devPrivate.ptr;
+    int stride = (pixmap)->devKind / 2;
 
     p = p + y * stride + x;
 
@@ -1059,8 +1023,8 @@ static inline void
 _glamor_dump_pixmap_word(PixmapPtr pixmap, int x, int y, int w, int h)
 {
     int i, j;
-    unsigned int *p = pixmap->devPrivate.ptr;
-    int stride = pixmap->devKind / 4;
+    unsigned int *p = (pixmap)->devPrivate.ptr;
+    int stride = (pixmap)->devKind / 4;
 
     p = p + y * stride + x;
 
@@ -1076,11 +1040,11 @@ _glamor_dump_pixmap_word(PixmapPtr pixmap, int x, int y, int w, int h)
 static inline void
 glamor_dump_pixmap(PixmapPtr pixmap, int x, int y, int w, int h)
 {
-    w = ((x + w) > pixmap->drawable.width) ? (pixmap->drawable.width - x) : w;
-    h = ((y + h) > pixmap->drawable.height) ? (pixmap->drawable.height - y) : h;
+    w = ((x + w) > (pixmap)->drawable.width) ? ((pixmap)->drawable.width - x) : w;
+    h = ((y + h) > (pixmap)->drawable.height) ? ((pixmap)->drawable.height - y) : h;
 
-    glamor_prepare_access(&pixmap->drawable, GLAMOR_ACCESS_RO);
-    switch (pixmap->drawable.depth) {
+    glamor_prepare_access(&(pixmap)->drawable, GLAMOR_ACCESS_RO);
+    switch ((pixmap)->drawable.depth) {
     case 8:
         _glamor_dump_pixmap_byte(pixmap, x, y, w, h);
         break;
@@ -1097,9 +1061,9 @@ glamor_dump_pixmap(PixmapPtr pixmap, int x, int y, int w, int h)
         _glamor_dump_pixmap_bits(pixmap, x, y, w, h);
         break;
     default:
-        ErrorF("dump depth %d, not implemented.\n", pixmap->drawable.depth);
+        ErrorF("dump depth %d, not implemented.\n", (pixmap)->drawable.depth);
     }
-    glamor_finish_access(&pixmap->drawable);
+    glamor_finish_access(&(pixmap)->drawable);
 }
 
 static inline void
@@ -1297,7 +1261,7 @@ glamor_compare_pictures(ScreenPtr screen,
                                       GLAMOR_CREATE_PIXMAP_CPU);
 
         pixman_pic = CreatePicture(0,
-                                   &pixmap->drawable,
+                                   &(pixmap)->drawable,
                                    PictureMatchFormat(screen,
                                                       PIXMAN_FORMAT_DEPTH
                                                       (format), format), 0, 0,
@@ -1325,7 +1289,7 @@ glamor_compare_pictures(ScreenPtr screen,
                                       GLAMOR_CREATE_PIXMAP_CPU);
 
         pixman_pic = CreatePicture(0,
-                                   &pixmap->drawable,
+                                   &(pixmap)->drawable,
                                    PictureMatchFormat(screen,
                                                       PIXMAN_FORMAT_DEPTH
                                                       (format), format), 0, 0,
@@ -1429,4 +1393,21 @@ glamor_make_current(glamor_screen_private *glamor_priv)
     }
 }
 
+/**
+ * Helper function for implementing draws with GL_QUADS on GLES2,
+ * where we don't have them.
+ */
+static inline void
+glamor_glDrawArrays_GL_QUADS(glamor_screen_private *glamor_priv, unsigned count)
+{
+    if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
+        glDrawArrays(GL_QUADS, 0, count * 4);
+    } else {
+        unsigned i;
+        for (i = 0; i < count; i++)
+            glDrawArrays(GL_TRIANGLE_FAN, i * 4, 4);
+    }
+}
+
+
 #endif
diff --git a/xorg-server/glamor/glamor_window.c b/xorg-server/glamor/glamor_window.c
index 60647bf80..a39e723ef 100644
--- a/xorg-server/glamor/glamor_window.c
+++ b/xorg-server/glamor/glamor_window.c
@@ -79,16 +79,16 @@ glamor_set_window_pixmap(WindowPtr win, PixmapPtr pPixmap)
 
         pixmap_priv = glamor_get_pixmap_private(old);
         if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv) &&
-            pixmap_priv->base.picture->pDrawable == (DrawablePtr) win) {
-            pic = pixmap_priv->base.picture;
-            pixmap_priv->base.is_picture = 0;
-            pixmap_priv->base.picture = NULL;
+            pixmap_priv->picture->pDrawable == (DrawablePtr) win) {
+            pic = pixmap_priv->picture;
+            pixmap_priv->is_picture = 0;
+            pixmap_priv->picture = NULL;
         }
 
         pixmap_priv = glamor_get_pixmap_private(pPixmap);
         if (pixmap_priv) {
-            pixmap_priv->base.is_picture = ! !pic;
-            pixmap_priv->base.picture = pic;
+            pixmap_priv->is_picture = ! !pic;
+            pixmap_priv->picture = pic;
         }
     }
 
diff --git a/xorg-server/glamor/glamor_xv.c b/xorg-server/glamor/glamor_xv.c
index 83e24adb2..364104ddd 100644
--- a/xorg-server/glamor/glamor_xv.c
+++ b/xorg-server/glamor/glamor_xv.c
@@ -241,8 +241,8 @@ glamor_xv_render(glamor_port_private *port_priv)
 {
     ScreenPtr screen = port_priv->pPixmap->drawable.pScreen;
     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-    glamor_pixmap_private *pixmap_priv =
-        glamor_get_pixmap_private(port_priv->pPixmap);
+    PixmapPtr pixmap = port_priv->pPixmap;
+    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
     glamor_pixmap_private *src_pixmap_priv[3];
     float vertices[32], texcoords[8];
     BoxPtr box = REGION_RECTS(&port_priv->clip);
@@ -282,10 +282,11 @@ glamor_xv_render(glamor_port_private *port_priv)
     off[2] = Loff * yco + Coff * (uco[2] + vco[2]) + bright;
     gamma = 1.0;
 
-    pixmap_priv_get_dest_scale(pixmap_priv, &dst_xscale, &dst_yscale);
+    pixmap_priv_get_dest_scale(pixmap, pixmap_priv, &dst_xscale, &dst_yscale);
     glamor_get_drawable_deltas(port_priv->pDraw, port_priv->pPixmap, &dst_x_off,
                                &dst_y_off);
-    glamor_set_destination_pixmap_priv_nc(pixmap_priv);
+    glamor_set_destination_pixmap_priv_nc(glamor_priv, pixmap, pixmap_priv);
+    glamor_set_alu(screen, GXcopy);
 
     for (i = 0; i < 3; i++) {
         if (port_priv->src_pix[i]) {
@@ -306,21 +307,21 @@ glamor_xv_render(glamor_port_private *port_priv)
     glUniform4f(uloc, vco[0], vco[1], vco[2], 0);
 
     glActiveTexture(GL_TEXTURE0);
-    glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[0]->base.fbo->tex);
+    glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[0]->fbo->tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
     glActiveTexture(GL_TEXTURE1);
-    glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[1]->base.fbo->tex);
+    glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[1]->fbo->tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
     glActiveTexture(GL_TEXTURE2);
-    glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->base.fbo->tex);
+    glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[2]->fbo->tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index a7c708bd0..a0813a628 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -63,7 +63,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 1240
+#define _gloffset_COUNT 1263
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -473,7 +473,7 @@
 #define _gloffset_MultiTexCoord4iv 405
 #define _gloffset_MultiTexCoord4s 406
 #define _gloffset_MultiTexCoord4sv 407
-#define driDispatchRemapTable_size 832
+#define driDispatchRemapTable_size 855
 SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define CompressedTexImage1D_remap_index 0
@@ -938,376 +938,399 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define VertexBindingDivisor_remap_index 459
 #define MultiDrawArraysIndirect_remap_index 460
 #define MultiDrawElementsIndirect_remap_index 461
-#define TexBufferRange_remap_index 462
-#define TexStorage2DMultisample_remap_index 463
-#define TexStorage3DMultisample_remap_index 464
-#define BufferStorage_remap_index 465
-#define ClearTexImage_remap_index 466
-#define ClearTexSubImage_remap_index 467
-#define BindBuffersBase_remap_index 468
-#define BindBuffersRange_remap_index 469
-#define BindImageTextures_remap_index 470
-#define BindSamplers_remap_index 471
-#define BindTextures_remap_index 472
-#define BindVertexBuffers_remap_index 473
-#define ClipControl_remap_index 474
-#define BindTextureUnit_remap_index 475
-#define ClearNamedBufferData_remap_index 476
-#define ClearNamedBufferSubData_remap_index 477
-#define CompressedTextureSubImage1D_remap_index 478
-#define CompressedTextureSubImage2D_remap_index 479
-#define CompressedTextureSubImage3D_remap_index 480
-#define CopyNamedBufferSubData_remap_index 481
-#define CopyTextureSubImage1D_remap_index 482
-#define CopyTextureSubImage2D_remap_index 483
-#define CopyTextureSubImage3D_remap_index 484
-#define CreateBuffers_remap_index 485
-#define CreateTextures_remap_index 486
-#define FlushMappedNamedBufferRange_remap_index 487
-#define GenerateTextureMipmap_remap_index 488
-#define GetCompressedTextureImage_remap_index 489
-#define GetNamedBufferParameteri64v_remap_index 490
-#define GetNamedBufferParameteriv_remap_index 491
-#define GetNamedBufferPointerv_remap_index 492
-#define GetNamedBufferSubData_remap_index 493
-#define GetTextureImage_remap_index 494
-#define GetTextureLevelParameterfv_remap_index 495
-#define GetTextureLevelParameteriv_remap_index 496
-#define GetTextureParameterIiv_remap_index 497
-#define GetTextureParameterIuiv_remap_index 498
-#define GetTextureParameterfv_remap_index 499
-#define GetTextureParameteriv_remap_index 500
-#define MapNamedBuffer_remap_index 501
-#define MapNamedBufferRange_remap_index 502
-#define NamedBufferData_remap_index 503
-#define NamedBufferStorage_remap_index 504
-#define NamedBufferSubData_remap_index 505
-#define TextureBuffer_remap_index 506
-#define TextureBufferRange_remap_index 507
-#define TextureParameterIiv_remap_index 508
-#define TextureParameterIuiv_remap_index 509
-#define TextureParameterf_remap_index 510
-#define TextureParameterfv_remap_index 511
-#define TextureParameteri_remap_index 512
-#define TextureParameteriv_remap_index 513
-#define TextureStorage1D_remap_index 514
-#define TextureStorage2D_remap_index 515
-#define TextureStorage2DMultisample_remap_index 516
-#define TextureStorage3D_remap_index 517
-#define TextureStorage3DMultisample_remap_index 518
-#define TextureSubImage1D_remap_index 519
-#define TextureSubImage2D_remap_index 520
-#define TextureSubImage3D_remap_index 521
-#define UnmapNamedBuffer_remap_index 522
-#define InvalidateBufferData_remap_index 523
-#define InvalidateBufferSubData_remap_index 524
-#define InvalidateFramebuffer_remap_index 525
-#define InvalidateSubFramebuffer_remap_index 526
-#define InvalidateTexImage_remap_index 527
-#define InvalidateTexSubImage_remap_index 528
-#define PolygonOffsetEXT_remap_index 529
-#define DrawTexfOES_remap_index 530
-#define DrawTexfvOES_remap_index 531
-#define DrawTexiOES_remap_index 532
-#define DrawTexivOES_remap_index 533
-#define DrawTexsOES_remap_index 534
-#define DrawTexsvOES_remap_index 535
-#define DrawTexxOES_remap_index 536
-#define DrawTexxvOES_remap_index 537
-#define PointSizePointerOES_remap_index 538
-#define QueryMatrixxOES_remap_index 539
-#define SampleMaskSGIS_remap_index 540
-#define SamplePatternSGIS_remap_index 541
-#define ColorPointerEXT_remap_index 542
-#define EdgeFlagPointerEXT_remap_index 543
-#define IndexPointerEXT_remap_index 544
-#define NormalPointerEXT_remap_index 545
-#define TexCoordPointerEXT_remap_index 546
-#define VertexPointerEXT_remap_index 547
-#define DiscardFramebufferEXT_remap_index 548
-#define ActiveShaderProgram_remap_index 549
-#define BindProgramPipeline_remap_index 550
-#define CreateShaderProgramv_remap_index 551
-#define DeleteProgramPipelines_remap_index 552
-#define GenProgramPipelines_remap_index 553
-#define GetProgramPipelineInfoLog_remap_index 554
-#define GetProgramPipelineiv_remap_index 555
-#define IsProgramPipeline_remap_index 556
-#define LockArraysEXT_remap_index 557
-#define ProgramUniform1d_remap_index 558
-#define ProgramUniform1dv_remap_index 559
-#define ProgramUniform1f_remap_index 560
-#define ProgramUniform1fv_remap_index 561
-#define ProgramUniform1i_remap_index 562
-#define ProgramUniform1iv_remap_index 563
-#define ProgramUniform1ui_remap_index 564
-#define ProgramUniform1uiv_remap_index 565
-#define ProgramUniform2d_remap_index 566
-#define ProgramUniform2dv_remap_index 567
-#define ProgramUniform2f_remap_index 568
-#define ProgramUniform2fv_remap_index 569
-#define ProgramUniform2i_remap_index 570
-#define ProgramUniform2iv_remap_index 571
-#define ProgramUniform2ui_remap_index 572
-#define ProgramUniform2uiv_remap_index 573
-#define ProgramUniform3d_remap_index 574
-#define ProgramUniform3dv_remap_index 575
-#define ProgramUniform3f_remap_index 576
-#define ProgramUniform3fv_remap_index 577
-#define ProgramUniform3i_remap_index 578
-#define ProgramUniform3iv_remap_index 579
-#define ProgramUniform3ui_remap_index 580
-#define ProgramUniform3uiv_remap_index 581
-#define ProgramUniform4d_remap_index 582
-#define ProgramUniform4dv_remap_index 583
-#define ProgramUniform4f_remap_index 584
-#define ProgramUniform4fv_remap_index 585
-#define ProgramUniform4i_remap_index 586
-#define ProgramUniform4iv_remap_index 587
-#define ProgramUniform4ui_remap_index 588
-#define ProgramUniform4uiv_remap_index 589
-#define ProgramUniformMatrix2dv_remap_index 590
-#define ProgramUniformMatrix2fv_remap_index 591
-#define ProgramUniformMatrix2x3dv_remap_index 592
-#define ProgramUniformMatrix2x3fv_remap_index 593
-#define ProgramUniformMatrix2x4dv_remap_index 594
-#define ProgramUniformMatrix2x4fv_remap_index 595
-#define ProgramUniformMatrix3dv_remap_index 596
-#define ProgramUniformMatrix3fv_remap_index 597
-#define ProgramUniformMatrix3x2dv_remap_index 598
-#define ProgramUniformMatrix3x2fv_remap_index 599
-#define ProgramUniformMatrix3x4dv_remap_index 600
-#define ProgramUniformMatrix3x4fv_remap_index 601
-#define ProgramUniformMatrix4dv_remap_index 602
-#define ProgramUniformMatrix4fv_remap_index 603
-#define ProgramUniformMatrix4x2dv_remap_index 604
-#define ProgramUniformMatrix4x2fv_remap_index 605
-#define ProgramUniformMatrix4x3dv_remap_index 606
-#define ProgramUniformMatrix4x3fv_remap_index 607
-#define UnlockArraysEXT_remap_index 608
-#define UseProgramStages_remap_index 609
-#define ValidateProgramPipeline_remap_index 610
-#define DebugMessageCallback_remap_index 611
-#define DebugMessageControl_remap_index 612
-#define DebugMessageInsert_remap_index 613
-#define GetDebugMessageLog_remap_index 614
-#define GetObjectLabel_remap_index 615
-#define GetObjectPtrLabel_remap_index 616
-#define ObjectLabel_remap_index 617
-#define ObjectPtrLabel_remap_index 618
-#define PopDebugGroup_remap_index 619
-#define PushDebugGroup_remap_index 620
-#define SecondaryColor3fEXT_remap_index 621
-#define SecondaryColor3fvEXT_remap_index 622
-#define MultiDrawElementsEXT_remap_index 623
-#define FogCoordfEXT_remap_index 624
-#define FogCoordfvEXT_remap_index 625
-#define ResizeBuffersMESA_remap_index 626
-#define WindowPos4dMESA_remap_index 627
-#define WindowPos4dvMESA_remap_index 628
-#define WindowPos4fMESA_remap_index 629
-#define WindowPos4fvMESA_remap_index 630
-#define WindowPos4iMESA_remap_index 631
-#define WindowPos4ivMESA_remap_index 632
-#define WindowPos4sMESA_remap_index 633
-#define WindowPos4svMESA_remap_index 634
-#define MultiModeDrawArraysIBM_remap_index 635
-#define MultiModeDrawElementsIBM_remap_index 636
-#define AreProgramsResidentNV_remap_index 637
-#define ExecuteProgramNV_remap_index 638
-#define GetProgramParameterdvNV_remap_index 639
-#define GetProgramParameterfvNV_remap_index 640
-#define GetProgramStringNV_remap_index 641
-#define GetProgramivNV_remap_index 642
-#define GetTrackMatrixivNV_remap_index 643
-#define GetVertexAttribdvNV_remap_index 644
-#define GetVertexAttribfvNV_remap_index 645
-#define GetVertexAttribivNV_remap_index 646
-#define LoadProgramNV_remap_index 647
-#define ProgramParameters4dvNV_remap_index 648
-#define ProgramParameters4fvNV_remap_index 649
-#define RequestResidentProgramsNV_remap_index 650
-#define TrackMatrixNV_remap_index 651
-#define VertexAttrib1dNV_remap_index 652
-#define VertexAttrib1dvNV_remap_index 653
-#define VertexAttrib1fNV_remap_index 654
-#define VertexAttrib1fvNV_remap_index 655
-#define VertexAttrib1sNV_remap_index 656
-#define VertexAttrib1svNV_remap_index 657
-#define VertexAttrib2dNV_remap_index 658
-#define VertexAttrib2dvNV_remap_index 659
-#define VertexAttrib2fNV_remap_index 660
-#define VertexAttrib2fvNV_remap_index 661
-#define VertexAttrib2sNV_remap_index 662
-#define VertexAttrib2svNV_remap_index 663
-#define VertexAttrib3dNV_remap_index 664
-#define VertexAttrib3dvNV_remap_index 665
-#define VertexAttrib3fNV_remap_index 666
-#define VertexAttrib3fvNV_remap_index 667
-#define VertexAttrib3sNV_remap_index 668
-#define VertexAttrib3svNV_remap_index 669
-#define VertexAttrib4dNV_remap_index 670
-#define VertexAttrib4dvNV_remap_index 671
-#define VertexAttrib4fNV_remap_index 672
-#define VertexAttrib4fvNV_remap_index 673
-#define VertexAttrib4sNV_remap_index 674
-#define VertexAttrib4svNV_remap_index 675
-#define VertexAttrib4ubNV_remap_index 676
-#define VertexAttrib4ubvNV_remap_index 677
-#define VertexAttribPointerNV_remap_index 678
-#define VertexAttribs1dvNV_remap_index 679
-#define VertexAttribs1fvNV_remap_index 680
-#define VertexAttribs1svNV_remap_index 681
-#define VertexAttribs2dvNV_remap_index 682
-#define VertexAttribs2fvNV_remap_index 683
-#define VertexAttribs2svNV_remap_index 684
-#define VertexAttribs3dvNV_remap_index 685
-#define VertexAttribs3fvNV_remap_index 686
-#define VertexAttribs3svNV_remap_index 687
-#define VertexAttribs4dvNV_remap_index 688
-#define VertexAttribs4fvNV_remap_index 689
-#define VertexAttribs4svNV_remap_index 690
-#define VertexAttribs4ubvNV_remap_index 691
-#define GetTexBumpParameterfvATI_remap_index 692
-#define GetTexBumpParameterivATI_remap_index 693
-#define TexBumpParameterfvATI_remap_index 694
-#define TexBumpParameterivATI_remap_index 695
-#define AlphaFragmentOp1ATI_remap_index 696
-#define AlphaFragmentOp2ATI_remap_index 697
-#define AlphaFragmentOp3ATI_remap_index 698
-#define BeginFragmentShaderATI_remap_index 699
-#define BindFragmentShaderATI_remap_index 700
-#define ColorFragmentOp1ATI_remap_index 701
-#define ColorFragmentOp2ATI_remap_index 702
-#define ColorFragmentOp3ATI_remap_index 703
-#define DeleteFragmentShaderATI_remap_index 704
-#define EndFragmentShaderATI_remap_index 705
-#define GenFragmentShadersATI_remap_index 706
-#define PassTexCoordATI_remap_index 707
-#define SampleMapATI_remap_index 708
-#define SetFragmentShaderConstantATI_remap_index 709
-#define ActiveStencilFaceEXT_remap_index 710
-#define BindVertexArrayAPPLE_remap_index 711
-#define GenVertexArraysAPPLE_remap_index 712
-#define GetProgramNamedParameterdvNV_remap_index 713
-#define GetProgramNamedParameterfvNV_remap_index 714
-#define ProgramNamedParameter4dNV_remap_index 715
-#define ProgramNamedParameter4dvNV_remap_index 716
-#define ProgramNamedParameter4fNV_remap_index 717
-#define ProgramNamedParameter4fvNV_remap_index 718
-#define PrimitiveRestartNV_remap_index 719
-#define GetTexGenxvOES_remap_index 720
-#define TexGenxOES_remap_index 721
-#define TexGenxvOES_remap_index 722
-#define DepthBoundsEXT_remap_index 723
-#define BindFramebufferEXT_remap_index 724
-#define BindRenderbufferEXT_remap_index 725
-#define BufferParameteriAPPLE_remap_index 726
-#define FlushMappedBufferRangeAPPLE_remap_index 727
-#define VertexAttribI1iEXT_remap_index 728
-#define VertexAttribI1uiEXT_remap_index 729
-#define VertexAttribI2iEXT_remap_index 730
-#define VertexAttribI2ivEXT_remap_index 731
-#define VertexAttribI2uiEXT_remap_index 732
-#define VertexAttribI2uivEXT_remap_index 733
-#define VertexAttribI3iEXT_remap_index 734
-#define VertexAttribI3ivEXT_remap_index 735
-#define VertexAttribI3uiEXT_remap_index 736
-#define VertexAttribI3uivEXT_remap_index 737
-#define VertexAttribI4iEXT_remap_index 738
-#define VertexAttribI4ivEXT_remap_index 739
-#define VertexAttribI4uiEXT_remap_index 740
-#define VertexAttribI4uivEXT_remap_index 741
-#define ClearColorIiEXT_remap_index 742
-#define ClearColorIuiEXT_remap_index 743
-#define BindBufferOffsetEXT_remap_index 744
-#define BeginPerfMonitorAMD_remap_index 745
-#define DeletePerfMonitorsAMD_remap_index 746
-#define EndPerfMonitorAMD_remap_index 747
-#define GenPerfMonitorsAMD_remap_index 748
-#define GetPerfMonitorCounterDataAMD_remap_index 749
-#define GetPerfMonitorCounterInfoAMD_remap_index 750
-#define GetPerfMonitorCounterStringAMD_remap_index 751
-#define GetPerfMonitorCountersAMD_remap_index 752
-#define GetPerfMonitorGroupStringAMD_remap_index 753
-#define GetPerfMonitorGroupsAMD_remap_index 754
-#define SelectPerfMonitorCountersAMD_remap_index 755
-#define GetObjectParameterivAPPLE_remap_index 756
-#define ObjectPurgeableAPPLE_remap_index 757
-#define ObjectUnpurgeableAPPLE_remap_index 758
-#define ActiveProgramEXT_remap_index 759
-#define CreateShaderProgramEXT_remap_index 760
-#define UseShaderProgramEXT_remap_index 761
-#define TextureBarrierNV_remap_index 762
-#define VDPAUFiniNV_remap_index 763
-#define VDPAUGetSurfaceivNV_remap_index 764
-#define VDPAUInitNV_remap_index 765
-#define VDPAUIsSurfaceNV_remap_index 766
-#define VDPAUMapSurfacesNV_remap_index 767
-#define VDPAURegisterOutputSurfaceNV_remap_index 768
-#define VDPAURegisterVideoSurfaceNV_remap_index 769
-#define VDPAUSurfaceAccessNV_remap_index 770
-#define VDPAUUnmapSurfacesNV_remap_index 771
-#define VDPAUUnregisterSurfaceNV_remap_index 772
-#define BeginPerfQueryINTEL_remap_index 773
-#define CreatePerfQueryINTEL_remap_index 774
-#define DeletePerfQueryINTEL_remap_index 775
-#define EndPerfQueryINTEL_remap_index 776
-#define GetFirstPerfQueryIdINTEL_remap_index 777
-#define GetNextPerfQueryIdINTEL_remap_index 778
-#define GetPerfCounterInfoINTEL_remap_index 779
-#define GetPerfQueryDataINTEL_remap_index 780
-#define GetPerfQueryIdByNameINTEL_remap_index 781
-#define GetPerfQueryInfoINTEL_remap_index 782
-#define PolygonOffsetClampEXT_remap_index 783
-#define StencilFuncSeparateATI_remap_index 784
-#define ProgramEnvParameters4fvEXT_remap_index 785
-#define ProgramLocalParameters4fvEXT_remap_index 786
-#define EGLImageTargetRenderbufferStorageOES_remap_index 787
-#define EGLImageTargetTexture2DOES_remap_index 788
-#define AlphaFuncx_remap_index 789
-#define ClearColorx_remap_index 790
-#define ClearDepthx_remap_index 791
-#define Color4x_remap_index 792
-#define DepthRangex_remap_index 793
-#define Fogx_remap_index 794
-#define Fogxv_remap_index 795
-#define Frustumf_remap_index 796
-#define Frustumx_remap_index 797
-#define LightModelx_remap_index 798
-#define LightModelxv_remap_index 799
-#define Lightx_remap_index 800
-#define Lightxv_remap_index 801
-#define LineWidthx_remap_index 802
-#define LoadMatrixx_remap_index 803
-#define Materialx_remap_index 804
-#define Materialxv_remap_index 805
-#define MultMatrixx_remap_index 806
-#define MultiTexCoord4x_remap_index 807
-#define Normal3x_remap_index 808
-#define Orthof_remap_index 809
-#define Orthox_remap_index 810
-#define PointSizex_remap_index 811
-#define PolygonOffsetx_remap_index 812
-#define Rotatex_remap_index 813
-#define SampleCoveragex_remap_index 814
-#define Scalex_remap_index 815
-#define TexEnvx_remap_index 816
-#define TexEnvxv_remap_index 817
-#define TexParameterx_remap_index 818
-#define Translatex_remap_index 819
-#define ClipPlanef_remap_index 820
-#define ClipPlanex_remap_index 821
-#define GetClipPlanef_remap_index 822
-#define GetClipPlanex_remap_index 823
-#define GetFixedv_remap_index 824
-#define GetLightxv_remap_index 825
-#define GetMaterialxv_remap_index 826
-#define GetTexEnvxv_remap_index 827
-#define GetTexParameterxv_remap_index 828
-#define PointParameterx_remap_index 829
-#define PointParameterxv_remap_index 830
-#define TexParameterxv_remap_index 831
+#define GetProgramInterfaceiv_remap_index 462
+#define GetProgramResourceIndex_remap_index 463
+#define GetProgramResourceLocation_remap_index 464
+#define GetProgramResourceLocationIndex_remap_index 465
+#define GetProgramResourceName_remap_index 466
+#define GetProgramResourceiv_remap_index 467
+#define TexBufferRange_remap_index 468
+#define TexStorage2DMultisample_remap_index 469
+#define TexStorage3DMultisample_remap_index 470
+#define BufferStorage_remap_index 471
+#define ClearTexImage_remap_index 472
+#define ClearTexSubImage_remap_index 473
+#define BindBuffersBase_remap_index 474
+#define BindBuffersRange_remap_index 475
+#define BindImageTextures_remap_index 476
+#define BindSamplers_remap_index 477
+#define BindTextures_remap_index 478
+#define BindVertexBuffers_remap_index 479
+#define ClipControl_remap_index 480
+#define BindTextureUnit_remap_index 481
+#define ClearNamedBufferData_remap_index 482
+#define ClearNamedBufferSubData_remap_index 483
+#define CompressedTextureSubImage1D_remap_index 484
+#define CompressedTextureSubImage2D_remap_index 485
+#define CompressedTextureSubImage3D_remap_index 486
+#define CopyNamedBufferSubData_remap_index 487
+#define CopyTextureSubImage1D_remap_index 488
+#define CopyTextureSubImage2D_remap_index 489
+#define CopyTextureSubImage3D_remap_index 490
+#define CreateBuffers_remap_index 491
+#define CreateProgramPipelines_remap_index 492
+#define CreateQueries_remap_index 493
+#define CreateRenderbuffers_remap_index 494
+#define CreateSamplers_remap_index 495
+#define CreateTextures_remap_index 496
+#define CreateTransformFeedbacks_remap_index 497
+#define FlushMappedNamedBufferRange_remap_index 498
+#define GenerateTextureMipmap_remap_index 499
+#define GetCompressedTextureImage_remap_index 500
+#define GetNamedBufferParameteri64v_remap_index 501
+#define GetNamedBufferParameteriv_remap_index 502
+#define GetNamedBufferPointerv_remap_index 503
+#define GetNamedBufferSubData_remap_index 504
+#define GetNamedRenderbufferParameteriv_remap_index 505
+#define GetQueryBufferObjecti64v_remap_index 506
+#define GetQueryBufferObjectiv_remap_index 507
+#define GetQueryBufferObjectui64v_remap_index 508
+#define GetQueryBufferObjectuiv_remap_index 509
+#define GetTextureImage_remap_index 510
+#define GetTextureLevelParameterfv_remap_index 511
+#define GetTextureLevelParameteriv_remap_index 512
+#define GetTextureParameterIiv_remap_index 513
+#define GetTextureParameterIuiv_remap_index 514
+#define GetTextureParameterfv_remap_index 515
+#define GetTextureParameteriv_remap_index 516
+#define GetTransformFeedbacki64_v_remap_index 517
+#define GetTransformFeedbacki_v_remap_index 518
+#define GetTransformFeedbackiv_remap_index 519
+#define MapNamedBuffer_remap_index 520
+#define MapNamedBufferRange_remap_index 521
+#define NamedBufferData_remap_index 522
+#define NamedBufferStorage_remap_index 523
+#define NamedBufferSubData_remap_index 524
+#define NamedRenderbufferStorage_remap_index 525
+#define NamedRenderbufferStorageMultisample_remap_index 526
+#define TextureBuffer_remap_index 527
+#define TextureBufferRange_remap_index 528
+#define TextureParameterIiv_remap_index 529
+#define TextureParameterIuiv_remap_index 530
+#define TextureParameterf_remap_index 531
+#define TextureParameterfv_remap_index 532
+#define TextureParameteri_remap_index 533
+#define TextureParameteriv_remap_index 534
+#define TextureStorage1D_remap_index 535
+#define TextureStorage2D_remap_index 536
+#define TextureStorage2DMultisample_remap_index 537
+#define TextureStorage3D_remap_index 538
+#define TextureStorage3DMultisample_remap_index 539
+#define TextureSubImage1D_remap_index 540
+#define TextureSubImage2D_remap_index 541
+#define TextureSubImage3D_remap_index 542
+#define TransformFeedbackBufferBase_remap_index 543
+#define TransformFeedbackBufferRange_remap_index 544
+#define UnmapNamedBuffer_remap_index 545
+#define InvalidateBufferData_remap_index 546
+#define InvalidateBufferSubData_remap_index 547
+#define InvalidateFramebuffer_remap_index 548
+#define InvalidateSubFramebuffer_remap_index 549
+#define InvalidateTexImage_remap_index 550
+#define InvalidateTexSubImage_remap_index 551
+#define PolygonOffsetEXT_remap_index 552
+#define DrawTexfOES_remap_index 553
+#define DrawTexfvOES_remap_index 554
+#define DrawTexiOES_remap_index 555
+#define DrawTexivOES_remap_index 556
+#define DrawTexsOES_remap_index 557
+#define DrawTexsvOES_remap_index 558
+#define DrawTexxOES_remap_index 559
+#define DrawTexxvOES_remap_index 560
+#define PointSizePointerOES_remap_index 561
+#define QueryMatrixxOES_remap_index 562
+#define SampleMaskSGIS_remap_index 563
+#define SamplePatternSGIS_remap_index 564
+#define ColorPointerEXT_remap_index 565
+#define EdgeFlagPointerEXT_remap_index 566
+#define IndexPointerEXT_remap_index 567
+#define NormalPointerEXT_remap_index 568
+#define TexCoordPointerEXT_remap_index 569
+#define VertexPointerEXT_remap_index 570
+#define DiscardFramebufferEXT_remap_index 571
+#define ActiveShaderProgram_remap_index 572
+#define BindProgramPipeline_remap_index 573
+#define CreateShaderProgramv_remap_index 574
+#define DeleteProgramPipelines_remap_index 575
+#define GenProgramPipelines_remap_index 576
+#define GetProgramPipelineInfoLog_remap_index 577
+#define GetProgramPipelineiv_remap_index 578
+#define IsProgramPipeline_remap_index 579
+#define LockArraysEXT_remap_index 580
+#define ProgramUniform1d_remap_index 581
+#define ProgramUniform1dv_remap_index 582
+#define ProgramUniform1f_remap_index 583
+#define ProgramUniform1fv_remap_index 584
+#define ProgramUniform1i_remap_index 585
+#define ProgramUniform1iv_remap_index 586
+#define ProgramUniform1ui_remap_index 587
+#define ProgramUniform1uiv_remap_index 588
+#define ProgramUniform2d_remap_index 589
+#define ProgramUniform2dv_remap_index 590
+#define ProgramUniform2f_remap_index 591
+#define ProgramUniform2fv_remap_index 592
+#define ProgramUniform2i_remap_index 593
+#define ProgramUniform2iv_remap_index 594
+#define ProgramUniform2ui_remap_index 595
+#define ProgramUniform2uiv_remap_index 596
+#define ProgramUniform3d_remap_index 597
+#define ProgramUniform3dv_remap_index 598
+#define ProgramUniform3f_remap_index 599
+#define ProgramUniform3fv_remap_index 600
+#define ProgramUniform3i_remap_index 601
+#define ProgramUniform3iv_remap_index 602
+#define ProgramUniform3ui_remap_index 603
+#define ProgramUniform3uiv_remap_index 604
+#define ProgramUniform4d_remap_index 605
+#define ProgramUniform4dv_remap_index 606
+#define ProgramUniform4f_remap_index 607
+#define ProgramUniform4fv_remap_index 608
+#define ProgramUniform4i_remap_index 609
+#define ProgramUniform4iv_remap_index 610
+#define ProgramUniform4ui_remap_index 611
+#define ProgramUniform4uiv_remap_index 612
+#define ProgramUniformMatrix2dv_remap_index 613
+#define ProgramUniformMatrix2fv_remap_index 614
+#define ProgramUniformMatrix2x3dv_remap_index 615
+#define ProgramUniformMatrix2x3fv_remap_index 616
+#define ProgramUniformMatrix2x4dv_remap_index 617
+#define ProgramUniformMatrix2x4fv_remap_index 618
+#define ProgramUniformMatrix3dv_remap_index 619
+#define ProgramUniformMatrix3fv_remap_index 620
+#define ProgramUniformMatrix3x2dv_remap_index 621
+#define ProgramUniformMatrix3x2fv_remap_index 622
+#define ProgramUniformMatrix3x4dv_remap_index 623
+#define ProgramUniformMatrix3x4fv_remap_index 624
+#define ProgramUniformMatrix4dv_remap_index 625
+#define ProgramUniformMatrix4fv_remap_index 626
+#define ProgramUniformMatrix4x2dv_remap_index 627
+#define ProgramUniformMatrix4x2fv_remap_index 628
+#define ProgramUniformMatrix4x3dv_remap_index 629
+#define ProgramUniformMatrix4x3fv_remap_index 630
+#define UnlockArraysEXT_remap_index 631
+#define UseProgramStages_remap_index 632
+#define ValidateProgramPipeline_remap_index 633
+#define DebugMessageCallback_remap_index 634
+#define DebugMessageControl_remap_index 635
+#define DebugMessageInsert_remap_index 636
+#define GetDebugMessageLog_remap_index 637
+#define GetObjectLabel_remap_index 638
+#define GetObjectPtrLabel_remap_index 639
+#define ObjectLabel_remap_index 640
+#define ObjectPtrLabel_remap_index 641
+#define PopDebugGroup_remap_index 642
+#define PushDebugGroup_remap_index 643
+#define SecondaryColor3fEXT_remap_index 644
+#define SecondaryColor3fvEXT_remap_index 645
+#define MultiDrawElementsEXT_remap_index 646
+#define FogCoordfEXT_remap_index 647
+#define FogCoordfvEXT_remap_index 648
+#define ResizeBuffersMESA_remap_index 649
+#define WindowPos4dMESA_remap_index 650
+#define WindowPos4dvMESA_remap_index 651
+#define WindowPos4fMESA_remap_index 652
+#define WindowPos4fvMESA_remap_index 653
+#define WindowPos4iMESA_remap_index 654
+#define WindowPos4ivMESA_remap_index 655
+#define WindowPos4sMESA_remap_index 656
+#define WindowPos4svMESA_remap_index 657
+#define MultiModeDrawArraysIBM_remap_index 658
+#define MultiModeDrawElementsIBM_remap_index 659
+#define AreProgramsResidentNV_remap_index 660
+#define ExecuteProgramNV_remap_index 661
+#define GetProgramParameterdvNV_remap_index 662
+#define GetProgramParameterfvNV_remap_index 663
+#define GetProgramStringNV_remap_index 664
+#define GetProgramivNV_remap_index 665
+#define GetTrackMatrixivNV_remap_index 666
+#define GetVertexAttribdvNV_remap_index 667
+#define GetVertexAttribfvNV_remap_index 668
+#define GetVertexAttribivNV_remap_index 669
+#define LoadProgramNV_remap_index 670
+#define ProgramParameters4dvNV_remap_index 671
+#define ProgramParameters4fvNV_remap_index 672
+#define RequestResidentProgramsNV_remap_index 673
+#define TrackMatrixNV_remap_index 674
+#define VertexAttrib1dNV_remap_index 675
+#define VertexAttrib1dvNV_remap_index 676
+#define VertexAttrib1fNV_remap_index 677
+#define VertexAttrib1fvNV_remap_index 678
+#define VertexAttrib1sNV_remap_index 679
+#define VertexAttrib1svNV_remap_index 680
+#define VertexAttrib2dNV_remap_index 681
+#define VertexAttrib2dvNV_remap_index 682
+#define VertexAttrib2fNV_remap_index 683
+#define VertexAttrib2fvNV_remap_index 684
+#define VertexAttrib2sNV_remap_index 685
+#define VertexAttrib2svNV_remap_index 686
+#define VertexAttrib3dNV_remap_index 687
+#define VertexAttrib3dvNV_remap_index 688
+#define VertexAttrib3fNV_remap_index 689
+#define VertexAttrib3fvNV_remap_index 690
+#define VertexAttrib3sNV_remap_index 691
+#define VertexAttrib3svNV_remap_index 692
+#define VertexAttrib4dNV_remap_index 693
+#define VertexAttrib4dvNV_remap_index 694
+#define VertexAttrib4fNV_remap_index 695
+#define VertexAttrib4fvNV_remap_index 696
+#define VertexAttrib4sNV_remap_index 697
+#define VertexAttrib4svNV_remap_index 698
+#define VertexAttrib4ubNV_remap_index 699
+#define VertexAttrib4ubvNV_remap_index 700
+#define VertexAttribPointerNV_remap_index 701
+#define VertexAttribs1dvNV_remap_index 702
+#define VertexAttribs1fvNV_remap_index 703
+#define VertexAttribs1svNV_remap_index 704
+#define VertexAttribs2dvNV_remap_index 705
+#define VertexAttribs2fvNV_remap_index 706
+#define VertexAttribs2svNV_remap_index 707
+#define VertexAttribs3dvNV_remap_index 708
+#define VertexAttribs3fvNV_remap_index 709
+#define VertexAttribs3svNV_remap_index 710
+#define VertexAttribs4dvNV_remap_index 711
+#define VertexAttribs4fvNV_remap_index 712
+#define VertexAttribs4svNV_remap_index 713
+#define VertexAttribs4ubvNV_remap_index 714
+#define GetTexBumpParameterfvATI_remap_index 715
+#define GetTexBumpParameterivATI_remap_index 716
+#define TexBumpParameterfvATI_remap_index 717
+#define TexBumpParameterivATI_remap_index 718
+#define AlphaFragmentOp1ATI_remap_index 719
+#define AlphaFragmentOp2ATI_remap_index 720
+#define AlphaFragmentOp3ATI_remap_index 721
+#define BeginFragmentShaderATI_remap_index 722
+#define BindFragmentShaderATI_remap_index 723
+#define ColorFragmentOp1ATI_remap_index 724
+#define ColorFragmentOp2ATI_remap_index 725
+#define ColorFragmentOp3ATI_remap_index 726
+#define DeleteFragmentShaderATI_remap_index 727
+#define EndFragmentShaderATI_remap_index 728
+#define GenFragmentShadersATI_remap_index 729
+#define PassTexCoordATI_remap_index 730
+#define SampleMapATI_remap_index 731
+#define SetFragmentShaderConstantATI_remap_index 732
+#define ActiveStencilFaceEXT_remap_index 733
+#define BindVertexArrayAPPLE_remap_index 734
+#define GenVertexArraysAPPLE_remap_index 735
+#define GetProgramNamedParameterdvNV_remap_index 736
+#define GetProgramNamedParameterfvNV_remap_index 737
+#define ProgramNamedParameter4dNV_remap_index 738
+#define ProgramNamedParameter4dvNV_remap_index 739
+#define ProgramNamedParameter4fNV_remap_index 740
+#define ProgramNamedParameter4fvNV_remap_index 741
+#define PrimitiveRestartNV_remap_index 742
+#define GetTexGenxvOES_remap_index 743
+#define TexGenxOES_remap_index 744
+#define TexGenxvOES_remap_index 745
+#define DepthBoundsEXT_remap_index 746
+#define BindFramebufferEXT_remap_index 747
+#define BindRenderbufferEXT_remap_index 748
+#define BufferParameteriAPPLE_remap_index 749
+#define FlushMappedBufferRangeAPPLE_remap_index 750
+#define VertexAttribI1iEXT_remap_index 751
+#define VertexAttribI1uiEXT_remap_index 752
+#define VertexAttribI2iEXT_remap_index 753
+#define VertexAttribI2ivEXT_remap_index 754
+#define VertexAttribI2uiEXT_remap_index 755
+#define VertexAttribI2uivEXT_remap_index 756
+#define VertexAttribI3iEXT_remap_index 757
+#define VertexAttribI3ivEXT_remap_index 758
+#define VertexAttribI3uiEXT_remap_index 759
+#define VertexAttribI3uivEXT_remap_index 760
+#define VertexAttribI4iEXT_remap_index 761
+#define VertexAttribI4ivEXT_remap_index 762
+#define VertexAttribI4uiEXT_remap_index 763
+#define VertexAttribI4uivEXT_remap_index 764
+#define ClearColorIiEXT_remap_index 765
+#define ClearColorIuiEXT_remap_index 766
+#define BindBufferOffsetEXT_remap_index 767
+#define BeginPerfMonitorAMD_remap_index 768
+#define DeletePerfMonitorsAMD_remap_index 769
+#define EndPerfMonitorAMD_remap_index 770
+#define GenPerfMonitorsAMD_remap_index 771
+#define GetPerfMonitorCounterDataAMD_remap_index 772
+#define GetPerfMonitorCounterInfoAMD_remap_index 773
+#define GetPerfMonitorCounterStringAMD_remap_index 774
+#define GetPerfMonitorCountersAMD_remap_index 775
+#define GetPerfMonitorGroupStringAMD_remap_index 776
+#define GetPerfMonitorGroupsAMD_remap_index 777
+#define SelectPerfMonitorCountersAMD_remap_index 778
+#define GetObjectParameterivAPPLE_remap_index 779
+#define ObjectPurgeableAPPLE_remap_index 780
+#define ObjectUnpurgeableAPPLE_remap_index 781
+#define ActiveProgramEXT_remap_index 782
+#define CreateShaderProgramEXT_remap_index 783
+#define UseShaderProgramEXT_remap_index 784
+#define TextureBarrierNV_remap_index 785
+#define VDPAUFiniNV_remap_index 786
+#define VDPAUGetSurfaceivNV_remap_index 787
+#define VDPAUInitNV_remap_index 788
+#define VDPAUIsSurfaceNV_remap_index 789
+#define VDPAUMapSurfacesNV_remap_index 790
+#define VDPAURegisterOutputSurfaceNV_remap_index 791
+#define VDPAURegisterVideoSurfaceNV_remap_index 792
+#define VDPAUSurfaceAccessNV_remap_index 793
+#define VDPAUUnmapSurfacesNV_remap_index 794
+#define VDPAUUnregisterSurfaceNV_remap_index 795
+#define BeginPerfQueryINTEL_remap_index 796
+#define CreatePerfQueryINTEL_remap_index 797
+#define DeletePerfQueryINTEL_remap_index 798
+#define EndPerfQueryINTEL_remap_index 799
+#define GetFirstPerfQueryIdINTEL_remap_index 800
+#define GetNextPerfQueryIdINTEL_remap_index 801
+#define GetPerfCounterInfoINTEL_remap_index 802
+#define GetPerfQueryDataINTEL_remap_index 803
+#define GetPerfQueryIdByNameINTEL_remap_index 804
+#define GetPerfQueryInfoINTEL_remap_index 805
+#define PolygonOffsetClampEXT_remap_index 806
+#define StencilFuncSeparateATI_remap_index 807
+#define ProgramEnvParameters4fvEXT_remap_index 808
+#define ProgramLocalParameters4fvEXT_remap_index 809
+#define EGLImageTargetRenderbufferStorageOES_remap_index 810
+#define EGLImageTargetTexture2DOES_remap_index 811
+#define AlphaFuncx_remap_index 812
+#define ClearColorx_remap_index 813
+#define ClearDepthx_remap_index 814
+#define Color4x_remap_index 815
+#define DepthRangex_remap_index 816
+#define Fogx_remap_index 817
+#define Fogxv_remap_index 818
+#define Frustumf_remap_index 819
+#define Frustumx_remap_index 820
+#define LightModelx_remap_index 821
+#define LightModelxv_remap_index 822
+#define Lightx_remap_index 823
+#define Lightxv_remap_index 824
+#define LineWidthx_remap_index 825
+#define LoadMatrixx_remap_index 826
+#define Materialx_remap_index 827
+#define Materialxv_remap_index 828
+#define MultMatrixx_remap_index 829
+#define MultiTexCoord4x_remap_index 830
+#define Normal3x_remap_index 831
+#define Orthof_remap_index 832
+#define Orthox_remap_index 833
+#define PointSizex_remap_index 834
+#define PolygonOffsetx_remap_index 835
+#define Rotatex_remap_index 836
+#define SampleCoveragex_remap_index 837
+#define Scalex_remap_index 838
+#define TexEnvx_remap_index 839
+#define TexEnvxv_remap_index 840
+#define TexParameterx_remap_index 841
+#define Translatex_remap_index 842
+#define ClipPlanef_remap_index 843
+#define ClipPlanex_remap_index 844
+#define GetClipPlanef_remap_index 845
+#define GetClipPlanex_remap_index 846
+#define GetFixedv_remap_index 847
+#define GetLightxv_remap_index 848
+#define GetMaterialxv_remap_index 849
+#define GetTexEnvxv_remap_index 850
+#define GetTexParameterxv_remap_index 851
+#define PointParameterx_remap_index 852
+#define PointParameterxv_remap_index 853
+#define TexParameterxv_remap_index 854
 
 #define _gloffset_CompressedTexImage1D driDispatchRemapTable[CompressedTexImage1D_remap_index]
 #define _gloffset_CompressedTexImage2D driDispatchRemapTable[CompressedTexImage2D_remap_index]
@@ -1771,6 +1794,12 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_VertexBindingDivisor driDispatchRemapTable[VertexBindingDivisor_remap_index]
 #define _gloffset_MultiDrawArraysIndirect driDispatchRemapTable[MultiDrawArraysIndirect_remap_index]
 #define _gloffset_MultiDrawElementsIndirect driDispatchRemapTable[MultiDrawElementsIndirect_remap_index]
+#define _gloffset_GetProgramInterfaceiv driDispatchRemapTable[GetProgramInterfaceiv_remap_index]
+#define _gloffset_GetProgramResourceIndex driDispatchRemapTable[GetProgramResourceIndex_remap_index]
+#define _gloffset_GetProgramResourceLocation driDispatchRemapTable[GetProgramResourceLocation_remap_index]
+#define _gloffset_GetProgramResourceLocationIndex driDispatchRemapTable[GetProgramResourceLocationIndex_remap_index]
+#define _gloffset_GetProgramResourceName driDispatchRemapTable[GetProgramResourceName_remap_index]
+#define _gloffset_GetProgramResourceiv driDispatchRemapTable[GetProgramResourceiv_remap_index]
 #define _gloffset_TexBufferRange driDispatchRemapTable[TexBufferRange_remap_index]
 #define _gloffset_TexStorage2DMultisample driDispatchRemapTable[TexStorage2DMultisample_remap_index]
 #define _gloffset_TexStorage3DMultisample driDispatchRemapTable[TexStorage3DMultisample_remap_index]
@@ -1795,7 +1824,12 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_CopyTextureSubImage2D driDispatchRemapTable[CopyTextureSubImage2D_remap_index]
 #define _gloffset_CopyTextureSubImage3D driDispatchRemapTable[CopyTextureSubImage3D_remap_index]
 #define _gloffset_CreateBuffers driDispatchRemapTable[CreateBuffers_remap_index]
+#define _gloffset_CreateProgramPipelines driDispatchRemapTable[CreateProgramPipelines_remap_index]
+#define _gloffset_CreateQueries driDispatchRemapTable[CreateQueries_remap_index]
+#define _gloffset_CreateRenderbuffers driDispatchRemapTable[CreateRenderbuffers_remap_index]
+#define _gloffset_CreateSamplers driDispatchRemapTable[CreateSamplers_remap_index]
 #define _gloffset_CreateTextures driDispatchRemapTable[CreateTextures_remap_index]
+#define _gloffset_CreateTransformFeedbacks driDispatchRemapTable[CreateTransformFeedbacks_remap_index]
 #define _gloffset_FlushMappedNamedBufferRange driDispatchRemapTable[FlushMappedNamedBufferRange_remap_index]
 #define _gloffset_GenerateTextureMipmap driDispatchRemapTable[GenerateTextureMipmap_remap_index]
 #define _gloffset_GetCompressedTextureImage driDispatchRemapTable[GetCompressedTextureImage_remap_index]
@@ -1803,6 +1837,11 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_GetNamedBufferParameteriv driDispatchRemapTable[GetNamedBufferParameteriv_remap_index]
 #define _gloffset_GetNamedBufferPointerv driDispatchRemapTable[GetNamedBufferPointerv_remap_index]
 #define _gloffset_GetNamedBufferSubData driDispatchRemapTable[GetNamedBufferSubData_remap_index]
+#define _gloffset_GetNamedRenderbufferParameteriv driDispatchRemapTable[GetNamedRenderbufferParameteriv_remap_index]
+#define _gloffset_GetQueryBufferObjecti64v driDispatchRemapTable[GetQueryBufferObjecti64v_remap_index]
+#define _gloffset_GetQueryBufferObjectiv driDispatchRemapTable[GetQueryBufferObjectiv_remap_index]
+#define _gloffset_GetQueryBufferObjectui64v driDispatchRemapTable[GetQueryBufferObjectui64v_remap_index]
+#define _gloffset_GetQueryBufferObjectuiv driDispatchRemapTable[GetQueryBufferObjectuiv_remap_index]
 #define _gloffset_GetTextureImage driDispatchRemapTable[GetTextureImage_remap_index]
 #define _gloffset_GetTextureLevelParameterfv driDispatchRemapTable[GetTextureLevelParameterfv_remap_index]
 #define _gloffset_GetTextureLevelParameteriv driDispatchRemapTable[GetTextureLevelParameteriv_remap_index]
@@ -1810,11 +1849,16 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_GetTextureParameterIuiv driDispatchRemapTable[GetTextureParameterIuiv_remap_index]
 #define _gloffset_GetTextureParameterfv driDispatchRemapTable[GetTextureParameterfv_remap_index]
 #define _gloffset_GetTextureParameteriv driDispatchRemapTable[GetTextureParameteriv_remap_index]
+#define _gloffset_GetTransformFeedbacki64_v driDispatchRemapTable[GetTransformFeedbacki64_v_remap_index]
+#define _gloffset_GetTransformFeedbacki_v driDispatchRemapTable[GetTransformFeedbacki_v_remap_index]
+#define _gloffset_GetTransformFeedbackiv driDispatchRemapTable[GetTransformFeedbackiv_remap_index]
 #define _gloffset_MapNamedBuffer driDispatchRemapTable[MapNamedBuffer_remap_index]
 #define _gloffset_MapNamedBufferRange driDispatchRemapTable[MapNamedBufferRange_remap_index]
 #define _gloffset_NamedBufferData driDispatchRemapTable[NamedBufferData_remap_index]
 #define _gloffset_NamedBufferStorage driDispatchRemapTable[NamedBufferStorage_remap_index]
 #define _gloffset_NamedBufferSubData driDispatchRemapTable[NamedBufferSubData_remap_index]
+#define _gloffset_NamedRenderbufferStorage driDispatchRemapTable[NamedRenderbufferStorage_remap_index]
+#define _gloffset_NamedRenderbufferStorageMultisample driDispatchRemapTable[NamedRenderbufferStorageMultisample_remap_index]
 #define _gloffset_TextureBuffer driDispatchRemapTable[TextureBuffer_remap_index]
 #define _gloffset_TextureBufferRange driDispatchRemapTable[TextureBufferRange_remap_index]
 #define _gloffset_TextureParameterIiv driDispatchRemapTable[TextureParameterIiv_remap_index]
@@ -1831,6 +1875,8 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_TextureSubImage1D driDispatchRemapTable[TextureSubImage1D_remap_index]
 #define _gloffset_TextureSubImage2D driDispatchRemapTable[TextureSubImage2D_remap_index]
 #define _gloffset_TextureSubImage3D driDispatchRemapTable[TextureSubImage3D_remap_index]
+#define _gloffset_TransformFeedbackBufferBase driDispatchRemapTable[TransformFeedbackBufferBase_remap_index]
+#define _gloffset_TransformFeedbackBufferRange driDispatchRemapTable[TransformFeedbackBufferRange_remap_index]
 #define _gloffset_UnmapNamedBuffer driDispatchRemapTable[UnmapNamedBuffer_remap_index]
 #define _gloffset_InvalidateBufferData driDispatchRemapTable[InvalidateBufferData_remap_index]
 #define _gloffset_InvalidateBufferSubData driDispatchRemapTable[InvalidateBufferSubData_remap_index]
@@ -11712,6 +11758,72 @@ static INLINE void SET_MultiDrawElementsIndirect(struct _glapi_table *disp, void
    SET_by_offset(disp, _gloffset_MultiDrawElementsIndirect, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_GetProgramInterfaceiv)(GLuint, GLenum, GLenum, GLint *);
+#define CALL_GetProgramInterfaceiv(disp, parameters) \
+    (* GET_GetProgramInterfaceiv(disp)) parameters
+static INLINE _glptr_GetProgramInterfaceiv GET_GetProgramInterfaceiv(struct _glapi_table *disp) {
+   return (_glptr_GetProgramInterfaceiv) (GET_by_offset(disp, _gloffset_GetProgramInterfaceiv));
+}
+
+static INLINE void SET_GetProgramInterfaceiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetProgramInterfaceiv, fn);
+}
+
+typedef GLuint (GLAPIENTRYP _glptr_GetProgramResourceIndex)(GLuint, GLenum, const GLchar *);
+#define CALL_GetProgramResourceIndex(disp, parameters) \
+    (* GET_GetProgramResourceIndex(disp)) parameters
+static INLINE _glptr_GetProgramResourceIndex GET_GetProgramResourceIndex(struct _glapi_table *disp) {
+   return (_glptr_GetProgramResourceIndex) (GET_by_offset(disp, _gloffset_GetProgramResourceIndex));
+}
+
+static INLINE void SET_GetProgramResourceIndex(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint, GLenum, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetProgramResourceIndex, fn);
+}
+
+typedef GLint (GLAPIENTRYP _glptr_GetProgramResourceLocation)(GLuint, GLenum, const GLchar *);
+#define CALL_GetProgramResourceLocation(disp, parameters) \
+    (* GET_GetProgramResourceLocation(disp)) parameters
+static INLINE _glptr_GetProgramResourceLocation GET_GetProgramResourceLocation(struct _glapi_table *disp) {
+   return (_glptr_GetProgramResourceLocation) (GET_by_offset(disp, _gloffset_GetProgramResourceLocation));
+}
+
+static INLINE void SET_GetProgramResourceLocation(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, GLenum, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetProgramResourceLocation, fn);
+}
+
+typedef GLint (GLAPIENTRYP _glptr_GetProgramResourceLocationIndex)(GLuint, GLenum, const GLchar *);
+#define CALL_GetProgramResourceLocationIndex(disp, parameters) \
+    (* GET_GetProgramResourceLocationIndex(disp)) parameters
+static INLINE _glptr_GetProgramResourceLocationIndex GET_GetProgramResourceLocationIndex(struct _glapi_table *disp) {
+   return (_glptr_GetProgramResourceLocationIndex) (GET_by_offset(disp, _gloffset_GetProgramResourceLocationIndex));
+}
+
+static INLINE void SET_GetProgramResourceLocationIndex(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, GLenum, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetProgramResourceLocationIndex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetProgramResourceName)(GLuint, GLenum, GLuint, GLsizei , GLsizei *, GLchar *);
+#define CALL_GetProgramResourceName(disp, parameters) \
+    (* GET_GetProgramResourceName(disp)) parameters
+static INLINE _glptr_GetProgramResourceName GET_GetProgramResourceName(struct _glapi_table *disp) {
+   return (_glptr_GetProgramResourceName) (GET_by_offset(disp, _gloffset_GetProgramResourceName));
+}
+
+static INLINE void SET_GetProgramResourceName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint, GLsizei , GLsizei *, GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetProgramResourceName, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetProgramResourceiv)(GLuint, GLenum, GLuint, GLsizei , const GLenum *, GLsizei , GLsizei *, GLint *);
+#define CALL_GetProgramResourceiv(disp, parameters) \
+    (* GET_GetProgramResourceiv(disp)) parameters
+static INLINE _glptr_GetProgramResourceiv GET_GetProgramResourceiv(struct _glapi_table *disp) {
+   return (_glptr_GetProgramResourceiv) (GET_by_offset(disp, _gloffset_GetProgramResourceiv));
+}
+
+static INLINE void SET_GetProgramResourceiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint, GLsizei , const GLenum *, GLsizei , GLsizei *, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetProgramResourceiv, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_TexBufferRange)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr);
 #define CALL_TexBufferRange(disp, parameters) \
     (* GET_TexBufferRange(disp)) parameters
@@ -11976,6 +12088,50 @@ static INLINE void SET_CreateBuffers(struct _glapi_table *disp, void (GLAPIENTRY
    SET_by_offset(disp, _gloffset_CreateBuffers, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_CreateProgramPipelines)(GLsizei, GLuint *);
+#define CALL_CreateProgramPipelines(disp, parameters) \
+    (* GET_CreateProgramPipelines(disp)) parameters
+static INLINE _glptr_CreateProgramPipelines GET_CreateProgramPipelines(struct _glapi_table *disp) {
+   return (_glptr_CreateProgramPipelines) (GET_by_offset(disp, _gloffset_CreateProgramPipelines));
+}
+
+static INLINE void SET_CreateProgramPipelines(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_CreateProgramPipelines, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CreateQueries)(GLenum, GLsizei, GLuint *);
+#define CALL_CreateQueries(disp, parameters) \
+    (* GET_CreateQueries(disp)) parameters
+static INLINE _glptr_CreateQueries GET_CreateQueries(struct _glapi_table *disp) {
+   return (_glptr_CreateQueries) (GET_by_offset(disp, _gloffset_CreateQueries));
+}
+
+static INLINE void SET_CreateQueries(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_CreateQueries, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CreateRenderbuffers)(GLsizei, GLuint *);
+#define CALL_CreateRenderbuffers(disp, parameters) \
+    (* GET_CreateRenderbuffers(disp)) parameters
+static INLINE _glptr_CreateRenderbuffers GET_CreateRenderbuffers(struct _glapi_table *disp) {
+   return (_glptr_CreateRenderbuffers) (GET_by_offset(disp, _gloffset_CreateRenderbuffers));
+}
+
+static INLINE void SET_CreateRenderbuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_CreateRenderbuffers, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CreateSamplers)(GLsizei, GLuint *);
+#define CALL_CreateSamplers(disp, parameters) \
+    (* GET_CreateSamplers(disp)) parameters
+static INLINE _glptr_CreateSamplers GET_CreateSamplers(struct _glapi_table *disp) {
+   return (_glptr_CreateSamplers) (GET_by_offset(disp, _gloffset_CreateSamplers));
+}
+
+static INLINE void SET_CreateSamplers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_CreateSamplers, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_CreateTextures)(GLenum, GLsizei, GLuint *);
 #define CALL_CreateTextures(disp, parameters) \
     (* GET_CreateTextures(disp)) parameters
@@ -11987,6 +12143,17 @@ static INLINE void SET_CreateTextures(struct _glapi_table *disp, void (GLAPIENTR
    SET_by_offset(disp, _gloffset_CreateTextures, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_CreateTransformFeedbacks)(GLsizei, GLuint *);
+#define CALL_CreateTransformFeedbacks(disp, parameters) \
+    (* GET_CreateTransformFeedbacks(disp)) parameters
+static INLINE _glptr_CreateTransformFeedbacks GET_CreateTransformFeedbacks(struct _glapi_table *disp) {
+   return (_glptr_CreateTransformFeedbacks) (GET_by_offset(disp, _gloffset_CreateTransformFeedbacks));
+}
+
+static INLINE void SET_CreateTransformFeedbacks(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_CreateTransformFeedbacks, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_FlushMappedNamedBufferRange)(GLuint, GLintptr, GLsizeiptr);
 #define CALL_FlushMappedNamedBufferRange(disp, parameters) \
     (* GET_FlushMappedNamedBufferRange(disp)) parameters
@@ -12064,6 +12231,61 @@ static INLINE void SET_GetNamedBufferSubData(struct _glapi_table *disp, void (GL
    SET_by_offset(disp, _gloffset_GetNamedBufferSubData, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_GetNamedRenderbufferParameteriv)(GLuint, GLenum, GLint *);
+#define CALL_GetNamedRenderbufferParameteriv(disp, parameters) \
+    (* GET_GetNamedRenderbufferParameteriv(disp)) parameters
+static INLINE _glptr_GetNamedRenderbufferParameteriv GET_GetNamedRenderbufferParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetNamedRenderbufferParameteriv) (GET_by_offset(disp, _gloffset_GetNamedRenderbufferParameteriv));
+}
+
+static INLINE void SET_GetNamedRenderbufferParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetNamedRenderbufferParameteriv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryBufferObjecti64v)(GLuint, GLuint, GLenum, GLintptr);
+#define CALL_GetQueryBufferObjecti64v(disp, parameters) \
+    (* GET_GetQueryBufferObjecti64v(disp)) parameters
+static INLINE _glptr_GetQueryBufferObjecti64v GET_GetQueryBufferObjecti64v(struct _glapi_table *disp) {
+   return (_glptr_GetQueryBufferObjecti64v) (GET_by_offset(disp, _gloffset_GetQueryBufferObjecti64v));
+}
+
+static INLINE void SET_GetQueryBufferObjecti64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum, GLintptr)) {
+   SET_by_offset(disp, _gloffset_GetQueryBufferObjecti64v, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryBufferObjectiv)(GLuint, GLuint, GLenum, GLintptr);
+#define CALL_GetQueryBufferObjectiv(disp, parameters) \
+    (* GET_GetQueryBufferObjectiv(disp)) parameters
+static INLINE _glptr_GetQueryBufferObjectiv GET_GetQueryBufferObjectiv(struct _glapi_table *disp) {
+   return (_glptr_GetQueryBufferObjectiv) (GET_by_offset(disp, _gloffset_GetQueryBufferObjectiv));
+}
+
+static INLINE void SET_GetQueryBufferObjectiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum, GLintptr)) {
+   SET_by_offset(disp, _gloffset_GetQueryBufferObjectiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryBufferObjectui64v)(GLuint, GLuint, GLenum, GLintptr);
+#define CALL_GetQueryBufferObjectui64v(disp, parameters) \
+    (* GET_GetQueryBufferObjectui64v(disp)) parameters
+static INLINE _glptr_GetQueryBufferObjectui64v GET_GetQueryBufferObjectui64v(struct _glapi_table *disp) {
+   return (_glptr_GetQueryBufferObjectui64v) (GET_by_offset(disp, _gloffset_GetQueryBufferObjectui64v));
+}
+
+static INLINE void SET_GetQueryBufferObjectui64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum, GLintptr)) {
+   SET_by_offset(disp, _gloffset_GetQueryBufferObjectui64v, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryBufferObjectuiv)(GLuint, GLuint, GLenum, GLintptr);
+#define CALL_GetQueryBufferObjectuiv(disp, parameters) \
+    (* GET_GetQueryBufferObjectuiv(disp)) parameters
+static INLINE _glptr_GetQueryBufferObjectuiv GET_GetQueryBufferObjectuiv(struct _glapi_table *disp) {
+   return (_glptr_GetQueryBufferObjectuiv) (GET_by_offset(disp, _gloffset_GetQueryBufferObjectuiv));
+}
+
+static INLINE void SET_GetQueryBufferObjectuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum, GLintptr)) {
+   SET_by_offset(disp, _gloffset_GetQueryBufferObjectuiv, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_GetTextureImage)(GLuint, GLint, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetTextureImage(disp, parameters) \
     (* GET_GetTextureImage(disp)) parameters
@@ -12141,6 +12363,39 @@ static INLINE void SET_GetTextureParameteriv(struct _glapi_table *disp, void (GL
    SET_by_offset(disp, _gloffset_GetTextureParameteriv, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_GetTransformFeedbacki64_v)(GLuint, GLenum, GLuint, GLint64 *);
+#define CALL_GetTransformFeedbacki64_v(disp, parameters) \
+    (* GET_GetTransformFeedbacki64_v(disp)) parameters
+static INLINE _glptr_GetTransformFeedbacki64_v GET_GetTransformFeedbacki64_v(struct _glapi_table *disp) {
+   return (_glptr_GetTransformFeedbacki64_v) (GET_by_offset(disp, _gloffset_GetTransformFeedbacki64_v));
+}
+
+static INLINE void SET_GetTransformFeedbacki64_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint, GLint64 *)) {
+   SET_by_offset(disp, _gloffset_GetTransformFeedbacki64_v, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTransformFeedbacki_v)(GLuint, GLenum, GLuint, GLint *);
+#define CALL_GetTransformFeedbacki_v(disp, parameters) \
+    (* GET_GetTransformFeedbacki_v(disp)) parameters
+static INLINE _glptr_GetTransformFeedbacki_v GET_GetTransformFeedbacki_v(struct _glapi_table *disp) {
+   return (_glptr_GetTransformFeedbacki_v) (GET_by_offset(disp, _gloffset_GetTransformFeedbacki_v));
+}
+
+static INLINE void SET_GetTransformFeedbacki_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetTransformFeedbacki_v, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTransformFeedbackiv)(GLuint, GLenum, GLint *);
+#define CALL_GetTransformFeedbackiv(disp, parameters) \
+    (* GET_GetTransformFeedbackiv(disp)) parameters
+static INLINE _glptr_GetTransformFeedbackiv GET_GetTransformFeedbackiv(struct _glapi_table *disp) {
+   return (_glptr_GetTransformFeedbackiv) (GET_by_offset(disp, _gloffset_GetTransformFeedbackiv));
+}
+
+static INLINE void SET_GetTransformFeedbackiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetTransformFeedbackiv, fn);
+}
+
 typedef GLvoid * (GLAPIENTRYP _glptr_MapNamedBuffer)(GLuint, GLenum);
 #define CALL_MapNamedBuffer(disp, parameters) \
     (* GET_MapNamedBuffer(disp)) parameters
@@ -12196,6 +12451,28 @@ static INLINE void SET_NamedBufferSubData(struct _glapi_table *disp, void (GLAPI
    SET_by_offset(disp, _gloffset_NamedBufferSubData, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_NamedRenderbufferStorage)(GLuint, GLenum, GLsizei, GLsizei);
+#define CALL_NamedRenderbufferStorage(disp, parameters) \
+    (* GET_NamedRenderbufferStorage(disp)) parameters
+static INLINE _glptr_NamedRenderbufferStorage GET_NamedRenderbufferStorage(struct _glapi_table *disp) {
+   return (_glptr_NamedRenderbufferStorage) (GET_by_offset(disp, _gloffset_NamedRenderbufferStorage));
+}
+
+static INLINE void SET_NamedRenderbufferStorage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_NamedRenderbufferStorage, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_NamedRenderbufferStorageMultisample)(GLuint, GLsizei, GLenum, GLsizei, GLsizei);
+#define CALL_NamedRenderbufferStorageMultisample(disp, parameters) \
+    (* GET_NamedRenderbufferStorageMultisample(disp)) parameters
+static INLINE _glptr_NamedRenderbufferStorageMultisample GET_NamedRenderbufferStorageMultisample(struct _glapi_table *disp) {
+   return (_glptr_NamedRenderbufferStorageMultisample) (GET_by_offset(disp, _gloffset_NamedRenderbufferStorageMultisample));
+}
+
+static INLINE void SET_NamedRenderbufferStorageMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_NamedRenderbufferStorageMultisample, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_TextureBuffer)(GLuint, GLenum, GLuint);
 #define CALL_TextureBuffer(disp, parameters) \
     (* GET_TextureBuffer(disp)) parameters
@@ -12372,6 +12649,28 @@ static INLINE void SET_TextureSubImage3D(struct _glapi_table *disp, void (GLAPIE
    SET_by_offset(disp, _gloffset_TextureSubImage3D, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_TransformFeedbackBufferBase)(GLuint, GLuint, GLuint);
+#define CALL_TransformFeedbackBufferBase(disp, parameters) \
+    (* GET_TransformFeedbackBufferBase(disp)) parameters
+static INLINE _glptr_TransformFeedbackBufferBase GET_TransformFeedbackBufferBase(struct _glapi_table *disp) {
+   return (_glptr_TransformFeedbackBufferBase) (GET_by_offset(disp, _gloffset_TransformFeedbackBufferBase));
+}
+
+static INLINE void SET_TransformFeedbackBufferBase(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_TransformFeedbackBufferBase, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TransformFeedbackBufferRange)(GLuint, GLuint, GLuint, GLintptr, GLsizeiptr);
+#define CALL_TransformFeedbackBufferRange(disp, parameters) \
+    (* GET_TransformFeedbackBufferRange(disp)) parameters
+static INLINE _glptr_TransformFeedbackBufferRange GET_TransformFeedbackBufferRange(struct _glapi_table *disp) {
+   return (_glptr_TransformFeedbackBufferRange) (GET_by_offset(disp, _gloffset_TransformFeedbackBufferRange));
+}
+
+static INLINE void SET_TransformFeedbackBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLintptr, GLsizeiptr)) {
+   SET_by_offset(disp, _gloffset_TransformFeedbackBufferRange, fn);
+}
+
 typedef GLboolean (GLAPIENTRYP _glptr_UnmapNamedBuffer)(GLuint);
 #define CALL_UnmapNamedBuffer(disp, parameters) \
     (* GET_UnmapNamedBuffer(disp)) parameters
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index 4aea61dc1..ba22b4b29 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -911,376 +911,399 @@ struct _glapi_table
    void (GLAPIENTRYP VertexBindingDivisor)(GLuint attribindex, GLuint divisor); /* 867 */
    void (GLAPIENTRYP MultiDrawArraysIndirect)(GLenum mode, const GLvoid * indirect, GLsizei primcount, GLsizei stride); /* 868 */
    void (GLAPIENTRYP MultiDrawElementsIndirect)(GLenum mode, GLenum type, const GLvoid * indirect, GLsizei primcount, GLsizei stride); /* 869 */
-   void (GLAPIENTRYP TexBufferRange)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 870 */
-   void (GLAPIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 871 */
-   void (GLAPIENTRYP TexStorage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 872 */
-   void (GLAPIENTRYP BufferStorage)(GLenum target, GLsizeiptr size, const GLvoid * data, GLbitfield flags); /* 873 */
-   void (GLAPIENTRYP ClearTexImage)(GLuint texture, GLint level, GLenum format, GLenum type, const GLvoid * data); /* 874 */
-   void (GLAPIENTRYP ClearTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * data); /* 875 */
-   void (GLAPIENTRYP BindBuffersBase)(GLenum target, GLuint first, GLsizei count, const GLuint * buffers); /* 876 */
-   void (GLAPIENTRYP BindBuffersRange)(GLenum target, GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizeiptr * sizes); /* 877 */
-   void (GLAPIENTRYP BindImageTextures)(GLuint first, GLsizei count, const GLuint * textures); /* 878 */
-   void (GLAPIENTRYP BindSamplers)(GLuint first, GLsizei count, const GLuint * samplers); /* 879 */
-   void (GLAPIENTRYP BindTextures)(GLuint first, GLsizei count, const GLuint * textures); /* 880 */
-   void (GLAPIENTRYP BindVertexBuffers)(GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizei * strides); /* 881 */
-   void (GLAPIENTRYP ClipControl)(GLenum origin, GLenum depth); /* 882 */
-   void (GLAPIENTRYP BindTextureUnit)(GLuint unit, GLuint texture); /* 883 */
-   void (GLAPIENTRYP ClearNamedBufferData)(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const GLvoid * data); /* 884 */
-   void (GLAPIENTRYP ClearNamedBufferSubData)(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid * data); /* 885 */
-   void (GLAPIENTRYP CompressedTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 886 */
-   void (GLAPIENTRYP CompressedTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 887 */
-   void (GLAPIENTRYP CompressedTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 888 */
-   void (GLAPIENTRYP CopyNamedBufferSubData)(GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 889 */
-   void (GLAPIENTRYP CopyTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); /* 890 */
-   void (GLAPIENTRYP CopyTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 891 */
-   void (GLAPIENTRYP CopyTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 892 */
-   void (GLAPIENTRYP CreateBuffers)(GLsizei n, GLuint * buffers); /* 893 */
-   void (GLAPIENTRYP CreateTextures)(GLenum target, GLsizei n, GLuint * textures); /* 894 */
-   void (GLAPIENTRYP FlushMappedNamedBufferRange)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 895 */
-   void (GLAPIENTRYP GenerateTextureMipmap)(GLuint texture); /* 896 */
-   void (GLAPIENTRYP GetCompressedTextureImage)(GLuint texture, GLint level, GLsizei bufSize, GLvoid * pixels); /* 897 */
-   void (GLAPIENTRYP GetNamedBufferParameteri64v)(GLuint buffer, GLenum pname, GLint64 * params); /* 898 */
-   void (GLAPIENTRYP GetNamedBufferParameteriv)(GLuint buffer, GLenum pname, GLint * params); /* 899 */
-   void (GLAPIENTRYP GetNamedBufferPointerv)(GLuint buffer, GLenum pname, GLvoid ** params); /* 900 */
-   void (GLAPIENTRYP GetNamedBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid * data); /* 901 */
-   void (GLAPIENTRYP GetTextureImage)(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * pixels); /* 902 */
-   void (GLAPIENTRYP GetTextureLevelParameterfv)(GLuint texture, GLint level, GLenum pname, GLfloat * params); /* 903 */
-   void (GLAPIENTRYP GetTextureLevelParameteriv)(GLuint texture, GLint level, GLenum pname, GLint * params); /* 904 */
-   void (GLAPIENTRYP GetTextureParameterIiv)(GLuint texture, GLenum pname, GLint * params); /* 905 */
-   void (GLAPIENTRYP GetTextureParameterIuiv)(GLuint texture, GLenum pname, GLuint * params); /* 906 */
-   void (GLAPIENTRYP GetTextureParameterfv)(GLuint texture, GLenum pname, GLfloat * params); /* 907 */
-   void (GLAPIENTRYP GetTextureParameteriv)(GLuint texture, GLenum pname, GLint * params); /* 908 */
-   GLvoid * (GLAPIENTRYP MapNamedBuffer)(GLuint buffer, GLenum access); /* 909 */
-   GLvoid * (GLAPIENTRYP MapNamedBufferRange)(GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 910 */
-   void (GLAPIENTRYP NamedBufferData)(GLuint buffer, GLsizeiptr size, const GLvoid * data, GLenum usage); /* 911 */
-   void (GLAPIENTRYP NamedBufferStorage)(GLuint buffer, GLsizeiptr size, const GLvoid * data, GLbitfield flags); /* 912 */
-   void (GLAPIENTRYP NamedBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid * data); /* 913 */
-   void (GLAPIENTRYP TextureBuffer)(GLuint texture, GLenum internalformat, GLuint buffer); /* 914 */
-   void (GLAPIENTRYP TextureBufferRange)(GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 915 */
-   void (GLAPIENTRYP TextureParameterIiv)(GLuint texture, GLenum pname, const GLint * params); /* 916 */
-   void (GLAPIENTRYP TextureParameterIuiv)(GLuint texture, GLenum pname, const GLuint * params); /* 917 */
-   void (GLAPIENTRYP TextureParameterf)(GLuint texture, GLenum pname, GLfloat param); /* 918 */
-   void (GLAPIENTRYP TextureParameterfv)(GLuint texture, GLenum pname, const GLfloat * param); /* 919 */
-   void (GLAPIENTRYP TextureParameteri)(GLuint texture, GLenum pname, GLint param); /* 920 */
-   void (GLAPIENTRYP TextureParameteriv)(GLuint texture, GLenum pname, const GLint * param); /* 921 */
-   void (GLAPIENTRYP TextureStorage1D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); /* 922 */
-   void (GLAPIENTRYP TextureStorage2D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); /* 923 */
-   void (GLAPIENTRYP TextureStorage2DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 924 */
-   void (GLAPIENTRYP TextureStorage3D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); /* 925 */
-   void (GLAPIENTRYP TextureStorage3DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 926 */
-   void (GLAPIENTRYP TextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels); /* 927 */
-   void (GLAPIENTRYP TextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 928 */
-   void (GLAPIENTRYP TextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels); /* 929 */
-   GLboolean (GLAPIENTRYP UnmapNamedBuffer)(GLuint buffer); /* 930 */
-   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 931 */
-   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 932 */
-   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 933 */
-   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 934 */
-   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 935 */
-   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 936 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 937 */
-   void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 938 */
-   void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 939 */
-   void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 940 */
-   void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 941 */
-   void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 942 */
-   void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 943 */
-   void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 944 */
-   void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 945 */
-   void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 946 */
-   GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 947 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 948 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 949 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 950 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 951 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 952 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 953 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 954 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 955 */
-   void (GLAPIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 956 */
-   void (GLAPIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program); /* 957 */
-   void (GLAPIENTRYP BindProgramPipeline)(GLuint pipeline); /* 958 */
-   GLuint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 959 */
-   void (GLAPIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint * pipelines); /* 960 */
-   void (GLAPIENTRYP GenProgramPipelines)(GLsizei n, GLuint * pipelines); /* 961 */
-   void (GLAPIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 962 */
-   void (GLAPIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint * params); /* 963 */
-   GLboolean (GLAPIENTRYP IsProgramPipeline)(GLuint pipeline); /* 964 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 965 */
-   void (GLAPIENTRYP ProgramUniform1d)(GLuint program, GLint location, GLdouble x); /* 966 */
-   void (GLAPIENTRYP ProgramUniform1dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 967 */
-   void (GLAPIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat x); /* 968 */
-   void (GLAPIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 969 */
-   void (GLAPIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint x); /* 970 */
-   void (GLAPIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 971 */
-   void (GLAPIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint x); /* 972 */
-   void (GLAPIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 973 */
-   void (GLAPIENTRYP ProgramUniform2d)(GLuint program, GLint location, GLdouble x, GLdouble y); /* 974 */
-   void (GLAPIENTRYP ProgramUniform2dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 975 */
-   void (GLAPIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat x, GLfloat y); /* 976 */
-   void (GLAPIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 977 */
-   void (GLAPIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint x, GLint y); /* 978 */
-   void (GLAPIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 979 */
-   void (GLAPIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint x, GLuint y); /* 980 */
-   void (GLAPIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 981 */
-   void (GLAPIENTRYP ProgramUniform3d)(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); /* 982 */
-   void (GLAPIENTRYP ProgramUniform3dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 983 */
-   void (GLAPIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); /* 984 */
-   void (GLAPIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 985 */
-   void (GLAPIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint x, GLint y, GLint z); /* 986 */
-   void (GLAPIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 987 */
-   void (GLAPIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z); /* 988 */
-   void (GLAPIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 989 */
-   void (GLAPIENTRYP ProgramUniform4d)(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 990 */
-   void (GLAPIENTRYP ProgramUniform4dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 991 */
-   void (GLAPIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 992 */
-   void (GLAPIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 993 */
-   void (GLAPIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); /* 994 */
-   void (GLAPIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 995 */
-   void (GLAPIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 996 */
-   void (GLAPIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 997 */
-   void (GLAPIENTRYP ProgramUniformMatrix2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 998 */
-   void (GLAPIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 999 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1000 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1001 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1002 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1003 */
-   void (GLAPIENTRYP ProgramUniformMatrix3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1004 */
-   void (GLAPIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1005 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1006 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1007 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1008 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1009 */
-   void (GLAPIENTRYP ProgramUniformMatrix4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1010 */
-   void (GLAPIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1011 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1012 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1013 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1014 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1015 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 1016 */
-   void (GLAPIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program); /* 1017 */
-   void (GLAPIENTRYP ValidateProgramPipeline)(GLuint pipeline); /* 1018 */
-   void (GLAPIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid * userParam); /* 1019 */
-   void (GLAPIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 1020 */
-   void (GLAPIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf); /* 1021 */
-   GLuint (GLAPIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog); /* 1022 */
-   void (GLAPIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label); /* 1023 */
-   void (GLAPIENTRYP GetObjectPtrLabel)(const GLvoid * ptr, GLsizei bufSize, GLsizei * length, GLchar * label); /* 1024 */
-   void (GLAPIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar * label); /* 1025 */
-   void (GLAPIENTRYP ObjectPtrLabel)(const GLvoid * ptr, GLsizei length, const GLchar * label); /* 1026 */
-   void (GLAPIENTRYP PopDebugGroup)(void); /* 1027 */
-   void (GLAPIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar * message); /* 1028 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 1029 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 1030 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 1031 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 1032 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 1033 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 1034 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1035 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 1036 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1037 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 1038 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 1039 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 1040 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 1041 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 1042 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 1043 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 1044 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 1045 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 1046 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 1047 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 1048 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 1049 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 1050 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 1051 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 1052 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 1053 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 1054 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 1055 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 1056 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 1057 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 1058 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 1059 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 1060 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 1061 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 1062 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 1063 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 1064 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 1065 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 1066 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 1067 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 1068 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 1069 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 1070 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 1071 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 1072 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 1073 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 1074 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 1075 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 1076 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 1077 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1078 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 1079 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1080 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 1081 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 1082 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 1083 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 1084 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 1085 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 1086 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1087 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1088 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1089 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1090 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1091 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1092 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1093 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1094 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1095 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1096 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1097 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1098 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 1099 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 1100 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 1101 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 1102 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 1103 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1104 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1105 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1106 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 1107 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 1108 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1109 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1110 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1111 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 1112 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 1113 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 1114 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 1115 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 1116 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 1117 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 1118 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 1119 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 1120 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 1121 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 1122 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1123 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 1124 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1125 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 1126 */
-   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 1127 */
-   void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 1128 */
-   void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 1129 */
-   void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 1130 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 1131 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 1132 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 1133 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 1134 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 1135 */
-   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 1136 */
-   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 1137 */
-   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 1138 */
-   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 1139 */
-   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 1140 */
-   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 1141 */
-   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 1142 */
-   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 1143 */
-   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 1144 */
-   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 1145 */
-   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 1146 */
-   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 1147 */
-   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 1148 */
-   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 1149 */
-   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 1150 */
-   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 1151 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1152 */
-   void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 1153 */
-   void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1154 */
-   void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 1155 */
-   void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1156 */
-   void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 1157 */
-   void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 1158 */
-   void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 1159 */
-   void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 1160 */
-   void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 1161 */
-   void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1162 */
-   void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1163 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1164 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1165 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1166 */
-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1167 */
-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1168 */
-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1169 */
-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 1170 */
-   void (GLAPIENTRYP VDPAUFiniNV)(void); /* 1171 */
-   void (GLAPIENTRYP VDPAUGetSurfaceivNV)(GLintptr surface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 1172 */
-   void (GLAPIENTRYP VDPAUInitNV)(const GLvoid * vdpDevice, const GLvoid * getProcAddress); /* 1173 */
-   GLboolean (GLAPIENTRYP VDPAUIsSurfaceNV)(GLintptr surface); /* 1174 */
-   void (GLAPIENTRYP VDPAUMapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1175 */
-   GLintptr (GLAPIENTRYP VDPAURegisterOutputSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1176 */
-   GLintptr (GLAPIENTRYP VDPAURegisterVideoSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1177 */
-   void (GLAPIENTRYP VDPAUSurfaceAccessNV)(GLintptr surface, GLenum access); /* 1178 */
-   void (GLAPIENTRYP VDPAUUnmapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1179 */
-   void (GLAPIENTRYP VDPAUUnregisterSurfaceNV)(GLintptr surface); /* 1180 */
-   void (GLAPIENTRYP BeginPerfQueryINTEL)(GLuint queryHandle); /* 1181 */
-   void (GLAPIENTRYP CreatePerfQueryINTEL)(GLuint queryId, GLuint * queryHandle); /* 1182 */
-   void (GLAPIENTRYP DeletePerfQueryINTEL)(GLuint queryHandle); /* 1183 */
-   void (GLAPIENTRYP EndPerfQueryINTEL)(GLuint queryHandle); /* 1184 */
-   void (GLAPIENTRYP GetFirstPerfQueryIdINTEL)(GLuint * queryId); /* 1185 */
-   void (GLAPIENTRYP GetNextPerfQueryIdINTEL)(GLuint queryId, GLuint * nextQueryId); /* 1186 */
-   void (GLAPIENTRYP GetPerfCounterInfoINTEL)(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue); /* 1187 */
-   void (GLAPIENTRYP GetPerfQueryDataINTEL)(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten); /* 1188 */
-   void (GLAPIENTRYP GetPerfQueryIdByNameINTEL)(GLchar * queryName, GLuint * queryId); /* 1189 */
-   void (GLAPIENTRYP GetPerfQueryInfoINTEL)(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask); /* 1190 */
-   void (GLAPIENTRYP PolygonOffsetClampEXT)(GLfloat factor, GLfloat units, GLfloat clamp); /* 1191 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1192 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1193 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1194 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1195 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1196 */
-   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1197 */
-   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1198 */
-   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1199 */
-   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1200 */
-   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1201 */
-   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1202 */
-   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1203 */
-   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1204 */
-   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1205 */
-   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1206 */
-   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1207 */
-   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1208 */
-   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1209 */
-   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1210 */
-   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1211 */
-   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1212 */
-   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1213 */
-   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1214 */
-   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1215 */
-   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1216 */
-   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1217 */
-   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1218 */
-   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1219 */
-   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1220 */
-   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1221 */
-   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1222 */
-   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1223 */
-   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1224 */
-   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1225 */
-   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1226 */
-   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1227 */
-   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1228 */
-   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1229 */
-   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1230 */
-   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1231 */
-   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1232 */
-   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1233 */
-   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1234 */
-   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1235 */
-   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1236 */
-   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1237 */
-   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1238 */
-   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1239 */
+   void (GLAPIENTRYP GetProgramInterfaceiv)(GLuint program, GLenum programInterface, GLenum pname, GLint * params); /* 870 */
+   GLuint (GLAPIENTRYP GetProgramResourceIndex)(GLuint program, GLenum programInterface, const GLchar * name); /* 871 */
+   GLint (GLAPIENTRYP GetProgramResourceLocation)(GLuint program, GLenum programInterface, const GLchar * name); /* 872 */
+   GLint (GLAPIENTRYP GetProgramResourceLocationIndex)(GLuint program, GLenum programInterface, const GLchar * name); /* 873 */
+   void (GLAPIENTRYP GetProgramResourceName)(GLuint program, GLenum programInterface, GLuint index, GLsizei  bufSize, GLsizei * length, GLchar * name); /* 874 */
+   void (GLAPIENTRYP GetProgramResourceiv)(GLuint program, GLenum programInterface, GLuint index, GLsizei  propCount, const GLenum * props, GLsizei  bufSize, GLsizei * length, GLint * params); /* 875 */
+   void (GLAPIENTRYP TexBufferRange)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 876 */
+   void (GLAPIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 877 */
+   void (GLAPIENTRYP TexStorage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 878 */
+   void (GLAPIENTRYP BufferStorage)(GLenum target, GLsizeiptr size, const GLvoid * data, GLbitfield flags); /* 879 */
+   void (GLAPIENTRYP ClearTexImage)(GLuint texture, GLint level, GLenum format, GLenum type, const GLvoid * data); /* 880 */
+   void (GLAPIENTRYP ClearTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * data); /* 881 */
+   void (GLAPIENTRYP BindBuffersBase)(GLenum target, GLuint first, GLsizei count, const GLuint * buffers); /* 882 */
+   void (GLAPIENTRYP BindBuffersRange)(GLenum target, GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizeiptr * sizes); /* 883 */
+   void (GLAPIENTRYP BindImageTextures)(GLuint first, GLsizei count, const GLuint * textures); /* 884 */
+   void (GLAPIENTRYP BindSamplers)(GLuint first, GLsizei count, const GLuint * samplers); /* 885 */
+   void (GLAPIENTRYP BindTextures)(GLuint first, GLsizei count, const GLuint * textures); /* 886 */
+   void (GLAPIENTRYP BindVertexBuffers)(GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizei * strides); /* 887 */
+   void (GLAPIENTRYP ClipControl)(GLenum origin, GLenum depth); /* 888 */
+   void (GLAPIENTRYP BindTextureUnit)(GLuint unit, GLuint texture); /* 889 */
+   void (GLAPIENTRYP ClearNamedBufferData)(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const GLvoid * data); /* 890 */
+   void (GLAPIENTRYP ClearNamedBufferSubData)(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid * data); /* 891 */
+   void (GLAPIENTRYP CompressedTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 892 */
+   void (GLAPIENTRYP CompressedTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 893 */
+   void (GLAPIENTRYP CompressedTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 894 */
+   void (GLAPIENTRYP CopyNamedBufferSubData)(GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 895 */
+   void (GLAPIENTRYP CopyTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); /* 896 */
+   void (GLAPIENTRYP CopyTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 897 */
+   void (GLAPIENTRYP CopyTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 898 */
+   void (GLAPIENTRYP CreateBuffers)(GLsizei n, GLuint * buffers); /* 899 */
+   void (GLAPIENTRYP CreateProgramPipelines)(GLsizei n, GLuint * pipelines); /* 900 */
+   void (GLAPIENTRYP CreateQueries)(GLenum target, GLsizei n, GLuint * ids); /* 901 */
+   void (GLAPIENTRYP CreateRenderbuffers)(GLsizei n, GLuint * renderbuffers); /* 902 */
+   void (GLAPIENTRYP CreateSamplers)(GLsizei n, GLuint * samplers); /* 903 */
+   void (GLAPIENTRYP CreateTextures)(GLenum target, GLsizei n, GLuint * textures); /* 904 */
+   void (GLAPIENTRYP CreateTransformFeedbacks)(GLsizei n, GLuint * ids); /* 905 */
+   void (GLAPIENTRYP FlushMappedNamedBufferRange)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 906 */
+   void (GLAPIENTRYP GenerateTextureMipmap)(GLuint texture); /* 907 */
+   void (GLAPIENTRYP GetCompressedTextureImage)(GLuint texture, GLint level, GLsizei bufSize, GLvoid * pixels); /* 908 */
+   void (GLAPIENTRYP GetNamedBufferParameteri64v)(GLuint buffer, GLenum pname, GLint64 * params); /* 909 */
+   void (GLAPIENTRYP GetNamedBufferParameteriv)(GLuint buffer, GLenum pname, GLint * params); /* 910 */
+   void (GLAPIENTRYP GetNamedBufferPointerv)(GLuint buffer, GLenum pname, GLvoid ** params); /* 911 */
+   void (GLAPIENTRYP GetNamedBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid * data); /* 912 */
+   void (GLAPIENTRYP GetNamedRenderbufferParameteriv)(GLuint renderbuffer, GLenum pname, GLint * params); /* 913 */
+   void (GLAPIENTRYP GetQueryBufferObjecti64v)(GLuint id, GLuint buffer, GLenum pname, GLintptr offset); /* 914 */
+   void (GLAPIENTRYP GetQueryBufferObjectiv)(GLuint id, GLuint buffer, GLenum pname, GLintptr offset); /* 915 */
+   void (GLAPIENTRYP GetQueryBufferObjectui64v)(GLuint id, GLuint buffer, GLenum pname, GLintptr offset); /* 916 */
+   void (GLAPIENTRYP GetQueryBufferObjectuiv)(GLuint id, GLuint buffer, GLenum pname, GLintptr offset); /* 917 */
+   void (GLAPIENTRYP GetTextureImage)(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * pixels); /* 918 */
+   void (GLAPIENTRYP GetTextureLevelParameterfv)(GLuint texture, GLint level, GLenum pname, GLfloat * params); /* 919 */
+   void (GLAPIENTRYP GetTextureLevelParameteriv)(GLuint texture, GLint level, GLenum pname, GLint * params); /* 920 */
+   void (GLAPIENTRYP GetTextureParameterIiv)(GLuint texture, GLenum pname, GLint * params); /* 921 */
+   void (GLAPIENTRYP GetTextureParameterIuiv)(GLuint texture, GLenum pname, GLuint * params); /* 922 */
+   void (GLAPIENTRYP GetTextureParameterfv)(GLuint texture, GLenum pname, GLfloat * params); /* 923 */
+   void (GLAPIENTRYP GetTextureParameteriv)(GLuint texture, GLenum pname, GLint * params); /* 924 */
+   void (GLAPIENTRYP GetTransformFeedbacki64_v)(GLuint xfb, GLenum pname, GLuint index, GLint64 * param); /* 925 */
+   void (GLAPIENTRYP GetTransformFeedbacki_v)(GLuint xfb, GLenum pname, GLuint index, GLint * param); /* 926 */
+   void (GLAPIENTRYP GetTransformFeedbackiv)(GLuint xfb, GLenum pname, GLint * param); /* 927 */
+   GLvoid * (GLAPIENTRYP MapNamedBuffer)(GLuint buffer, GLenum access); /* 928 */
+   GLvoid * (GLAPIENTRYP MapNamedBufferRange)(GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 929 */
+   void (GLAPIENTRYP NamedBufferData)(GLuint buffer, GLsizeiptr size, const GLvoid * data, GLenum usage); /* 930 */
+   void (GLAPIENTRYP NamedBufferStorage)(GLuint buffer, GLsizeiptr size, const GLvoid * data, GLbitfield flags); /* 931 */
+   void (GLAPIENTRYP NamedBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid * data); /* 932 */
+   void (GLAPIENTRYP NamedRenderbufferStorage)(GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); /* 933 */
+   void (GLAPIENTRYP NamedRenderbufferStorageMultisample)(GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 934 */
+   void (GLAPIENTRYP TextureBuffer)(GLuint texture, GLenum internalformat, GLuint buffer); /* 935 */
+   void (GLAPIENTRYP TextureBufferRange)(GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 936 */
+   void (GLAPIENTRYP TextureParameterIiv)(GLuint texture, GLenum pname, const GLint * params); /* 937 */
+   void (GLAPIENTRYP TextureParameterIuiv)(GLuint texture, GLenum pname, const GLuint * params); /* 938 */
+   void (GLAPIENTRYP TextureParameterf)(GLuint texture, GLenum pname, GLfloat param); /* 939 */
+   void (GLAPIENTRYP TextureParameterfv)(GLuint texture, GLenum pname, const GLfloat * param); /* 940 */
+   void (GLAPIENTRYP TextureParameteri)(GLuint texture, GLenum pname, GLint param); /* 941 */
+   void (GLAPIENTRYP TextureParameteriv)(GLuint texture, GLenum pname, const GLint * param); /* 942 */
+   void (GLAPIENTRYP TextureStorage1D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); /* 943 */
+   void (GLAPIENTRYP TextureStorage2D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); /* 944 */
+   void (GLAPIENTRYP TextureStorage2DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 945 */
+   void (GLAPIENTRYP TextureStorage3D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); /* 946 */
+   void (GLAPIENTRYP TextureStorage3DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 947 */
+   void (GLAPIENTRYP TextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels); /* 948 */
+   void (GLAPIENTRYP TextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 949 */
+   void (GLAPIENTRYP TextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels); /* 950 */
+   void (GLAPIENTRYP TransformFeedbackBufferBase)(GLuint xfb, GLuint index, GLuint buffer); /* 951 */
+   void (GLAPIENTRYP TransformFeedbackBufferRange)(GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 952 */
+   GLboolean (GLAPIENTRYP UnmapNamedBuffer)(GLuint buffer); /* 953 */
+   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 954 */
+   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 955 */
+   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 956 */
+   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 957 */
+   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 958 */
+   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 959 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 960 */
+   void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 961 */
+   void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 962 */
+   void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 963 */
+   void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 964 */
+   void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 965 */
+   void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 966 */
+   void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 967 */
+   void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 968 */
+   void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 969 */
+   GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 970 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 971 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 972 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 973 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 974 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 975 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 976 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 977 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 978 */
+   void (GLAPIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 979 */
+   void (GLAPIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program); /* 980 */
+   void (GLAPIENTRYP BindProgramPipeline)(GLuint pipeline); /* 981 */
+   GLuint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 982 */
+   void (GLAPIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint * pipelines); /* 983 */
+   void (GLAPIENTRYP GenProgramPipelines)(GLsizei n, GLuint * pipelines); /* 984 */
+   void (GLAPIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 985 */
+   void (GLAPIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint * params); /* 986 */
+   GLboolean (GLAPIENTRYP IsProgramPipeline)(GLuint pipeline); /* 987 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 988 */
+   void (GLAPIENTRYP ProgramUniform1d)(GLuint program, GLint location, GLdouble x); /* 989 */
+   void (GLAPIENTRYP ProgramUniform1dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 990 */
+   void (GLAPIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat x); /* 991 */
+   void (GLAPIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 992 */
+   void (GLAPIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint x); /* 993 */
+   void (GLAPIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 994 */
+   void (GLAPIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint x); /* 995 */
+   void (GLAPIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 996 */
+   void (GLAPIENTRYP ProgramUniform2d)(GLuint program, GLint location, GLdouble x, GLdouble y); /* 997 */
+   void (GLAPIENTRYP ProgramUniform2dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 998 */
+   void (GLAPIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat x, GLfloat y); /* 999 */
+   void (GLAPIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 1000 */
+   void (GLAPIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint x, GLint y); /* 1001 */
+   void (GLAPIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 1002 */
+   void (GLAPIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint x, GLuint y); /* 1003 */
+   void (GLAPIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 1004 */
+   void (GLAPIENTRYP ProgramUniform3d)(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); /* 1005 */
+   void (GLAPIENTRYP ProgramUniform3dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 1006 */
+   void (GLAPIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); /* 1007 */
+   void (GLAPIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 1008 */
+   void (GLAPIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint x, GLint y, GLint z); /* 1009 */
+   void (GLAPIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 1010 */
+   void (GLAPIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z); /* 1011 */
+   void (GLAPIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 1012 */
+   void (GLAPIENTRYP ProgramUniform4d)(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1013 */
+   void (GLAPIENTRYP ProgramUniform4dv)(GLuint program, GLint location, GLsizei count, const GLdouble * value); /* 1014 */
+   void (GLAPIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1015 */
+   void (GLAPIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 1016 */
+   void (GLAPIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); /* 1017 */
+   void (GLAPIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 1018 */
+   void (GLAPIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 1019 */
+   void (GLAPIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 1020 */
+   void (GLAPIENTRYP ProgramUniformMatrix2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1021 */
+   void (GLAPIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1022 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1023 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1024 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1025 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1026 */
+   void (GLAPIENTRYP ProgramUniformMatrix3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1027 */
+   void (GLAPIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1028 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1029 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1030 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1031 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1032 */
+   void (GLAPIENTRYP ProgramUniformMatrix4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1033 */
+   void (GLAPIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1034 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1035 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1036 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value); /* 1037 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 1038 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 1039 */
+   void (GLAPIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program); /* 1040 */
+   void (GLAPIENTRYP ValidateProgramPipeline)(GLuint pipeline); /* 1041 */
+   void (GLAPIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid * userParam); /* 1042 */
+   void (GLAPIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 1043 */
+   void (GLAPIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf); /* 1044 */
+   GLuint (GLAPIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog); /* 1045 */
+   void (GLAPIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label); /* 1046 */
+   void (GLAPIENTRYP GetObjectPtrLabel)(const GLvoid * ptr, GLsizei bufSize, GLsizei * length, GLchar * label); /* 1047 */
+   void (GLAPIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar * label); /* 1048 */
+   void (GLAPIENTRYP ObjectPtrLabel)(const GLvoid * ptr, GLsizei length, const GLchar * label); /* 1049 */
+   void (GLAPIENTRYP PopDebugGroup)(void); /* 1050 */
+   void (GLAPIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar * message); /* 1051 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 1052 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 1053 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 1054 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 1055 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 1056 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 1057 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1058 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 1059 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1060 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 1061 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 1062 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 1063 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 1064 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 1065 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 1066 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 1067 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 1068 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 1069 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 1070 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 1071 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 1072 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 1073 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 1074 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 1075 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 1076 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 1077 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 1078 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 1079 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 1080 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 1081 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 1082 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 1083 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 1084 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 1085 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 1086 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 1087 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 1088 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 1089 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 1090 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 1091 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 1092 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 1093 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 1094 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 1095 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 1096 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 1097 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 1098 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 1099 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 1100 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1101 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 1102 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1103 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 1104 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 1105 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 1106 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 1107 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 1108 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 1109 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1110 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1111 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1112 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1113 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1114 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1115 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1116 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1117 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1118 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1119 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1120 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1121 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 1122 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 1123 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 1124 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 1125 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 1126 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1127 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1128 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1129 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 1130 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 1131 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1132 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1133 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1134 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 1135 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 1136 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 1137 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 1138 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 1139 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 1140 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 1141 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 1142 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 1143 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 1144 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 1145 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1146 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 1147 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1148 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 1149 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 1150 */
+   void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 1151 */
+   void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 1152 */
+   void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 1153 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 1154 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 1155 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 1156 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 1157 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 1158 */
+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 1159 */
+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 1160 */
+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 1161 */
+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 1162 */
+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 1163 */
+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 1164 */
+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 1165 */
+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 1166 */
+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 1167 */
+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 1168 */
+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 1169 */
+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 1170 */
+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 1171 */
+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 1172 */
+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 1173 */
+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 1174 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1175 */
+   void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 1176 */
+   void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1177 */
+   void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 1178 */
+   void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1179 */
+   void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 1180 */
+   void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 1181 */
+   void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 1182 */
+   void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 1183 */
+   void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 1184 */
+   void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1185 */
+   void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1186 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1187 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1188 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1189 */
+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1190 */
+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1191 */
+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1192 */
+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 1193 */
+   void (GLAPIENTRYP VDPAUFiniNV)(void); /* 1194 */
+   void (GLAPIENTRYP VDPAUGetSurfaceivNV)(GLintptr surface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 1195 */
+   void (GLAPIENTRYP VDPAUInitNV)(const GLvoid * vdpDevice, const GLvoid * getProcAddress); /* 1196 */
+   GLboolean (GLAPIENTRYP VDPAUIsSurfaceNV)(GLintptr surface); /* 1197 */
+   void (GLAPIENTRYP VDPAUMapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1198 */
+   GLintptr (GLAPIENTRYP VDPAURegisterOutputSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1199 */
+   GLintptr (GLAPIENTRYP VDPAURegisterVideoSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1200 */
+   void (GLAPIENTRYP VDPAUSurfaceAccessNV)(GLintptr surface, GLenum access); /* 1201 */
+   void (GLAPIENTRYP VDPAUUnmapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1202 */
+   void (GLAPIENTRYP VDPAUUnregisterSurfaceNV)(GLintptr surface); /* 1203 */
+   void (GLAPIENTRYP BeginPerfQueryINTEL)(GLuint queryHandle); /* 1204 */
+   void (GLAPIENTRYP CreatePerfQueryINTEL)(GLuint queryId, GLuint * queryHandle); /* 1205 */
+   void (GLAPIENTRYP DeletePerfQueryINTEL)(GLuint queryHandle); /* 1206 */
+   void (GLAPIENTRYP EndPerfQueryINTEL)(GLuint queryHandle); /* 1207 */
+   void (GLAPIENTRYP GetFirstPerfQueryIdINTEL)(GLuint * queryId); /* 1208 */
+   void (GLAPIENTRYP GetNextPerfQueryIdINTEL)(GLuint queryId, GLuint * nextQueryId); /* 1209 */
+   void (GLAPIENTRYP GetPerfCounterInfoINTEL)(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue); /* 1210 */
+   void (GLAPIENTRYP GetPerfQueryDataINTEL)(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten); /* 1211 */
+   void (GLAPIENTRYP GetPerfQueryIdByNameINTEL)(GLchar * queryName, GLuint * queryId); /* 1212 */
+   void (GLAPIENTRYP GetPerfQueryInfoINTEL)(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask); /* 1213 */
+   void (GLAPIENTRYP PolygonOffsetClampEXT)(GLfloat factor, GLfloat units, GLfloat clamp); /* 1214 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1215 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1216 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1217 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1218 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1219 */
+   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1220 */
+   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1221 */
+   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1222 */
+   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1223 */
+   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1224 */
+   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1225 */
+   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1226 */
+   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1227 */
+   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1228 */
+   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1229 */
+   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1230 */
+   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1231 */
+   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1232 */
+   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1233 */
+   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1234 */
+   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1235 */
+   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1236 */
+   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1237 */
+   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1238 */
+   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1239 */
+   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1240 */
+   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1241 */
+   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1242 */
+   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1243 */
+   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1244 */
+   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1245 */
+   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1246 */
+   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1247 */
+   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1248 */
+   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1249 */
+   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1250 */
+   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1251 */
+   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1252 */
+   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1253 */
+   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1254 */
+   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1255 */
+   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1256 */
+   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1257 */
+   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1258 */
+   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1259 */
+   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1260 */
+   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1261 */
+   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1262 */
 #endif /* !defined HAVE_SHARED_GLAPI */
 };
 
diff --git a/xorg-server/glx/glfunctions.h b/xorg-server/glx/glfunctions.h
index d7e412543..6874da59d 100644
--- a/xorg-server/glx/glfunctions.h
+++ b/xorg-server/glx/glfunctions.h
@@ -904,6 +904,12 @@
 #define glVertexBindingDivisor(a1, a2) CALL_VertexBindingDivisor(GET_DISPATCH(), (a1, a2))
 #define glMultiDrawArraysIndirect(a1, a2, a3, a4) CALL_MultiDrawArraysIndirect(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glMultiDrawElementsIndirect(a1, a2, a3, a4, a5) CALL_MultiDrawElementsIndirect(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glGetProgramInterfaceiv(a1, a2, a3, a4) CALL_GetProgramInterfaceiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetProgramResourceIndex(a1, a2, a3) CALL_GetProgramResourceIndex(GET_DISPATCH(), (a1, a2, a3))
+#define glGetProgramResourceLocation(a1, a2, a3) CALL_GetProgramResourceLocation(GET_DISPATCH(), (a1, a2, a3))
+#define glGetProgramResourceLocationIndex(a1, a2, a3) CALL_GetProgramResourceLocationIndex(GET_DISPATCH(), (a1, a2, a3))
+#define glGetProgramResourceName(a1, a2, a3, a4, a5, a6) CALL_GetProgramResourceName(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glGetProgramResourceiv(a1, a2, a3, a4, a5, a6, a7, a8) CALL_GetProgramResourceiv(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8))
 #define glTexBufferRange(a1, a2, a3, a4, a5) CALL_TexBufferRange(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glTexStorage2DMultisample(a1, a2, a3, a4, a5, a6) CALL_TexStorage2DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
 #define glTexStorage3DMultisample(a1, a2, a3, a4, a5, a6, a7) CALL_TexStorage3DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
@@ -928,7 +934,12 @@
 #define glCopyTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_CopyTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8))
 #define glCopyTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CopyTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
 #define glCreateBuffers(a1, a2) CALL_CreateBuffers(GET_DISPATCH(), (a1, a2))
+#define glCreateProgramPipelines(a1, a2) CALL_CreateProgramPipelines(GET_DISPATCH(), (a1, a2))
+#define glCreateQueries(a1, a2, a3) CALL_CreateQueries(GET_DISPATCH(), (a1, a2, a3))
+#define glCreateRenderbuffers(a1, a2) CALL_CreateRenderbuffers(GET_DISPATCH(), (a1, a2))
+#define glCreateSamplers(a1, a2) CALL_CreateSamplers(GET_DISPATCH(), (a1, a2))
 #define glCreateTextures(a1, a2, a3) CALL_CreateTextures(GET_DISPATCH(), (a1, a2, a3))
+#define glCreateTransformFeedbacks(a1, a2) CALL_CreateTransformFeedbacks(GET_DISPATCH(), (a1, a2))
 #define glFlushMappedNamedBufferRange(a1, a2, a3) CALL_FlushMappedNamedBufferRange(GET_DISPATCH(), (a1, a2, a3))
 #define glGenerateTextureMipmap(a1) CALL_GenerateTextureMipmap(GET_DISPATCH(), (a1))
 #define glGetCompressedTextureImage(a1, a2, a3, a4) CALL_GetCompressedTextureImage(GET_DISPATCH(), (a1, a2, a3, a4))
@@ -936,6 +947,11 @@
 #define glGetNamedBufferParameteriv(a1, a2, a3) CALL_GetNamedBufferParameteriv(GET_DISPATCH(), (a1, a2, a3))
 #define glGetNamedBufferPointerv(a1, a2, a3) CALL_GetNamedBufferPointerv(GET_DISPATCH(), (a1, a2, a3))
 #define glGetNamedBufferSubData(a1, a2, a3, a4) CALL_GetNamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetNamedRenderbufferParameteriv(a1, a2, a3) CALL_GetNamedRenderbufferParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetQueryBufferObjecti64v(a1, a2, a3, a4) CALL_GetQueryBufferObjecti64v(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetQueryBufferObjectiv(a1, a2, a3, a4) CALL_GetQueryBufferObjectiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetQueryBufferObjectui64v(a1, a2, a3, a4) CALL_GetQueryBufferObjectui64v(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetQueryBufferObjectuiv(a1, a2, a3, a4) CALL_GetQueryBufferObjectuiv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glGetTextureImage(a1, a2, a3, a4, a5, a6) CALL_GetTextureImage(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
 #define glGetTextureLevelParameterfv(a1, a2, a3, a4) CALL_GetTextureLevelParameterfv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glGetTextureLevelParameteriv(a1, a2, a3, a4) CALL_GetTextureLevelParameteriv(GET_DISPATCH(), (a1, a2, a3, a4))
@@ -943,11 +959,16 @@
 #define glGetTextureParameterIuiv(a1, a2, a3) CALL_GetTextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
 #define glGetTextureParameterfv(a1, a2, a3) CALL_GetTextureParameterfv(GET_DISPATCH(), (a1, a2, a3))
 #define glGetTextureParameteriv(a1, a2, a3) CALL_GetTextureParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetTransformFeedbacki64_v(a1, a2, a3, a4) CALL_GetTransformFeedbacki64_v(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetTransformFeedbacki_v(a1, a2, a3, a4) CALL_GetTransformFeedbacki_v(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetTransformFeedbackiv(a1, a2, a3) CALL_GetTransformFeedbackiv(GET_DISPATCH(), (a1, a2, a3))
 #define glMapNamedBuffer(a1, a2) CALL_MapNamedBuffer(GET_DISPATCH(), (a1, a2))
 #define glMapNamedBufferRange(a1, a2, a3, a4) CALL_MapNamedBufferRange(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glNamedBufferData(a1, a2, a3, a4) CALL_NamedBufferData(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glNamedBufferStorage(a1, a2, a3, a4) CALL_NamedBufferStorage(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glNamedBufferSubData(a1, a2, a3, a4) CALL_NamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glNamedRenderbufferStorage(a1, a2, a3, a4) CALL_NamedRenderbufferStorage(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glNamedRenderbufferStorageMultisample(a1, a2, a3, a4, a5) CALL_NamedRenderbufferStorageMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glTextureBuffer(a1, a2, a3) CALL_TextureBuffer(GET_DISPATCH(), (a1, a2, a3))
 #define glTextureBufferRange(a1, a2, a3, a4, a5) CALL_TextureBufferRange(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glTextureParameterIiv(a1, a2, a3) CALL_TextureParameterIiv(GET_DISPATCH(), (a1, a2, a3))
@@ -964,6 +985,8 @@
 #define glTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_TextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
 #define glTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_TextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
 #define glTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_TextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
+#define glTransformFeedbackBufferBase(a1, a2, a3) CALL_TransformFeedbackBufferBase(GET_DISPATCH(), (a1, a2, a3))
+#define glTransformFeedbackBufferRange(a1, a2, a3, a4, a5) CALL_TransformFeedbackBufferRange(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glUnmapNamedBuffer(a1) CALL_UnmapNamedBuffer(GET_DISPATCH(), (a1))
 #define glInvalidateBufferData(a1) CALL_InvalidateBufferData(GET_DISPATCH(), (a1))
 #define glInvalidateBufferSubData(a1, a2, a3) CALL_InvalidateBufferSubData(GET_DISPATCH(), (a1, a2, a3))
diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
index b849807c2..9b09e22ca 100644
--- a/xorg-server/glx/glprocs.h
+++ b/xorg-server/glx/glprocs.h
@@ -922,6 +922,12 @@ static const char gl_string_table[] =
     "glVertexBindingDivisor\0"
     "glMultiDrawArraysIndirect\0"
     "glMultiDrawElementsIndirect\0"
+    "glGetProgramInterfaceiv\0"
+    "glGetProgramResourceIndex\0"
+    "glGetProgramResourceLocation\0"
+    "glGetProgramResourceLocationIndex\0"
+    "glGetProgramResourceName\0"
+    "glGetProgramResourceiv\0"
     "glTexBufferRange\0"
     "glTexStorage2DMultisample\0"
     "glTexStorage3DMultisample\0"
@@ -946,7 +952,12 @@ static const char gl_string_table[] =
     "glCopyTextureSubImage2D\0"
     "glCopyTextureSubImage3D\0"
     "glCreateBuffers\0"
+    "glCreateProgramPipelines\0"
+    "glCreateQueries\0"
+    "glCreateRenderbuffers\0"
+    "glCreateSamplers\0"
     "glCreateTextures\0"
+    "glCreateTransformFeedbacks\0"
     "glFlushMappedNamedBufferRange\0"
     "glGenerateTextureMipmap\0"
     "glGetCompressedTextureImage\0"
@@ -954,6 +965,11 @@ static const char gl_string_table[] =
     "glGetNamedBufferParameteriv\0"
     "glGetNamedBufferPointerv\0"
     "glGetNamedBufferSubData\0"
+    "glGetNamedRenderbufferParameteriv\0"
+    "glGetQueryBufferObjecti64v\0"
+    "glGetQueryBufferObjectiv\0"
+    "glGetQueryBufferObjectui64v\0"
+    "glGetQueryBufferObjectuiv\0"
     "glGetTextureImage\0"
     "glGetTextureLevelParameterfv\0"
     "glGetTextureLevelParameteriv\0"
@@ -961,11 +977,16 @@ static const char gl_string_table[] =
     "glGetTextureParameterIuiv\0"
     "glGetTextureParameterfv\0"
     "glGetTextureParameteriv\0"
+    "glGetTransformFeedbacki64_v\0"
+    "glGetTransformFeedbacki_v\0"
+    "glGetTransformFeedbackiv\0"
     "glMapNamedBuffer\0"
     "glMapNamedBufferRange\0"
     "glNamedBufferData\0"
     "glNamedBufferStorage\0"
     "glNamedBufferSubData\0"
+    "glNamedRenderbufferStorage\0"
+    "glNamedRenderbufferStorageMultisample\0"
     "glTextureBuffer\0"
     "glTextureBufferRange\0"
     "glTextureParameterIiv\0"
@@ -982,6 +1003,8 @@ static const char gl_string_table[] =
     "glTextureSubImage1D\0"
     "glTextureSubImage2D\0"
     "glTextureSubImage3D\0"
+    "glTransformFeedbackBufferBase\0"
+    "glTransformFeedbackBufferRange\0"
     "glUnmapNamedBuffer\0"
     "glInvalidateBufferData\0"
     "glInvalidateBufferSubData\0"
@@ -1825,39 +1848,17 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_732 mgl_dispatch_stub_732
 #define gl_dispatch_stub_733 mgl_dispatch_stub_733
 #define gl_dispatch_stub_846 mgl_dispatch_stub_846
-#define gl_dispatch_stub_938 mgl_dispatch_stub_938
-#define gl_dispatch_stub_939 mgl_dispatch_stub_939
-#define gl_dispatch_stub_940 mgl_dispatch_stub_940
-#define gl_dispatch_stub_941 mgl_dispatch_stub_941
-#define gl_dispatch_stub_942 mgl_dispatch_stub_942
-#define gl_dispatch_stub_943 mgl_dispatch_stub_943
-#define gl_dispatch_stub_944 mgl_dispatch_stub_944
-#define gl_dispatch_stub_945 mgl_dispatch_stub_945
-#define gl_dispatch_stub_947 mgl_dispatch_stub_947
-#define gl_dispatch_stub_948 mgl_dispatch_stub_948
-#define gl_dispatch_stub_949 mgl_dispatch_stub_949
-#define gl_dispatch_stub_956 mgl_dispatch_stub_956
-#define gl_dispatch_stub_957 mgl_dispatch_stub_957
-#define gl_dispatch_stub_958 mgl_dispatch_stub_958
-#define gl_dispatch_stub_959 mgl_dispatch_stub_959
-#define gl_dispatch_stub_960 mgl_dispatch_stub_960
 #define gl_dispatch_stub_961 mgl_dispatch_stub_961
 #define gl_dispatch_stub_962 mgl_dispatch_stub_962
 #define gl_dispatch_stub_963 mgl_dispatch_stub_963
 #define gl_dispatch_stub_964 mgl_dispatch_stub_964
+#define gl_dispatch_stub_965 mgl_dispatch_stub_965
 #define gl_dispatch_stub_966 mgl_dispatch_stub_966
 #define gl_dispatch_stub_967 mgl_dispatch_stub_967
 #define gl_dispatch_stub_968 mgl_dispatch_stub_968
-#define gl_dispatch_stub_969 mgl_dispatch_stub_969
 #define gl_dispatch_stub_970 mgl_dispatch_stub_970
 #define gl_dispatch_stub_971 mgl_dispatch_stub_971
 #define gl_dispatch_stub_972 mgl_dispatch_stub_972
-#define gl_dispatch_stub_973 mgl_dispatch_stub_973
-#define gl_dispatch_stub_974 mgl_dispatch_stub_974
-#define gl_dispatch_stub_975 mgl_dispatch_stub_975
-#define gl_dispatch_stub_976 mgl_dispatch_stub_976
-#define gl_dispatch_stub_977 mgl_dispatch_stub_977
-#define gl_dispatch_stub_978 mgl_dispatch_stub_978
 #define gl_dispatch_stub_979 mgl_dispatch_stub_979
 #define gl_dispatch_stub_980 mgl_dispatch_stub_980
 #define gl_dispatch_stub_981 mgl_dispatch_stub_981
@@ -1867,7 +1868,6 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_985 mgl_dispatch_stub_985
 #define gl_dispatch_stub_986 mgl_dispatch_stub_986
 #define gl_dispatch_stub_987 mgl_dispatch_stub_987
-#define gl_dispatch_stub_988 mgl_dispatch_stub_988
 #define gl_dispatch_stub_989 mgl_dispatch_stub_989
 #define gl_dispatch_stub_990 mgl_dispatch_stub_990
 #define gl_dispatch_stub_991 mgl_dispatch_stub_991
@@ -1895,32 +1895,55 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_1013 mgl_dispatch_stub_1013
 #define gl_dispatch_stub_1014 mgl_dispatch_stub_1014
 #define gl_dispatch_stub_1015 mgl_dispatch_stub_1015
+#define gl_dispatch_stub_1016 mgl_dispatch_stub_1016
 #define gl_dispatch_stub_1017 mgl_dispatch_stub_1017
 #define gl_dispatch_stub_1018 mgl_dispatch_stub_1018
-#define gl_dispatch_stub_1043 mgl_dispatch_stub_1043
-#define gl_dispatch_stub_1044 mgl_dispatch_stub_1044
-#define gl_dispatch_stub_1118 mgl_dispatch_stub_1118
-#define gl_dispatch_stub_1119 mgl_dispatch_stub_1119
-#define gl_dispatch_stub_1120 mgl_dispatch_stub_1120
-#define gl_dispatch_stub_1128 mgl_dispatch_stub_1128
-#define gl_dispatch_stub_1129 mgl_dispatch_stub_1129
-#define gl_dispatch_stub_1130 mgl_dispatch_stub_1130
-#define gl_dispatch_stub_1131 mgl_dispatch_stub_1131
-#define gl_dispatch_stub_1134 mgl_dispatch_stub_1134
-#define gl_dispatch_stub_1135 mgl_dispatch_stub_1135
-#define gl_dispatch_stub_1181 mgl_dispatch_stub_1181
-#define gl_dispatch_stub_1182 mgl_dispatch_stub_1182
-#define gl_dispatch_stub_1183 mgl_dispatch_stub_1183
-#define gl_dispatch_stub_1184 mgl_dispatch_stub_1184
-#define gl_dispatch_stub_1185 mgl_dispatch_stub_1185
-#define gl_dispatch_stub_1186 mgl_dispatch_stub_1186
-#define gl_dispatch_stub_1187 mgl_dispatch_stub_1187
-#define gl_dispatch_stub_1188 mgl_dispatch_stub_1188
-#define gl_dispatch_stub_1189 mgl_dispatch_stub_1189
-#define gl_dispatch_stub_1190 mgl_dispatch_stub_1190
-#define gl_dispatch_stub_1192 mgl_dispatch_stub_1192
-#define gl_dispatch_stub_1193 mgl_dispatch_stub_1193
-#define gl_dispatch_stub_1194 mgl_dispatch_stub_1194
+#define gl_dispatch_stub_1019 mgl_dispatch_stub_1019
+#define gl_dispatch_stub_1020 mgl_dispatch_stub_1020
+#define gl_dispatch_stub_1021 mgl_dispatch_stub_1021
+#define gl_dispatch_stub_1022 mgl_dispatch_stub_1022
+#define gl_dispatch_stub_1023 mgl_dispatch_stub_1023
+#define gl_dispatch_stub_1024 mgl_dispatch_stub_1024
+#define gl_dispatch_stub_1025 mgl_dispatch_stub_1025
+#define gl_dispatch_stub_1026 mgl_dispatch_stub_1026
+#define gl_dispatch_stub_1027 mgl_dispatch_stub_1027
+#define gl_dispatch_stub_1028 mgl_dispatch_stub_1028
+#define gl_dispatch_stub_1029 mgl_dispatch_stub_1029
+#define gl_dispatch_stub_1030 mgl_dispatch_stub_1030
+#define gl_dispatch_stub_1031 mgl_dispatch_stub_1031
+#define gl_dispatch_stub_1032 mgl_dispatch_stub_1032
+#define gl_dispatch_stub_1033 mgl_dispatch_stub_1033
+#define gl_dispatch_stub_1034 mgl_dispatch_stub_1034
+#define gl_dispatch_stub_1035 mgl_dispatch_stub_1035
+#define gl_dispatch_stub_1036 mgl_dispatch_stub_1036
+#define gl_dispatch_stub_1037 mgl_dispatch_stub_1037
+#define gl_dispatch_stub_1038 mgl_dispatch_stub_1038
+#define gl_dispatch_stub_1040 mgl_dispatch_stub_1040
+#define gl_dispatch_stub_1041 mgl_dispatch_stub_1041
+#define gl_dispatch_stub_1066 mgl_dispatch_stub_1066
+#define gl_dispatch_stub_1067 mgl_dispatch_stub_1067
+#define gl_dispatch_stub_1141 mgl_dispatch_stub_1141
+#define gl_dispatch_stub_1142 mgl_dispatch_stub_1142
+#define gl_dispatch_stub_1143 mgl_dispatch_stub_1143
+#define gl_dispatch_stub_1151 mgl_dispatch_stub_1151
+#define gl_dispatch_stub_1152 mgl_dispatch_stub_1152
+#define gl_dispatch_stub_1153 mgl_dispatch_stub_1153
+#define gl_dispatch_stub_1154 mgl_dispatch_stub_1154
+#define gl_dispatch_stub_1157 mgl_dispatch_stub_1157
+#define gl_dispatch_stub_1158 mgl_dispatch_stub_1158
+#define gl_dispatch_stub_1204 mgl_dispatch_stub_1204
+#define gl_dispatch_stub_1205 mgl_dispatch_stub_1205
+#define gl_dispatch_stub_1206 mgl_dispatch_stub_1206
+#define gl_dispatch_stub_1207 mgl_dispatch_stub_1207
+#define gl_dispatch_stub_1208 mgl_dispatch_stub_1208
+#define gl_dispatch_stub_1209 mgl_dispatch_stub_1209
+#define gl_dispatch_stub_1210 mgl_dispatch_stub_1210
+#define gl_dispatch_stub_1211 mgl_dispatch_stub_1211
+#define gl_dispatch_stub_1212 mgl_dispatch_stub_1212
+#define gl_dispatch_stub_1213 mgl_dispatch_stub_1213
+#define gl_dispatch_stub_1215 mgl_dispatch_stub_1215
+#define gl_dispatch_stub_1216 mgl_dispatch_stub_1216
+#define gl_dispatch_stub_1217 mgl_dispatch_stub_1217
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1942,102 +1965,102 @@ void GLAPIENTRY gl_dispatch_stub_731(GLuint id, GLenum pname, GLint64 * params);
 void GLAPIENTRY gl_dispatch_stub_732(GLuint id, GLenum pname, GLuint64 * params);
 void GLAPIENTRY gl_dispatch_stub_733(GLuint id, GLenum target);
 void GLAPIENTRY gl_dispatch_stub_846(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_938(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void GLAPIENTRY gl_dispatch_stub_939(const GLfloat * coords);
-void GLAPIENTRY gl_dispatch_stub_940(GLint x, GLint y, GLint z, GLint width, GLint height);
-void GLAPIENTRY gl_dispatch_stub_941(const GLint * coords);
-void GLAPIENTRY gl_dispatch_stub_942(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void GLAPIENTRY gl_dispatch_stub_943(const GLshort * coords);
-void GLAPIENTRY gl_dispatch_stub_944(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void GLAPIENTRY gl_dispatch_stub_945(const GLfixed * coords);
-GLbitfield GLAPIENTRY gl_dispatch_stub_947(GLfixed * mantissa, GLint * exponent);
-void GLAPIENTRY gl_dispatch_stub_948(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_949(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_956(GLenum target, GLsizei numAttachments, const GLenum * attachments);
-void GLAPIENTRY gl_dispatch_stub_957(GLuint pipeline, GLuint program);
-void GLAPIENTRY gl_dispatch_stub_958(GLuint pipeline);
-GLuint GLAPIENTRY gl_dispatch_stub_959(GLenum type, GLsizei count, const GLchar * const * strings);
-void GLAPIENTRY gl_dispatch_stub_960(GLsizei n, const GLuint * pipelines);
-void GLAPIENTRY gl_dispatch_stub_961(GLsizei n, GLuint * pipelines);
-void GLAPIENTRY gl_dispatch_stub_962(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
-void GLAPIENTRY gl_dispatch_stub_963(GLuint pipeline, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_964(GLuint pipeline);
-void GLAPIENTRY gl_dispatch_stub_966(GLuint program, GLint location, GLdouble x);
-void GLAPIENTRY gl_dispatch_stub_967(GLuint program, GLint location, GLsizei count, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_968(GLuint program, GLint location, GLfloat x);
-void GLAPIENTRY gl_dispatch_stub_969(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_970(GLuint program, GLint location, GLint x);
-void GLAPIENTRY gl_dispatch_stub_971(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_972(GLuint program, GLint location, GLuint x);
-void GLAPIENTRY gl_dispatch_stub_973(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_974(GLuint program, GLint location, GLdouble x, GLdouble y);
-void GLAPIENTRY gl_dispatch_stub_975(GLuint program, GLint location, GLsizei count, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_976(GLuint program, GLint location, GLfloat x, GLfloat y);
-void GLAPIENTRY gl_dispatch_stub_977(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_978(GLuint program, GLint location, GLint x, GLint y);
-void GLAPIENTRY gl_dispatch_stub_979(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_980(GLuint program, GLint location, GLuint x, GLuint y);
-void GLAPIENTRY gl_dispatch_stub_981(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_982(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
-void GLAPIENTRY gl_dispatch_stub_983(GLuint program, GLint location, GLsizei count, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_984(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
-void GLAPIENTRY gl_dispatch_stub_985(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_986(GLuint program, GLint location, GLint x, GLint y, GLint z);
-void GLAPIENTRY gl_dispatch_stub_987(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_988(GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
-void GLAPIENTRY gl_dispatch_stub_989(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_990(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-void GLAPIENTRY gl_dispatch_stub_991(GLuint program, GLint location, GLsizei count, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_992(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void GLAPIENTRY gl_dispatch_stub_993(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_994(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
-void GLAPIENTRY gl_dispatch_stub_995(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_996(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
-void GLAPIENTRY gl_dispatch_stub_997(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_998(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_999(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1000(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_1001(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1002(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_1003(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1004(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_1005(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1006(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_1007(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1008(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_1009(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1010(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_1011(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1012(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_1013(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1014(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
-void GLAPIENTRY gl_dispatch_stub_1015(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_1017(GLuint pipeline, GLbitfield stages, GLuint program);
-void GLAPIENTRY gl_dispatch_stub_1018(GLuint pipeline);
-void GLAPIENTRY gl_dispatch_stub_1043(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_1044(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_1118(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_1119(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_1120(GLsizei n, GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_1128(GLenum coord, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1129(GLenum coord, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1130(GLenum coord, GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1131(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_1134(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1135(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_1181(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1182(GLuint queryId, GLuint * queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1183(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1184(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1185(GLuint * queryId);
-void GLAPIENTRY gl_dispatch_stub_1186(GLuint queryId, GLuint * nextQueryId);
-void GLAPIENTRY gl_dispatch_stub_1187(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue);
-void GLAPIENTRY gl_dispatch_stub_1188(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten);
-void GLAPIENTRY gl_dispatch_stub_1189(GLchar * queryName, GLuint * queryId);
-void GLAPIENTRY gl_dispatch_stub_1190(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask);
-void GLAPIENTRY gl_dispatch_stub_1192(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_1193(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_1194(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_961(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void GLAPIENTRY gl_dispatch_stub_962(const GLfloat * coords);
+void GLAPIENTRY gl_dispatch_stub_963(GLint x, GLint y, GLint z, GLint width, GLint height);
+void GLAPIENTRY gl_dispatch_stub_964(const GLint * coords);
+void GLAPIENTRY gl_dispatch_stub_965(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void GLAPIENTRY gl_dispatch_stub_966(const GLshort * coords);
+void GLAPIENTRY gl_dispatch_stub_967(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void GLAPIENTRY gl_dispatch_stub_968(const GLfixed * coords);
+GLbitfield GLAPIENTRY gl_dispatch_stub_970(GLfixed * mantissa, GLint * exponent);
+void GLAPIENTRY gl_dispatch_stub_971(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_972(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_979(GLenum target, GLsizei numAttachments, const GLenum * attachments);
+void GLAPIENTRY gl_dispatch_stub_980(GLuint pipeline, GLuint program);
+void GLAPIENTRY gl_dispatch_stub_981(GLuint pipeline);
+GLuint GLAPIENTRY gl_dispatch_stub_982(GLenum type, GLsizei count, const GLchar * const * strings);
+void GLAPIENTRY gl_dispatch_stub_983(GLsizei n, const GLuint * pipelines);
+void GLAPIENTRY gl_dispatch_stub_984(GLsizei n, GLuint * pipelines);
+void GLAPIENTRY gl_dispatch_stub_985(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
+void GLAPIENTRY gl_dispatch_stub_986(GLuint pipeline, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_987(GLuint pipeline);
+void GLAPIENTRY gl_dispatch_stub_989(GLuint program, GLint location, GLdouble x);
+void GLAPIENTRY gl_dispatch_stub_990(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_991(GLuint program, GLint location, GLfloat x);
+void GLAPIENTRY gl_dispatch_stub_992(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_993(GLuint program, GLint location, GLint x);
+void GLAPIENTRY gl_dispatch_stub_994(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_995(GLuint program, GLint location, GLuint x);
+void GLAPIENTRY gl_dispatch_stub_996(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_997(GLuint program, GLint location, GLdouble x, GLdouble y);
+void GLAPIENTRY gl_dispatch_stub_998(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_999(GLuint program, GLint location, GLfloat x, GLfloat y);
+void GLAPIENTRY gl_dispatch_stub_1000(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1001(GLuint program, GLint location, GLint x, GLint y);
+void GLAPIENTRY gl_dispatch_stub_1002(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_1003(GLuint program, GLint location, GLuint x, GLuint y);
+void GLAPIENTRY gl_dispatch_stub_1004(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_1005(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+void GLAPIENTRY gl_dispatch_stub_1006(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1007(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+void GLAPIENTRY gl_dispatch_stub_1008(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1009(GLuint program, GLint location, GLint x, GLint y, GLint z);
+void GLAPIENTRY gl_dispatch_stub_1010(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_1011(GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
+void GLAPIENTRY gl_dispatch_stub_1012(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_1013(GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+void GLAPIENTRY gl_dispatch_stub_1014(GLuint program, GLint location, GLsizei count, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1015(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+void GLAPIENTRY gl_dispatch_stub_1016(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1017(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+void GLAPIENTRY gl_dispatch_stub_1018(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_1019(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
+void GLAPIENTRY gl_dispatch_stub_1020(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_1021(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1022(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1023(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1024(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1025(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1026(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1027(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1028(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1029(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1030(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1031(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1032(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1033(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1034(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1035(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1036(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1037(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble * value);
+void GLAPIENTRY gl_dispatch_stub_1038(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_1040(GLuint pipeline, GLbitfield stages, GLuint program);
+void GLAPIENTRY gl_dispatch_stub_1041(GLuint pipeline);
+void GLAPIENTRY gl_dispatch_stub_1066(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_1067(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_1141(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_1142(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_1143(GLsizei n, GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_1151(GLenum coord, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1152(GLenum coord, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1153(GLenum coord, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1154(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_1157(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1158(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_1204(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1205(GLuint queryId, GLuint * queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1206(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1207(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1208(GLuint * queryId);
+void GLAPIENTRY gl_dispatch_stub_1209(GLuint queryId, GLuint * nextQueryId);
+void GLAPIENTRY gl_dispatch_stub_1210(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue);
+void GLAPIENTRY gl_dispatch_stub_1211(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten);
+void GLAPIENTRY gl_dispatch_stub_1212(GLchar * queryName, GLuint * queryId);
+void GLAPIENTRY gl_dispatch_stub_1213(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask);
+void GLAPIENTRY gl_dispatch_stub_1215(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_1216(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1217(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2911,888 +2934,911 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(14520, glVertexBindingDivisor, glVertexBindingDivisor, NULL, 867),
     NAME_FUNC_OFFSET(14543, glMultiDrawArraysIndirect, glMultiDrawArraysIndirect, NULL, 868),
     NAME_FUNC_OFFSET(14569, glMultiDrawElementsIndirect, glMultiDrawElementsIndirect, NULL, 869),
-    NAME_FUNC_OFFSET(14597, glTexBufferRange, glTexBufferRange, NULL, 870),
-    NAME_FUNC_OFFSET(14614, glTexStorage2DMultisample, glTexStorage2DMultisample, NULL, 871),
-    NAME_FUNC_OFFSET(14640, glTexStorage3DMultisample, glTexStorage3DMultisample, NULL, 872),
-    NAME_FUNC_OFFSET(14666, glBufferStorage, glBufferStorage, NULL, 873),
-    NAME_FUNC_OFFSET(14682, glClearTexImage, glClearTexImage, NULL, 874),
-    NAME_FUNC_OFFSET(14698, glClearTexSubImage, glClearTexSubImage, NULL, 875),
-    NAME_FUNC_OFFSET(14717, glBindBuffersBase, glBindBuffersBase, NULL, 876),
-    NAME_FUNC_OFFSET(14735, glBindBuffersRange, glBindBuffersRange, NULL, 877),
-    NAME_FUNC_OFFSET(14754, glBindImageTextures, glBindImageTextures, NULL, 878),
-    NAME_FUNC_OFFSET(14774, glBindSamplers, glBindSamplers, NULL, 879),
-    NAME_FUNC_OFFSET(14789, glBindTextures, glBindTextures, NULL, 880),
-    NAME_FUNC_OFFSET(14804, glBindVertexBuffers, glBindVertexBuffers, NULL, 881),
-    NAME_FUNC_OFFSET(14824, glClipControl, glClipControl, NULL, 882),
-    NAME_FUNC_OFFSET(14838, glBindTextureUnit, glBindTextureUnit, NULL, 883),
-    NAME_FUNC_OFFSET(14856, glClearNamedBufferData, glClearNamedBufferData, NULL, 884),
-    NAME_FUNC_OFFSET(14879, glClearNamedBufferSubData, glClearNamedBufferSubData, NULL, 885),
-    NAME_FUNC_OFFSET(14905, glCompressedTextureSubImage1D, glCompressedTextureSubImage1D, NULL, 886),
-    NAME_FUNC_OFFSET(14935, glCompressedTextureSubImage2D, glCompressedTextureSubImage2D, NULL, 887),
-    NAME_FUNC_OFFSET(14965, glCompressedTextureSubImage3D, glCompressedTextureSubImage3D, NULL, 888),
-    NAME_FUNC_OFFSET(14995, glCopyNamedBufferSubData, glCopyNamedBufferSubData, NULL, 889),
-    NAME_FUNC_OFFSET(15020, glCopyTextureSubImage1D, glCopyTextureSubImage1D, NULL, 890),
-    NAME_FUNC_OFFSET(15044, glCopyTextureSubImage2D, glCopyTextureSubImage2D, NULL, 891),
-    NAME_FUNC_OFFSET(15068, glCopyTextureSubImage3D, glCopyTextureSubImage3D, NULL, 892),
-    NAME_FUNC_OFFSET(15092, glCreateBuffers, glCreateBuffers, NULL, 893),
-    NAME_FUNC_OFFSET(15108, glCreateTextures, glCreateTextures, NULL, 894),
-    NAME_FUNC_OFFSET(15125, glFlushMappedNamedBufferRange, glFlushMappedNamedBufferRange, NULL, 895),
-    NAME_FUNC_OFFSET(15155, glGenerateTextureMipmap, glGenerateTextureMipmap, NULL, 896),
-    NAME_FUNC_OFFSET(15179, glGetCompressedTextureImage, glGetCompressedTextureImage, NULL, 897),
-    NAME_FUNC_OFFSET(15207, glGetNamedBufferParameteri64v, glGetNamedBufferParameteri64v, NULL, 898),
-    NAME_FUNC_OFFSET(15237, glGetNamedBufferParameteriv, glGetNamedBufferParameteriv, NULL, 899),
-    NAME_FUNC_OFFSET(15265, glGetNamedBufferPointerv, glGetNamedBufferPointerv, NULL, 900),
-    NAME_FUNC_OFFSET(15290, glGetNamedBufferSubData, glGetNamedBufferSubData, NULL, 901),
-    NAME_FUNC_OFFSET(15314, glGetTextureImage, glGetTextureImage, NULL, 902),
-    NAME_FUNC_OFFSET(15332, glGetTextureLevelParameterfv, glGetTextureLevelParameterfv, NULL, 903),
-    NAME_FUNC_OFFSET(15361, glGetTextureLevelParameteriv, glGetTextureLevelParameteriv, NULL, 904),
-    NAME_FUNC_OFFSET(15390, glGetTextureParameterIiv, glGetTextureParameterIiv, NULL, 905),
-    NAME_FUNC_OFFSET(15415, glGetTextureParameterIuiv, glGetTextureParameterIuiv, NULL, 906),
-    NAME_FUNC_OFFSET(15441, glGetTextureParameterfv, glGetTextureParameterfv, NULL, 907),
-    NAME_FUNC_OFFSET(15465, glGetTextureParameteriv, glGetTextureParameteriv, NULL, 908),
-    NAME_FUNC_OFFSET(15489, glMapNamedBuffer, glMapNamedBuffer, NULL, 909),
-    NAME_FUNC_OFFSET(15506, glMapNamedBufferRange, glMapNamedBufferRange, NULL, 910),
-    NAME_FUNC_OFFSET(15528, glNamedBufferData, glNamedBufferData, NULL, 911),
-    NAME_FUNC_OFFSET(15546, glNamedBufferStorage, glNamedBufferStorage, NULL, 912),
-    NAME_FUNC_OFFSET(15567, glNamedBufferSubData, glNamedBufferSubData, NULL, 913),
-    NAME_FUNC_OFFSET(15588, glTextureBuffer, glTextureBuffer, NULL, 914),
-    NAME_FUNC_OFFSET(15604, glTextureBufferRange, glTextureBufferRange, NULL, 915),
-    NAME_FUNC_OFFSET(15625, glTextureParameterIiv, glTextureParameterIiv, NULL, 916),
-    NAME_FUNC_OFFSET(15647, glTextureParameterIuiv, glTextureParameterIuiv, NULL, 917),
-    NAME_FUNC_OFFSET(15670, glTextureParameterf, glTextureParameterf, NULL, 918),
-    NAME_FUNC_OFFSET(15690, glTextureParameterfv, glTextureParameterfv, NULL, 919),
-    NAME_FUNC_OFFSET(15711, glTextureParameteri, glTextureParameteri, NULL, 920),
-    NAME_FUNC_OFFSET(15731, glTextureParameteriv, glTextureParameteriv, NULL, 921),
-    NAME_FUNC_OFFSET(15752, glTextureStorage1D, glTextureStorage1D, NULL, 922),
-    NAME_FUNC_OFFSET(15771, glTextureStorage2D, glTextureStorage2D, NULL, 923),
-    NAME_FUNC_OFFSET(15790, glTextureStorage2DMultisample, glTextureStorage2DMultisample, NULL, 924),
-    NAME_FUNC_OFFSET(15820, glTextureStorage3D, glTextureStorage3D, NULL, 925),
-    NAME_FUNC_OFFSET(15839, glTextureStorage3DMultisample, glTextureStorage3DMultisample, NULL, 926),
-    NAME_FUNC_OFFSET(15869, glTextureSubImage1D, glTextureSubImage1D, NULL, 927),
-    NAME_FUNC_OFFSET(15889, glTextureSubImage2D, glTextureSubImage2D, NULL, 928),
-    NAME_FUNC_OFFSET(15909, glTextureSubImage3D, glTextureSubImage3D, NULL, 929),
-    NAME_FUNC_OFFSET(15929, glUnmapNamedBuffer, glUnmapNamedBuffer, NULL, 930),
-    NAME_FUNC_OFFSET(15948, glInvalidateBufferData, glInvalidateBufferData, NULL, 931),
-    NAME_FUNC_OFFSET(15971, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 932),
-    NAME_FUNC_OFFSET(15997, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 933),
-    NAME_FUNC_OFFSET(16021, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 934),
-    NAME_FUNC_OFFSET(16048, glInvalidateTexImage, glInvalidateTexImage, NULL, 935),
-    NAME_FUNC_OFFSET(16069, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 936),
-    NAME_FUNC_OFFSET(16093, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 937),
-    NAME_FUNC_OFFSET(16112, gl_dispatch_stub_938, gl_dispatch_stub_938, NULL, 938),
-    NAME_FUNC_OFFSET(16126, gl_dispatch_stub_939, gl_dispatch_stub_939, NULL, 939),
-    NAME_FUNC_OFFSET(16141, gl_dispatch_stub_940, gl_dispatch_stub_940, NULL, 940),
-    NAME_FUNC_OFFSET(16155, gl_dispatch_stub_941, gl_dispatch_stub_941, NULL, 941),
-    NAME_FUNC_OFFSET(16170, gl_dispatch_stub_942, gl_dispatch_stub_942, NULL, 942),
-    NAME_FUNC_OFFSET(16184, gl_dispatch_stub_943, gl_dispatch_stub_943, NULL, 943),
-    NAME_FUNC_OFFSET(16199, gl_dispatch_stub_944, gl_dispatch_stub_944, NULL, 944),
-    NAME_FUNC_OFFSET(16213, gl_dispatch_stub_945, gl_dispatch_stub_945, NULL, 945),
-    NAME_FUNC_OFFSET(16228, glPointSizePointerOES, glPointSizePointerOES, NULL, 946),
-    NAME_FUNC_OFFSET(16250, gl_dispatch_stub_947, gl_dispatch_stub_947, NULL, 947),
-    NAME_FUNC_OFFSET(16268, gl_dispatch_stub_948, gl_dispatch_stub_948, NULL, 948),
-    NAME_FUNC_OFFSET(16285, gl_dispatch_stub_949, gl_dispatch_stub_949, NULL, 949),
-    NAME_FUNC_OFFSET(16305, glColorPointerEXT, glColorPointerEXT, NULL, 950),
-    NAME_FUNC_OFFSET(16323, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 951),
-    NAME_FUNC_OFFSET(16344, glIndexPointerEXT, glIndexPointerEXT, NULL, 952),
-    NAME_FUNC_OFFSET(16362, glNormalPointerEXT, glNormalPointerEXT, NULL, 953),
-    NAME_FUNC_OFFSET(16381, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 954),
-    NAME_FUNC_OFFSET(16402, glVertexPointerEXT, glVertexPointerEXT, NULL, 955),
-    NAME_FUNC_OFFSET(16421, gl_dispatch_stub_956, gl_dispatch_stub_956, NULL, 956),
-    NAME_FUNC_OFFSET(16445, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
-    NAME_FUNC_OFFSET(16467, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL, 958),
-    NAME_FUNC_OFFSET(16489, gl_dispatch_stub_959, gl_dispatch_stub_959, NULL, 959),
-    NAME_FUNC_OFFSET(16512, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
-    NAME_FUNC_OFFSET(16537, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
-    NAME_FUNC_OFFSET(16559, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
-    NAME_FUNC_OFFSET(16587, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
-    NAME_FUNC_OFFSET(16610, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
-    NAME_FUNC_OFFSET(16630, glLockArraysEXT, glLockArraysEXT, NULL, 965),
-    NAME_FUNC_OFFSET(16646, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
-    NAME_FUNC_OFFSET(16665, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL, 967),
-    NAME_FUNC_OFFSET(16685, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
-    NAME_FUNC_OFFSET(16704, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
-    NAME_FUNC_OFFSET(16724, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
-    NAME_FUNC_OFFSET(16743, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
-    NAME_FUNC_OFFSET(16763, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
-    NAME_FUNC_OFFSET(16783, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
-    NAME_FUNC_OFFSET(16804, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
-    NAME_FUNC_OFFSET(16823, gl_dispatch_stub_975, gl_dispatch_stub_975, NULL, 975),
-    NAME_FUNC_OFFSET(16843, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
-    NAME_FUNC_OFFSET(16862, gl_dispatch_stub_977, gl_dispatch_stub_977, NULL, 977),
-    NAME_FUNC_OFFSET(16882, gl_dispatch_stub_978, gl_dispatch_stub_978, NULL, 978),
-    NAME_FUNC_OFFSET(16901, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
-    NAME_FUNC_OFFSET(16921, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
-    NAME_FUNC_OFFSET(16941, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
-    NAME_FUNC_OFFSET(16962, gl_dispatch_stub_982, gl_dispatch_stub_982, NULL, 982),
-    NAME_FUNC_OFFSET(16981, gl_dispatch_stub_983, gl_dispatch_stub_983, NULL, 983),
-    NAME_FUNC_OFFSET(17001, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
-    NAME_FUNC_OFFSET(17020, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
-    NAME_FUNC_OFFSET(17040, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
-    NAME_FUNC_OFFSET(17059, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
-    NAME_FUNC_OFFSET(17079, gl_dispatch_stub_988, gl_dispatch_stub_988, NULL, 988),
-    NAME_FUNC_OFFSET(17099, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
-    NAME_FUNC_OFFSET(17120, gl_dispatch_stub_990, gl_dispatch_stub_990, NULL, 990),
-    NAME_FUNC_OFFSET(17139, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
-    NAME_FUNC_OFFSET(17159, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
-    NAME_FUNC_OFFSET(17178, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
-    NAME_FUNC_OFFSET(17198, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
-    NAME_FUNC_OFFSET(17217, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
-    NAME_FUNC_OFFSET(17237, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
-    NAME_FUNC_OFFSET(17257, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
-    NAME_FUNC_OFFSET(17278, gl_dispatch_stub_998, gl_dispatch_stub_998, NULL, 998),
-    NAME_FUNC_OFFSET(17304, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
-    NAME_FUNC_OFFSET(17330, gl_dispatch_stub_1000, gl_dispatch_stub_1000, NULL, 1000),
-    NAME_FUNC_OFFSET(17358, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
-    NAME_FUNC_OFFSET(17386, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
-    NAME_FUNC_OFFSET(17414, gl_dispatch_stub_1003, gl_dispatch_stub_1003, NULL, 1003),
-    NAME_FUNC_OFFSET(17442, gl_dispatch_stub_1004, gl_dispatch_stub_1004, NULL, 1004),
-    NAME_FUNC_OFFSET(17468, gl_dispatch_stub_1005, gl_dispatch_stub_1005, NULL, 1005),
-    NAME_FUNC_OFFSET(17494, gl_dispatch_stub_1006, gl_dispatch_stub_1006, NULL, 1006),
-    NAME_FUNC_OFFSET(17522, gl_dispatch_stub_1007, gl_dispatch_stub_1007, NULL, 1007),
-    NAME_FUNC_OFFSET(17550, gl_dispatch_stub_1008, gl_dispatch_stub_1008, NULL, 1008),
-    NAME_FUNC_OFFSET(17578, gl_dispatch_stub_1009, gl_dispatch_stub_1009, NULL, 1009),
-    NAME_FUNC_OFFSET(17606, gl_dispatch_stub_1010, gl_dispatch_stub_1010, NULL, 1010),
-    NAME_FUNC_OFFSET(17632, gl_dispatch_stub_1011, gl_dispatch_stub_1011, NULL, 1011),
-    NAME_FUNC_OFFSET(17658, gl_dispatch_stub_1012, gl_dispatch_stub_1012, NULL, 1012),
-    NAME_FUNC_OFFSET(17686, gl_dispatch_stub_1013, gl_dispatch_stub_1013, NULL, 1013),
-    NAME_FUNC_OFFSET(17714, gl_dispatch_stub_1014, gl_dispatch_stub_1014, NULL, 1014),
-    NAME_FUNC_OFFSET(17742, gl_dispatch_stub_1015, gl_dispatch_stub_1015, NULL, 1015),
-    NAME_FUNC_OFFSET(17770, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 1016),
-    NAME_FUNC_OFFSET(17788, gl_dispatch_stub_1017, gl_dispatch_stub_1017, NULL, 1017),
-    NAME_FUNC_OFFSET(17807, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
-    NAME_FUNC_OFFSET(17833, glDebugMessageCallback, glDebugMessageCallback, NULL, 1019),
-    NAME_FUNC_OFFSET(17856, glDebugMessageControl, glDebugMessageControl, NULL, 1020),
-    NAME_FUNC_OFFSET(17878, glDebugMessageInsert, glDebugMessageInsert, NULL, 1021),
-    NAME_FUNC_OFFSET(17899, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1022),
-    NAME_FUNC_OFFSET(17920, glGetObjectLabel, glGetObjectLabel, NULL, 1023),
-    NAME_FUNC_OFFSET(17937, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 1024),
-    NAME_FUNC_OFFSET(17957, glObjectLabel, glObjectLabel, NULL, 1025),
-    NAME_FUNC_OFFSET(17971, glObjectPtrLabel, glObjectPtrLabel, NULL, 1026),
-    NAME_FUNC_OFFSET(17988, glPopDebugGroup, glPopDebugGroup, NULL, 1027),
-    NAME_FUNC_OFFSET(18004, glPushDebugGroup, glPushDebugGroup, NULL, 1028),
-    NAME_FUNC_OFFSET(18021, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1029),
-    NAME_FUNC_OFFSET(18043, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1030),
-    NAME_FUNC_OFFSET(18066, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1031),
-    NAME_FUNC_OFFSET(18089, glFogCoordfEXT, glFogCoordfEXT, NULL, 1032),
-    NAME_FUNC_OFFSET(18104, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1033),
-    NAME_FUNC_OFFSET(18120, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 1034),
-    NAME_FUNC_OFFSET(18140, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 1035),
-    NAME_FUNC_OFFSET(18158, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 1036),
-    NAME_FUNC_OFFSET(18177, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 1037),
-    NAME_FUNC_OFFSET(18195, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 1038),
-    NAME_FUNC_OFFSET(18214, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 1039),
-    NAME_FUNC_OFFSET(18232, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 1040),
-    NAME_FUNC_OFFSET(18251, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 1041),
-    NAME_FUNC_OFFSET(18269, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 1042),
-    NAME_FUNC_OFFSET(18288, gl_dispatch_stub_1043, gl_dispatch_stub_1043, NULL, 1043),
-    NAME_FUNC_OFFSET(18313, gl_dispatch_stub_1044, gl_dispatch_stub_1044, NULL, 1044),
-    NAME_FUNC_OFFSET(18340, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 1045),
-    NAME_FUNC_OFFSET(18364, glExecuteProgramNV, glExecuteProgramNV, NULL, 1046),
-    NAME_FUNC_OFFSET(18383, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 1047),
-    NAME_FUNC_OFFSET(18409, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 1048),
-    NAME_FUNC_OFFSET(18435, glGetProgramStringNV, glGetProgramStringNV, NULL, 1049),
-    NAME_FUNC_OFFSET(18456, glGetProgramivNV, glGetProgramivNV, NULL, 1050),
-    NAME_FUNC_OFFSET(18473, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 1051),
-    NAME_FUNC_OFFSET(18494, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 1052),
-    NAME_FUNC_OFFSET(18516, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 1053),
-    NAME_FUNC_OFFSET(18538, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 1054),
-    NAME_FUNC_OFFSET(18560, glLoadProgramNV, glLoadProgramNV, NULL, 1055),
-    NAME_FUNC_OFFSET(18576, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 1056),
-    NAME_FUNC_OFFSET(18601, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 1057),
-    NAME_FUNC_OFFSET(18626, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 1058),
-    NAME_FUNC_OFFSET(18654, glTrackMatrixNV, glTrackMatrixNV, NULL, 1059),
-    NAME_FUNC_OFFSET(18670, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 1060),
-    NAME_FUNC_OFFSET(18689, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 1061),
-    NAME_FUNC_OFFSET(18709, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 1062),
-    NAME_FUNC_OFFSET(18728, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 1063),
-    NAME_FUNC_OFFSET(18748, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 1064),
-    NAME_FUNC_OFFSET(18767, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 1065),
-    NAME_FUNC_OFFSET(18787, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 1066),
-    NAME_FUNC_OFFSET(18806, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 1067),
-    NAME_FUNC_OFFSET(18826, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 1068),
-    NAME_FUNC_OFFSET(18845, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 1069),
-    NAME_FUNC_OFFSET(18865, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 1070),
-    NAME_FUNC_OFFSET(18884, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 1071),
-    NAME_FUNC_OFFSET(18904, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 1072),
-    NAME_FUNC_OFFSET(18923, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 1073),
-    NAME_FUNC_OFFSET(18943, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 1074),
-    NAME_FUNC_OFFSET(18962, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 1075),
-    NAME_FUNC_OFFSET(18982, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 1076),
-    NAME_FUNC_OFFSET(19001, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 1077),
-    NAME_FUNC_OFFSET(19021, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 1078),
-    NAME_FUNC_OFFSET(19040, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 1079),
-    NAME_FUNC_OFFSET(19060, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 1080),
-    NAME_FUNC_OFFSET(19079, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 1081),
-    NAME_FUNC_OFFSET(19099, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 1082),
-    NAME_FUNC_OFFSET(19118, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 1083),
-    NAME_FUNC_OFFSET(19138, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 1084),
-    NAME_FUNC_OFFSET(19158, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 1085),
-    NAME_FUNC_OFFSET(19179, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 1086),
-    NAME_FUNC_OFFSET(19203, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 1087),
-    NAME_FUNC_OFFSET(19224, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 1088),
-    NAME_FUNC_OFFSET(19245, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1089),
-    NAME_FUNC_OFFSET(19266, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1090),
-    NAME_FUNC_OFFSET(19287, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1091),
-    NAME_FUNC_OFFSET(19308, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1092),
-    NAME_FUNC_OFFSET(19329, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1093),
-    NAME_FUNC_OFFSET(19350, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1094),
-    NAME_FUNC_OFFSET(19371, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1095),
-    NAME_FUNC_OFFSET(19392, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1096),
-    NAME_FUNC_OFFSET(19413, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1097),
-    NAME_FUNC_OFFSET(19434, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1098),
-    NAME_FUNC_OFFSET(19455, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1099),
-    NAME_FUNC_OFFSET(19477, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1100),
-    NAME_FUNC_OFFSET(19504, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1101),
-    NAME_FUNC_OFFSET(19531, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1102),
-    NAME_FUNC_OFFSET(19555, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1103),
-    NAME_FUNC_OFFSET(19579, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1104),
-    NAME_FUNC_OFFSET(19601, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1105),
-    NAME_FUNC_OFFSET(19623, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1106),
-    NAME_FUNC_OFFSET(19645, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1107),
-    NAME_FUNC_OFFSET(19670, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1108),
-    NAME_FUNC_OFFSET(19694, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1109),
-    NAME_FUNC_OFFSET(19716, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1110),
-    NAME_FUNC_OFFSET(19738, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1111),
-    NAME_FUNC_OFFSET(19760, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1112),
-    NAME_FUNC_OFFSET(19786, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1113),
-    NAME_FUNC_OFFSET(19809, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1114),
-    NAME_FUNC_OFFSET(19833, glPassTexCoordATI, glPassTexCoordATI, NULL, 1115),
-    NAME_FUNC_OFFSET(19851, glSampleMapATI, glSampleMapATI, NULL, 1116),
-    NAME_FUNC_OFFSET(19866, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1117),
-    NAME_FUNC_OFFSET(19897, gl_dispatch_stub_1118, gl_dispatch_stub_1118, NULL, 1118),
-    NAME_FUNC_OFFSET(19920, gl_dispatch_stub_1119, gl_dispatch_stub_1119, NULL, 1119),
-    NAME_FUNC_OFFSET(19943, gl_dispatch_stub_1120, gl_dispatch_stub_1120, NULL, 1120),
-    NAME_FUNC_OFFSET(19966, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1121),
-    NAME_FUNC_OFFSET(19997, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1122),
-    NAME_FUNC_OFFSET(20028, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1123),
-    NAME_FUNC_OFFSET(20056, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1124),
-    NAME_FUNC_OFFSET(20085, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1125),
-    NAME_FUNC_OFFSET(20113, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1126),
-    NAME_FUNC_OFFSET(20142, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1127),
-    NAME_FUNC_OFFSET(20163, gl_dispatch_stub_1128, gl_dispatch_stub_1128, NULL, 1128),
-    NAME_FUNC_OFFSET(20180, gl_dispatch_stub_1129, gl_dispatch_stub_1129, NULL, 1129),
-    NAME_FUNC_OFFSET(20193, gl_dispatch_stub_1130, gl_dispatch_stub_1130, NULL, 1130),
-    NAME_FUNC_OFFSET(20207, gl_dispatch_stub_1131, gl_dispatch_stub_1131, NULL, 1131),
-    NAME_FUNC_OFFSET(20224, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1132),
-    NAME_FUNC_OFFSET(20245, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1133),
-    NAME_FUNC_OFFSET(20267, gl_dispatch_stub_1134, gl_dispatch_stub_1134, NULL, 1134),
-    NAME_FUNC_OFFSET(20291, gl_dispatch_stub_1135, gl_dispatch_stub_1135, NULL, 1135),
-    NAME_FUNC_OFFSET(20321, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1136),
-    NAME_FUNC_OFFSET(20342, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1137),
-    NAME_FUNC_OFFSET(20364, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1138),
-    NAME_FUNC_OFFSET(20385, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1139),
-    NAME_FUNC_OFFSET(20407, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1140),
-    NAME_FUNC_OFFSET(20429, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1141),
-    NAME_FUNC_OFFSET(20452, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1142),
-    NAME_FUNC_OFFSET(20473, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1143),
-    NAME_FUNC_OFFSET(20495, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1144),
-    NAME_FUNC_OFFSET(20517, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1145),
-    NAME_FUNC_OFFSET(20540, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1146),
-    NAME_FUNC_OFFSET(20561, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1147),
-    NAME_FUNC_OFFSET(20583, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1148),
-    NAME_FUNC_OFFSET(20605, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1149),
-    NAME_FUNC_OFFSET(20628, glClearColorIiEXT, glClearColorIiEXT, NULL, 1150),
-    NAME_FUNC_OFFSET(20646, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1151),
-    NAME_FUNC_OFFSET(20665, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1152),
-    NAME_FUNC_OFFSET(20687, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1153),
-    NAME_FUNC_OFFSET(20709, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1154),
-    NAME_FUNC_OFFSET(20733, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1155),
-    NAME_FUNC_OFFSET(20753, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1156),
-    NAME_FUNC_OFFSET(20774, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1157),
-    NAME_FUNC_OFFSET(20805, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1158),
-    NAME_FUNC_OFFSET(20836, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1159),
-    NAME_FUNC_OFFSET(20869, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1160),
-    NAME_FUNC_OFFSET(20897, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1161),
-    NAME_FUNC_OFFSET(20928, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1162),
-    NAME_FUNC_OFFSET(20954, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1163),
-    NAME_FUNC_OFFSET(20985, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1164),
-    NAME_FUNC_OFFSET(21013, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1165),
-    NAME_FUNC_OFFSET(21036, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1166),
-    NAME_FUNC_OFFSET(21061, glActiveProgramEXT, glActiveProgramEXT, NULL, 1167),
-    NAME_FUNC_OFFSET(21080, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1168),
-    NAME_FUNC_OFFSET(21105, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1169),
-    NAME_FUNC_OFFSET(21127, glTextureBarrierNV, glTextureBarrierNV, NULL, 1170),
-    NAME_FUNC_OFFSET(21146, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1171),
-    NAME_FUNC_OFFSET(21160, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1172),
-    NAME_FUNC_OFFSET(21182, glVDPAUInitNV, glVDPAUInitNV, NULL, 1173),
-    NAME_FUNC_OFFSET(21196, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1174),
-    NAME_FUNC_OFFSET(21215, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1175),
-    NAME_FUNC_OFFSET(21236, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1176),
-    NAME_FUNC_OFFSET(21267, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1177),
-    NAME_FUNC_OFFSET(21297, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1178),
-    NAME_FUNC_OFFSET(21320, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1179),
-    NAME_FUNC_OFFSET(21343, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1180),
-    NAME_FUNC_OFFSET(21370, gl_dispatch_stub_1181, gl_dispatch_stub_1181, NULL, 1181),
-    NAME_FUNC_OFFSET(21392, gl_dispatch_stub_1182, gl_dispatch_stub_1182, NULL, 1182),
-    NAME_FUNC_OFFSET(21415, gl_dispatch_stub_1183, gl_dispatch_stub_1183, NULL, 1183),
-    NAME_FUNC_OFFSET(21438, gl_dispatch_stub_1184, gl_dispatch_stub_1184, NULL, 1184),
-    NAME_FUNC_OFFSET(21458, gl_dispatch_stub_1185, gl_dispatch_stub_1185, NULL, 1185),
-    NAME_FUNC_OFFSET(21485, gl_dispatch_stub_1186, gl_dispatch_stub_1186, NULL, 1186),
-    NAME_FUNC_OFFSET(21511, gl_dispatch_stub_1187, gl_dispatch_stub_1187, NULL, 1187),
-    NAME_FUNC_OFFSET(21537, gl_dispatch_stub_1188, gl_dispatch_stub_1188, NULL, 1188),
-    NAME_FUNC_OFFSET(21561, gl_dispatch_stub_1189, gl_dispatch_stub_1189, NULL, 1189),
-    NAME_FUNC_OFFSET(21589, gl_dispatch_stub_1190, gl_dispatch_stub_1190, NULL, 1190),
-    NAME_FUNC_OFFSET(21613, glPolygonOffsetClampEXT, glPolygonOffsetClampEXT, NULL, 1191),
-    NAME_FUNC_OFFSET(21637, gl_dispatch_stub_1192, gl_dispatch_stub_1192, NULL, 1192),
-    NAME_FUNC_OFFSET(21662, gl_dispatch_stub_1193, gl_dispatch_stub_1193, NULL, 1193),
-    NAME_FUNC_OFFSET(21691, gl_dispatch_stub_1194, gl_dispatch_stub_1194, NULL, 1194),
-    NAME_FUNC_OFFSET(21722, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1195),
-    NAME_FUNC_OFFSET(21761, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1196),
-    NAME_FUNC_OFFSET(21790, glAlphaFuncx, glAlphaFuncx, NULL, 1197),
-    NAME_FUNC_OFFSET(21803, glClearColorx, glClearColorx, NULL, 1198),
-    NAME_FUNC_OFFSET(21817, glClearDepthx, glClearDepthx, NULL, 1199),
-    NAME_FUNC_OFFSET(21831, glColor4x, glColor4x, NULL, 1200),
-    NAME_FUNC_OFFSET(21841, glDepthRangex, glDepthRangex, NULL, 1201),
-    NAME_FUNC_OFFSET(21855, glFogx, glFogx, NULL, 1202),
-    NAME_FUNC_OFFSET(21862, glFogxv, glFogxv, NULL, 1203),
-    NAME_FUNC_OFFSET(21870, glFrustumf, glFrustumf, NULL, 1204),
-    NAME_FUNC_OFFSET(21881, glFrustumx, glFrustumx, NULL, 1205),
-    NAME_FUNC_OFFSET(21892, glLightModelx, glLightModelx, NULL, 1206),
-    NAME_FUNC_OFFSET(21906, glLightModelxv, glLightModelxv, NULL, 1207),
-    NAME_FUNC_OFFSET(21921, glLightx, glLightx, NULL, 1208),
-    NAME_FUNC_OFFSET(21930, glLightxv, glLightxv, NULL, 1209),
-    NAME_FUNC_OFFSET(21940, glLineWidthx, glLineWidthx, NULL, 1210),
-    NAME_FUNC_OFFSET(21953, glLoadMatrixx, glLoadMatrixx, NULL, 1211),
-    NAME_FUNC_OFFSET(21967, glMaterialx, glMaterialx, NULL, 1212),
-    NAME_FUNC_OFFSET(21979, glMaterialxv, glMaterialxv, NULL, 1213),
-    NAME_FUNC_OFFSET(21992, glMultMatrixx, glMultMatrixx, NULL, 1214),
-    NAME_FUNC_OFFSET(22006, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1215),
-    NAME_FUNC_OFFSET(22024, glNormal3x, glNormal3x, NULL, 1216),
-    NAME_FUNC_OFFSET(22035, glOrthof, glOrthof, NULL, 1217),
-    NAME_FUNC_OFFSET(22044, glOrthox, glOrthox, NULL, 1218),
-    NAME_FUNC_OFFSET(22053, glPointSizex, glPointSizex, NULL, 1219),
-    NAME_FUNC_OFFSET(22066, glPolygonOffsetx, glPolygonOffsetx, NULL, 1220),
-    NAME_FUNC_OFFSET(22083, glRotatex, glRotatex, NULL, 1221),
-    NAME_FUNC_OFFSET(22093, glSampleCoveragex, glSampleCoveragex, NULL, 1222),
-    NAME_FUNC_OFFSET(22111, glScalex, glScalex, NULL, 1223),
-    NAME_FUNC_OFFSET(22120, glTexEnvx, glTexEnvx, NULL, 1224),
-    NAME_FUNC_OFFSET(22130, glTexEnvxv, glTexEnvxv, NULL, 1225),
-    NAME_FUNC_OFFSET(22141, glTexParameterx, glTexParameterx, NULL, 1226),
-    NAME_FUNC_OFFSET(22157, glTranslatex, glTranslatex, NULL, 1227),
-    NAME_FUNC_OFFSET(22170, glClipPlanef, glClipPlanef, NULL, 1228),
-    NAME_FUNC_OFFSET(22183, glClipPlanex, glClipPlanex, NULL, 1229),
-    NAME_FUNC_OFFSET(22196, glGetClipPlanef, glGetClipPlanef, NULL, 1230),
-    NAME_FUNC_OFFSET(22212, glGetClipPlanex, glGetClipPlanex, NULL, 1231),
-    NAME_FUNC_OFFSET(22228, glGetFixedv, glGetFixedv, NULL, 1232),
-    NAME_FUNC_OFFSET(22240, glGetLightxv, glGetLightxv, NULL, 1233),
-    NAME_FUNC_OFFSET(22253, glGetMaterialxv, glGetMaterialxv, NULL, 1234),
-    NAME_FUNC_OFFSET(22269, glGetTexEnvxv, glGetTexEnvxv, NULL, 1235),
-    NAME_FUNC_OFFSET(22283, glGetTexParameterxv, glGetTexParameterxv, NULL, 1236),
-    NAME_FUNC_OFFSET(22303, glPointParameterx, glPointParameterx, NULL, 1237),
-    NAME_FUNC_OFFSET(22321, glPointParameterxv, glPointParameterxv, NULL, 1238),
-    NAME_FUNC_OFFSET(22340, glTexParameterxv, glTexParameterxv, NULL, 1239),
-    NAME_FUNC_OFFSET(22357, glTexGenf, glTexGenf, NULL, 190),
-    NAME_FUNC_OFFSET(22370, glTexGenfv, glTexGenfv, NULL, 191),
-    NAME_FUNC_OFFSET(22384, glTexGeni, glTexGeni, NULL, 192),
-    NAME_FUNC_OFFSET(22397, glTexGeniv, glTexGeniv, NULL, 193),
-    NAME_FUNC_OFFSET(22411, glReadBuffer, glReadBuffer, NULL, 254),
-    NAME_FUNC_OFFSET(22426, glGetTexGenfv, glGetTexGenfv, NULL, 279),
-    NAME_FUNC_OFFSET(22443, glGetTexGeniv, glGetTexGeniv, NULL, 280),
-    NAME_FUNC_OFFSET(22460, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(22478, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(22495, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(22511, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(22536, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(22556, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(22576, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(22599, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(22622, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(22642, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
-    NAME_FUNC_OFFSET(22659, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(22676, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(22691, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
-    NAME_FUNC_OFFSET(22715, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(22734, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(22753, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(22769, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(22788, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(22807, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(22830, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(22846, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(22862, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
-    NAME_FUNC_OFFSET(22889, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
-    NAME_FUNC_OFFSET(22916, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(22936, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(22955, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(22974, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(23004, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(23034, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(23064, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(23094, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(23113, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(23136, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
-    NAME_FUNC_OFFSET(23161, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
-    NAME_FUNC_OFFSET(23186, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
-    NAME_FUNC_OFFSET(23213, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
-    NAME_FUNC_OFFSET(23241, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
-    NAME_FUNC_OFFSET(23268, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
-    NAME_FUNC_OFFSET(23296, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(23325, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(23354, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(23380, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(23411, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(23442, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(23466, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(23489, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(23507, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(23536, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(23565, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(23580, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(23606, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(23632, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(23647, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(23659, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(23679, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(23696, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(23712, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(23728, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(23747, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(23766, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(23789, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(23812, glActiveTexture, glActiveTexture, NULL, 374),
-    NAME_FUNC_OFFSET(23831, glClientActiveTexture, glClientActiveTexture, NULL, 375),
-    NAME_FUNC_OFFSET(23856, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
-    NAME_FUNC_OFFSET(23877, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
-    NAME_FUNC_OFFSET(23899, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
-    NAME_FUNC_OFFSET(23917, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
-    NAME_FUNC_OFFSET(23936, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
-    NAME_FUNC_OFFSET(23957, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
-    NAME_FUNC_OFFSET(23979, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
-    NAME_FUNC_OFFSET(24000, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
-    NAME_FUNC_OFFSET(24022, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
-    NAME_FUNC_OFFSET(24043, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
-    NAME_FUNC_OFFSET(24065, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
-    NAME_FUNC_OFFSET(24083, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
-    NAME_FUNC_OFFSET(24102, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
-    NAME_FUNC_OFFSET(24123, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
-    NAME_FUNC_OFFSET(24145, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
-    NAME_FUNC_OFFSET(24166, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
-    NAME_FUNC_OFFSET(24188, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
-    NAME_FUNC_OFFSET(24209, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
-    NAME_FUNC_OFFSET(24231, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
-    NAME_FUNC_OFFSET(24249, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
-    NAME_FUNC_OFFSET(24268, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
-    NAME_FUNC_OFFSET(24289, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
-    NAME_FUNC_OFFSET(24311, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
-    NAME_FUNC_OFFSET(24332, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
-    NAME_FUNC_OFFSET(24354, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
-    NAME_FUNC_OFFSET(24375, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
-    NAME_FUNC_OFFSET(24397, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
-    NAME_FUNC_OFFSET(24415, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
-    NAME_FUNC_OFFSET(24434, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
-    NAME_FUNC_OFFSET(24455, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
-    NAME_FUNC_OFFSET(24477, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
-    NAME_FUNC_OFFSET(24498, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
-    NAME_FUNC_OFFSET(24520, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
-    NAME_FUNC_OFFSET(24546, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
-    NAME_FUNC_OFFSET(24572, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
-    NAME_FUNC_OFFSET(24598, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
-    NAME_FUNC_OFFSET(24624, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
-    NAME_FUNC_OFFSET(24653, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
-    NAME_FUNC_OFFSET(24682, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
-    NAME_FUNC_OFFSET(24711, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
-    NAME_FUNC_OFFSET(24740, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
-    NAME_FUNC_OFFSET(24767, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
-    NAME_FUNC_OFFSET(24793, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
-    NAME_FUNC_OFFSET(24819, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
-    NAME_FUNC_OFFSET(24845, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
-    NAME_FUNC_OFFSET(24871, glSampleCoverage, glSampleCoverage, NULL, 419),
-    NAME_FUNC_OFFSET(24891, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(24914, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(24938, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(24961, glFogCoordPointer, glFogCoordPointer, NULL, 421),
-    NAME_FUNC_OFFSET(24982, glFogCoordd, glFogCoordd, NULL, 422),
-    NAME_FUNC_OFFSET(24997, glFogCoorddv, glFogCoorddv, NULL, 423),
-    NAME_FUNC_OFFSET(25013, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
-    NAME_FUNC_OFFSET(25034, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(25055, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(25076, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(25098, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(25120, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(25142, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(25165, glPointParameteri, glPointParameteri, NULL, 427),
-    NAME_FUNC_OFFSET(25185, glPointParameteriv, glPointParameteriv, NULL, 428),
-    NAME_FUNC_OFFSET(25206, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
-    NAME_FUNC_OFFSET(25228, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
-    NAME_FUNC_OFFSET(25251, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
-    NAME_FUNC_OFFSET(25273, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
-    NAME_FUNC_OFFSET(25296, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
-    NAME_FUNC_OFFSET(25318, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
-    NAME_FUNC_OFFSET(25341, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
-    NAME_FUNC_OFFSET(25363, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
-    NAME_FUNC_OFFSET(25386, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
-    NAME_FUNC_OFFSET(25409, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
-    NAME_FUNC_OFFSET(25433, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
-    NAME_FUNC_OFFSET(25456, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
-    NAME_FUNC_OFFSET(25480, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
-    NAME_FUNC_OFFSET(25503, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
-    NAME_FUNC_OFFSET(25527, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
-    NAME_FUNC_OFFSET(25554, glWindowPos2d, glWindowPos2d, NULL, 444),
-    NAME_FUNC_OFFSET(25571, glWindowPos2d, glWindowPos2d, NULL, 444),
-    NAME_FUNC_OFFSET(25589, glWindowPos2dv, glWindowPos2dv, NULL, 445),
-    NAME_FUNC_OFFSET(25607, glWindowPos2dv, glWindowPos2dv, NULL, 445),
-    NAME_FUNC_OFFSET(25626, glWindowPos2f, glWindowPos2f, NULL, 446),
-    NAME_FUNC_OFFSET(25643, glWindowPos2f, glWindowPos2f, NULL, 446),
-    NAME_FUNC_OFFSET(25661, glWindowPos2fv, glWindowPos2fv, NULL, 447),
-    NAME_FUNC_OFFSET(25679, glWindowPos2fv, glWindowPos2fv, NULL, 447),
-    NAME_FUNC_OFFSET(25698, glWindowPos2i, glWindowPos2i, NULL, 448),
-    NAME_FUNC_OFFSET(25715, glWindowPos2i, glWindowPos2i, NULL, 448),
-    NAME_FUNC_OFFSET(25733, glWindowPos2iv, glWindowPos2iv, NULL, 449),
-    NAME_FUNC_OFFSET(25751, glWindowPos2iv, glWindowPos2iv, NULL, 449),
-    NAME_FUNC_OFFSET(25770, glWindowPos2s, glWindowPos2s, NULL, 450),
-    NAME_FUNC_OFFSET(25787, glWindowPos2s, glWindowPos2s, NULL, 450),
-    NAME_FUNC_OFFSET(25805, glWindowPos2sv, glWindowPos2sv, NULL, 451),
-    NAME_FUNC_OFFSET(25823, glWindowPos2sv, glWindowPos2sv, NULL, 451),
-    NAME_FUNC_OFFSET(25842, glWindowPos3d, glWindowPos3d, NULL, 452),
-    NAME_FUNC_OFFSET(25859, glWindowPos3d, glWindowPos3d, NULL, 452),
-    NAME_FUNC_OFFSET(25877, glWindowPos3dv, glWindowPos3dv, NULL, 453),
-    NAME_FUNC_OFFSET(25895, glWindowPos3dv, glWindowPos3dv, NULL, 453),
-    NAME_FUNC_OFFSET(25914, glWindowPos3f, glWindowPos3f, NULL, 454),
-    NAME_FUNC_OFFSET(25931, glWindowPos3f, glWindowPos3f, NULL, 454),
-    NAME_FUNC_OFFSET(25949, glWindowPos3fv, glWindowPos3fv, NULL, 455),
-    NAME_FUNC_OFFSET(25967, glWindowPos3fv, glWindowPos3fv, NULL, 455),
-    NAME_FUNC_OFFSET(25986, glWindowPos3i, glWindowPos3i, NULL, 456),
-    NAME_FUNC_OFFSET(26003, glWindowPos3i, glWindowPos3i, NULL, 456),
-    NAME_FUNC_OFFSET(26021, glWindowPos3iv, glWindowPos3iv, NULL, 457),
-    NAME_FUNC_OFFSET(26039, glWindowPos3iv, glWindowPos3iv, NULL, 457),
-    NAME_FUNC_OFFSET(26058, glWindowPos3s, glWindowPos3s, NULL, 458),
-    NAME_FUNC_OFFSET(26075, glWindowPos3s, glWindowPos3s, NULL, 458),
-    NAME_FUNC_OFFSET(26093, glWindowPos3sv, glWindowPos3sv, NULL, 459),
-    NAME_FUNC_OFFSET(26111, glWindowPos3sv, glWindowPos3sv, NULL, 459),
-    NAME_FUNC_OFFSET(26130, glBeginQuery, glBeginQuery, NULL, 460),
-    NAME_FUNC_OFFSET(26146, glBindBuffer, glBindBuffer, NULL, 461),
-    NAME_FUNC_OFFSET(26162, glBufferData, glBufferData, NULL, 462),
-    NAME_FUNC_OFFSET(26178, glBufferSubData, glBufferSubData, NULL, 463),
-    NAME_FUNC_OFFSET(26197, glDeleteBuffers, glDeleteBuffers, NULL, 464),
-    NAME_FUNC_OFFSET(26216, glDeleteQueries, glDeleteQueries, NULL, 465),
-    NAME_FUNC_OFFSET(26235, glEndQuery, glEndQuery, NULL, 466),
-    NAME_FUNC_OFFSET(26249, glGenBuffers, glGenBuffers, NULL, 467),
-    NAME_FUNC_OFFSET(26265, glGenQueries, glGenQueries, NULL, 468),
-    NAME_FUNC_OFFSET(26281, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
-    NAME_FUNC_OFFSET(26307, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
-    NAME_FUNC_OFFSET(26330, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
-    NAME_FUNC_OFFSET(26353, glGetBufferSubData, glGetBufferSubData, NULL, 471),
-    NAME_FUNC_OFFSET(26375, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
-    NAME_FUNC_OFFSET(26397, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
-    NAME_FUNC_OFFSET(26420, glGetQueryiv, glGetQueryiv, NULL, 474),
-    NAME_FUNC_OFFSET(26436, glIsBuffer, glIsBuffer, NULL, 475),
-    NAME_FUNC_OFFSET(26450, glIsQuery, glIsQuery, NULL, 476),
-    NAME_FUNC_OFFSET(26463, glMapBuffer, glMapBuffer, NULL, 477),
-    NAME_FUNC_OFFSET(26478, glMapBuffer, glMapBuffer, NULL, 477),
-    NAME_FUNC_OFFSET(26493, glUnmapBuffer, glUnmapBuffer, NULL, 478),
-    NAME_FUNC_OFFSET(26510, glUnmapBuffer, glUnmapBuffer, NULL, 478),
-    NAME_FUNC_OFFSET(26527, glBindAttribLocation, glBindAttribLocation, NULL, 480),
-    NAME_FUNC_OFFSET(26551, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(26578, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(26605, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(26632, glCompileShader, glCompileShader, NULL, 482),
-    NAME_FUNC_OFFSET(26651, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
-    NAME_FUNC_OFFSET(26681, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(26698, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(26715, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(26731, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(26748, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
-    NAME_FUNC_OFFSET(26777, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
-    NAME_FUNC_OFFSET(26798, glGetActiveUniform, glGetActiveUniform, NULL, 492),
-    NAME_FUNC_OFFSET(26820, glGetAttribLocation, glGetAttribLocation, NULL, 494),
-    NAME_FUNC_OFFSET(26843, glGetShaderSource, glGetShaderSource, NULL, 498),
-    NAME_FUNC_OFFSET(26864, glGetUniformLocation, glGetUniformLocation, NULL, 500),
-    NAME_FUNC_OFFSET(26888, glGetUniformfv, glGetUniformfv, NULL, 501),
-    NAME_FUNC_OFFSET(26906, glGetUniformiv, glGetUniformiv, NULL, 502),
-    NAME_FUNC_OFFSET(26924, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
-    NAME_FUNC_OFFSET(26953, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
-    NAME_FUNC_OFFSET(26981, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
-    NAME_FUNC_OFFSET(27004, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
-    NAME_FUNC_OFFSET(27027, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
-    NAME_FUNC_OFFSET(27050, glLinkProgram, glLinkProgram, NULL, 509),
-    NAME_FUNC_OFFSET(27067, glShaderSource, glShaderSource, NULL, 510),
-    NAME_FUNC_OFFSET(27085, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
-    NAME_FUNC_OFFSET(27108, glUniform1f, glUniform1f, NULL, 514),
-    NAME_FUNC_OFFSET(27123, glUniform1fv, glUniform1fv, NULL, 515),
-    NAME_FUNC_OFFSET(27139, glUniform1i, glUniform1i, NULL, 516),
-    NAME_FUNC_OFFSET(27154, glUniform1iv, glUniform1iv, NULL, 517),
-    NAME_FUNC_OFFSET(27170, glUniform2f, glUniform2f, NULL, 518),
-    NAME_FUNC_OFFSET(27185, glUniform2fv, glUniform2fv, NULL, 519),
-    NAME_FUNC_OFFSET(27201, glUniform2i, glUniform2i, NULL, 520),
-    NAME_FUNC_OFFSET(27216, glUniform2iv, glUniform2iv, NULL, 521),
-    NAME_FUNC_OFFSET(27232, glUniform3f, glUniform3f, NULL, 522),
-    NAME_FUNC_OFFSET(27247, glUniform3fv, glUniform3fv, NULL, 523),
-    NAME_FUNC_OFFSET(27263, glUniform3i, glUniform3i, NULL, 524),
-    NAME_FUNC_OFFSET(27278, glUniform3iv, glUniform3iv, NULL, 525),
-    NAME_FUNC_OFFSET(27294, glUniform4f, glUniform4f, NULL, 526),
-    NAME_FUNC_OFFSET(27309, glUniform4fv, glUniform4fv, NULL, 527),
-    NAME_FUNC_OFFSET(27325, glUniform4i, glUniform4i, NULL, 528),
-    NAME_FUNC_OFFSET(27340, glUniform4iv, glUniform4iv, NULL, 529),
-    NAME_FUNC_OFFSET(27356, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
-    NAME_FUNC_OFFSET(27378, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
-    NAME_FUNC_OFFSET(27400, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
-    NAME_FUNC_OFFSET(27422, glUseProgram, glUseProgram, NULL, 533),
-    NAME_FUNC_OFFSET(27444, glValidateProgram, glValidateProgram, NULL, 534),
-    NAME_FUNC_OFFSET(27465, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
-    NAME_FUNC_OFFSET(27485, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
-    NAME_FUNC_OFFSET(27506, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
-    NAME_FUNC_OFFSET(27526, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
-    NAME_FUNC_OFFSET(27547, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
-    NAME_FUNC_OFFSET(27567, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
-    NAME_FUNC_OFFSET(27588, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
-    NAME_FUNC_OFFSET(27608, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
-    NAME_FUNC_OFFSET(27629, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
-    NAME_FUNC_OFFSET(27649, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
-    NAME_FUNC_OFFSET(27670, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
-    NAME_FUNC_OFFSET(27690, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
-    NAME_FUNC_OFFSET(27711, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
-    NAME_FUNC_OFFSET(27733, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
-    NAME_FUNC_OFFSET(27755, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
-    NAME_FUNC_OFFSET(27777, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
-    NAME_FUNC_OFFSET(27799, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
-    NAME_FUNC_OFFSET(27822, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
-    NAME_FUNC_OFFSET(27845, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
-    NAME_FUNC_OFFSET(27868, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
-    NAME_FUNC_OFFSET(27889, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
-    NAME_FUNC_OFFSET(27909, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
-    NAME_FUNC_OFFSET(27930, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
-    NAME_FUNC_OFFSET(27951, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
-    NAME_FUNC_OFFSET(27971, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
-    NAME_FUNC_OFFSET(27992, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
-    NAME_FUNC_OFFSET(28014, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
-    NAME_FUNC_OFFSET(28036, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
-    NAME_FUNC_OFFSET(28058, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
-    NAME_FUNC_OFFSET(28083, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
-    NAME_FUNC_OFFSET(28110, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
-    NAME_FUNC_OFFSET(28138, glBindBufferBase, glBindBufferBase, NULL, 572),
-    NAME_FUNC_OFFSET(28158, glBindBufferRange, glBindBufferRange, NULL, 573),
-    NAME_FUNC_OFFSET(28179, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
-    NAME_FUNC_OFFSET(28205, glClampColor, glClampColor, NULL, 575),
-    NAME_FUNC_OFFSET(28221, glColorMaski, glColorMaski, NULL, 580),
-    NAME_FUNC_OFFSET(28243, glDisablei, glDisablei, NULL, 581),
-    NAME_FUNC_OFFSET(28263, glEnablei, glEnablei, NULL, 582),
-    NAME_FUNC_OFFSET(28282, glEndConditionalRender, glEndConditionalRender, NULL, 583),
-    NAME_FUNC_OFFSET(28307, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
-    NAME_FUNC_OFFSET(28333, glGetBooleani_v, glGetBooleani_v, NULL, 585),
-    NAME_FUNC_OFFSET(28357, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
-    NAME_FUNC_OFFSET(28382, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
-    NAME_FUNC_OFFSET(28406, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
-    NAME_FUNC_OFFSET(28430, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
-    NAME_FUNC_OFFSET(28455, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
-    NAME_FUNC_OFFSET(28488, glGetUniformuiv, glGetUniformuiv, NULL, 592),
-    NAME_FUNC_OFFSET(28507, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
-    NAME_FUNC_OFFSET(28531, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
-    NAME_FUNC_OFFSET(28556, glIsEnabledi, glIsEnabledi, NULL, 595),
-    NAME_FUNC_OFFSET(28578, glTexParameterIiv, glTexParameterIiv, NULL, 596),
-    NAME_FUNC_OFFSET(28599, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
-    NAME_FUNC_OFFSET(28621, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
-    NAME_FUNC_OFFSET(28652, glUniform1ui, glUniform1ui, NULL, 599),
-    NAME_FUNC_OFFSET(28668, glUniform1uiv, glUniform1uiv, NULL, 600),
-    NAME_FUNC_OFFSET(28685, glUniform2ui, glUniform2ui, NULL, 601),
-    NAME_FUNC_OFFSET(28701, glUniform2uiv, glUniform2uiv, NULL, 602),
-    NAME_FUNC_OFFSET(28718, glUniform3ui, glUniform3ui, NULL, 603),
-    NAME_FUNC_OFFSET(28734, glUniform3uiv, glUniform3uiv, NULL, 604),
-    NAME_FUNC_OFFSET(28751, glUniform4ui, glUniform4ui, NULL, 605),
-    NAME_FUNC_OFFSET(28767, glUniform4uiv, glUniform4uiv, NULL, 606),
-    NAME_FUNC_OFFSET(28784, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
-    NAME_FUNC_OFFSET(28806, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
-    NAME_FUNC_OFFSET(28829, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
-    NAME_FUNC_OFFSET(28851, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
-    NAME_FUNC_OFFSET(28873, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
-    NAME_FUNC_OFFSET(28896, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
-    NAME_FUNC_OFFSET(28919, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
-    NAME_FUNC_OFFSET(28945, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
-    NAME_FUNC_OFFSET(28971, glTexBuffer, glTexBuffer, NULL, 615),
-    NAME_FUNC_OFFSET(28986, glFramebufferTexture, glFramebufferTexture, NULL, 616),
-    NAME_FUNC_OFFSET(29010, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
-    NAME_FUNC_OFFSET(29035, glMinSampleShading, glMinSampleShading, NULL, 620),
-    NAME_FUNC_OFFSET(29057, glBindProgramARB, glBindProgramARB, NULL, 621),
-    NAME_FUNC_OFFSET(29073, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
-    NAME_FUNC_OFFSET(29092, glGenProgramsARB, glGenProgramsARB, NULL, 623),
-    NAME_FUNC_OFFSET(29108, glIsProgramARB, glIsProgramARB, NULL, 630),
-    NAME_FUNC_OFFSET(29122, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
-    NAME_FUNC_OFFSET(29145, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
-    NAME_FUNC_OFFSET(29169, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
-    NAME_FUNC_OFFSET(29192, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
-    NAME_FUNC_OFFSET(29216, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
-    NAME_FUNC_OFFSET(29233, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
-    NAME_FUNC_OFFSET(29251, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
-    NAME_FUNC_OFFSET(29268, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
-    NAME_FUNC_OFFSET(29286, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
-    NAME_FUNC_OFFSET(29303, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
-    NAME_FUNC_OFFSET(29321, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
-    NAME_FUNC_OFFSET(29338, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
-    NAME_FUNC_OFFSET(29356, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
-    NAME_FUNC_OFFSET(29381, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
-    NAME_FUNC_OFFSET(29403, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
-    NAME_FUNC_OFFSET(29430, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
-    NAME_FUNC_OFFSET(29454, glBindFramebuffer, glBindFramebuffer, NULL, 660),
-    NAME_FUNC_OFFSET(29475, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
-    NAME_FUNC_OFFSET(29497, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
-    NAME_FUNC_OFFSET(29518, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
-    NAME_FUNC_OFFSET(29546, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
-    NAME_FUNC_OFFSET(29574, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
-    NAME_FUNC_OFFSET(29598, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
-    NAME_FUNC_OFFSET(29622, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
-    NAME_FUNC_OFFSET(29647, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
-    NAME_FUNC_OFFSET(29672, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
-    NAME_FUNC_OFFSET(29701, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
-    NAME_FUNC_OFFSET(29730, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
-    NAME_FUNC_OFFSET(29756, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
-    NAME_FUNC_OFFSET(29782, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
-    NAME_FUNC_OFFSET(29808, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
-    NAME_FUNC_OFFSET(29834, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
-    NAME_FUNC_OFFSET(29860, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
-    NAME_FUNC_OFFSET(29889, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
-    NAME_FUNC_OFFSET(29918, glGenFramebuffers, glGenFramebuffers, NULL, 671),
-    NAME_FUNC_OFFSET(29939, glGenFramebuffers, glGenFramebuffers, NULL, 671),
-    NAME_FUNC_OFFSET(29960, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
-    NAME_FUNC_OFFSET(29982, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
-    NAME_FUNC_OFFSET(30004, glGenerateMipmap, glGenerateMipmap, NULL, 673),
-    NAME_FUNC_OFFSET(30024, glGenerateMipmap, glGenerateMipmap, NULL, 673),
-    NAME_FUNC_OFFSET(30044, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
-    NAME_FUNC_OFFSET(30085, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
-    NAME_FUNC_OFFSET(30126, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
-    NAME_FUNC_OFFSET(30158, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
-    NAME_FUNC_OFFSET(30190, glIsFramebuffer, glIsFramebuffer, NULL, 676),
-    NAME_FUNC_OFFSET(30209, glIsFramebuffer, glIsFramebuffer, NULL, 676),
-    NAME_FUNC_OFFSET(30228, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
-    NAME_FUNC_OFFSET(30248, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
-    NAME_FUNC_OFFSET(30268, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
-    NAME_FUNC_OFFSET(30293, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
-    NAME_FUNC_OFFSET(30318, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
-    NAME_FUNC_OFFSET(30354, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
-    NAME_FUNC_OFFSET(30382, glMapBufferRange, glMapBufferRange, NULL, 682),
-    NAME_FUNC_OFFSET(30402, glBindVertexArray, glBindVertexArray, NULL, 683),
-    NAME_FUNC_OFFSET(30423, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
-    NAME_FUNC_OFFSET(30449, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
-    NAME_FUNC_OFFSET(30473, glGenVertexArrays, glGenVertexArrays, NULL, 685),
-    NAME_FUNC_OFFSET(30494, glIsVertexArray, glIsVertexArray, NULL, 686),
-    NAME_FUNC_OFFSET(30515, glIsVertexArray, glIsVertexArray, NULL, 686),
-    NAME_FUNC_OFFSET(30534, glProvokingVertex, glProvokingVertex, NULL, 706),
-    NAME_FUNC_OFFSET(30555, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
-    NAME_FUNC_OFFSET(30589, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
-    NAME_FUNC_OFFSET(30614, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
-    NAME_FUNC_OFFSET(30640, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
-    NAME_FUNC_OFFSET(30657, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
-    NAME_FUNC_OFFSET(30687, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
-    NAME_FUNC_OFFSET(30708, glBlendFunciARB, glBlendFunciARB, NULL, 714),
-    NAME_FUNC_OFFSET(30730, glBlendFunciARB, glBlendFunciARB, NULL, 714),
-    NAME_FUNC_OFFSET(30743, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
-    NAME_FUNC_OFFSET(30767, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
-    NAME_FUNC_OFFSET(30792, glClearDepthf, glClearDepthf, NULL, 803),
-    NAME_FUNC_OFFSET(30809, glDepthRangef, glDepthRangef, NULL, 804),
-    NAME_FUNC_OFFSET(30826, glGetProgramBinary, glGetProgramBinary, NULL, 808),
-    NAME_FUNC_OFFSET(30848, glProgramBinary, glProgramBinary, NULL, 809),
-    NAME_FUNC_OFFSET(30867, glProgramParameteri, glProgramParameteri, NULL, 810),
-    NAME_FUNC_OFFSET(30890, glProgramParameteri, glProgramParameteri, NULL, 810),
-    NAME_FUNC_OFFSET(30913, gl_dispatch_stub_948, gl_dispatch_stub_948, NULL, 948),
-    NAME_FUNC_OFFSET(30929, gl_dispatch_stub_949, gl_dispatch_stub_949, NULL, 949),
-    NAME_FUNC_OFFSET(30948, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
-    NAME_FUNC_OFFSET(30973, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL, 958),
-    NAME_FUNC_OFFSET(30998, gl_dispatch_stub_959, gl_dispatch_stub_959, NULL, 959),
-    NAME_FUNC_OFFSET(31024, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
-    NAME_FUNC_OFFSET(31052, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
-    NAME_FUNC_OFFSET(31077, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
-    NAME_FUNC_OFFSET(31108, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
-    NAME_FUNC_OFFSET(31134, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
-    NAME_FUNC_OFFSET(31157, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
-    NAME_FUNC_OFFSET(31179, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
-    NAME_FUNC_OFFSET(31202, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
-    NAME_FUNC_OFFSET(31224, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
-    NAME_FUNC_OFFSET(31247, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
-    NAME_FUNC_OFFSET(31270, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
-    NAME_FUNC_OFFSET(31294, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
-    NAME_FUNC_OFFSET(31316, gl_dispatch_stub_977, gl_dispatch_stub_977, NULL, 977),
-    NAME_FUNC_OFFSET(31339, gl_dispatch_stub_978, gl_dispatch_stub_978, NULL, 978),
-    NAME_FUNC_OFFSET(31361, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
-    NAME_FUNC_OFFSET(31384, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
-    NAME_FUNC_OFFSET(31407, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
-    NAME_FUNC_OFFSET(31431, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
-    NAME_FUNC_OFFSET(31453, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
-    NAME_FUNC_OFFSET(31476, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
-    NAME_FUNC_OFFSET(31498, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
-    NAME_FUNC_OFFSET(31521, gl_dispatch_stub_988, gl_dispatch_stub_988, NULL, 988),
-    NAME_FUNC_OFFSET(31544, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
-    NAME_FUNC_OFFSET(31568, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
-    NAME_FUNC_OFFSET(31590, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
-    NAME_FUNC_OFFSET(31613, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
-    NAME_FUNC_OFFSET(31635, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
-    NAME_FUNC_OFFSET(31658, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
-    NAME_FUNC_OFFSET(31681, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
-    NAME_FUNC_OFFSET(31705, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
-    NAME_FUNC_OFFSET(31734, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
-    NAME_FUNC_OFFSET(31765, gl_dispatch_stub_1003, gl_dispatch_stub_1003, NULL, 1003),
-    NAME_FUNC_OFFSET(31796, gl_dispatch_stub_1005, gl_dispatch_stub_1005, NULL, 1005),
-    NAME_FUNC_OFFSET(31825, gl_dispatch_stub_1007, gl_dispatch_stub_1007, NULL, 1007),
-    NAME_FUNC_OFFSET(31856, gl_dispatch_stub_1009, gl_dispatch_stub_1009, NULL, 1009),
-    NAME_FUNC_OFFSET(31887, gl_dispatch_stub_1011, gl_dispatch_stub_1011, NULL, 1011),
-    NAME_FUNC_OFFSET(31916, gl_dispatch_stub_1013, gl_dispatch_stub_1013, NULL, 1013),
-    NAME_FUNC_OFFSET(31947, gl_dispatch_stub_1015, gl_dispatch_stub_1015, NULL, 1015),
-    NAME_FUNC_OFFSET(31978, gl_dispatch_stub_1017, gl_dispatch_stub_1017, NULL, 1017),
-    NAME_FUNC_OFFSET(32000, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
-    NAME_FUNC_OFFSET(32029, glDebugMessageCallback, glDebugMessageCallback, NULL, 1019),
-    NAME_FUNC_OFFSET(32055, glDebugMessageControl, glDebugMessageControl, NULL, 1020),
-    NAME_FUNC_OFFSET(32080, glDebugMessageInsert, glDebugMessageInsert, NULL, 1021),
-    NAME_FUNC_OFFSET(32104, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1022),
-    NAME_FUNC_OFFSET(32128, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1029),
-    NAME_FUNC_OFFSET(32147, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1030),
-    NAME_FUNC_OFFSET(32167, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1031),
-    NAME_FUNC_OFFSET(32187, glFogCoordfEXT, glFogCoordfEXT, NULL, 1032),
-    NAME_FUNC_OFFSET(32199, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1033),
-    NAME_FUNC_OFFSET(32212, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1136),
-    NAME_FUNC_OFFSET(32230, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1137),
-    NAME_FUNC_OFFSET(32249, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1138),
-    NAME_FUNC_OFFSET(32267, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1139),
-    NAME_FUNC_OFFSET(32286, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1140),
-    NAME_FUNC_OFFSET(32305, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1141),
-    NAME_FUNC_OFFSET(32325, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1142),
-    NAME_FUNC_OFFSET(32343, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1143),
-    NAME_FUNC_OFFSET(32362, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1144),
-    NAME_FUNC_OFFSET(32381, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1145),
-    NAME_FUNC_OFFSET(32401, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1146),
-    NAME_FUNC_OFFSET(32419, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1147),
-    NAME_FUNC_OFFSET(32438, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1148),
-    NAME_FUNC_OFFSET(32457, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1149),
-    NAME_FUNC_OFFSET(32477, glTextureBarrierNV, glTextureBarrierNV, NULL, 1170),
-    NAME_FUNC_OFFSET(32494, glAlphaFuncx, glAlphaFuncx, NULL, 1197),
-    NAME_FUNC_OFFSET(32510, glClearColorx, glClearColorx, NULL, 1198),
-    NAME_FUNC_OFFSET(32527, glClearDepthx, glClearDepthx, NULL, 1199),
-    NAME_FUNC_OFFSET(32544, glColor4x, glColor4x, NULL, 1200),
-    NAME_FUNC_OFFSET(32557, glDepthRangex, glDepthRangex, NULL, 1201),
-    NAME_FUNC_OFFSET(32574, glFogx, glFogx, NULL, 1202),
-    NAME_FUNC_OFFSET(32584, glFogxv, glFogxv, NULL, 1203),
-    NAME_FUNC_OFFSET(32595, glFrustumf, glFrustumf, NULL, 1204),
-    NAME_FUNC_OFFSET(32609, glFrustumx, glFrustumx, NULL, 1205),
-    NAME_FUNC_OFFSET(32623, glLightModelx, glLightModelx, NULL, 1206),
-    NAME_FUNC_OFFSET(32640, glLightModelxv, glLightModelxv, NULL, 1207),
-    NAME_FUNC_OFFSET(32658, glLightx, glLightx, NULL, 1208),
-    NAME_FUNC_OFFSET(32670, glLightxv, glLightxv, NULL, 1209),
-    NAME_FUNC_OFFSET(32683, glLineWidthx, glLineWidthx, NULL, 1210),
-    NAME_FUNC_OFFSET(32699, glLoadMatrixx, glLoadMatrixx, NULL, 1211),
-    NAME_FUNC_OFFSET(32716, glMaterialx, glMaterialx, NULL, 1212),
-    NAME_FUNC_OFFSET(32731, glMaterialxv, glMaterialxv, NULL, 1213),
-    NAME_FUNC_OFFSET(32747, glMultMatrixx, glMultMatrixx, NULL, 1214),
-    NAME_FUNC_OFFSET(32764, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1215),
-    NAME_FUNC_OFFSET(32785, glNormal3x, glNormal3x, NULL, 1216),
-    NAME_FUNC_OFFSET(32799, glOrthof, glOrthof, NULL, 1217),
-    NAME_FUNC_OFFSET(32811, glOrthox, glOrthox, NULL, 1218),
-    NAME_FUNC_OFFSET(32823, glPointSizex, glPointSizex, NULL, 1219),
-    NAME_FUNC_OFFSET(32839, glPolygonOffsetx, glPolygonOffsetx, NULL, 1220),
-    NAME_FUNC_OFFSET(32859, glRotatex, glRotatex, NULL, 1221),
-    NAME_FUNC_OFFSET(32872, glSampleCoveragex, glSampleCoveragex, NULL, 1222),
-    NAME_FUNC_OFFSET(32893, glScalex, glScalex, NULL, 1223),
-    NAME_FUNC_OFFSET(32905, glTexEnvx, glTexEnvx, NULL, 1224),
-    NAME_FUNC_OFFSET(32918, glTexEnvxv, glTexEnvxv, NULL, 1225),
-    NAME_FUNC_OFFSET(32932, glTexParameterx, glTexParameterx, NULL, 1226),
-    NAME_FUNC_OFFSET(32951, glTranslatex, glTranslatex, NULL, 1227),
-    NAME_FUNC_OFFSET(32967, glClipPlanef, glClipPlanef, NULL, 1228),
-    NAME_FUNC_OFFSET(32983, glClipPlanex, glClipPlanex, NULL, 1229),
-    NAME_FUNC_OFFSET(32999, glGetClipPlanef, glGetClipPlanef, NULL, 1230),
-    NAME_FUNC_OFFSET(33018, glGetClipPlanex, glGetClipPlanex, NULL, 1231),
-    NAME_FUNC_OFFSET(33037, glGetFixedv, glGetFixedv, NULL, 1232),
-    NAME_FUNC_OFFSET(33052, glGetLightxv, glGetLightxv, NULL, 1233),
-    NAME_FUNC_OFFSET(33068, glGetMaterialxv, glGetMaterialxv, NULL, 1234),
-    NAME_FUNC_OFFSET(33087, glGetTexEnvxv, glGetTexEnvxv, NULL, 1235),
-    NAME_FUNC_OFFSET(33104, glGetTexParameterxv, glGetTexParameterxv, NULL, 1236),
-    NAME_FUNC_OFFSET(33127, glPointParameterx, glPointParameterx, NULL, 1237),
-    NAME_FUNC_OFFSET(33148, glPointParameterxv, glPointParameterxv, NULL, 1238),
-    NAME_FUNC_OFFSET(33170, glTexParameterxv, glTexParameterxv, NULL, 1239),
+    NAME_FUNC_OFFSET(14597, glGetProgramInterfaceiv, glGetProgramInterfaceiv, NULL, 870),
+    NAME_FUNC_OFFSET(14621, glGetProgramResourceIndex, glGetProgramResourceIndex, NULL, 871),
+    NAME_FUNC_OFFSET(14647, glGetProgramResourceLocation, glGetProgramResourceLocation, NULL, 872),
+    NAME_FUNC_OFFSET(14676, glGetProgramResourceLocationIndex, glGetProgramResourceLocationIndex, NULL, 873),
+    NAME_FUNC_OFFSET(14710, glGetProgramResourceName, glGetProgramResourceName, NULL, 874),
+    NAME_FUNC_OFFSET(14735, glGetProgramResourceiv, glGetProgramResourceiv, NULL, 875),
+    NAME_FUNC_OFFSET(14758, glTexBufferRange, glTexBufferRange, NULL, 876),
+    NAME_FUNC_OFFSET(14775, glTexStorage2DMultisample, glTexStorage2DMultisample, NULL, 877),
+    NAME_FUNC_OFFSET(14801, glTexStorage3DMultisample, glTexStorage3DMultisample, NULL, 878),
+    NAME_FUNC_OFFSET(14827, glBufferStorage, glBufferStorage, NULL, 879),
+    NAME_FUNC_OFFSET(14843, glClearTexImage, glClearTexImage, NULL, 880),
+    NAME_FUNC_OFFSET(14859, glClearTexSubImage, glClearTexSubImage, NULL, 881),
+    NAME_FUNC_OFFSET(14878, glBindBuffersBase, glBindBuffersBase, NULL, 882),
+    NAME_FUNC_OFFSET(14896, glBindBuffersRange, glBindBuffersRange, NULL, 883),
+    NAME_FUNC_OFFSET(14915, glBindImageTextures, glBindImageTextures, NULL, 884),
+    NAME_FUNC_OFFSET(14935, glBindSamplers, glBindSamplers, NULL, 885),
+    NAME_FUNC_OFFSET(14950, glBindTextures, glBindTextures, NULL, 886),
+    NAME_FUNC_OFFSET(14965, glBindVertexBuffers, glBindVertexBuffers, NULL, 887),
+    NAME_FUNC_OFFSET(14985, glClipControl, glClipControl, NULL, 888),
+    NAME_FUNC_OFFSET(14999, glBindTextureUnit, glBindTextureUnit, NULL, 889),
+    NAME_FUNC_OFFSET(15017, glClearNamedBufferData, glClearNamedBufferData, NULL, 890),
+    NAME_FUNC_OFFSET(15040, glClearNamedBufferSubData, glClearNamedBufferSubData, NULL, 891),
+    NAME_FUNC_OFFSET(15066, glCompressedTextureSubImage1D, glCompressedTextureSubImage1D, NULL, 892),
+    NAME_FUNC_OFFSET(15096, glCompressedTextureSubImage2D, glCompressedTextureSubImage2D, NULL, 893),
+    NAME_FUNC_OFFSET(15126, glCompressedTextureSubImage3D, glCompressedTextureSubImage3D, NULL, 894),
+    NAME_FUNC_OFFSET(15156, glCopyNamedBufferSubData, glCopyNamedBufferSubData, NULL, 895),
+    NAME_FUNC_OFFSET(15181, glCopyTextureSubImage1D, glCopyTextureSubImage1D, NULL, 896),
+    NAME_FUNC_OFFSET(15205, glCopyTextureSubImage2D, glCopyTextureSubImage2D, NULL, 897),
+    NAME_FUNC_OFFSET(15229, glCopyTextureSubImage3D, glCopyTextureSubImage3D, NULL, 898),
+    NAME_FUNC_OFFSET(15253, glCreateBuffers, glCreateBuffers, NULL, 899),
+    NAME_FUNC_OFFSET(15269, glCreateProgramPipelines, glCreateProgramPipelines, NULL, 900),
+    NAME_FUNC_OFFSET(15294, glCreateQueries, glCreateQueries, NULL, 901),
+    NAME_FUNC_OFFSET(15310, glCreateRenderbuffers, glCreateRenderbuffers, NULL, 902),
+    NAME_FUNC_OFFSET(15332, glCreateSamplers, glCreateSamplers, NULL, 903),
+    NAME_FUNC_OFFSET(15349, glCreateTextures, glCreateTextures, NULL, 904),
+    NAME_FUNC_OFFSET(15366, glCreateTransformFeedbacks, glCreateTransformFeedbacks, NULL, 905),
+    NAME_FUNC_OFFSET(15393, glFlushMappedNamedBufferRange, glFlushMappedNamedBufferRange, NULL, 906),
+    NAME_FUNC_OFFSET(15423, glGenerateTextureMipmap, glGenerateTextureMipmap, NULL, 907),
+    NAME_FUNC_OFFSET(15447, glGetCompressedTextureImage, glGetCompressedTextureImage, NULL, 908),
+    NAME_FUNC_OFFSET(15475, glGetNamedBufferParameteri64v, glGetNamedBufferParameteri64v, NULL, 909),
+    NAME_FUNC_OFFSET(15505, glGetNamedBufferParameteriv, glGetNamedBufferParameteriv, NULL, 910),
+    NAME_FUNC_OFFSET(15533, glGetNamedBufferPointerv, glGetNamedBufferPointerv, NULL, 911),
+    NAME_FUNC_OFFSET(15558, glGetNamedBufferSubData, glGetNamedBufferSubData, NULL, 912),
+    NAME_FUNC_OFFSET(15582, glGetNamedRenderbufferParameteriv, glGetNamedRenderbufferParameteriv, NULL, 913),
+    NAME_FUNC_OFFSET(15616, glGetQueryBufferObjecti64v, glGetQueryBufferObjecti64v, NULL, 914),
+    NAME_FUNC_OFFSET(15643, glGetQueryBufferObjectiv, glGetQueryBufferObjectiv, NULL, 915),
+    NAME_FUNC_OFFSET(15668, glGetQueryBufferObjectui64v, glGetQueryBufferObjectui64v, NULL, 916),
+    NAME_FUNC_OFFSET(15696, glGetQueryBufferObjectuiv, glGetQueryBufferObjectuiv, NULL, 917),
+    NAME_FUNC_OFFSET(15722, glGetTextureImage, glGetTextureImage, NULL, 918),
+    NAME_FUNC_OFFSET(15740, glGetTextureLevelParameterfv, glGetTextureLevelParameterfv, NULL, 919),
+    NAME_FUNC_OFFSET(15769, glGetTextureLevelParameteriv, glGetTextureLevelParameteriv, NULL, 920),
+    NAME_FUNC_OFFSET(15798, glGetTextureParameterIiv, glGetTextureParameterIiv, NULL, 921),
+    NAME_FUNC_OFFSET(15823, glGetTextureParameterIuiv, glGetTextureParameterIuiv, NULL, 922),
+    NAME_FUNC_OFFSET(15849, glGetTextureParameterfv, glGetTextureParameterfv, NULL, 923),
+    NAME_FUNC_OFFSET(15873, glGetTextureParameteriv, glGetTextureParameteriv, NULL, 924),
+    NAME_FUNC_OFFSET(15897, glGetTransformFeedbacki64_v, glGetTransformFeedbacki64_v, NULL, 925),
+    NAME_FUNC_OFFSET(15925, glGetTransformFeedbacki_v, glGetTransformFeedbacki_v, NULL, 926),
+    NAME_FUNC_OFFSET(15951, glGetTransformFeedbackiv, glGetTransformFeedbackiv, NULL, 927),
+    NAME_FUNC_OFFSET(15976, glMapNamedBuffer, glMapNamedBuffer, NULL, 928),
+    NAME_FUNC_OFFSET(15993, glMapNamedBufferRange, glMapNamedBufferRange, NULL, 929),
+    NAME_FUNC_OFFSET(16015, glNamedBufferData, glNamedBufferData, NULL, 930),
+    NAME_FUNC_OFFSET(16033, glNamedBufferStorage, glNamedBufferStorage, NULL, 931),
+    NAME_FUNC_OFFSET(16054, glNamedBufferSubData, glNamedBufferSubData, NULL, 932),
+    NAME_FUNC_OFFSET(16075, glNamedRenderbufferStorage, glNamedRenderbufferStorage, NULL, 933),
+    NAME_FUNC_OFFSET(16102, glNamedRenderbufferStorageMultisample, glNamedRenderbufferStorageMultisample, NULL, 934),
+    NAME_FUNC_OFFSET(16140, glTextureBuffer, glTextureBuffer, NULL, 935),
+    NAME_FUNC_OFFSET(16156, glTextureBufferRange, glTextureBufferRange, NULL, 936),
+    NAME_FUNC_OFFSET(16177, glTextureParameterIiv, glTextureParameterIiv, NULL, 937),
+    NAME_FUNC_OFFSET(16199, glTextureParameterIuiv, glTextureParameterIuiv, NULL, 938),
+    NAME_FUNC_OFFSET(16222, glTextureParameterf, glTextureParameterf, NULL, 939),
+    NAME_FUNC_OFFSET(16242, glTextureParameterfv, glTextureParameterfv, NULL, 940),
+    NAME_FUNC_OFFSET(16263, glTextureParameteri, glTextureParameteri, NULL, 941),
+    NAME_FUNC_OFFSET(16283, glTextureParameteriv, glTextureParameteriv, NULL, 942),
+    NAME_FUNC_OFFSET(16304, glTextureStorage1D, glTextureStorage1D, NULL, 943),
+    NAME_FUNC_OFFSET(16323, glTextureStorage2D, glTextureStorage2D, NULL, 944),
+    NAME_FUNC_OFFSET(16342, glTextureStorage2DMultisample, glTextureStorage2DMultisample, NULL, 945),
+    NAME_FUNC_OFFSET(16372, glTextureStorage3D, glTextureStorage3D, NULL, 946),
+    NAME_FUNC_OFFSET(16391, glTextureStorage3DMultisample, glTextureStorage3DMultisample, NULL, 947),
+    NAME_FUNC_OFFSET(16421, glTextureSubImage1D, glTextureSubImage1D, NULL, 948),
+    NAME_FUNC_OFFSET(16441, glTextureSubImage2D, glTextureSubImage2D, NULL, 949),
+    NAME_FUNC_OFFSET(16461, glTextureSubImage3D, glTextureSubImage3D, NULL, 950),
+    NAME_FUNC_OFFSET(16481, glTransformFeedbackBufferBase, glTransformFeedbackBufferBase, NULL, 951),
+    NAME_FUNC_OFFSET(16511, glTransformFeedbackBufferRange, glTransformFeedbackBufferRange, NULL, 952),
+    NAME_FUNC_OFFSET(16542, glUnmapNamedBuffer, glUnmapNamedBuffer, NULL, 953),
+    NAME_FUNC_OFFSET(16561, glInvalidateBufferData, glInvalidateBufferData, NULL, 954),
+    NAME_FUNC_OFFSET(16584, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 955),
+    NAME_FUNC_OFFSET(16610, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 956),
+    NAME_FUNC_OFFSET(16634, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 957),
+    NAME_FUNC_OFFSET(16661, glInvalidateTexImage, glInvalidateTexImage, NULL, 958),
+    NAME_FUNC_OFFSET(16682, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 959),
+    NAME_FUNC_OFFSET(16706, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 960),
+    NAME_FUNC_OFFSET(16725, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
+    NAME_FUNC_OFFSET(16739, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
+    NAME_FUNC_OFFSET(16754, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
+    NAME_FUNC_OFFSET(16768, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
+    NAME_FUNC_OFFSET(16783, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
+    NAME_FUNC_OFFSET(16797, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
+    NAME_FUNC_OFFSET(16812, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL, 967),
+    NAME_FUNC_OFFSET(16826, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
+    NAME_FUNC_OFFSET(16841, glPointSizePointerOES, glPointSizePointerOES, NULL, 969),
+    NAME_FUNC_OFFSET(16863, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
+    NAME_FUNC_OFFSET(16881, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
+    NAME_FUNC_OFFSET(16898, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+    NAME_FUNC_OFFSET(16918, glColorPointerEXT, glColorPointerEXT, NULL, 973),
+    NAME_FUNC_OFFSET(16936, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 974),
+    NAME_FUNC_OFFSET(16957, glIndexPointerEXT, glIndexPointerEXT, NULL, 975),
+    NAME_FUNC_OFFSET(16975, glNormalPointerEXT, glNormalPointerEXT, NULL, 976),
+    NAME_FUNC_OFFSET(16994, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 977),
+    NAME_FUNC_OFFSET(17015, glVertexPointerEXT, glVertexPointerEXT, NULL, 978),
+    NAME_FUNC_OFFSET(17034, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
+    NAME_FUNC_OFFSET(17058, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
+    NAME_FUNC_OFFSET(17080, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
+    NAME_FUNC_OFFSET(17102, gl_dispatch_stub_982, gl_dispatch_stub_982, NULL, 982),
+    NAME_FUNC_OFFSET(17125, gl_dispatch_stub_983, gl_dispatch_stub_983, NULL, 983),
+    NAME_FUNC_OFFSET(17150, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
+    NAME_FUNC_OFFSET(17172, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
+    NAME_FUNC_OFFSET(17200, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
+    NAME_FUNC_OFFSET(17223, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
+    NAME_FUNC_OFFSET(17243, glLockArraysEXT, glLockArraysEXT, NULL, 988),
+    NAME_FUNC_OFFSET(17259, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
+    NAME_FUNC_OFFSET(17278, gl_dispatch_stub_990, gl_dispatch_stub_990, NULL, 990),
+    NAME_FUNC_OFFSET(17298, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
+    NAME_FUNC_OFFSET(17317, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
+    NAME_FUNC_OFFSET(17337, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
+    NAME_FUNC_OFFSET(17356, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
+    NAME_FUNC_OFFSET(17376, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
+    NAME_FUNC_OFFSET(17396, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
+    NAME_FUNC_OFFSET(17417, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
+    NAME_FUNC_OFFSET(17436, gl_dispatch_stub_998, gl_dispatch_stub_998, NULL, 998),
+    NAME_FUNC_OFFSET(17456, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
+    NAME_FUNC_OFFSET(17475, gl_dispatch_stub_1000, gl_dispatch_stub_1000, NULL, 1000),
+    NAME_FUNC_OFFSET(17495, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
+    NAME_FUNC_OFFSET(17514, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
+    NAME_FUNC_OFFSET(17534, gl_dispatch_stub_1003, gl_dispatch_stub_1003, NULL, 1003),
+    NAME_FUNC_OFFSET(17554, gl_dispatch_stub_1004, gl_dispatch_stub_1004, NULL, 1004),
+    NAME_FUNC_OFFSET(17575, gl_dispatch_stub_1005, gl_dispatch_stub_1005, NULL, 1005),
+    NAME_FUNC_OFFSET(17594, gl_dispatch_stub_1006, gl_dispatch_stub_1006, NULL, 1006),
+    NAME_FUNC_OFFSET(17614, gl_dispatch_stub_1007, gl_dispatch_stub_1007, NULL, 1007),
+    NAME_FUNC_OFFSET(17633, gl_dispatch_stub_1008, gl_dispatch_stub_1008, NULL, 1008),
+    NAME_FUNC_OFFSET(17653, gl_dispatch_stub_1009, gl_dispatch_stub_1009, NULL, 1009),
+    NAME_FUNC_OFFSET(17672, gl_dispatch_stub_1010, gl_dispatch_stub_1010, NULL, 1010),
+    NAME_FUNC_OFFSET(17692, gl_dispatch_stub_1011, gl_dispatch_stub_1011, NULL, 1011),
+    NAME_FUNC_OFFSET(17712, gl_dispatch_stub_1012, gl_dispatch_stub_1012, NULL, 1012),
+    NAME_FUNC_OFFSET(17733, gl_dispatch_stub_1013, gl_dispatch_stub_1013, NULL, 1013),
+    NAME_FUNC_OFFSET(17752, gl_dispatch_stub_1014, gl_dispatch_stub_1014, NULL, 1014),
+    NAME_FUNC_OFFSET(17772, gl_dispatch_stub_1015, gl_dispatch_stub_1015, NULL, 1015),
+    NAME_FUNC_OFFSET(17791, gl_dispatch_stub_1016, gl_dispatch_stub_1016, NULL, 1016),
+    NAME_FUNC_OFFSET(17811, gl_dispatch_stub_1017, gl_dispatch_stub_1017, NULL, 1017),
+    NAME_FUNC_OFFSET(17830, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
+    NAME_FUNC_OFFSET(17850, gl_dispatch_stub_1019, gl_dispatch_stub_1019, NULL, 1019),
+    NAME_FUNC_OFFSET(17870, gl_dispatch_stub_1020, gl_dispatch_stub_1020, NULL, 1020),
+    NAME_FUNC_OFFSET(17891, gl_dispatch_stub_1021, gl_dispatch_stub_1021, NULL, 1021),
+    NAME_FUNC_OFFSET(17917, gl_dispatch_stub_1022, gl_dispatch_stub_1022, NULL, 1022),
+    NAME_FUNC_OFFSET(17943, gl_dispatch_stub_1023, gl_dispatch_stub_1023, NULL, 1023),
+    NAME_FUNC_OFFSET(17971, gl_dispatch_stub_1024, gl_dispatch_stub_1024, NULL, 1024),
+    NAME_FUNC_OFFSET(17999, gl_dispatch_stub_1025, gl_dispatch_stub_1025, NULL, 1025),
+    NAME_FUNC_OFFSET(18027, gl_dispatch_stub_1026, gl_dispatch_stub_1026, NULL, 1026),
+    NAME_FUNC_OFFSET(18055, gl_dispatch_stub_1027, gl_dispatch_stub_1027, NULL, 1027),
+    NAME_FUNC_OFFSET(18081, gl_dispatch_stub_1028, gl_dispatch_stub_1028, NULL, 1028),
+    NAME_FUNC_OFFSET(18107, gl_dispatch_stub_1029, gl_dispatch_stub_1029, NULL, 1029),
+    NAME_FUNC_OFFSET(18135, gl_dispatch_stub_1030, gl_dispatch_stub_1030, NULL, 1030),
+    NAME_FUNC_OFFSET(18163, gl_dispatch_stub_1031, gl_dispatch_stub_1031, NULL, 1031),
+    NAME_FUNC_OFFSET(18191, gl_dispatch_stub_1032, gl_dispatch_stub_1032, NULL, 1032),
+    NAME_FUNC_OFFSET(18219, gl_dispatch_stub_1033, gl_dispatch_stub_1033, NULL, 1033),
+    NAME_FUNC_OFFSET(18245, gl_dispatch_stub_1034, gl_dispatch_stub_1034, NULL, 1034),
+    NAME_FUNC_OFFSET(18271, gl_dispatch_stub_1035, gl_dispatch_stub_1035, NULL, 1035),
+    NAME_FUNC_OFFSET(18299, gl_dispatch_stub_1036, gl_dispatch_stub_1036, NULL, 1036),
+    NAME_FUNC_OFFSET(18327, gl_dispatch_stub_1037, gl_dispatch_stub_1037, NULL, 1037),
+    NAME_FUNC_OFFSET(18355, gl_dispatch_stub_1038, gl_dispatch_stub_1038, NULL, 1038),
+    NAME_FUNC_OFFSET(18383, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 1039),
+    NAME_FUNC_OFFSET(18401, gl_dispatch_stub_1040, gl_dispatch_stub_1040, NULL, 1040),
+    NAME_FUNC_OFFSET(18420, gl_dispatch_stub_1041, gl_dispatch_stub_1041, NULL, 1041),
+    NAME_FUNC_OFFSET(18446, glDebugMessageCallback, glDebugMessageCallback, NULL, 1042),
+    NAME_FUNC_OFFSET(18469, glDebugMessageControl, glDebugMessageControl, NULL, 1043),
+    NAME_FUNC_OFFSET(18491, glDebugMessageInsert, glDebugMessageInsert, NULL, 1044),
+    NAME_FUNC_OFFSET(18512, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1045),
+    NAME_FUNC_OFFSET(18533, glGetObjectLabel, glGetObjectLabel, NULL, 1046),
+    NAME_FUNC_OFFSET(18550, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 1047),
+    NAME_FUNC_OFFSET(18570, glObjectLabel, glObjectLabel, NULL, 1048),
+    NAME_FUNC_OFFSET(18584, glObjectPtrLabel, glObjectPtrLabel, NULL, 1049),
+    NAME_FUNC_OFFSET(18601, glPopDebugGroup, glPopDebugGroup, NULL, 1050),
+    NAME_FUNC_OFFSET(18617, glPushDebugGroup, glPushDebugGroup, NULL, 1051),
+    NAME_FUNC_OFFSET(18634, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1052),
+    NAME_FUNC_OFFSET(18656, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1053),
+    NAME_FUNC_OFFSET(18679, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1054),
+    NAME_FUNC_OFFSET(18702, glFogCoordfEXT, glFogCoordfEXT, NULL, 1055),
+    NAME_FUNC_OFFSET(18717, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1056),
+    NAME_FUNC_OFFSET(18733, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 1057),
+    NAME_FUNC_OFFSET(18753, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 1058),
+    NAME_FUNC_OFFSET(18771, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 1059),
+    NAME_FUNC_OFFSET(18790, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 1060),
+    NAME_FUNC_OFFSET(18808, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 1061),
+    NAME_FUNC_OFFSET(18827, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 1062),
+    NAME_FUNC_OFFSET(18845, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 1063),
+    NAME_FUNC_OFFSET(18864, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 1064),
+    NAME_FUNC_OFFSET(18882, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 1065),
+    NAME_FUNC_OFFSET(18901, gl_dispatch_stub_1066, gl_dispatch_stub_1066, NULL, 1066),
+    NAME_FUNC_OFFSET(18926, gl_dispatch_stub_1067, gl_dispatch_stub_1067, NULL, 1067),
+    NAME_FUNC_OFFSET(18953, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 1068),
+    NAME_FUNC_OFFSET(18977, glExecuteProgramNV, glExecuteProgramNV, NULL, 1069),
+    NAME_FUNC_OFFSET(18996, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 1070),
+    NAME_FUNC_OFFSET(19022, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 1071),
+    NAME_FUNC_OFFSET(19048, glGetProgramStringNV, glGetProgramStringNV, NULL, 1072),
+    NAME_FUNC_OFFSET(19069, glGetProgramivNV, glGetProgramivNV, NULL, 1073),
+    NAME_FUNC_OFFSET(19086, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 1074),
+    NAME_FUNC_OFFSET(19107, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 1075),
+    NAME_FUNC_OFFSET(19129, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 1076),
+    NAME_FUNC_OFFSET(19151, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 1077),
+    NAME_FUNC_OFFSET(19173, glLoadProgramNV, glLoadProgramNV, NULL, 1078),
+    NAME_FUNC_OFFSET(19189, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 1079),
+    NAME_FUNC_OFFSET(19214, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 1080),
+    NAME_FUNC_OFFSET(19239, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 1081),
+    NAME_FUNC_OFFSET(19267, glTrackMatrixNV, glTrackMatrixNV, NULL, 1082),
+    NAME_FUNC_OFFSET(19283, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 1083),
+    NAME_FUNC_OFFSET(19302, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 1084),
+    NAME_FUNC_OFFSET(19322, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 1085),
+    NAME_FUNC_OFFSET(19341, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 1086),
+    NAME_FUNC_OFFSET(19361, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 1087),
+    NAME_FUNC_OFFSET(19380, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 1088),
+    NAME_FUNC_OFFSET(19400, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 1089),
+    NAME_FUNC_OFFSET(19419, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 1090),
+    NAME_FUNC_OFFSET(19439, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 1091),
+    NAME_FUNC_OFFSET(19458, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 1092),
+    NAME_FUNC_OFFSET(19478, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 1093),
+    NAME_FUNC_OFFSET(19497, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 1094),
+    NAME_FUNC_OFFSET(19517, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 1095),
+    NAME_FUNC_OFFSET(19536, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 1096),
+    NAME_FUNC_OFFSET(19556, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 1097),
+    NAME_FUNC_OFFSET(19575, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 1098),
+    NAME_FUNC_OFFSET(19595, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 1099),
+    NAME_FUNC_OFFSET(19614, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 1100),
+    NAME_FUNC_OFFSET(19634, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 1101),
+    NAME_FUNC_OFFSET(19653, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 1102),
+    NAME_FUNC_OFFSET(19673, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 1103),
+    NAME_FUNC_OFFSET(19692, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 1104),
+    NAME_FUNC_OFFSET(19712, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 1105),
+    NAME_FUNC_OFFSET(19731, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 1106),
+    NAME_FUNC_OFFSET(19751, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 1107),
+    NAME_FUNC_OFFSET(19771, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 1108),
+    NAME_FUNC_OFFSET(19792, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 1109),
+    NAME_FUNC_OFFSET(19816, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 1110),
+    NAME_FUNC_OFFSET(19837, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 1111),
+    NAME_FUNC_OFFSET(19858, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1112),
+    NAME_FUNC_OFFSET(19879, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1113),
+    NAME_FUNC_OFFSET(19900, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1114),
+    NAME_FUNC_OFFSET(19921, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1115),
+    NAME_FUNC_OFFSET(19942, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1116),
+    NAME_FUNC_OFFSET(19963, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1117),
+    NAME_FUNC_OFFSET(19984, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1118),
+    NAME_FUNC_OFFSET(20005, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1119),
+    NAME_FUNC_OFFSET(20026, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1120),
+    NAME_FUNC_OFFSET(20047, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1121),
+    NAME_FUNC_OFFSET(20068, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1122),
+    NAME_FUNC_OFFSET(20090, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1123),
+    NAME_FUNC_OFFSET(20117, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1124),
+    NAME_FUNC_OFFSET(20144, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1125),
+    NAME_FUNC_OFFSET(20168, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1126),
+    NAME_FUNC_OFFSET(20192, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1127),
+    NAME_FUNC_OFFSET(20214, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1128),
+    NAME_FUNC_OFFSET(20236, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1129),
+    NAME_FUNC_OFFSET(20258, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1130),
+    NAME_FUNC_OFFSET(20283, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1131),
+    NAME_FUNC_OFFSET(20307, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1132),
+    NAME_FUNC_OFFSET(20329, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1133),
+    NAME_FUNC_OFFSET(20351, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1134),
+    NAME_FUNC_OFFSET(20373, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1135),
+    NAME_FUNC_OFFSET(20399, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1136),
+    NAME_FUNC_OFFSET(20422, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1137),
+    NAME_FUNC_OFFSET(20446, glPassTexCoordATI, glPassTexCoordATI, NULL, 1138),
+    NAME_FUNC_OFFSET(20464, glSampleMapATI, glSampleMapATI, NULL, 1139),
+    NAME_FUNC_OFFSET(20479, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1140),
+    NAME_FUNC_OFFSET(20510, gl_dispatch_stub_1141, gl_dispatch_stub_1141, NULL, 1141),
+    NAME_FUNC_OFFSET(20533, gl_dispatch_stub_1142, gl_dispatch_stub_1142, NULL, 1142),
+    NAME_FUNC_OFFSET(20556, gl_dispatch_stub_1143, gl_dispatch_stub_1143, NULL, 1143),
+    NAME_FUNC_OFFSET(20579, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1144),
+    NAME_FUNC_OFFSET(20610, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1145),
+    NAME_FUNC_OFFSET(20641, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1146),
+    NAME_FUNC_OFFSET(20669, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1147),
+    NAME_FUNC_OFFSET(20698, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1148),
+    NAME_FUNC_OFFSET(20726, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1149),
+    NAME_FUNC_OFFSET(20755, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1150),
+    NAME_FUNC_OFFSET(20776, gl_dispatch_stub_1151, gl_dispatch_stub_1151, NULL, 1151),
+    NAME_FUNC_OFFSET(20793, gl_dispatch_stub_1152, gl_dispatch_stub_1152, NULL, 1152),
+    NAME_FUNC_OFFSET(20806, gl_dispatch_stub_1153, gl_dispatch_stub_1153, NULL, 1153),
+    NAME_FUNC_OFFSET(20820, gl_dispatch_stub_1154, gl_dispatch_stub_1154, NULL, 1154),
+    NAME_FUNC_OFFSET(20837, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1155),
+    NAME_FUNC_OFFSET(20858, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1156),
+    NAME_FUNC_OFFSET(20880, gl_dispatch_stub_1157, gl_dispatch_stub_1157, NULL, 1157),
+    NAME_FUNC_OFFSET(20904, gl_dispatch_stub_1158, gl_dispatch_stub_1158, NULL, 1158),
+    NAME_FUNC_OFFSET(20934, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1159),
+    NAME_FUNC_OFFSET(20955, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1160),
+    NAME_FUNC_OFFSET(20977, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1161),
+    NAME_FUNC_OFFSET(20998, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1162),
+    NAME_FUNC_OFFSET(21020, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1163),
+    NAME_FUNC_OFFSET(21042, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1164),
+    NAME_FUNC_OFFSET(21065, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1165),
+    NAME_FUNC_OFFSET(21086, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1166),
+    NAME_FUNC_OFFSET(21108, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1167),
+    NAME_FUNC_OFFSET(21130, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1168),
+    NAME_FUNC_OFFSET(21153, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1169),
+    NAME_FUNC_OFFSET(21174, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1170),
+    NAME_FUNC_OFFSET(21196, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1171),
+    NAME_FUNC_OFFSET(21218, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1172),
+    NAME_FUNC_OFFSET(21241, glClearColorIiEXT, glClearColorIiEXT, NULL, 1173),
+    NAME_FUNC_OFFSET(21259, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1174),
+    NAME_FUNC_OFFSET(21278, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1175),
+    NAME_FUNC_OFFSET(21300, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1176),
+    NAME_FUNC_OFFSET(21322, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1177),
+    NAME_FUNC_OFFSET(21346, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1178),
+    NAME_FUNC_OFFSET(21366, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1179),
+    NAME_FUNC_OFFSET(21387, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1180),
+    NAME_FUNC_OFFSET(21418, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1181),
+    NAME_FUNC_OFFSET(21449, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1182),
+    NAME_FUNC_OFFSET(21482, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1183),
+    NAME_FUNC_OFFSET(21510, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1184),
+    NAME_FUNC_OFFSET(21541, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1185),
+    NAME_FUNC_OFFSET(21567, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1186),
+    NAME_FUNC_OFFSET(21598, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1187),
+    NAME_FUNC_OFFSET(21626, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1188),
+    NAME_FUNC_OFFSET(21649, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1189),
+    NAME_FUNC_OFFSET(21674, glActiveProgramEXT, glActiveProgramEXT, NULL, 1190),
+    NAME_FUNC_OFFSET(21693, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1191),
+    NAME_FUNC_OFFSET(21718, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1192),
+    NAME_FUNC_OFFSET(21740, glTextureBarrierNV, glTextureBarrierNV, NULL, 1193),
+    NAME_FUNC_OFFSET(21759, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1194),
+    NAME_FUNC_OFFSET(21773, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1195),
+    NAME_FUNC_OFFSET(21795, glVDPAUInitNV, glVDPAUInitNV, NULL, 1196),
+    NAME_FUNC_OFFSET(21809, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1197),
+    NAME_FUNC_OFFSET(21828, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1198),
+    NAME_FUNC_OFFSET(21849, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1199),
+    NAME_FUNC_OFFSET(21880, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1200),
+    NAME_FUNC_OFFSET(21910, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1201),
+    NAME_FUNC_OFFSET(21933, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1202),
+    NAME_FUNC_OFFSET(21956, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1203),
+    NAME_FUNC_OFFSET(21983, gl_dispatch_stub_1204, gl_dispatch_stub_1204, NULL, 1204),
+    NAME_FUNC_OFFSET(22005, gl_dispatch_stub_1205, gl_dispatch_stub_1205, NULL, 1205),
+    NAME_FUNC_OFFSET(22028, gl_dispatch_stub_1206, gl_dispatch_stub_1206, NULL, 1206),
+    NAME_FUNC_OFFSET(22051, gl_dispatch_stub_1207, gl_dispatch_stub_1207, NULL, 1207),
+    NAME_FUNC_OFFSET(22071, gl_dispatch_stub_1208, gl_dispatch_stub_1208, NULL, 1208),
+    NAME_FUNC_OFFSET(22098, gl_dispatch_stub_1209, gl_dispatch_stub_1209, NULL, 1209),
+    NAME_FUNC_OFFSET(22124, gl_dispatch_stub_1210, gl_dispatch_stub_1210, NULL, 1210),
+    NAME_FUNC_OFFSET(22150, gl_dispatch_stub_1211, gl_dispatch_stub_1211, NULL, 1211),
+    NAME_FUNC_OFFSET(22174, gl_dispatch_stub_1212, gl_dispatch_stub_1212, NULL, 1212),
+    NAME_FUNC_OFFSET(22202, gl_dispatch_stub_1213, gl_dispatch_stub_1213, NULL, 1213),
+    NAME_FUNC_OFFSET(22226, glPolygonOffsetClampEXT, glPolygonOffsetClampEXT, NULL, 1214),
+    NAME_FUNC_OFFSET(22250, gl_dispatch_stub_1215, gl_dispatch_stub_1215, NULL, 1215),
+    NAME_FUNC_OFFSET(22275, gl_dispatch_stub_1216, gl_dispatch_stub_1216, NULL, 1216),
+    NAME_FUNC_OFFSET(22304, gl_dispatch_stub_1217, gl_dispatch_stub_1217, NULL, 1217),
+    NAME_FUNC_OFFSET(22335, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1218),
+    NAME_FUNC_OFFSET(22374, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1219),
+    NAME_FUNC_OFFSET(22403, glAlphaFuncx, glAlphaFuncx, NULL, 1220),
+    NAME_FUNC_OFFSET(22416, glClearColorx, glClearColorx, NULL, 1221),
+    NAME_FUNC_OFFSET(22430, glClearDepthx, glClearDepthx, NULL, 1222),
+    NAME_FUNC_OFFSET(22444, glColor4x, glColor4x, NULL, 1223),
+    NAME_FUNC_OFFSET(22454, glDepthRangex, glDepthRangex, NULL, 1224),
+    NAME_FUNC_OFFSET(22468, glFogx, glFogx, NULL, 1225),
+    NAME_FUNC_OFFSET(22475, glFogxv, glFogxv, NULL, 1226),
+    NAME_FUNC_OFFSET(22483, glFrustumf, glFrustumf, NULL, 1227),
+    NAME_FUNC_OFFSET(22494, glFrustumx, glFrustumx, NULL, 1228),
+    NAME_FUNC_OFFSET(22505, glLightModelx, glLightModelx, NULL, 1229),
+    NAME_FUNC_OFFSET(22519, glLightModelxv, glLightModelxv, NULL, 1230),
+    NAME_FUNC_OFFSET(22534, glLightx, glLightx, NULL, 1231),
+    NAME_FUNC_OFFSET(22543, glLightxv, glLightxv, NULL, 1232),
+    NAME_FUNC_OFFSET(22553, glLineWidthx, glLineWidthx, NULL, 1233),
+    NAME_FUNC_OFFSET(22566, glLoadMatrixx, glLoadMatrixx, NULL, 1234),
+    NAME_FUNC_OFFSET(22580, glMaterialx, glMaterialx, NULL, 1235),
+    NAME_FUNC_OFFSET(22592, glMaterialxv, glMaterialxv, NULL, 1236),
+    NAME_FUNC_OFFSET(22605, glMultMatrixx, glMultMatrixx, NULL, 1237),
+    NAME_FUNC_OFFSET(22619, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1238),
+    NAME_FUNC_OFFSET(22637, glNormal3x, glNormal3x, NULL, 1239),
+    NAME_FUNC_OFFSET(22648, glOrthof, glOrthof, NULL, 1240),
+    NAME_FUNC_OFFSET(22657, glOrthox, glOrthox, NULL, 1241),
+    NAME_FUNC_OFFSET(22666, glPointSizex, glPointSizex, NULL, 1242),
+    NAME_FUNC_OFFSET(22679, glPolygonOffsetx, glPolygonOffsetx, NULL, 1243),
+    NAME_FUNC_OFFSET(22696, glRotatex, glRotatex, NULL, 1244),
+    NAME_FUNC_OFFSET(22706, glSampleCoveragex, glSampleCoveragex, NULL, 1245),
+    NAME_FUNC_OFFSET(22724, glScalex, glScalex, NULL, 1246),
+    NAME_FUNC_OFFSET(22733, glTexEnvx, glTexEnvx, NULL, 1247),
+    NAME_FUNC_OFFSET(22743, glTexEnvxv, glTexEnvxv, NULL, 1248),
+    NAME_FUNC_OFFSET(22754, glTexParameterx, glTexParameterx, NULL, 1249),
+    NAME_FUNC_OFFSET(22770, glTranslatex, glTranslatex, NULL, 1250),
+    NAME_FUNC_OFFSET(22783, glClipPlanef, glClipPlanef, NULL, 1251),
+    NAME_FUNC_OFFSET(22796, glClipPlanex, glClipPlanex, NULL, 1252),
+    NAME_FUNC_OFFSET(22809, glGetClipPlanef, glGetClipPlanef, NULL, 1253),
+    NAME_FUNC_OFFSET(22825, glGetClipPlanex, glGetClipPlanex, NULL, 1254),
+    NAME_FUNC_OFFSET(22841, glGetFixedv, glGetFixedv, NULL, 1255),
+    NAME_FUNC_OFFSET(22853, glGetLightxv, glGetLightxv, NULL, 1256),
+    NAME_FUNC_OFFSET(22866, glGetMaterialxv, glGetMaterialxv, NULL, 1257),
+    NAME_FUNC_OFFSET(22882, glGetTexEnvxv, glGetTexEnvxv, NULL, 1258),
+    NAME_FUNC_OFFSET(22896, glGetTexParameterxv, glGetTexParameterxv, NULL, 1259),
+    NAME_FUNC_OFFSET(22916, glPointParameterx, glPointParameterx, NULL, 1260),
+    NAME_FUNC_OFFSET(22934, glPointParameterxv, glPointParameterxv, NULL, 1261),
+    NAME_FUNC_OFFSET(22953, glTexParameterxv, glTexParameterxv, NULL, 1262),
+    NAME_FUNC_OFFSET(22970, glTexGenf, glTexGenf, NULL, 190),
+    NAME_FUNC_OFFSET(22983, glTexGenfv, glTexGenfv, NULL, 191),
+    NAME_FUNC_OFFSET(22997, glTexGeni, glTexGeni, NULL, 192),
+    NAME_FUNC_OFFSET(23010, glTexGeniv, glTexGeniv, NULL, 193),
+    NAME_FUNC_OFFSET(23024, glReadBuffer, glReadBuffer, NULL, 254),
+    NAME_FUNC_OFFSET(23039, glGetTexGenfv, glGetTexGenfv, NULL, 279),
+    NAME_FUNC_OFFSET(23056, glGetTexGeniv, glGetTexGeniv, NULL, 280),
+    NAME_FUNC_OFFSET(23073, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(23091, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(23108, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(23124, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(23149, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(23169, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(23189, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(23212, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(23235, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(23255, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(23272, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(23289, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(23304, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(23328, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(23347, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(23366, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(23382, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(23401, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(23420, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(23443, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(23459, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(23475, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(23502, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(23529, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(23549, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(23568, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(23587, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(23617, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(23647, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(23677, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(23707, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(23726, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(23749, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(23774, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(23799, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(23826, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(23854, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(23881, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(23909, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(23938, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(23967, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(23993, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(24024, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(24055, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(24079, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(24102, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(24120, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(24149, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(24178, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(24193, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(24219, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(24245, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(24260, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(24272, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(24292, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(24309, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(24325, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(24341, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(24360, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(24379, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(24402, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(24425, glActiveTexture, glActiveTexture, NULL, 374),
+    NAME_FUNC_OFFSET(24444, glClientActiveTexture, glClientActiveTexture, NULL, 375),
+    NAME_FUNC_OFFSET(24469, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
+    NAME_FUNC_OFFSET(24490, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
+    NAME_FUNC_OFFSET(24512, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(24530, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(24549, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
+    NAME_FUNC_OFFSET(24570, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
+    NAME_FUNC_OFFSET(24592, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
+    NAME_FUNC_OFFSET(24613, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
+    NAME_FUNC_OFFSET(24635, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
+    NAME_FUNC_OFFSET(24656, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
+    NAME_FUNC_OFFSET(24678, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(24696, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(24715, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
+    NAME_FUNC_OFFSET(24736, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
+    NAME_FUNC_OFFSET(24758, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
+    NAME_FUNC_OFFSET(24779, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
+    NAME_FUNC_OFFSET(24801, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
+    NAME_FUNC_OFFSET(24822, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
+    NAME_FUNC_OFFSET(24844, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(24862, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(24881, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
+    NAME_FUNC_OFFSET(24902, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
+    NAME_FUNC_OFFSET(24924, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
+    NAME_FUNC_OFFSET(24945, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
+    NAME_FUNC_OFFSET(24967, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
+    NAME_FUNC_OFFSET(24988, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
+    NAME_FUNC_OFFSET(25010, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(25028, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(25047, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
+    NAME_FUNC_OFFSET(25068, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
+    NAME_FUNC_OFFSET(25090, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
+    NAME_FUNC_OFFSET(25111, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
+    NAME_FUNC_OFFSET(25133, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
+    NAME_FUNC_OFFSET(25159, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
+    NAME_FUNC_OFFSET(25185, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET(25211, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET(25237, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
+    NAME_FUNC_OFFSET(25266, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
+    NAME_FUNC_OFFSET(25295, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET(25324, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET(25353, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
+    NAME_FUNC_OFFSET(25380, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
+    NAME_FUNC_OFFSET(25406, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
+    NAME_FUNC_OFFSET(25432, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
+    NAME_FUNC_OFFSET(25458, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
+    NAME_FUNC_OFFSET(25484, glSampleCoverage, glSampleCoverage, NULL, 419),
+    NAME_FUNC_OFFSET(25504, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(25527, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(25551, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(25574, glFogCoordPointer, glFogCoordPointer, NULL, 421),
+    NAME_FUNC_OFFSET(25595, glFogCoordd, glFogCoordd, NULL, 422),
+    NAME_FUNC_OFFSET(25610, glFogCoorddv, glFogCoorddv, NULL, 423),
+    NAME_FUNC_OFFSET(25626, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
+    NAME_FUNC_OFFSET(25647, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(25668, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(25689, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(25711, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(25733, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(25755, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(25778, glPointParameteri, glPointParameteri, NULL, 427),
+    NAME_FUNC_OFFSET(25798, glPointParameteriv, glPointParameteriv, NULL, 428),
+    NAME_FUNC_OFFSET(25819, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
+    NAME_FUNC_OFFSET(25841, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
+    NAME_FUNC_OFFSET(25864, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
+    NAME_FUNC_OFFSET(25886, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
+    NAME_FUNC_OFFSET(25909, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
+    NAME_FUNC_OFFSET(25931, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
+    NAME_FUNC_OFFSET(25954, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
+    NAME_FUNC_OFFSET(25976, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
+    NAME_FUNC_OFFSET(25999, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
+    NAME_FUNC_OFFSET(26022, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
+    NAME_FUNC_OFFSET(26046, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
+    NAME_FUNC_OFFSET(26069, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
+    NAME_FUNC_OFFSET(26093, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
+    NAME_FUNC_OFFSET(26116, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
+    NAME_FUNC_OFFSET(26140, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
+    NAME_FUNC_OFFSET(26167, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET(26184, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET(26202, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET(26220, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET(26239, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET(26256, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET(26274, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET(26292, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET(26311, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET(26328, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET(26346, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET(26364, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET(26383, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET(26400, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET(26418, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET(26436, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET(26455, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET(26472, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET(26490, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET(26508, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET(26527, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET(26544, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET(26562, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET(26580, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET(26599, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET(26616, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET(26634, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET(26652, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET(26671, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET(26688, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET(26706, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET(26724, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET(26743, glBeginQuery, glBeginQuery, NULL, 460),
+    NAME_FUNC_OFFSET(26759, glBindBuffer, glBindBuffer, NULL, 461),
+    NAME_FUNC_OFFSET(26775, glBufferData, glBufferData, NULL, 462),
+    NAME_FUNC_OFFSET(26791, glBufferSubData, glBufferSubData, NULL, 463),
+    NAME_FUNC_OFFSET(26810, glDeleteBuffers, glDeleteBuffers, NULL, 464),
+    NAME_FUNC_OFFSET(26829, glDeleteQueries, glDeleteQueries, NULL, 465),
+    NAME_FUNC_OFFSET(26848, glEndQuery, glEndQuery, NULL, 466),
+    NAME_FUNC_OFFSET(26862, glGenBuffers, glGenBuffers, NULL, 467),
+    NAME_FUNC_OFFSET(26878, glGenQueries, glGenQueries, NULL, 468),
+    NAME_FUNC_OFFSET(26894, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
+    NAME_FUNC_OFFSET(26920, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET(26943, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET(26966, glGetBufferSubData, glGetBufferSubData, NULL, 471),
+    NAME_FUNC_OFFSET(26988, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
+    NAME_FUNC_OFFSET(27010, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
+    NAME_FUNC_OFFSET(27033, glGetQueryiv, glGetQueryiv, NULL, 474),
+    NAME_FUNC_OFFSET(27049, glIsBuffer, glIsBuffer, NULL, 475),
+    NAME_FUNC_OFFSET(27063, glIsQuery, glIsQuery, NULL, 476),
+    NAME_FUNC_OFFSET(27076, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET(27091, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET(27106, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET(27123, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET(27140, glBindAttribLocation, glBindAttribLocation, NULL, 480),
+    NAME_FUNC_OFFSET(27164, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(27191, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(27218, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(27245, glCompileShader, glCompileShader, NULL, 482),
+    NAME_FUNC_OFFSET(27264, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
+    NAME_FUNC_OFFSET(27294, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(27311, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(27328, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(27344, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(27361, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
+    NAME_FUNC_OFFSET(27390, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
+    NAME_FUNC_OFFSET(27411, glGetActiveUniform, glGetActiveUniform, NULL, 492),
+    NAME_FUNC_OFFSET(27433, glGetAttribLocation, glGetAttribLocation, NULL, 494),
+    NAME_FUNC_OFFSET(27456, glGetShaderSource, glGetShaderSource, NULL, 498),
+    NAME_FUNC_OFFSET(27477, glGetUniformLocation, glGetUniformLocation, NULL, 500),
+    NAME_FUNC_OFFSET(27501, glGetUniformfv, glGetUniformfv, NULL, 501),
+    NAME_FUNC_OFFSET(27519, glGetUniformiv, glGetUniformiv, NULL, 502),
+    NAME_FUNC_OFFSET(27537, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET(27566, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET(27594, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
+    NAME_FUNC_OFFSET(27617, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
+    NAME_FUNC_OFFSET(27640, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
+    NAME_FUNC_OFFSET(27663, glLinkProgram, glLinkProgram, NULL, 509),
+    NAME_FUNC_OFFSET(27680, glShaderSource, glShaderSource, NULL, 510),
+    NAME_FUNC_OFFSET(27698, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
+    NAME_FUNC_OFFSET(27721, glUniform1f, glUniform1f, NULL, 514),
+    NAME_FUNC_OFFSET(27736, glUniform1fv, glUniform1fv, NULL, 515),
+    NAME_FUNC_OFFSET(27752, glUniform1i, glUniform1i, NULL, 516),
+    NAME_FUNC_OFFSET(27767, glUniform1iv, glUniform1iv, NULL, 517),
+    NAME_FUNC_OFFSET(27783, glUniform2f, glUniform2f, NULL, 518),
+    NAME_FUNC_OFFSET(27798, glUniform2fv, glUniform2fv, NULL, 519),
+    NAME_FUNC_OFFSET(27814, glUniform2i, glUniform2i, NULL, 520),
+    NAME_FUNC_OFFSET(27829, glUniform2iv, glUniform2iv, NULL, 521),
+    NAME_FUNC_OFFSET(27845, glUniform3f, glUniform3f, NULL, 522),
+    NAME_FUNC_OFFSET(27860, glUniform3fv, glUniform3fv, NULL, 523),
+    NAME_FUNC_OFFSET(27876, glUniform3i, glUniform3i, NULL, 524),
+    NAME_FUNC_OFFSET(27891, glUniform3iv, glUniform3iv, NULL, 525),
+    NAME_FUNC_OFFSET(27907, glUniform4f, glUniform4f, NULL, 526),
+    NAME_FUNC_OFFSET(27922, glUniform4fv, glUniform4fv, NULL, 527),
+    NAME_FUNC_OFFSET(27938, glUniform4i, glUniform4i, NULL, 528),
+    NAME_FUNC_OFFSET(27953, glUniform4iv, glUniform4iv, NULL, 529),
+    NAME_FUNC_OFFSET(27969, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
+    NAME_FUNC_OFFSET(27991, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
+    NAME_FUNC_OFFSET(28013, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
+    NAME_FUNC_OFFSET(28035, glUseProgram, glUseProgram, NULL, 533),
+    NAME_FUNC_OFFSET(28057, glValidateProgram, glValidateProgram, NULL, 534),
+    NAME_FUNC_OFFSET(28078, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
+    NAME_FUNC_OFFSET(28098, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
+    NAME_FUNC_OFFSET(28119, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
+    NAME_FUNC_OFFSET(28139, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
+    NAME_FUNC_OFFSET(28160, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
+    NAME_FUNC_OFFSET(28180, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
+    NAME_FUNC_OFFSET(28201, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
+    NAME_FUNC_OFFSET(28221, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
+    NAME_FUNC_OFFSET(28242, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
+    NAME_FUNC_OFFSET(28262, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
+    NAME_FUNC_OFFSET(28283, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
+    NAME_FUNC_OFFSET(28303, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
+    NAME_FUNC_OFFSET(28324, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
+    NAME_FUNC_OFFSET(28346, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
+    NAME_FUNC_OFFSET(28368, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
+    NAME_FUNC_OFFSET(28390, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
+    NAME_FUNC_OFFSET(28412, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
+    NAME_FUNC_OFFSET(28435, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
+    NAME_FUNC_OFFSET(28458, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
+    NAME_FUNC_OFFSET(28481, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
+    NAME_FUNC_OFFSET(28502, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
+    NAME_FUNC_OFFSET(28522, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
+    NAME_FUNC_OFFSET(28543, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
+    NAME_FUNC_OFFSET(28564, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
+    NAME_FUNC_OFFSET(28584, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
+    NAME_FUNC_OFFSET(28605, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
+    NAME_FUNC_OFFSET(28627, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
+    NAME_FUNC_OFFSET(28649, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
+    NAME_FUNC_OFFSET(28671, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
+    NAME_FUNC_OFFSET(28696, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
+    NAME_FUNC_OFFSET(28723, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
+    NAME_FUNC_OFFSET(28751, glBindBufferBase, glBindBufferBase, NULL, 572),
+    NAME_FUNC_OFFSET(28771, glBindBufferRange, glBindBufferRange, NULL, 573),
+    NAME_FUNC_OFFSET(28792, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
+    NAME_FUNC_OFFSET(28818, glClampColor, glClampColor, NULL, 575),
+    NAME_FUNC_OFFSET(28834, glColorMaski, glColorMaski, NULL, 580),
+    NAME_FUNC_OFFSET(28856, glDisablei, glDisablei, NULL, 581),
+    NAME_FUNC_OFFSET(28876, glEnablei, glEnablei, NULL, 582),
+    NAME_FUNC_OFFSET(28895, glEndConditionalRender, glEndConditionalRender, NULL, 583),
+    NAME_FUNC_OFFSET(28920, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
+    NAME_FUNC_OFFSET(28946, glGetBooleani_v, glGetBooleani_v, NULL, 585),
+    NAME_FUNC_OFFSET(28970, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
+    NAME_FUNC_OFFSET(28995, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
+    NAME_FUNC_OFFSET(29019, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
+    NAME_FUNC_OFFSET(29043, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
+    NAME_FUNC_OFFSET(29068, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
+    NAME_FUNC_OFFSET(29101, glGetUniformuiv, glGetUniformuiv, NULL, 592),
+    NAME_FUNC_OFFSET(29120, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
+    NAME_FUNC_OFFSET(29144, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
+    NAME_FUNC_OFFSET(29169, glIsEnabledi, glIsEnabledi, NULL, 595),
+    NAME_FUNC_OFFSET(29191, glTexParameterIiv, glTexParameterIiv, NULL, 596),
+    NAME_FUNC_OFFSET(29212, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
+    NAME_FUNC_OFFSET(29234, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
+    NAME_FUNC_OFFSET(29265, glUniform1ui, glUniform1ui, NULL, 599),
+    NAME_FUNC_OFFSET(29281, glUniform1uiv, glUniform1uiv, NULL, 600),
+    NAME_FUNC_OFFSET(29298, glUniform2ui, glUniform2ui, NULL, 601),
+    NAME_FUNC_OFFSET(29314, glUniform2uiv, glUniform2uiv, NULL, 602),
+    NAME_FUNC_OFFSET(29331, glUniform3ui, glUniform3ui, NULL, 603),
+    NAME_FUNC_OFFSET(29347, glUniform3uiv, glUniform3uiv, NULL, 604),
+    NAME_FUNC_OFFSET(29364, glUniform4ui, glUniform4ui, NULL, 605),
+    NAME_FUNC_OFFSET(29380, glUniform4uiv, glUniform4uiv, NULL, 606),
+    NAME_FUNC_OFFSET(29397, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
+    NAME_FUNC_OFFSET(29419, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
+    NAME_FUNC_OFFSET(29442, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
+    NAME_FUNC_OFFSET(29464, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
+    NAME_FUNC_OFFSET(29486, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
+    NAME_FUNC_OFFSET(29509, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
+    NAME_FUNC_OFFSET(29532, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
+    NAME_FUNC_OFFSET(29558, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
+    NAME_FUNC_OFFSET(29584, glTexBuffer, glTexBuffer, NULL, 615),
+    NAME_FUNC_OFFSET(29599, glFramebufferTexture, glFramebufferTexture, NULL, 616),
+    NAME_FUNC_OFFSET(29623, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
+    NAME_FUNC_OFFSET(29648, glMinSampleShading, glMinSampleShading, NULL, 620),
+    NAME_FUNC_OFFSET(29670, glBindProgramARB, glBindProgramARB, NULL, 621),
+    NAME_FUNC_OFFSET(29686, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
+    NAME_FUNC_OFFSET(29705, glGenProgramsARB, glGenProgramsARB, NULL, 623),
+    NAME_FUNC_OFFSET(29721, glIsProgramARB, glIsProgramARB, NULL, 630),
+    NAME_FUNC_OFFSET(29735, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
+    NAME_FUNC_OFFSET(29758, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
+    NAME_FUNC_OFFSET(29782, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
+    NAME_FUNC_OFFSET(29805, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
+    NAME_FUNC_OFFSET(29829, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
+    NAME_FUNC_OFFSET(29846, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
+    NAME_FUNC_OFFSET(29864, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
+    NAME_FUNC_OFFSET(29881, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
+    NAME_FUNC_OFFSET(29899, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
+    NAME_FUNC_OFFSET(29916, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
+    NAME_FUNC_OFFSET(29934, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
+    NAME_FUNC_OFFSET(29951, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
+    NAME_FUNC_OFFSET(29969, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(29994, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(30016, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+    NAME_FUNC_OFFSET(30043, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+    NAME_FUNC_OFFSET(30067, glBindFramebuffer, glBindFramebuffer, NULL, 660),
+    NAME_FUNC_OFFSET(30088, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
+    NAME_FUNC_OFFSET(30110, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
+    NAME_FUNC_OFFSET(30131, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+    NAME_FUNC_OFFSET(30159, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+    NAME_FUNC_OFFSET(30187, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+    NAME_FUNC_OFFSET(30211, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+    NAME_FUNC_OFFSET(30235, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+    NAME_FUNC_OFFSET(30260, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+    NAME_FUNC_OFFSET(30285, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+    NAME_FUNC_OFFSET(30314, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+    NAME_FUNC_OFFSET(30343, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
+    NAME_FUNC_OFFSET(30369, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+    NAME_FUNC_OFFSET(30395, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+    NAME_FUNC_OFFSET(30421, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+    NAME_FUNC_OFFSET(30447, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+    NAME_FUNC_OFFSET(30473, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+    NAME_FUNC_OFFSET(30502, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+    NAME_FUNC_OFFSET(30531, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+    NAME_FUNC_OFFSET(30552, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+    NAME_FUNC_OFFSET(30573, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+    NAME_FUNC_OFFSET(30595, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+    NAME_FUNC_OFFSET(30617, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+    NAME_FUNC_OFFSET(30637, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+    NAME_FUNC_OFFSET(30657, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(30698, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(30739, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+    NAME_FUNC_OFFSET(30771, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+    NAME_FUNC_OFFSET(30803, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+    NAME_FUNC_OFFSET(30822, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+    NAME_FUNC_OFFSET(30841, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+    NAME_FUNC_OFFSET(30861, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+    NAME_FUNC_OFFSET(30881, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+    NAME_FUNC_OFFSET(30906, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+    NAME_FUNC_OFFSET(30931, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
+    NAME_FUNC_OFFSET(30967, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
+    NAME_FUNC_OFFSET(30995, glMapBufferRange, glMapBufferRange, NULL, 682),
+    NAME_FUNC_OFFSET(31015, glBindVertexArray, glBindVertexArray, NULL, 683),
+    NAME_FUNC_OFFSET(31036, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+    NAME_FUNC_OFFSET(31062, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+    NAME_FUNC_OFFSET(31086, glGenVertexArrays, glGenVertexArrays, NULL, 685),
+    NAME_FUNC_OFFSET(31107, glIsVertexArray, glIsVertexArray, NULL, 686),
+    NAME_FUNC_OFFSET(31128, glIsVertexArray, glIsVertexArray, NULL, 686),
+    NAME_FUNC_OFFSET(31147, glProvokingVertex, glProvokingVertex, NULL, 706),
+    NAME_FUNC_OFFSET(31168, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+    NAME_FUNC_OFFSET(31202, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+    NAME_FUNC_OFFSET(31227, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+    NAME_FUNC_OFFSET(31253, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+    NAME_FUNC_OFFSET(31270, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+    NAME_FUNC_OFFSET(31300, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+    NAME_FUNC_OFFSET(31321, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+    NAME_FUNC_OFFSET(31343, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+    NAME_FUNC_OFFSET(31356, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
+    NAME_FUNC_OFFSET(31380, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
+    NAME_FUNC_OFFSET(31405, glClearDepthf, glClearDepthf, NULL, 803),
+    NAME_FUNC_OFFSET(31422, glDepthRangef, glDepthRangef, NULL, 804),
+    NAME_FUNC_OFFSET(31439, glGetProgramBinary, glGetProgramBinary, NULL, 808),
+    NAME_FUNC_OFFSET(31461, glProgramBinary, glProgramBinary, NULL, 809),
+    NAME_FUNC_OFFSET(31480, glProgramParameteri, glProgramParameteri, NULL, 810),
+    NAME_FUNC_OFFSET(31503, glProgramParameteri, glProgramParameteri, NULL, 810),
+    NAME_FUNC_OFFSET(31526, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
+    NAME_FUNC_OFFSET(31542, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+    NAME_FUNC_OFFSET(31561, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
+    NAME_FUNC_OFFSET(31586, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
+    NAME_FUNC_OFFSET(31611, gl_dispatch_stub_982, gl_dispatch_stub_982, NULL, 982),
+    NAME_FUNC_OFFSET(31637, gl_dispatch_stub_983, gl_dispatch_stub_983, NULL, 983),
+    NAME_FUNC_OFFSET(31665, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
+    NAME_FUNC_OFFSET(31690, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
+    NAME_FUNC_OFFSET(31721, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
+    NAME_FUNC_OFFSET(31747, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
+    NAME_FUNC_OFFSET(31770, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
+    NAME_FUNC_OFFSET(31792, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
+    NAME_FUNC_OFFSET(31815, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
+    NAME_FUNC_OFFSET(31837, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
+    NAME_FUNC_OFFSET(31860, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
+    NAME_FUNC_OFFSET(31883, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
+    NAME_FUNC_OFFSET(31907, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
+    NAME_FUNC_OFFSET(31929, gl_dispatch_stub_1000, gl_dispatch_stub_1000, NULL, 1000),
+    NAME_FUNC_OFFSET(31952, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
+    NAME_FUNC_OFFSET(31974, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
+    NAME_FUNC_OFFSET(31997, gl_dispatch_stub_1003, gl_dispatch_stub_1003, NULL, 1003),
+    NAME_FUNC_OFFSET(32020, gl_dispatch_stub_1004, gl_dispatch_stub_1004, NULL, 1004),
+    NAME_FUNC_OFFSET(32044, gl_dispatch_stub_1007, gl_dispatch_stub_1007, NULL, 1007),
+    NAME_FUNC_OFFSET(32066, gl_dispatch_stub_1008, gl_dispatch_stub_1008, NULL, 1008),
+    NAME_FUNC_OFFSET(32089, gl_dispatch_stub_1009, gl_dispatch_stub_1009, NULL, 1009),
+    NAME_FUNC_OFFSET(32111, gl_dispatch_stub_1010, gl_dispatch_stub_1010, NULL, 1010),
+    NAME_FUNC_OFFSET(32134, gl_dispatch_stub_1011, gl_dispatch_stub_1011, NULL, 1011),
+    NAME_FUNC_OFFSET(32157, gl_dispatch_stub_1012, gl_dispatch_stub_1012, NULL, 1012),
+    NAME_FUNC_OFFSET(32181, gl_dispatch_stub_1015, gl_dispatch_stub_1015, NULL, 1015),
+    NAME_FUNC_OFFSET(32203, gl_dispatch_stub_1016, gl_dispatch_stub_1016, NULL, 1016),
+    NAME_FUNC_OFFSET(32226, gl_dispatch_stub_1017, gl_dispatch_stub_1017, NULL, 1017),
+    NAME_FUNC_OFFSET(32248, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
+    NAME_FUNC_OFFSET(32271, gl_dispatch_stub_1019, gl_dispatch_stub_1019, NULL, 1019),
+    NAME_FUNC_OFFSET(32294, gl_dispatch_stub_1020, gl_dispatch_stub_1020, NULL, 1020),
+    NAME_FUNC_OFFSET(32318, gl_dispatch_stub_1022, gl_dispatch_stub_1022, NULL, 1022),
+    NAME_FUNC_OFFSET(32347, gl_dispatch_stub_1024, gl_dispatch_stub_1024, NULL, 1024),
+    NAME_FUNC_OFFSET(32378, gl_dispatch_stub_1026, gl_dispatch_stub_1026, NULL, 1026),
+    NAME_FUNC_OFFSET(32409, gl_dispatch_stub_1028, gl_dispatch_stub_1028, NULL, 1028),
+    NAME_FUNC_OFFSET(32438, gl_dispatch_stub_1030, gl_dispatch_stub_1030, NULL, 1030),
+    NAME_FUNC_OFFSET(32469, gl_dispatch_stub_1032, gl_dispatch_stub_1032, NULL, 1032),
+    NAME_FUNC_OFFSET(32500, gl_dispatch_stub_1034, gl_dispatch_stub_1034, NULL, 1034),
+    NAME_FUNC_OFFSET(32529, gl_dispatch_stub_1036, gl_dispatch_stub_1036, NULL, 1036),
+    NAME_FUNC_OFFSET(32560, gl_dispatch_stub_1038, gl_dispatch_stub_1038, NULL, 1038),
+    NAME_FUNC_OFFSET(32591, gl_dispatch_stub_1040, gl_dispatch_stub_1040, NULL, 1040),
+    NAME_FUNC_OFFSET(32613, gl_dispatch_stub_1041, gl_dispatch_stub_1041, NULL, 1041),
+    NAME_FUNC_OFFSET(32642, glDebugMessageCallback, glDebugMessageCallback, NULL, 1042),
+    NAME_FUNC_OFFSET(32668, glDebugMessageControl, glDebugMessageControl, NULL, 1043),
+    NAME_FUNC_OFFSET(32693, glDebugMessageInsert, glDebugMessageInsert, NULL, 1044),
+    NAME_FUNC_OFFSET(32717, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 1045),
+    NAME_FUNC_OFFSET(32741, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 1052),
+    NAME_FUNC_OFFSET(32760, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 1053),
+    NAME_FUNC_OFFSET(32780, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 1054),
+    NAME_FUNC_OFFSET(32800, glFogCoordfEXT, glFogCoordfEXT, NULL, 1055),
+    NAME_FUNC_OFFSET(32812, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 1056),
+    NAME_FUNC_OFFSET(32825, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1159),
+    NAME_FUNC_OFFSET(32843, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1160),
+    NAME_FUNC_OFFSET(32862, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1161),
+    NAME_FUNC_OFFSET(32880, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1162),
+    NAME_FUNC_OFFSET(32899, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1163),
+    NAME_FUNC_OFFSET(32918, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1164),
+    NAME_FUNC_OFFSET(32938, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1165),
+    NAME_FUNC_OFFSET(32956, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1166),
+    NAME_FUNC_OFFSET(32975, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1167),
+    NAME_FUNC_OFFSET(32994, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1168),
+    NAME_FUNC_OFFSET(33014, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1169),
+    NAME_FUNC_OFFSET(33032, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1170),
+    NAME_FUNC_OFFSET(33051, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1171),
+    NAME_FUNC_OFFSET(33070, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1172),
+    NAME_FUNC_OFFSET(33090, glTextureBarrierNV, glTextureBarrierNV, NULL, 1193),
+    NAME_FUNC_OFFSET(33107, glAlphaFuncx, glAlphaFuncx, NULL, 1220),
+    NAME_FUNC_OFFSET(33123, glClearColorx, glClearColorx, NULL, 1221),
+    NAME_FUNC_OFFSET(33140, glClearDepthx, glClearDepthx, NULL, 1222),
+    NAME_FUNC_OFFSET(33157, glColor4x, glColor4x, NULL, 1223),
+    NAME_FUNC_OFFSET(33170, glDepthRangex, glDepthRangex, NULL, 1224),
+    NAME_FUNC_OFFSET(33187, glFogx, glFogx, NULL, 1225),
+    NAME_FUNC_OFFSET(33197, glFogxv, glFogxv, NULL, 1226),
+    NAME_FUNC_OFFSET(33208, glFrustumf, glFrustumf, NULL, 1227),
+    NAME_FUNC_OFFSET(33222, glFrustumx, glFrustumx, NULL, 1228),
+    NAME_FUNC_OFFSET(33236, glLightModelx, glLightModelx, NULL, 1229),
+    NAME_FUNC_OFFSET(33253, glLightModelxv, glLightModelxv, NULL, 1230),
+    NAME_FUNC_OFFSET(33271, glLightx, glLightx, NULL, 1231),
+    NAME_FUNC_OFFSET(33283, glLightxv, glLightxv, NULL, 1232),
+    NAME_FUNC_OFFSET(33296, glLineWidthx, glLineWidthx, NULL, 1233),
+    NAME_FUNC_OFFSET(33312, glLoadMatrixx, glLoadMatrixx, NULL, 1234),
+    NAME_FUNC_OFFSET(33329, glMaterialx, glMaterialx, NULL, 1235),
+    NAME_FUNC_OFFSET(33344, glMaterialxv, glMaterialxv, NULL, 1236),
+    NAME_FUNC_OFFSET(33360, glMultMatrixx, glMultMatrixx, NULL, 1237),
+    NAME_FUNC_OFFSET(33377, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1238),
+    NAME_FUNC_OFFSET(33398, glNormal3x, glNormal3x, NULL, 1239),
+    NAME_FUNC_OFFSET(33412, glOrthof, glOrthof, NULL, 1240),
+    NAME_FUNC_OFFSET(33424, glOrthox, glOrthox, NULL, 1241),
+    NAME_FUNC_OFFSET(33436, glPointSizex, glPointSizex, NULL, 1242),
+    NAME_FUNC_OFFSET(33452, glPolygonOffsetx, glPolygonOffsetx, NULL, 1243),
+    NAME_FUNC_OFFSET(33472, glRotatex, glRotatex, NULL, 1244),
+    NAME_FUNC_OFFSET(33485, glSampleCoveragex, glSampleCoveragex, NULL, 1245),
+    NAME_FUNC_OFFSET(33506, glScalex, glScalex, NULL, 1246),
+    NAME_FUNC_OFFSET(33518, glTexEnvx, glTexEnvx, NULL, 1247),
+    NAME_FUNC_OFFSET(33531, glTexEnvxv, glTexEnvxv, NULL, 1248),
+    NAME_FUNC_OFFSET(33545, glTexParameterx, glTexParameterx, NULL, 1249),
+    NAME_FUNC_OFFSET(33564, glTranslatex, glTranslatex, NULL, 1250),
+    NAME_FUNC_OFFSET(33580, glClipPlanef, glClipPlanef, NULL, 1251),
+    NAME_FUNC_OFFSET(33596, glClipPlanex, glClipPlanex, NULL, 1252),
+    NAME_FUNC_OFFSET(33612, glGetClipPlanef, glGetClipPlanef, NULL, 1253),
+    NAME_FUNC_OFFSET(33631, glGetClipPlanex, glGetClipPlanex, NULL, 1254),
+    NAME_FUNC_OFFSET(33650, glGetFixedv, glGetFixedv, NULL, 1255),
+    NAME_FUNC_OFFSET(33665, glGetLightxv, glGetLightxv, NULL, 1256),
+    NAME_FUNC_OFFSET(33681, glGetMaterialxv, glGetMaterialxv, NULL, 1257),
+    NAME_FUNC_OFFSET(33700, glGetTexEnvxv, glGetTexEnvxv, NULL, 1258),
+    NAME_FUNC_OFFSET(33717, glGetTexParameterxv, glGetTexParameterxv, NULL, 1259),
+    NAME_FUNC_OFFSET(33740, glPointParameterx, glPointParameterx, NULL, 1260),
+    NAME_FUNC_OFFSET(33761, glPointParameterxv, glPointParameterxv, NULL, 1261),
+    NAME_FUNC_OFFSET(33783, glTexParameterxv, glTexParameterxv, NULL, 1262),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/xorg-server/glx/indirect_dispatch.h b/xorg-server/glx/indirect_dispatch.h
index ca8344c1b..abc957cd9 100644
--- a/xorg-server/glx/indirect_dispatch.h
+++ b/xorg-server/glx/indirect_dispatch.h
@@ -70,8 +70,8 @@ extern _X_HIDDEN int __glXDisp_GenQueries(struct __GLXclientStateRec *, GLbyte *
 extern _X_HIDDEN int __glXDispSwap_GenQueries(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexCoord2iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2iv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexParameteri(GLbyte * pc);
@@ -724,8 +724,6 @@ extern _X_HIDDEN int __glXDisp_DeleteProgramsARB(struct __GLXclientStateRec *, G
 extern _X_HIDDEN int __glXDispSwap_DeleteProgramsARB(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ShadeModel(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ShadeModel(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_GetProgramLocalParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
@@ -890,6 +888,8 @@ extern _X_HIDDEN void __glXDisp_VertexAttrib1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Rotated(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rotated(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_FramebufferTextureLayer(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_FramebufferTextureLayer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexEnvfv(GLbyte * pc);
@@ -956,6 +956,8 @@ extern _X_HIDDEN int __glXDisp_ChangeDrawableAttributesSGIX(struct __GLXclientSt
 extern _X_HIDDEN int __glXDispSwap_ChangeDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_BlendEquationSeparate(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_BlendEquationSeparate(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ClearColor(GLbyte * pc);
@@ -984,8 +986,6 @@ extern _X_HIDDEN void __glXDisp_PixelTransferi(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelTransferi(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_ClientInfo(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDispSwap_ClientInfo(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib4fvNV(GLbyte * pc);
diff --git a/xorg-server/glx/remap_helper.h b/xorg-server/glx/remap_helper.h
index d13667621..34618c8b2 100644
--- a/xorg-server/glx/remap_helper.h
+++ b/xorg-server/glx/remap_helper.h
@@ -103,3067 +103,3122 @@ static const char _mesa_function_pool[] =
    "iip\0"
    "glMultiTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[451]: Color4fNormal3fVertex3fSUN (dynamic) */
-   "ffffffffff\0"
-   "glColor4fNormal3fVertex3fSUN\0"
+   /* _mesa_function_pool[451]: VertexAttribI4usv (will be remapped) */
+   "ip\0"
+   "glVertexAttribI4usvEXT\0"
+   "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[492]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[498]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[507]: GetCombinerOutputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[513]: GetCombinerOutputParameterfvNV (dynamic) */
    "iiip\0"
    "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[546]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[552]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[566]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[572]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[604]: GetClipPlanex (will be remapped) */
+   /* _mesa_function_pool[610]: GetClipPlanex (will be remapped) */
    "ip\0"
    "glGetClipPlanexOES\0"
    "glGetClipPlanex\0"
    "\0"
-   /* _mesa_function_pool[643]: TexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[649]: TexCoordP1uiv (will be remapped) */
    "ip\0"
    "glTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[663]: RenderbufferStorage (will be remapped) */
+   /* _mesa_function_pool[669]: RenderbufferStorage (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "glRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[741]: GetClipPlanef (will be remapped) */
+   /* _mesa_function_pool[747]: GetClipPlanef (will be remapped) */
    "ip\0"
    "glGetClipPlanefOES\0"
    "glGetClipPlanef\0"
    "\0"
-   /* _mesa_function_pool[780]: GetPerfQueryDataINTEL (will be remapped) */
+   /* _mesa_function_pool[786]: GetPerfQueryDataINTEL (will be remapped) */
    "iiipp\0"
    "glGetPerfQueryDataINTEL\0"
    "\0"
-   /* _mesa_function_pool[811]: DrawArraysIndirect (will be remapped) */
+   /* _mesa_function_pool[817]: DrawArraysIndirect (will be remapped) */
    "ip\0"
    "glDrawArraysIndirect\0"
    "\0"
-   /* _mesa_function_pool[836]: Uniform3i (will be remapped) */
+   /* _mesa_function_pool[842]: Uniform3i (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[869]: VDPAUGetSurfaceivNV (will be remapped) */
+   /* _mesa_function_pool[875]: VDPAUGetSurfaceivNV (will be remapped) */
    "iiipp\0"
    "glVDPAUGetSurfaceivNV\0"
    "\0"
-   /* _mesa_function_pool[898]: Uniform3d (will be remapped) */
+   /* _mesa_function_pool[904]: Uniform3d (will be remapped) */
    "iddd\0"
    "glUniform3d\0"
    "\0"
-   /* _mesa_function_pool[916]: Uniform3f (will be remapped) */
+   /* _mesa_function_pool[922]: Uniform3f (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[949]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[955]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[976]: QueryMatrixxOES (will be remapped) */
+   /* _mesa_function_pool[982]: QueryMatrixxOES (will be remapped) */
    "pp\0"
    "glQueryMatrixxOES\0"
    "\0"
-   /* _mesa_function_pool[998]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[1004]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[1013]: DrawTexiOES (will be remapped) */
+   /* _mesa_function_pool[1019]: DrawTexiOES (will be remapped) */
    "iiiii\0"
    "glDrawTexiOES\0"
    "\0"
-   /* _mesa_function_pool[1034]: Viewport (offset 305) */
+   /* _mesa_function_pool[1040]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[1051]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1057]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1107]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[1113]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[1129]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[1135]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[1160]: DeleteVertexArrays (will be remapped) */
+   /* _mesa_function_pool[1166]: DeleteVertexArrays (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "glDeleteVertexArraysOES\0"
    "\0"
-   /* _mesa_function_pool[1235]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[1241]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[1260]: GetnConvolutionFilterARB (will be remapped) */
+   /* _mesa_function_pool[1266]: GetnConvolutionFilterARB (will be remapped) */
    "iiiip\0"
    "glGetnConvolutionFilterARB\0"
    "\0"
-   /* _mesa_function_pool[1294]: GetLightxv (will be remapped) */
+   /* _mesa_function_pool[1300]: GetLightxv (will be remapped) */
    "iip\0"
    "glGetLightxvOES\0"
    "glGetLightxv\0"
    "\0"
-   /* _mesa_function_pool[1328]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[1334]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[1392]: VertexAttrib4usv (will be remapped) */
+   /* _mesa_function_pool[1398]: GetProgramResourceLocation (will be remapped) */
+   "iip\0"
+   "glGetProgramResourceLocation\0"
+   "\0"
+   /* _mesa_function_pool[1432]: VertexAttrib4usv (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[1437]: TextureStorage1DEXT (will be remapped) */
+   /* _mesa_function_pool[1477]: TextureStorage1DEXT (will be remapped) */
    "iiiii\0"
    "glTextureStorage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[1466]: VertexAttrib4Nub (will be remapped) */
+   /* _mesa_function_pool[1506]: VertexAttrib4Nub (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[1514]: VertexAttribP3ui (will be remapped) */
+   /* _mesa_function_pool[1554]: VertexAttribP3ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP3ui\0"
    "\0"
-   /* _mesa_function_pool[1539]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[1579]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[1570]: PointSize (offset 173) */
+   /* _mesa_function_pool[1610]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[1585]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[1625]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[1616]: PopName (offset 200) */
+   /* _mesa_function_pool[1656]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[1628]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[1668]: GetProgramResourceLocationIndex (will be remapped) */
+   "iip\0"
+   "glGetProgramResourceLocationIndex\0"
+   "\0"
+   /* _mesa_function_pool[1707]: CreateTransformFeedbacks (will be remapped) */
+   "ip\0"
+   "glCreateTransformFeedbacks\0"
+   "\0"
+   /* _mesa_function_pool[1738]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[1655]: ValidateProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[1765]: ValidateProgramPipeline (will be remapped) */
    "i\0"
    "glValidateProgramPipeline\0"
    "glValidateProgramPipelineEXT\0"
    "\0"
-   /* _mesa_function_pool[1713]: BindFragDataLocationIndexed (will be remapped) */
+   /* _mesa_function_pool[1823]: BindFragDataLocationIndexed (will be remapped) */
    "iiip\0"
    "glBindFragDataLocationIndexed\0"
    "\0"
-   /* _mesa_function_pool[1749]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[1859]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[1768]: CombinerParameterfvNV (dynamic) */
+   /* _mesa_function_pool[1878]: CombinerParameterfvNV (dynamic) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[1796]: TexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[1906]: TexCoordP4uiv (will be remapped) */
    "ip\0"
    "glTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[1816]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[1926]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[1842]: ProgramUniformMatrix2x4dv (will be remapped) */
+   /* _mesa_function_pool[1952]: ProgramUniformMatrix2x4dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x4dv\0"
    "\0"
-   /* _mesa_function_pool[1877]: GenQueries (will be remapped) */
+   /* _mesa_function_pool[1987]: GenQueries (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[1910]: ProgramUniform4iv (will be remapped) */
+   /* _mesa_function_pool[2020]: ProgramUniform4iv (will be remapped) */
    "iiip\0"
    "glProgramUniform4iv\0"
    "glProgramUniform4ivEXT\0"
    "\0"
-   /* _mesa_function_pool[1959]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[2069]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[1989]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[2099]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[2006]: TexImage2DMultisample (will be remapped) */
+   /* _mesa_function_pool[2116]: TexImage2DMultisample (will be remapped) */
    "iiiiii\0"
    "glTexImage2DMultisample\0"
    "\0"
-   /* _mesa_function_pool[2038]: TexParameterx (will be remapped) */
+   /* _mesa_function_pool[2148]: TexParameterx (will be remapped) */
    "iii\0"
    "glTexParameterxOES\0"
    "glTexParameterx\0"
    "\0"
-   /* _mesa_function_pool[2078]: Color4iv (offset 32) */
+   /* _mesa_function_pool[2188]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[2092]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[2202]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[2113]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[2223]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[2134]: GetUniformiv (will be remapped) */
+   /* _mesa_function_pool[2244]: GetUniformiv (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[2172]: ClearBufferSubData (will be remapped) */
+   /* _mesa_function_pool[2282]: ClearBufferSubData (will be remapped) */
    "iiiiiip\0"
    "glClearBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[2202]: TextureParameterfv (will be remapped) */
+   /* _mesa_function_pool[2312]: TextureParameterfv (will be remapped) */
    "iip\0"
    "glTextureParameterfv\0"
    "\0"
-   /* _mesa_function_pool[2228]: VDPAUFiniNV (will be remapped) */
+   /* _mesa_function_pool[2338]: VDPAUFiniNV (will be remapped) */
    "\0"
    "glVDPAUFiniNV\0"
    "\0"
-   /* _mesa_function_pool[2244]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[2354]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[2271]: ProgramUniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[2381]: ProgramUniformMatrix4x2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x2fv\0"
    "glProgramUniformMatrix4x2fvEXT\0"
    "\0"
-   /* _mesa_function_pool[2337]: ProgramUniform2f (will be remapped) */
+   /* _mesa_function_pool[2447]: ProgramUniform2f (will be remapped) */
    "iiff\0"
    "glProgramUniform2f\0"
    "glProgramUniform2fEXT\0"
    "\0"
-   /* _mesa_function_pool[2384]: ProgramUniform2d (will be remapped) */
+   /* _mesa_function_pool[2494]: ProgramUniform2d (will be remapped) */
    "iidd\0"
    "glProgramUniform2d\0"
    "\0"
-   /* _mesa_function_pool[2409]: ProgramUniform2i (will be remapped) */
+   /* _mesa_function_pool[2519]: ProgramUniform2i (will be remapped) */
    "iiii\0"
    "glProgramUniform2i\0"
    "glProgramUniform2iEXT\0"
    "\0"
-   /* _mesa_function_pool[2456]: Fogx (will be remapped) */
+   /* _mesa_function_pool[2566]: Fogx (will be remapped) */
    "ii\0"
    "glFogxOES\0"
    "glFogx\0"
    "\0"
-   /* _mesa_function_pool[2477]: Fogf (offset 153) */
+   /* _mesa_function_pool[2587]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[2488]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[2598]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2532]: Color4usv (offset 40) */
+   /* _mesa_function_pool[2642]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[2547]: Fogi (offset 155) */
+   /* _mesa_function_pool[2657]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[2558]: FinalCombinerInputNV (dynamic) */
+   /* _mesa_function_pool[2668]: FinalCombinerInputNV (dynamic) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[2587]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[2697]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[2602]: GetSamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[2712]: GetSamplerParameterIiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[2632]: VertexAttribI4uiEXT (will be remapped) */
+   /* _mesa_function_pool[2742]: VertexAttribI4uiEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4uiEXT\0"
    "glVertexAttribI4ui\0"
    "\0"
-   /* _mesa_function_pool[2680]: DrawElementsInstancedBaseVertexBaseInstance (will be remapped) */
+   /* _mesa_function_pool[2790]: DrawElementsInstancedBaseVertexBaseInstance (will be remapped) */
    "iiipiii\0"
    "glDrawElementsInstancedBaseVertexBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[2735]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[2845]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[2792]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[2902]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[2848]: BindSamplers (will be remapped) */
+   /* _mesa_function_pool[2958]: BindSamplers (will be remapped) */
    "iip\0"
    "glBindSamplers\0"
    "\0"
-   /* _mesa_function_pool[2868]: GetnCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[2978]: GetnCompressedTexImageARB (will be remapped) */
    "iiip\0"
    "glGetnCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[2902]: CopyNamedBufferSubData (will be remapped) */
+   /* _mesa_function_pool[3012]: CopyNamedBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyNamedBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[2934]: BindSampler (will be remapped) */
+   /* _mesa_function_pool[3044]: BindSampler (will be remapped) */
    "ii\0"
    "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[2952]: GetUniformuiv (will be remapped) */
+   /* _mesa_function_pool[3062]: GetUniformuiv (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[2992]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[3102]: GetQueryBufferObjectuiv (will be remapped) */
+   "iiii\0"
+   "glGetQueryBufferObjectuiv\0"
+   "\0"
+   /* _mesa_function_pool[3134]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[3036]: IndexPointer (offset 314) */
-   "iip\0"
-   "glIndexPointer\0"
+   /* _mesa_function_pool[3178]: GetTextureImage (will be remapped) */
+   "iiiiip\0"
+   "glGetTextureImage\0"
    "\0"
-   /* _mesa_function_pool[3056]: MultiTexCoord3iv (offset 397) */
+   /* _mesa_function_pool[3204]: MultiTexCoord3iv (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[3101]: Finish (offset 216) */
+   /* _mesa_function_pool[3249]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[3112]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[3260]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[3130]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[3278]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[3154]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[3302]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[3171]: VDPAURegisterOutputSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[3319]: VDPAURegisterOutputSurfaceNV (will be remapped) */
    "piip\0"
    "glVDPAURegisterOutputSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[3208]: VertexP4ui (will be remapped) */
+   /* _mesa_function_pool[3356]: VertexP4ui (will be remapped) */
    "ii\0"
    "glVertexP4ui\0"
    "\0"
-   /* _mesa_function_pool[3225]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3373]: GetProgramResourceIndex (will be remapped) */
+   "iip\0"
+   "glGetProgramResourceIndex\0"
+   "\0"
+   /* _mesa_function_pool[3404]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3253]: TextureStorage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[3432]: TextureStorage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[3292]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[3471]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[3317]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[3496]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[3343]: BlendFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[3522]: BlendFuncSeparate (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "glBlendFuncSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[3439]: Color3us (offset 23) */
+   /* _mesa_function_pool[3618]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[3455]: LoadMatrixx (will be remapped) */
+   /* _mesa_function_pool[3634]: LoadMatrixx (will be remapped) */
    "p\0"
    "glLoadMatrixxOES\0"
    "glLoadMatrixx\0"
    "\0"
-   /* _mesa_function_pool[3489]: BufferStorage (will be remapped) */
+   /* _mesa_function_pool[3668]: BufferStorage (will be remapped) */
    "iipi\0"
    "glBufferStorage\0"
    "\0"
-   /* _mesa_function_pool[3511]: Color3ub (offset 19) */
+   /* _mesa_function_pool[3690]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[3527]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[3706]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[3550]: Color3ui (offset 21) */
+   /* _mesa_function_pool[3729]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[3566]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[3745]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[3590]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[3769]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[3623]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[3802]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[3641]: DeleteProgramPipelines (will be remapped) */
+   /* _mesa_function_pool[3820]: DeleteProgramPipelines (will be remapped) */
    "ip\0"
    "glDeleteProgramPipelines\0"
    "glDeleteProgramPipelinesEXT\0"
    "\0"
-   /* _mesa_function_pool[3698]: LineWidthx (will be remapped) */
+   /* _mesa_function_pool[3877]: LineWidthx (will be remapped) */
    "i\0"
    "glLineWidthxOES\0"
    "glLineWidthx\0"
    "\0"
-   /* _mesa_function_pool[3730]: Indexdv (offset 45) */
+   /* _mesa_function_pool[3909]: GetTransformFeedbacki_v (will be remapped) */
+   "iiip\0"
+   "glGetTransformFeedbacki_v\0"
+   "\0"
+   /* _mesa_function_pool[3941]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[3743]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[3954]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[3768]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[3979]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[3801]: DepthMask (offset 211) */
+   /* _mesa_function_pool[4012]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[3816]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[4027]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[3838]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[4049]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[3863]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[4074]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[3890]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[4101]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "glBlendFuncSeparatei\0"
    "\0"
-   /* _mesa_function_pool[3972]: PixelTexGenParameteriSGIS (dynamic) */
+   /* _mesa_function_pool[4183]: PixelTexGenParameteriSGIS (dynamic) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[4004]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[4215]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[4047]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[4258]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[4075]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[4286]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[4097]: GetCompressedTexImage (will be remapped) */
+   /* _mesa_function_pool[4308]: GetCompressedTexImage (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[4153]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[4364]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[4188]: UniformMatrix2dv (will be remapped) */
+   /* _mesa_function_pool[4399]: UniformMatrix2dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2dv\0"
    "\0"
-   /* _mesa_function_pool[4213]: GetQueryObjectui64v (will be remapped) */
+   /* _mesa_function_pool[4424]: GetQueryObjectui64v (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64v\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[4265]: VertexAttribP1uiv (will be remapped) */
+   /* _mesa_function_pool[4476]: VertexAttribP1uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[4291]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[4502]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[4306]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4517]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4338]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[4549]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[4360]: BindBuffersBase (will be remapped) */
+   /* _mesa_function_pool[4571]: BindBuffersBase (will be remapped) */
    "iiip\0"
    "glBindBuffersBase\0"
    "\0"
-   /* _mesa_function_pool[4384]: GenTextures (offset 328) */
+   /* _mesa_function_pool[4595]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[4419]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4630]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4447]: UnmapNamedBuffer (will be remapped) */
+   /* _mesa_function_pool[4658]: UnmapNamedBuffer (will be remapped) */
    "i\0"
    "glUnmapNamedBuffer\0"
    "\0"
-   /* _mesa_function_pool[4469]: UniformMatrix3x2dv (will be remapped) */
+   /* _mesa_function_pool[4680]: UniformMatrix3x2dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2dv\0"
    "\0"
-   /* _mesa_function_pool[4496]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[4707]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[4520]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[4731]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[4546]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[4757]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[4571]: Uniform4i (will be remapped) */
+   /* _mesa_function_pool[4782]: Uniform4i (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[4605]: Uniform4d (will be remapped) */
+   /* _mesa_function_pool[4816]: Uniform4d (will be remapped) */
    "idddd\0"
    "glUniform4d\0"
    "\0"
-   /* _mesa_function_pool[4624]: Uniform4f (will be remapped) */
+   /* _mesa_function_pool[4835]: Uniform4f (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[4658]: ProgramUniform3dv (will be remapped) */
+   /* _mesa_function_pool[4869]: ProgramUniform3dv (will be remapped) */
    "iiip\0"
    "glProgramUniform3dv\0"
    "\0"
-   /* _mesa_function_pool[4684]: GetNamedBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[4895]: GetNamedBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetNamedBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[4719]: ProgramUniform3d (will be remapped) */
+   /* _mesa_function_pool[4930]: ProgramUniform3d (will be remapped) */
    "iiddd\0"
    "glProgramUniform3d\0"
    "\0"
-   /* _mesa_function_pool[4745]: ProgramUniform3f (will be remapped) */
+   /* _mesa_function_pool[4956]: ProgramUniform3f (will be remapped) */
    "iifff\0"
    "glProgramUniform3f\0"
    "glProgramUniform3fEXT\0"
    "\0"
-   /* _mesa_function_pool[4793]: ProgramUniform3i (will be remapped) */
+   /* _mesa_function_pool[5004]: ProgramUniform3i (will be remapped) */
    "iiiii\0"
    "glProgramUniform3i\0"
    "glProgramUniform3iEXT\0"
    "\0"
-   /* _mesa_function_pool[4841]: PointParameterfv (will be remapped) */
+   /* _mesa_function_pool[5052]: PointParameterfv (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[4931]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[5142]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[4991]: GetString (offset 275) */
+   /* _mesa_function_pool[5202]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[5006]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[5217]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[5032]: VDPAUUnmapSurfacesNV (will be remapped) */
+   /* _mesa_function_pool[5243]: VDPAUUnmapSurfacesNV (will be remapped) */
    "ip\0"
    "glVDPAUUnmapSurfacesNV\0"
    "\0"
-   /* _mesa_function_pool[5059]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[5270]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[5086]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5297]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5139]: SecondaryColor3s (will be remapped) */
+   /* _mesa_function_pool[5350]: SecondaryColor3s (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[5185]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[5396]: VertexAttribP2uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[5211]: UniformMatrix3x4dv (will be remapped) */
+   /* _mesa_function_pool[5422]: UniformMatrix3x4dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4dv\0"
    "\0"
-   /* _mesa_function_pool[5238]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[5449]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[5263]: SecondaryColor3b (will be remapped) */
+   /* _mesa_function_pool[5474]: SecondaryColor3b (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[5309]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[5520]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[5332]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[5543]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5359]: SecondaryColor3i (will be remapped) */
+   /* _mesa_function_pool[5570]: SecondaryColor3i (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[5405]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[5616]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[5431]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[5642]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[5464]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[5675]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[5489]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[5700]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "glFlushMappedBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[5547]: Lightfv (offset 160) */
+   /* _mesa_function_pool[5758]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[5562]: GetFramebufferAttachmentParameteriv (will be remapped) */
+   /* _mesa_function_pool[5773]: GetFramebufferAttachmentParameteriv (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "glGetFramebufferAttachmentParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[5688]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[5899]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[5731]: EndPerfMonitorAMD (will be remapped) */
+   /* _mesa_function_pool[5942]: EndPerfMonitorAMD (will be remapped) */
    "i\0"
    "glEndPerfMonitorAMD\0"
    "\0"
-   /* _mesa_function_pool[5754]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[5965]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[5779]: CreateBuffers (will be remapped) */
+   /* _mesa_function_pool[5990]: CreateBuffers (will be remapped) */
    "ip\0"
    "glCreateBuffers\0"
    "\0"
-   /* _mesa_function_pool[5799]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[6010]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[5823]: GetMultisamplefv (will be remapped) */
+   /* _mesa_function_pool[6034]: GetMultisamplefv (will be remapped) */
    "iip\0"
    "glGetMultisamplefv\0"
    "\0"
-   /* _mesa_function_pool[5847]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[6058]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[5865]: Rectdv (offset 87) */
+   /* _mesa_function_pool[6076]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[5878]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[6089]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[5956]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[6167]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[5991]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[6202]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[6015]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[6226]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[6041]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[6252]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[6067]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[6278]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[6098]: Disablei (will be remapped) */
+   /* _mesa_function_pool[6309]: Disablei (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[6133]: CompressedTexSubImage3D (will be remapped) */
+   /* _mesa_function_pool[6344]: CompressedTexSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "glCompressedTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[6230]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[6441]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[6255]: Color3dv (offset 12) */
+   /* _mesa_function_pool[6466]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[6269]: BeginQuery (will be remapped) */
+   /* _mesa_function_pool[6480]: BeginQuery (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[6302]: VertexP3uiv (will be remapped) */
+   /* _mesa_function_pool[6513]: VertexP3uiv (will be remapped) */
    "ip\0"
    "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[6320]: GetUniformLocation (will be remapped) */
+   /* _mesa_function_pool[6531]: GetUniformLocation (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[6369]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[6580]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[6387]: WindowPos2iv (will be remapped) */
+   /* _mesa_function_pool[6598]: WindowPos2iv (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[6442]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[6653]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[6460]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[6671]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[6486]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[6697]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[6518]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[6729]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[6545]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6756]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6591]: CheckFramebufferStatus (will be remapped) */
+   /* _mesa_function_pool[6802]: CheckFramebufferStatus (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "glCheckFramebufferStatusOES\0"
    "\0"
-   /* _mesa_function_pool[6675]: DispatchComputeIndirect (will be remapped) */
+   /* _mesa_function_pool[6886]: DispatchComputeIndirect (will be remapped) */
    "i\0"
    "glDispatchComputeIndirect\0"
    "\0"
-   /* _mesa_function_pool[6704]: InvalidateBufferData (will be remapped) */
+   /* _mesa_function_pool[6915]: InvalidateBufferData (will be remapped) */
    "i\0"
    "glInvalidateBufferData\0"
    "\0"
-   /* _mesa_function_pool[6730]: GetUniformdv (will be remapped) */
+   /* _mesa_function_pool[6941]: GetUniformdv (will be remapped) */
    "iip\0"
    "glGetUniformdv\0"
    "\0"
-   /* _mesa_function_pool[6750]: VDPAUMapSurfacesNV (will be remapped) */
+   /* _mesa_function_pool[6961]: VDPAUMapSurfacesNV (will be remapped) */
    "ip\0"
    "glVDPAUMapSurfacesNV\0"
    "\0"
-   /* _mesa_function_pool[6775]: IsFramebuffer (will be remapped) */
+   /* _mesa_function_pool[6986]: IsFramebuffer (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "glIsFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[6832]: GetPixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[7043]: GetPixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[6868]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[7079]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[6885]: GetObjectLabel (will be remapped) */
+   /* _mesa_function_pool[7096]: GetObjectLabel (will be remapped) */
    "iiipp\0"
    "glGetObjectLabel\0"
    "\0"
-   /* _mesa_function_pool[6909]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[7120]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[6930]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[7141]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[6947]: CombinerParameteriNV (dynamic) */
+   /* _mesa_function_pool[7158]: CombinerParameteriNV (dynamic) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[6974]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7185]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7001]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[7212]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[7046]: SecondaryColor3ubv (will be remapped) */
+   /* _mesa_function_pool[7257]: SecondaryColor3ubv (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[7094]: GetDebugMessageLog (will be remapped) */
+   /* _mesa_function_pool[7305]: GetDebugMessageLog (will be remapped) */
    "iipppppp\0"
    "glGetDebugMessageLogARB\0"
    "glGetDebugMessageLog\0"
    "\0"
-   /* _mesa_function_pool[7149]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[7360]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[7188]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[7399]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[7212]: VertexAttribI4usv (will be remapped) */
-   "ip\0"
-   "glVertexAttribI4usvEXT\0"
-   "glVertexAttribI4usv\0"
+   /* _mesa_function_pool[7423]: Color4fNormal3fVertex3fSUN (dynamic) */
+   "ffffffffff\0"
+   "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7259]: PixelTexGenParameterfSGIS (dynamic) */
+   /* _mesa_function_pool[7464]: PixelTexGenParameterfSGIS (dynamic) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[7291]: ProgramUniform2ui (will be remapped) */
+   /* _mesa_function_pool[7496]: ProgramUniform2ui (will be remapped) */
    "iiii\0"
    "glProgramUniform2ui\0"
    "glProgramUniform2uiEXT\0"
    "\0"
-   /* _mesa_function_pool[7340]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7545]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7369]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7574]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7396]: GetShaderSource (will be remapped) */
+   /* _mesa_function_pool[7601]: GetShaderSource (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[7441]: BindProgramARB (will be remapped) */
+   /* _mesa_function_pool[7646]: BindProgramARB (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[7478]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[7683]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[7503]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[7708]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[7534]: ProgramUniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[7739]: ProgramUniformMatrix4x3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x3fv\0"
    "glProgramUniformMatrix4x3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[7600]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[7805]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[7620]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[7825]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[7705]: GetQueryObjectuiv (will be remapped) */
+   /* _mesa_function_pool[7910]: GetQueryObjectuiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[7753]: VertexAttribI4bv (will be remapped) */
+   /* _mesa_function_pool[7958]: VertexAttribI4bv (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[7798]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8003]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7829]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[8034]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[7850]: ListBase (offset 6) */
+   /* _mesa_function_pool[8055]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[7864]: GenerateMipmap (will be remapped) */
+   /* _mesa_function_pool[8069]: GenerateMipmap (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "glGenerateMipmapOES\0"
    "\0"
-   /* _mesa_function_pool[7924]: BindBufferRange (will be remapped) */
+   /* _mesa_function_pool[8129]: BindBufferRange (will be remapped) */
    "iiiii\0"
    "glBindBufferRange\0"
    "glBindBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[7970]: ProgramUniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[8175]: ProgramUniformMatrix2x4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x4fv\0"
    "glProgramUniformMatrix2x4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[8036]: BindBufferBase (will be remapped) */
+   /* _mesa_function_pool[8241]: BindBufferBase (will be remapped) */
    "iii\0"
    "glBindBufferBase\0"
    "glBindBufferBaseEXT\0"
    "\0"
-   /* _mesa_function_pool[8078]: GetQueryObjectiv (will be remapped) */
+   /* _mesa_function_pool[8283]: GetQueryObjectiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[8124]: VertexAttrib2s (will be remapped) */
+   /* _mesa_function_pool[8329]: VertexAttrib2s (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[8166]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[8371]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[8212]: VertexAttrib2d (will be remapped) */
+   /* _mesa_function_pool[8417]: VertexAttrib2d (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[8254]: Uniform1fv (will be remapped) */
+   /* _mesa_function_pool[8459]: Uniform1fv (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[8288]: GetProgramPipelineInfoLog (will be remapped) */
+   /* _mesa_function_pool[8493]: GetProgramPipelineInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramPipelineInfoLog\0"
    "glGetProgramPipelineInfoLogEXT\0"
    "\0"
-   /* _mesa_function_pool[8353]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[8558]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[8378]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[8583]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[8399]: WindowPos3fv (will be remapped) */
+   /* _mesa_function_pool[8604]: WindowPos3fv (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[8454]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[8659]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[8480]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[8685]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[8540]: PointParameteriv (will be remapped) */
+   /* _mesa_function_pool[8745]: PointParameteriv (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[8584]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[8789]: NamedRenderbufferStorage (will be remapped) */
+   "iiii\0"
+   "glNamedRenderbufferStorage\0"
+   "\0"
+   /* _mesa_function_pool[8822]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[8607]: BindRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[8845]: BindRenderbuffer (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[8652]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[8890]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[8698]: PrimitiveRestartIndex (will be remapped) */
+   /* _mesa_function_pool[8936]: PrimitiveRestartIndex (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndex\0"
    "glPrimitiveRestartIndexNV\0"
    "\0"
-   /* _mesa_function_pool[8751]: VertexAttribI4ubv (will be remapped) */
+   /* _mesa_function_pool[8989]: VertexAttribI4ubv (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[8798]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[9036]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[8828]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[9066]: CreateRenderbuffers (will be remapped) */
+   "ip\0"
+   "glCreateRenderbuffers\0"
+   "\0"
+   /* _mesa_function_pool[9092]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[8854]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[9118]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[8880]: DepthRange (offset 288) */
+   /* _mesa_function_pool[9144]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[8897]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[9161]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[8925]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[9189]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[8951]: Uniform4fv (will be remapped) */
+   /* _mesa_function_pool[9215]: Uniform4fv (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[8985]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[9249]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[9011]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[9275]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[9038]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[9302]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[9071]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[9335]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9099]: Frustumf (will be remapped) */
+   /* _mesa_function_pool[9363]: Frustumf (will be remapped) */
    "ffffff\0"
    "glFrustumfOES\0"
    "glFrustumf\0"
    "\0"
-   /* _mesa_function_pool[9132]: ProgramUniform2uiv (will be remapped) */
+   /* _mesa_function_pool[9396]: GetQueryBufferObjectui64v (will be remapped) */
+   "iiii\0"
+   "glGetQueryBufferObjectui64v\0"
+   "\0"
+   /* _mesa_function_pool[9430]: ProgramUniform2uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform2uiv\0"
    "glProgramUniform2uivEXT\0"
    "\0"
-   /* _mesa_function_pool[9183]: Rectsv (offset 93) */
+   /* _mesa_function_pool[9481]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[9196]: Frustumx (will be remapped) */
+   /* _mesa_function_pool[9494]: Frustumx (will be remapped) */
    "iiiiii\0"
    "glFrustumxOES\0"
    "glFrustumx\0"
    "\0"
-   /* _mesa_function_pool[9229]: CullFace (offset 152) */
+   /* _mesa_function_pool[9527]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[9243]: BindTexture (offset 307) */
+   /* _mesa_function_pool[9541]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[9278]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[9576]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[9324]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[9622]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[9350]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[9648]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[9376]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[9674]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[9397]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[9695]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9422]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[9720]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[9446]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[9744]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[9470]: VertexAttrib4bv (will be remapped) */
+   /* _mesa_function_pool[9768]: VertexAttrib4bv (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[9513]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[9811]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[9540]: SecondaryColor3usv (will be remapped) */
+   /* _mesa_function_pool[9838]: SecondaryColor3usv (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[9588]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[9886]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[9609]: MapNamedBuffer (will be remapped) */
+   /* _mesa_function_pool[9907]: MapNamedBuffer (will be remapped) */
    "ii\0"
    "glMapNamedBuffer\0"
    "\0"
-   /* _mesa_function_pool[9630]: Indexfv (offset 47) */
+   /* _mesa_function_pool[9928]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[9643]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[9941]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[9673]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[9971]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[9699]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[9997]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[9715]: ProgramUniform2dv (will be remapped) */
+   /* _mesa_function_pool[10013]: ProgramUniform2dv (will be remapped) */
    "iiip\0"
    "glProgramUniform2dv\0"
    "\0"
-   /* _mesa_function_pool[9741]: MultiTexCoord3i (offset 396) */
+   /* _mesa_function_pool[10039]: MultiTexCoord3i (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[9786]: ProgramUniform1fv (will be remapped) */
+   /* _mesa_function_pool[10084]: ProgramUniform1fv (will be remapped) */
    "iiip\0"
    "glProgramUniform1fv\0"
    "glProgramUniform1fvEXT\0"
    "\0"
-   /* _mesa_function_pool[9835]: MultiTexCoord3d (offset 392) */
+   /* _mesa_function_pool[10133]: MultiTexCoord3d (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[9880]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[10178]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[9897]: Fogfv (offset 154) */
+   /* _mesa_function_pool[10195]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[9909]: Minmax (offset 368) */
+   /* _mesa_function_pool[10207]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[9935]: MultiTexCoord3s (offset 398) */
+   /* _mesa_function_pool[10233]: MultiTexCoord3s (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[9980]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[10278]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[10002]: GetFinalCombinerInputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[10300]: GetFinalCombinerInputParameterfvNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[10044]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[10342]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[10069]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[10367]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[10084]: BufferSubData (will be remapped) */
+   /* _mesa_function_pool[10382]: BufferSubData (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[10125]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[10423]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[10161]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[10459]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[10191]: Begin (offset 7) */
+   /* _mesa_function_pool[10489]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[10202]: LightModeli (offset 165) */
+   /* _mesa_function_pool[10500]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[10220]: UniformMatrix2fv (will be remapped) */
+   /* _mesa_function_pool[10518]: UniformMatrix2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[10267]: LightModelf (offset 163) */
+   /* _mesa_function_pool[10565]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[10285]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[10583]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[10310]: TextureStorage1D (will be remapped) */
+   /* _mesa_function_pool[10608]: TextureStorage1D (will be remapped) */
    "iiii\0"
    "glTextureStorage1D\0"
    "\0"
-   /* _mesa_function_pool[10335]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[10633]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10361]: GetCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[10659]: GetCombinerInputParameterivNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[10400]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[10698]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[10429]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[10727]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[10474]: VertexAttrib4ubv (will be remapped) */
+   /* _mesa_function_pool[10772]: VertexAttrib4ubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[10519]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[10817]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[10545]: ColorMask (offset 210) */
+   /* _mesa_function_pool[10843]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[10563]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[10861]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[10588]: MultiTexCoord4x (will be remapped) */
+   /* _mesa_function_pool[10886]: MultiTexCoord4x (will be remapped) */
    "iiiii\0"
    "glMultiTexCoord4xOES\0"
    "glMultiTexCoord4x\0"
    "\0"
-   /* _mesa_function_pool[10634]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[10932]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[10671]: VertexAttribI4sv (will be remapped) */
-   "ip\0"
-   "glVertexAttribI4svEXT\0"
-   "glVertexAttribI4sv\0"
+   /* _mesa_function_pool[10969]: VertexAttribs4svNV (will be remapped) */
+   "iip\0"
+   "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[10716]: DrawElementsInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[10995]: DrawElementsInstancedBaseInstance (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[10760]: UniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[11039]: UniformMatrix4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[10807]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[11086]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[10834]: VertexAttrib4Nuiv (will be remapped) */
+   /* _mesa_function_pool[11113]: VertexAttrib4Nuiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[10881]: ClientActiveTexture (offset 375) */
+   /* _mesa_function_pool[11160]: ClientActiveTexture (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[10931]: GetUniformIndices (will be remapped) */
+   /* _mesa_function_pool[11210]: GetUniformIndices (will be remapped) */
    "iipp\0"
    "glGetUniformIndices\0"
    "\0"
-   /* _mesa_function_pool[10957]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[11236]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[10988]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[11267]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[11009]: CombinerParameterivNV (dynamic) */
+   /* _mesa_function_pool[11288]: CombinerParameterivNV (dynamic) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[11037]: MultiTexCoord2sv (offset 391) */
+   /* _mesa_function_pool[11316]: MultiTexCoord2sv (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[11082]: NamedBufferStorage (will be remapped) */
+   /* _mesa_function_pool[11361]: NamedBufferStorage (will be remapped) */
    "iipi\0"
    "glNamedBufferStorage\0"
    "\0"
-   /* _mesa_function_pool[11109]: LoadIdentity (offset 290) */
+   /* _mesa_function_pool[11388]: LoadIdentity (offset 290) */
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[11126]: ActiveShaderProgram (will be remapped) */
+   /* _mesa_function_pool[11405]: ActiveShaderProgram (will be remapped) */
    "ii\0"
    "glActiveShaderProgram\0"
    "glActiveShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[11177]: BindImageTextures (will be remapped) */
+   /* _mesa_function_pool[11456]: BindImageTextures (will be remapped) */
    "iip\0"
    "glBindImageTextures\0"
    "\0"
-   /* _mesa_function_pool[11202]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[11481]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[11233]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[11512]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[11258]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[11537]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[11288]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[11567]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[11304]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[11583]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[11330]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[11609]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[11358]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[11637]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11404]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[11683]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[11424]: TextureBufferRange (will be remapped) */
+   /* _mesa_function_pool[11703]: TextureBufferRange (will be remapped) */
    "iiiii\0"
    "glTextureBufferRange\0"
    "\0"
-   /* _mesa_function_pool[11452]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[11731]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[11470]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[11749]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[11494]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[11773]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[11543]: GetNamedBufferSubData (will be remapped) */
+   /* _mesa_function_pool[11822]: GetNamedBufferSubData (will be remapped) */
    "iiip\0"
    "glGetNamedBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[11573]: VDPAUSurfaceAccessNV (will be remapped) */
+   /* _mesa_function_pool[11852]: VDPAUSurfaceAccessNV (will be remapped) */
    "ii\0"
    "glVDPAUSurfaceAccessNV\0"
    "\0"
-   /* _mesa_function_pool[11600]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[11879]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[11622]: WindowPos2f (will be remapped) */
+   /* _mesa_function_pool[11901]: WindowPos2f (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
    "glWindowPos2fMESA\0"
    "\0"
-   /* _mesa_function_pool[11675]: WindowPos2d (will be remapped) */
+   /* _mesa_function_pool[11954]: WindowPos2d (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[11728]: WindowPos2i (will be remapped) */
+   /* _mesa_function_pool[12007]: WindowPos2i (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[11781]: WindowPos2s (will be remapped) */
+   /* _mesa_function_pool[12060]: WindowPos2s (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[11834]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[12113]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[11879]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[12158]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[11895]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[12174]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[11917]: CompressedTexImage3D (will be remapped) */
+   /* _mesa_function_pool[12196]: CompressedTexImage3D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "glCompressedTexImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[12003]: VertexAttribI1uiv (will be remapped) */
+   /* _mesa_function_pool[12282]: VertexAttribI1uiv (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[12050]: SecondaryColor3dv (will be remapped) */
+   /* _mesa_function_pool[12329]: SecondaryColor3dv (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[12096]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[12375]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[12126]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[12405]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[12152]: VertexAttrib3s (will be remapped) */
+   /* _mesa_function_pool[12431]: VertexAttrib3s (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[12195]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[12474]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[12222]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[12501]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[12243]: GetQueryiv (will be remapped) */
+   /* _mesa_function_pool[12522]: GetQueryiv (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[12277]: VertexAttrib3d (will be remapped) */
+   /* _mesa_function_pool[12556]: VertexAttrib3d (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[12320]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[12599]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[12354]: MapNamedBufferRange (will be remapped) */
+   /* _mesa_function_pool[12633]: MapNamedBufferRange (will be remapped) */
    "iiii\0"
    "glMapNamedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[12382]: MapBuffer (will be remapped) */
+   /* _mesa_function_pool[12661]: MapBuffer (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "glMapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[12428]: VertexAttrib4Nbv (will be remapped) */
+   /* _mesa_function_pool[12707]: VertexAttrib4Nbv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[12473]: ProgramBinary (will be remapped) */
+   /* _mesa_function_pool[12752]: ProgramBinary (will be remapped) */
    "iipi\0"
    "glProgramBinary\0"
    "glProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[12514]: InvalidateTexImage (will be remapped) */
+   /* _mesa_function_pool[12793]: InvalidateTexImage (will be remapped) */
    "ii\0"
    "glInvalidateTexImage\0"
    "\0"
-   /* _mesa_function_pool[12539]: Uniform4ui (will be remapped) */
+   /* _mesa_function_pool[12818]: Uniform4ui (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[12575]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[12854]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[12616]: GetBooleani_v (will be remapped) */
+   /* _mesa_function_pool[12895]: GetBooleani_v (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[12661]: DrawTexsOES (will be remapped) */
+   /* _mesa_function_pool[12940]: DrawTexsOES (will be remapped) */
    "iiiii\0"
    "glDrawTexsOES\0"
    "\0"
-   /* _mesa_function_pool[12682]: GetObjectPtrLabel (will be remapped) */
+   /* _mesa_function_pool[12961]: GetObjectPtrLabel (will be remapped) */
    "pipp\0"
    "glGetObjectPtrLabel\0"
    "\0"
-   /* _mesa_function_pool[12708]: ProgramParameteri (will be remapped) */
+   /* _mesa_function_pool[12987]: ProgramParameteri (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "glProgramParameteri\0"
    "glProgramParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[12779]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13058]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12817]: Color3fv (offset 14) */
+   /* _mesa_function_pool[13096]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[12831]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[13110]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[12857]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[13136]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[12878]: MultiTexCoord2i (offset 388) */
+   /* _mesa_function_pool[13157]: MultiTexCoord2i (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[12922]: MultiTexCoord2d (offset 384) */
+   /* _mesa_function_pool[13201]: MultiTexCoord2d (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[12966]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[13245]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[12994]: MultiTexCoord2s (offset 390) */
+   /* _mesa_function_pool[13273]: MultiTexCoord2s (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[13038]: VDPAURegisterVideoSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[13317]: VDPAURegisterVideoSurfaceNV (will be remapped) */
    "piip\0"
    "glVDPAURegisterVideoSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[13074]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13353]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13127]: Indexub (offset 315) */
+   /* _mesa_function_pool[13406]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[13140]: GetPerfMonitorCounterDataAMD (will be remapped) */
+   /* _mesa_function_pool[13419]: GetPerfMonitorCounterDataAMD (will be remapped) */
    "iiipp\0"
    "glGetPerfMonitorCounterDataAMD\0"
    "\0"
-   /* _mesa_function_pool[13178]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13457]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13223]: MultTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[13502]: MultTransposeMatrixf (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[13275]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[13554]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[13298]: Scalex (will be remapped) */
+   /* _mesa_function_pool[13577]: Scalex (will be remapped) */
    "iii\0"
    "glScalexOES\0"
    "glScalex\0"
    "\0"
-   /* _mesa_function_pool[13324]: Scaled (offset 301) */
+   /* _mesa_function_pool[13603]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[13338]: Scalef (offset 302) */
+   /* _mesa_function_pool[13617]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[13352]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[13631]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[13376]: GetUniformfv (will be remapped) */
+   /* _mesa_function_pool[13655]: GetUniformfv (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[13414]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[13693]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[13448]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[13727]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[13472]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[13751]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[13494]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13773]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13523]: QueryCounter (will be remapped) */
+   /* _mesa_function_pool[13802]: QueryCounter (will be remapped) */
    "ii\0"
    "glQueryCounter\0"
    "\0"
-   /* _mesa_function_pool[13542]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[13821]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[13567]: ProgramUniform3iv (will be remapped) */
+   /* _mesa_function_pool[13846]: ProgramUniform3iv (will be remapped) */
    "iiip\0"
    "glProgramUniform3iv\0"
    "glProgramUniform3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[13616]: ProgramUniformMatrix2dv (will be remapped) */
+   /* _mesa_function_pool[13895]: ProgramUniformMatrix2dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2dv\0"
    "\0"
-   /* _mesa_function_pool[13649]: ClearTexSubImage (will be remapped) */
+   /* _mesa_function_pool[13928]: ClearTexSubImage (will be remapped) */
    "iiiiiiiiiip\0"
    "glClearTexSubImage\0"
    "\0"
-   /* _mesa_function_pool[13681]: GetActiveUniformBlockName (will be remapped) */
+   /* _mesa_function_pool[13960]: GetActiveUniformBlockName (will be remapped) */
    "iiipp\0"
    "glGetActiveUniformBlockName\0"
    "\0"
-   /* _mesa_function_pool[13716]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[13995]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[13748]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[14027]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[13766]: ColorMaski (will be remapped) */
+   /* _mesa_function_pool[14045]: ColorMaski (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[13808]: Uniform2uiv (will be remapped) */
+   /* _mesa_function_pool[14087]: Uniform2uiv (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[13844]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[14123]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[13863]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[14142]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[13882]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[14161]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[13901]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[14180]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "glBindVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[13943]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[14222]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[13962]: GetTexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[14241]: GetTexParameteriv (offset 283) */
    "iip\0"
-   "glGetTexParameterIuivEXT\0"
-   "glGetTexParameterIuiv\0"
+   "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14014]: DrawTransformFeedbackStreamInstanced (will be remapped) */
+   /* _mesa_function_pool[14266]: DrawTransformFeedbackStreamInstanced (will be remapped) */
    "iiii\0"
    "glDrawTransformFeedbackStreamInstanced\0"
    "\0"
-   /* _mesa_function_pool[14059]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[14311]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[14102]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14354]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14132]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14384]: GetProgramResourceName (will be remapped) */
+   "iiiipp\0"
+   "glGetProgramResourceName\0"
+   "\0"
+   /* _mesa_function_pool[14417]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14174]: ProgramUniformMatrix4x3dv (will be remapped) */
+   /* _mesa_function_pool[14459]: ProgramUniformMatrix4x3dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x3dv\0"
    "\0"
-   /* _mesa_function_pool[14209]: IsFenceNV (dynamic) */
+   /* _mesa_function_pool[14494]: IsFenceNV (dynamic) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[14224]: ColorTable (offset 339) */
+   /* _mesa_function_pool[14509]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[14277]: LoadName (offset 198) */
+   /* _mesa_function_pool[14562]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[14291]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14576]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14320]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[14605]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[14346]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[14631]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[14362]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[14647]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[14420]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[14705]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[14441]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[14726]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[14460]: FlushMappedNamedBufferRange (will be remapped) */
+   /* _mesa_function_pool[14745]: FlushMappedNamedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedNamedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[14495]: MultiTexCoordP1ui (will be remapped) */
+   /* _mesa_function_pool[14780]: MultiTexCoordP1ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[14520]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[14805]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[14539]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[14824]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[14554]: SelectPerfMonitorCountersAMD (will be remapped) */
+   /* _mesa_function_pool[14839]: SelectPerfMonitorCountersAMD (will be remapped) */
    "iiiip\0"
    "glSelectPerfMonitorCountersAMD\0"
    "\0"
-   /* _mesa_function_pool[14592]: TextureStorage2D (will be remapped) */
+   /* _mesa_function_pool[14877]: TextureStorage2D (will be remapped) */
    "iiiii\0"
    "glTextureStorage2D\0"
    "\0"
-   /* _mesa_function_pool[14618]: GetTextureParameterIiv (will be remapped) */
+   /* _mesa_function_pool[14903]: GetTextureParameterIiv (will be remapped) */
    "iip\0"
    "glGetTextureParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[14648]: BindFramebuffer (will be remapped) */
+   /* _mesa_function_pool[14933]: BindFramebuffer (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[14691]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[14976]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[14709]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[14994]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[14743]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15028]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14769]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[15054]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[14795]: GetActiveUniformsiv (will be remapped) */
+   /* _mesa_function_pool[15080]: GetActiveUniformsiv (will be remapped) */
    "iipip\0"
    "glGetActiveUniformsiv\0"
    "\0"
-   /* _mesa_function_pool[14824]: VertexAttrib2sv (will be remapped) */
+   /* _mesa_function_pool[15109]: VertexAttrib2sv (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[14867]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[15152]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[14902]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[15187]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14930]: Uniform1dv (will be remapped) */
+   /* _mesa_function_pool[15215]: Uniform1dv (will be remapped) */
    "iip\0"
    "glUniform1dv\0"
    "\0"
-   /* _mesa_function_pool[14948]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[15233]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[14984]: PushDebugGroup (will be remapped) */
+   /* _mesa_function_pool[15269]: TransformFeedbackBufferRange (will be remapped) */
+   "iiiii\0"
+   "glTransformFeedbackBufferRange\0"
+   "\0"
+   /* _mesa_function_pool[15307]: PushDebugGroup (will be remapped) */
    "iiip\0"
    "glPushDebugGroup\0"
    "\0"
-   /* _mesa_function_pool[15007]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15330]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15055]: GetPerfMonitorGroupStringAMD (will be remapped) */
+   /* _mesa_function_pool[15378]: GetPerfMonitorGroupStringAMD (will be remapped) */
    "iipp\0"
    "glGetPerfMonitorGroupStringAMD\0"
    "\0"
-   /* _mesa_function_pool[15092]: GetError (offset 261) */
+   /* _mesa_function_pool[15415]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[15105]: PassThrough (offset 199) */
+   /* _mesa_function_pool[15428]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[15122]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[15445]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[15152]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[15475]: CreateProgramPipelines (will be remapped) */
+   "ip\0"
+   "glCreateProgramPipelines\0"
+   "\0"
+   /* _mesa_function_pool[15504]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15186]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[15538]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[15214]: BindBuffersRange (will be remapped) */
+   /* _mesa_function_pool[15566]: BindBuffersRange (will be remapped) */
    "iiippp\0"
    "glBindBuffersRange\0"
    "\0"
-   /* _mesa_function_pool[15241]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[15593]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[15284]: WindowPos3dv (will be remapped) */
+   /* _mesa_function_pool[15636]: WindowPos3dv (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15339]: TexGenxOES (will be remapped) */
+   /* _mesa_function_pool[15691]: TexGenxOES (will be remapped) */
    "iii\0"
    "glTexGenxOES\0"
    "\0"
-   /* _mesa_function_pool[15357]: DeleteFencesNV (dynamic) */
+   /* _mesa_function_pool[15709]: DeleteFencesNV (dynamic) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[15378]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[15730]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[15416]: StencilOp (offset 244) */
+   /* _mesa_function_pool[15768]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[15433]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[15785]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[15454]: ProgramUniform1iv (will be remapped) */
+   /* _mesa_function_pool[15806]: ProgramUniform1iv (will be remapped) */
    "iiip\0"
    "glProgramUniform1iv\0"
    "glProgramUniform1ivEXT\0"
    "\0"
-   /* _mesa_function_pool[15503]: ProgramUniform3ui (will be remapped) */
+   /* _mesa_function_pool[15855]: ProgramUniform3ui (will be remapped) */
    "iiiii\0"
    "glProgramUniform3ui\0"
    "glProgramUniform3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[15553]: SecondaryColor3sv (will be remapped) */
+   /* _mesa_function_pool[15905]: SecondaryColor3sv (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[15599]: TexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[15951]: TexCoordP3ui (will be remapped) */
    "ii\0"
    "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[15618]: Fogxv (will be remapped) */
+   /* _mesa_function_pool[15970]: Fogxv (will be remapped) */
    "ip\0"
    "glFogxvOES\0"
    "glFogxv\0"
    "\0"
-   /* _mesa_function_pool[15641]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[15993]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[15668]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[16020]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[15693]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[16045]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[15711]: LogicOp (offset 242) */
+   /* _mesa_function_pool[16063]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[15724]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[16076]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[15800]: WindowPos3d (will be remapped) */
+   /* _mesa_function_pool[16152]: GetTransformFeedbacki64_v (will be remapped) */
+   "iiip\0"
+   "glGetTransformFeedbacki64_v\0"
+   "\0"
+   /* _mesa_function_pool[16186]: WindowPos3d (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[15854]: Enablei (will be remapped) */
+   /* _mesa_function_pool[16240]: Enablei (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[15887]: WindowPos3f (will be remapped) */
+   /* _mesa_function_pool[16273]: WindowPos3f (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[15941]: GenProgramsARB (will be remapped) */
+   /* _mesa_function_pool[16327]: GenProgramsARB (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[15978]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[16364]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[15996]: WindowPos3i (will be remapped) */
+   /* _mesa_function_pool[16382]: WindowPos3i (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[16050]: MultiTexCoord4iv (offset 405) */
+   /* _mesa_function_pool[16436]: MultiTexCoord4iv (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[16095]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[16481]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[16112]: WindowPos3s (will be remapped) */
+   /* _mesa_function_pool[16498]: WindowPos3s (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[16166]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[16552]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[16185]: DebugMessageInsert (will be remapped) */
+   /* _mesa_function_pool[16571]: DebugMessageInsert (will be remapped) */
    "iiiiip\0"
    "glDebugMessageInsertARB\0"
    "glDebugMessageInsert\0"
    "\0"
-   /* _mesa_function_pool[16238]: Orthof (will be remapped) */
+   /* _mesa_function_pool[16624]: Orthof (will be remapped) */
    "ffffff\0"
    "glOrthofOES\0"
    "glOrthof\0"
    "\0"
-   /* _mesa_function_pool[16267]: CompressedTexImage2D (will be remapped) */
+   /* _mesa_function_pool[16653]: CompressedTexImage2D (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[16326]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[16712]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[16347]: ProgramUniformMatrix2x3dv (will be remapped) */
+   /* _mesa_function_pool[16733]: ProgramUniformMatrix2x3dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x3dv\0"
    "\0"
-   /* _mesa_function_pool[16382]: IsSync (will be remapped) */
+   /* _mesa_function_pool[16768]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[16394]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[16780]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[16409]: MultiTexCoord1sv (offset 383) */
+   /* _mesa_function_pool[16795]: MultiTexCoord1sv (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[16454]: Orthox (will be remapped) */
+   /* _mesa_function_pool[16840]: Orthox (will be remapped) */
    "iiiiii\0"
    "glOrthoxOES\0"
    "glOrthox\0"
    "\0"
-   /* _mesa_function_pool[16483]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[16869]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[16499]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[16885]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[16517]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[16903]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[16533]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16919]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16574]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[16960]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[16596]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[16982]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[16614]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[17000]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[16632]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[17018]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[16650]: InvalidateSubFramebuffer (will be remapped) */
+   /* _mesa_function_pool[17036]: InvalidateSubFramebuffer (will be remapped) */
    "iipiiii\0"
    "glInvalidateSubFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[16686]: Color4ub (offset 35) */
+   /* _mesa_function_pool[17072]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[16703]: UniformMatrix2x4dv (will be remapped) */
+   /* _mesa_function_pool[17089]: UniformMatrix2x4dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4dv\0"
    "\0"
-   /* _mesa_function_pool[16730]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[17116]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[16748]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[17134]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[16766]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[17152]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16801]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[17187]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[16828]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[17214]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[16863]: MultiTexCoord3dv (offset 393) */
+   /* _mesa_function_pool[17249]: MultiTexCoord3dv (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[16908]: BindProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[17294]: BindProgramPipeline (will be remapped) */
    "i\0"
    "glBindProgramPipeline\0"
    "glBindProgramPipelineEXT\0"
    "\0"
-   /* _mesa_function_pool[16958]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[17344]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[16984]: DebugMessageCallback (will be remapped) */
+   /* _mesa_function_pool[17370]: DebugMessageCallback (will be remapped) */
    "pp\0"
    "glDebugMessageCallbackARB\0"
    "glDebugMessageCallback\0"
    "\0"
-   /* _mesa_function_pool[17037]: MultiTexCoord1i (offset 380) */
+   /* _mesa_function_pool[17423]: MultiTexCoord1i (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[17080]: WindowPos2dv (will be remapped) */
+   /* _mesa_function_pool[17466]: WindowPos2dv (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[17135]: TexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[17521]: TexParameterIuiv (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[17181]: DeletePerfQueryINTEL (will be remapped) */
+   /* _mesa_function_pool[17567]: DeletePerfQueryINTEL (will be remapped) */
    "i\0"
    "glDeletePerfQueryINTEL\0"
    "\0"
-   /* _mesa_function_pool[17207]: MultiTexCoord1d (offset 376) */
+   /* _mesa_function_pool[17593]: MultiTexCoord1d (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[17250]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[17636]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[17277]: MultiTexCoord1s (offset 382) */
+   /* _mesa_function_pool[17663]: MultiTexCoord1s (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[17320]: BeginConditionalRender (will be remapped) */
+   /* _mesa_function_pool[17706]: BeginConditionalRender (will be remapped) */
    "ii\0"
    "glBeginConditionalRender\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[17376]: LoadPaletteFromModelViewMatrixOES (dynamic) */
+   /* _mesa_function_pool[17762]: LoadPaletteFromModelViewMatrixOES (dynamic) */
    "\0"
    "glLoadPaletteFromModelViewMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[17414]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[17800]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[17433]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17819]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17467]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[17853]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[17529]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[17915]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[17550]: UniformMatrix4dv (will be remapped) */
+   /* _mesa_function_pool[17936]: UniformMatrix4dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4dv\0"
    "\0"
-   /* _mesa_function_pool[17575]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[17961]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[17603]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[17989]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[17630]: GetTexParameterxv (will be remapped) */
+   /* _mesa_function_pool[18016]: GetTexParameterxv (will be remapped) */
    "iip\0"
    "glGetTexParameterxvOES\0"
    "glGetTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[17678]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[18064]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[17705]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[18091]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[17727]: Materialiv (offset 172) */
+   /* _mesa_function_pool[18113]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[17745]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[18131]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[17774]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[18160]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[17793]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[18179]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[17835]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[18221]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[17859]: TexGeni (offset 192) */
+   /* _mesa_function_pool[18245]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "glTexGeniOES\0"
    "\0"
-   /* _mesa_function_pool[17887]: TexGenf (offset 190) */
+   /* _mesa_function_pool[18273]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "glTexGenfOES\0"
    "\0"
-   /* _mesa_function_pool[17915]: TexGend (offset 188) */
+   /* _mesa_function_pool[18301]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[17930]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[18316]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[17957]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[18343]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[17986]: Color4sv (offset 34) */
+   /* _mesa_function_pool[18372]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[18000]: GetCombinerInputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[18386]: GetCombinerInputParameterfvNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[18039]: LoadTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[18425]: LoadTransposeMatrixf (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[18091]: LoadTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[18477]: LoadTransposeMatrixd (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[18143]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[18529]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[18159]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[18545]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[18217]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[18603]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[18273]: IsTexture (offset 330) */
+   /* _mesa_function_pool[18659]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[18303]: ProgramUniform3uiv (will be remapped) */
+   /* _mesa_function_pool[18689]: ProgramUniform3uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform3uiv\0"
    "glProgramUniform3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[18354]: GetTextureImage (will be remapped) */
-   "iiiiip\0"
-   "glGetTextureImage\0"
+   /* _mesa_function_pool[18740]: IndexPointer (offset 314) */
+   "iip\0"
+   "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[18380]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[18760]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[18415]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[18795]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[18441]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[18821]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[18457]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[18837]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[18480]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18860]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[18529]: IsBuffer (will be remapped) */
+   /* _mesa_function_pool[18909]: IsBuffer (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[18557]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[18937]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[18573]: TextureStorage3D (will be remapped) */
+   /* _mesa_function_pool[18953]: TextureStorage3D (will be remapped) */
    "iiiiii\0"
    "glTextureStorage3D\0"
    "\0"
-   /* _mesa_function_pool[18600]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18980]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18627]: TexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[19007]: TexCoordP3uiv (will be remapped) */
    "ip\0"
    "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[18647]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[19027]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[18666]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[19046]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[18683]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[19063]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[18709]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[19089]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[18737]: Uniform1iv (will be remapped) */
+   /* _mesa_function_pool[19117]: Uniform1iv (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[18771]: Uniform4uiv (will be remapped) */
+   /* _mesa_function_pool[19151]: Uniform4uiv (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[18807]: PopDebugGroup (will be remapped) */
+   /* _mesa_function_pool[19187]: PopDebugGroup (will be remapped) */
    "\0"
    "glPopDebugGroup\0"
    "\0"
-   /* _mesa_function_pool[18825]: VertexAttrib1d (will be remapped) */
+   /* _mesa_function_pool[19205]: VertexAttrib1d (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[18866]: CompressedTexImage1D (will be remapped) */
+   /* _mesa_function_pool[19246]: CompressedTexImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[18924]: NamedBufferSubData (will be remapped) */
+   /* _mesa_function_pool[19304]: NamedBufferSubData (will be remapped) */
    "iiip\0"
    "glNamedBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[18951]: TexBufferRange (will be remapped) */
+   /* _mesa_function_pool[19331]: TexBufferRange (will be remapped) */
    "iiiii\0"
    "glTexBufferRange\0"
    "\0"
-   /* _mesa_function_pool[18975]: VertexAttrib1s (will be remapped) */
+   /* _mesa_function_pool[19355]: VertexAttrib1s (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[19016]: MultiDrawElementsIndirect (will be remapped) */
+   /* _mesa_function_pool[19396]: MultiDrawElementsIndirect (will be remapped) */
    "iipii\0"
    "glMultiDrawElementsIndirect\0"
    "\0"
-   /* _mesa_function_pool[19051]: UniformMatrix4x3dv (will be remapped) */
+   /* _mesa_function_pool[19431]: UniformMatrix4x3dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3dv\0"
    "\0"
-   /* _mesa_function_pool[19078]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[19458]: TransformFeedbackBufferBase (will be remapped) */
+   "iii\0"
+   "glTransformFeedbackBufferBase\0"
+   "\0"
+   /* _mesa_function_pool[19493]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[19110]: BeginPerfMonitorAMD (will be remapped) */
+   /* _mesa_function_pool[19525]: BeginPerfMonitorAMD (will be remapped) */
    "i\0"
    "glBeginPerfMonitorAMD\0"
    "\0"
-   /* _mesa_function_pool[19135]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[19550]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[19227]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[19642]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[19272]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[19687]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[19303]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[19718]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[19318]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[19733]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[19339]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[19754]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[19363]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[19778]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[19390]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[19805]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[19414]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[19829]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[19433]: ViewportArrayv (will be remapped) */
+   /* _mesa_function_pool[19848]: ViewportArrayv (will be remapped) */
    "iip\0"
    "glViewportArrayv\0"
    "\0"
-   /* _mesa_function_pool[19455]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19870]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19526]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[19941]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[19579]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19994]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19624]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[20039]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[19660]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[20075]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[19684]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[20099]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[19713]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[20128]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[19731]: Fogiv (offset 156) */
+   /* _mesa_function_pool[20146]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[19743]: EndQuery (will be remapped) */
+   /* _mesa_function_pool[20158]: EndQuery (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[19771]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[20186]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[19788]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[20203]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[19805]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[20220]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[19832]: Clear (offset 203) */
+   /* _mesa_function_pool[20247]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[19843]: VertexAttrib4sv (will be remapped) */
+   /* _mesa_function_pool[20258]: VertexAttrib4sv (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[19886]: Ortho (offset 296) */
+   /* _mesa_function_pool[20301]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[19902]: Uniform3uiv (will be remapped) */
+   /* _mesa_function_pool[20317]: Uniform3uiv (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[19938]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[20353]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "glMatrixIndexPointerOES\0"
    "\0"
-   /* _mesa_function_pool[19992]: EndQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[20407]: EndQueryIndexed (will be remapped) */
    "ii\0"
    "glEndQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[20014]: TexParameterxv (will be remapped) */
+   /* _mesa_function_pool[20429]: TexParameterxv (will be remapped) */
    "iip\0"
    "glTexParameterxvOES\0"
    "glTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[20056]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[20471]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[20093]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[20508]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[20128]: ProgramUniformMatrix2fv (will be remapped) */
+   /* _mesa_function_pool[20543]: ProgramUniformMatrix2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2fv\0"
    "glProgramUniformMatrix2fvEXT\0"
    "\0"
-   /* _mesa_function_pool[20190]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[20605]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[20225]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[20640]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[20251]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[20666]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[20271]: Uniform4dv (will be remapped) */
+   /* _mesa_function_pool[20686]: Uniform4dv (will be remapped) */
    "iip\0"
    "glUniform4dv\0"
    "\0"
-   /* _mesa_function_pool[20289]: LightModelx (will be remapped) */
+   /* _mesa_function_pool[20704]: LightModelx (will be remapped) */
    "ii\0"
    "glLightModelxOES\0"
    "glLightModelx\0"
    "\0"
-   /* _mesa_function_pool[20324]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[20739]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[20369]: ClearColorx (will be remapped) */
+   /* _mesa_function_pool[20784]: ClearColorx (will be remapped) */
    "iiii\0"
    "glClearColorxOES\0"
    "glClearColorx\0"
    "\0"
-   /* _mesa_function_pool[20406]: EndTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[20821]: EndTransformFeedback (will be remapped) */
    "\0"
    "glEndTransformFeedback\0"
    "glEndTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[20457]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[20872]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[20475]: GetProgramBinary (will be remapped) */
+   /* _mesa_function_pool[20890]: GetProgramBinary (will be remapped) */
    "iippp\0"
    "glGetProgramBinary\0"
    "glGetProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[20523]: ViewportIndexedfv (will be remapped) */
+   /* _mesa_function_pool[20938]: ViewportIndexedfv (will be remapped) */
    "ip\0"
    "glViewportIndexedfv\0"
    "\0"
-   /* _mesa_function_pool[20547]: BindTextureUnit (will be remapped) */
+   /* _mesa_function_pool[20962]: BindTextureUnit (will be remapped) */
    "ii\0"
    "glBindTextureUnit\0"
    "\0"
-   /* _mesa_function_pool[20569]: CallList (offset 2) */
+   /* _mesa_function_pool[20984]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[20583]: Materialfv (offset 170) */
+   /* _mesa_function_pool[20998]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[20601]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[21016]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[20620]: GetActiveAtomicCounterBufferiv (will be remapped) */
+   /* _mesa_function_pool[21035]: GetActiveAtomicCounterBufferiv (will be remapped) */
    "iiip\0"
    "glGetActiveAtomicCounterBufferiv\0"
    "\0"
-   /* _mesa_function_pool[20659]: TexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[21074]: TexParameterIiv (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[20703]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[21118]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[20725]: FlushVertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[21140]: FlushVertexArrayRangeNV (dynamic) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[20753]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[21168]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[20808]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[21223]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[20843]: Uniform2iv (will be remapped) */
+   /* _mesa_function_pool[21258]: Uniform2iv (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[20877]: GetFixedv (will be remapped) */
+   /* _mesa_function_pool[21292]: GetFixedv (will be remapped) */
    "ip\0"
    "glGetFixedvOES\0"
    "glGetFixedv\0"
    "\0"
-   /* _mesa_function_pool[20908]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[21323]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[20939]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[21354]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[20959]: SampleCoveragex (will be remapped) */
+   /* _mesa_function_pool[21374]: SampleCoveragex (will be remapped) */
    "ii\0"
    "glSampleCoveragexOES\0"
    "glSampleCoveragex\0"
    "\0"
-   /* _mesa_function_pool[21002]: GetPerfQueryInfoINTEL (will be remapped) */
+   /* _mesa_function_pool[21417]: GetPerfQueryInfoINTEL (will be remapped) */
    "iippppp\0"
    "glGetPerfQueryInfoINTEL\0"
    "\0"
-   /* _mesa_function_pool[21035]: DeleteFramebuffers (will be remapped) */
+   /* _mesa_function_pool[21450]: DeleteFramebuffers (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "glDeleteFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[21108]: CombinerInputNV (dynamic) */
+   /* _mesa_function_pool[21523]: CombinerInputNV (dynamic) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[21134]: VertexAttrib4uiv (will be remapped) */
+   /* _mesa_function_pool[21549]: VertexAttrib4uiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[21179]: VertexAttrib4Nsv (will be remapped) */
+   /* _mesa_function_pool[21594]: VertexAttrib4Nsv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[21224]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[21639]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[21241]: VertexAttribI2iEXT (will be remapped) */
+   /* _mesa_function_pool[21656]: VertexAttribI2iEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2iEXT\0"
    "glVertexAttribI2i\0"
    "\0"
-   /* _mesa_function_pool[21285]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[21700]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[21302]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[21717]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[21319]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[21734]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "glGetTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[21355]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[21770]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[21372]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[21787]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21403]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[21818]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[21434]: GetVertexAttribIuiv (will be remapped) */
+   /* _mesa_function_pool[21849]: GetVertexAttribIuiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
    "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[21486]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[21901]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[21505]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[21920]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[21520]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[21935]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[21551]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[21966]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[21573]: StencilMask (offset 209) */
+   /* _mesa_function_pool[21988]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[21590]: IsList (offset 287) */
+   /* _mesa_function_pool[22005]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[21602]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[22017]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[21623]: GetIntegeri_v (will be remapped) */
+   /* _mesa_function_pool[22038]: GetIntegeri_v (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[21668]: ProgramUniform2iv (will be remapped) */
+   /* _mesa_function_pool[22083]: ProgramUniform2iv (will be remapped) */
    "iiip\0"
    "glProgramUniform2iv\0"
    "glProgramUniform2ivEXT\0"
    "\0"
-   /* _mesa_function_pool[21717]: VertexAttribs4svNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs4svNV\0"
+   /* _mesa_function_pool[22132]: VertexAttribI4sv (will be remapped) */
+   "ip\0"
+   "glVertexAttribI4svEXT\0"
+   "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[21743]: FogCoordPointer (will be remapped) */
+   /* _mesa_function_pool[22177]: FogCoordPointer (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21787]: SecondaryColor3us (will be remapped) */
+   /* _mesa_function_pool[22221]: SecondaryColor3us (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[21835]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[22269]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[21874]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[22308]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[21896]: SecondaryColor3ub (will be remapped) */
+   /* _mesa_function_pool[22330]: SecondaryColor3ub (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[21944]: GetActiveUniformName (will be remapped) */
+   /* _mesa_function_pool[22378]: GetActiveUniformName (will be remapped) */
    "iiipp\0"
    "glGetActiveUniformName\0"
    "\0"
-   /* _mesa_function_pool[21974]: SecondaryColor3ui (will be remapped) */
+   /* _mesa_function_pool[22408]: SecondaryColor3ui (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[22022]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[22456]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[22069]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[22503]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[22089]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[22523]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[22118]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[22552]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[22141]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[22575]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[22161]: TextureBuffer (will be remapped) */
+   /* _mesa_function_pool[22595]: TextureBuffer (will be remapped) */
    "iii\0"
    "glTextureBuffer\0"
    "\0"
-   /* _mesa_function_pool[22182]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[22616]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[22212]: InitNames (offset 197) */
+   /* _mesa_function_pool[22646]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[22226]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[22660]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[22241]: DeleteQueries (will be remapped) */
+   /* _mesa_function_pool[22675]: DeleteQueries (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[22280]: InvalidateFramebuffer (will be remapped) */
+   /* _mesa_function_pool[22714]: InvalidateFramebuffer (will be remapped) */
    "iip\0"
    "glInvalidateFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[22309]: Hint (offset 158) */
+   /* _mesa_function_pool[22743]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[22320]: MemoryBarrier (will be remapped) */
+   /* _mesa_function_pool[22754]: MemoryBarrier (will be remapped) */
    "i\0"
    "glMemoryBarrier\0"
    "\0"
-   /* _mesa_function_pool[22339]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[22773]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[22389]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[22823]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[22407]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[22841]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[22438]: GetTexEnvxv (will be remapped) */
+   /* _mesa_function_pool[22872]: GetTexEnvxv (will be remapped) */
    "iip\0"
    "glGetTexEnvxvOES\0"
    "glGetTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[22474]: DrawTexsvOES (will be remapped) */
+   /* _mesa_function_pool[22908]: DrawTexsvOES (will be remapped) */
    "p\0"
    "glDrawTexsvOES\0"
    "\0"
-   /* _mesa_function_pool[22492]: Disable (offset 214) */
+   /* _mesa_function_pool[22926]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[22505]: ClearColor (offset 206) */
+   /* _mesa_function_pool[22939]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[22524]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[22958]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[22543]: GetTextureParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[22977]: GetTextureParameterIuiv (will be remapped) */
    "iip\0"
    "glGetTextureParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[22574]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[23008]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[22592]: VDPAUIsSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[23026]: VDPAUIsSurfaceNV (will be remapped) */
    "i\0"
    "glVDPAUIsSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[22614]: ProgramUniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[23048]: ProgramUniformMatrix2x3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x3fv\0"
    "glProgramUniformMatrix2x3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[22680]: BindVertexBuffer (will be remapped) */
+   /* _mesa_function_pool[23114]: BindVertexBuffer (will be remapped) */
    "iiii\0"
    "glBindVertexBuffer\0"
    "\0"
-   /* _mesa_function_pool[22705]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[23139]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[22726]: RasterPos4i (offset 82) */
+   /* _mesa_function_pool[23160]: RasterPos4i (offset 82) */
    "iiii\0"
    "glRasterPos4i\0"
    "\0"
-   /* _mesa_function_pool[22746]: RasterPos4d (offset 78) */
+   /* _mesa_function_pool[23180]: RasterPos4d (offset 78) */
    "dddd\0"
    "glRasterPos4d\0"
    "\0"
-   /* _mesa_function_pool[22766]: RasterPos4f (offset 80) */
+   /* _mesa_function_pool[23200]: RasterPos4f (offset 80) */
    "ffff\0"
    "glRasterPos4f\0"
    "\0"
-   /* _mesa_function_pool[22786]: GetQueryIndexediv (will be remapped) */
+   /* _mesa_function_pool[23220]: GetQueryIndexediv (will be remapped) */
    "iiip\0"
    "glGetQueryIndexediv\0"
    "\0"
-   /* _mesa_function_pool[22812]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[23246]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[22830]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[23264]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[22850]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[23284]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[22867]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[23301]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[22887]: PixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[23321]: PixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[22920]: VertexAttrib3dv (will be remapped) */
+   /* _mesa_function_pool[23354]: VertexAttrib3dv (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[22963]: Histogram (offset 367) */
+   /* _mesa_function_pool[23397]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[22996]: Uniform2fv (will be remapped) */
+   /* _mesa_function_pool[23430]: Uniform2fv (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[23030]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[23464]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[23060]: ProgramUniformMatrix3x4dv (will be remapped) */
+   /* _mesa_function_pool[23494]: ProgramUniformMatrix3x4dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x4dv\0"
    "\0"
-   /* _mesa_function_pool[23095]: DrawBuffers (will be remapped) */
+   /* _mesa_function_pool[23529]: DrawBuffers (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
@@ -3171,3269 +3226,3306 @@ static const char _mesa_function_pool[] =
    "glDrawBuffersNV\0"
    "glDrawBuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[23180]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[23614]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[23208]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[23642]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[23223]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[23657]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[23241]: TextureStorage3DEXT (will be remapped) */
+   /* _mesa_function_pool[23675]: TextureStorage3DEXT (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[23272]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[23706]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[23314]: WindowPos2fv (will be remapped) */
+   /* _mesa_function_pool[23748]: WindowPos2fv (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[23369]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[23803]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[23389]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[23823]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "glTexImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[23446]: GetPerfQueryIdByNameINTEL (will be remapped) */
+   /* _mesa_function_pool[23880]: GetPerfQueryIdByNameINTEL (will be remapped) */
    "pp\0"
    "glGetPerfQueryIdByNameINTEL\0"
    "\0"
-   /* _mesa_function_pool[23478]: BindFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[23912]: BindFragDataLocation (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[23532]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[23966]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[23551]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[23985]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[23566]: BeginQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[24000]: BeginQueryIndexed (will be remapped) */
    "iii\0"
    "glBeginQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[23591]: ClearNamedBufferData (will be remapped) */
+   /* _mesa_function_pool[24025]: ClearNamedBufferData (will be remapped) */
    "iiiip\0"
    "glClearNamedBufferData\0"
    "\0"
-   /* _mesa_function_pool[23621]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[24055]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[23636]: UniformMatrix2x3dv (will be remapped) */
+   /* _mesa_function_pool[24070]: UniformMatrix2x3dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3dv\0"
    "\0"
-   /* _mesa_function_pool[23663]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[24097]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[23680]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[24114]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[23707]: VertexP3ui (will be remapped) */
+   /* _mesa_function_pool[24141]: VertexP3ui (will be remapped) */
    "ii\0"
    "glVertexP3ui\0"
    "\0"
-   /* _mesa_function_pool[23724]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[24158]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[23751]: UniformMatrix3fv (will be remapped) */
+   /* _mesa_function_pool[24185]: UniformMatrix3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3fv\0"
    "glUniformMatrix3fvARB\0"
    "\0"
-   /* _mesa_function_pool[23798]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[24232]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[23848]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[24282]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[23895]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[24329]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[23916]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[24350]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[23953]: GetMaterialxv (will be remapped) */
+   /* _mesa_function_pool[24387]: GetMaterialxv (will be remapped) */
    "iip\0"
    "glGetMaterialxvOES\0"
    "glGetMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[23993]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[24427]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[24017]: SecondaryColor3uiv (will be remapped) */
+   /* _mesa_function_pool[24451]: SecondaryColor3uiv (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[24065]: EndConditionalRender (will be remapped) */
+   /* _mesa_function_pool[24499]: EndConditionalRender (will be remapped) */
    "\0"
    "glEndConditionalRender\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[24115]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[24549]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[24152]: Color3sv (offset 18) */
+   /* _mesa_function_pool[24586]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[24166]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[24600]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[24193]: GetNamedBufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[24627]: GetNamedBufferParameteriv (will be remapped) */
    "iip\0"
    "glGetNamedBufferParameteriv\0"
    "\0"
-   /* _mesa_function_pool[24226]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[24660]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "glBlendEquationSeparateIndexedAMD\0"
    "glBlendEquationSeparatei\0"
    "\0"
-   /* _mesa_function_pool[24318]: TestFenceNV (dynamic) */
+   /* _mesa_function_pool[24752]: TestFenceNV (dynamic) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[24335]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[24769]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[24380]: TexStorage2D (will be remapped) */
+   /* _mesa_function_pool[24814]: TexStorage2D (will be remapped) */
    "iiiii\0"
    "glTexStorage2D\0"
    "\0"
-   /* _mesa_function_pool[24402]: GetPixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[24836]: GetPixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[24438]: FramebufferTexture2D (will be remapped) */
+   /* _mesa_function_pool[24872]: FramebufferTexture2D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "glFramebufferTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[24520]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[24954]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24549]: VertexAttrib2dv (will be remapped) */
+   /* _mesa_function_pool[24983]: VertexAttrib2dv (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[24592]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[25026]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[24607]: GetQueryObjecti64v (will be remapped) */
+   /* _mesa_function_pool[25041]: GetQueryObjecti64v (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64v\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[24657]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[25091]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[24690]: TextureRangeAPPLE (dynamic) */
+   /* _mesa_function_pool[25124]: TextureRangeAPPLE (dynamic) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[24715]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[25149]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[24770]: DrawElementsIndirect (will be remapped) */
+   /* _mesa_function_pool[25204]: DrawElementsIndirect (will be remapped) */
    "iip\0"
    "glDrawElementsIndirect\0"
    "\0"
-   /* _mesa_function_pool[24798]: WindowPos3sv (will be remapped) */
+   /* _mesa_function_pool[25232]: WindowPos3sv (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[24853]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[25287]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24883]: CallLists (offset 3) */
+   /* _mesa_function_pool[25317]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[24900]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[25334]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[24916]: GetTextureParameterfv (will be remapped) */
+   /* _mesa_function_pool[25350]: GetTextureParameterfv (will be remapped) */
    "iip\0"
    "glGetTextureParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24945]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[25379]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[24959]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[25393]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24997]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[25431]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[25012]: DepthRangex (will be remapped) */
+   /* _mesa_function_pool[25446]: DepthRangex (will be remapped) */
    "ii\0"
    "glDepthRangexOES\0"
    "glDepthRangex\0"
    "\0"
-   /* _mesa_function_pool[25047]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[25481]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[25074]: VDPAUInitNV (will be remapped) */
+   /* _mesa_function_pool[25508]: VDPAUInitNV (will be remapped) */
    "pp\0"
    "glVDPAUInitNV\0"
    "\0"
-   /* _mesa_function_pool[25092]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[25526]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[25122]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[25556]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[25158]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[25592]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "glDepthRangefOES\0"
    "\0"
-   /* _mesa_function_pool[25193]: TextureParameteriv (will be remapped) */
+   /* _mesa_function_pool[25627]: TextureParameteriv (will be remapped) */
    "iip\0"
    "glTextureParameteriv\0"
    "\0"
-   /* _mesa_function_pool[25219]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[25653]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[25256]: ValidateProgram (will be remapped) */
+   /* _mesa_function_pool[25690]: ValidateProgram (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[25298]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[25732]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[25324]: Scissor (offset 176) */
+   /* _mesa_function_pool[25758]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[25340]: BeginTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[25774]: BeginTransformFeedback (will be remapped) */
    "i\0"
    "glBeginTransformFeedback\0"
    "glBeginTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[25396]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[25830]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[25413]: Color4ui (offset 37) */
+   /* _mesa_function_pool[25847]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[25430]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[25864]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[25447]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[25881]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[25464]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[25898]: GetTransformFeedbackiv (will be remapped) */
+   "iip\0"
+   "glGetTransformFeedbackiv\0"
+   "\0"
+   /* _mesa_function_pool[25928]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[25481]: PointSizePointerOES (will be remapped) */
+   /* _mesa_function_pool[25945]: PointSizePointerOES (will be remapped) */
    "iip\0"
    "glPointSizePointerOES\0"
    "\0"
-   /* _mesa_function_pool[25508]: Color4us (offset 39) */
+   /* _mesa_function_pool[25972]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[25525]: Color3bv (offset 10) */
+   /* _mesa_function_pool[25989]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[25539]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[26003]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[25562]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[26026]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[25590]: ProvokingVertex (will be remapped) */
+   /* _mesa_function_pool[26054]: ProvokingVertex (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[25632]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[26096]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[25658]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[26122]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[25690]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[26154]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[25705]: HintPGI (dynamic) */
+   /* _mesa_function_pool[26169]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[25719]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[26183]: GetQueryBufferObjecti64v (will be remapped) */
+   "iiii\0"
+   "glGetQueryBufferObjecti64v\0"
+   "\0"
+   /* _mesa_function_pool[26216]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[25744]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[26241]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[25762]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[26259]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[25779]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[26276]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[25800]: MultiTexCoord4dv (offset 401) */
+   /* _mesa_function_pool[26297]: MultiTexCoord4dv (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[25845]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[26342]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[25902]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[26399]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[25920]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[26417]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[25950]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[26447]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[25965]: EndList (offset 1) */
+   /* _mesa_function_pool[26462]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[25977]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[26474]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[26028]: GetTexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[26525]: GetTexGenxvOES (will be remapped) */
    "iip\0"
    "glGetTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[26050]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[26547]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[26076]: DrawTexfvOES (will be remapped) */
+   /* _mesa_function_pool[26573]: DrawTexfvOES (will be remapped) */
    "p\0"
    "glDrawTexfvOES\0"
    "\0"
-   /* _mesa_function_pool[26094]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[26591]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "glBlendFunci\0"
    "\0"
-   /* _mesa_function_pool[26150]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[26647]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[26177]: Uniform2ui (will be remapped) */
+   /* _mesa_function_pool[26674]: Uniform2ui (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[26211]: ScissorIndexed (will be remapped) */
+   /* _mesa_function_pool[26708]: ScissorIndexed (will be remapped) */
    "iiiii\0"
    "glScissorIndexed\0"
    "\0"
-   /* _mesa_function_pool[26235]: End (offset 43) */
+   /* _mesa_function_pool[26732]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[26243]: BindVertexBuffers (will be remapped) */
+   /* _mesa_function_pool[26740]: BindVertexBuffers (will be remapped) */
    "iippp\0"
    "glBindVertexBuffers\0"
    "\0"
-   /* _mesa_function_pool[26270]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[26767]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[26299]: GenProgramPipelines (will be remapped) */
+   /* _mesa_function_pool[26796]: GenProgramPipelines (will be remapped) */
    "ip\0"
    "glGenProgramPipelines\0"
    "glGenProgramPipelinesEXT\0"
    "\0"
-   /* _mesa_function_pool[26350]: Enable (offset 215) */
+   /* _mesa_function_pool[26847]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[26362]: IsProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[26859]: IsProgramPipeline (will be remapped) */
    "i\0"
    "glIsProgramPipeline\0"
    "glIsProgramPipelineEXT\0"
    "\0"
-   /* _mesa_function_pool[26408]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[26905]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[26430]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[26927]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[26463]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[26960]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "glWeightPointerOES\0"
    "\0"
-   /* _mesa_function_pool[26507]: TextureSubImage1D (will be remapped) */
+   /* _mesa_function_pool[27004]: TextureSubImage1D (will be remapped) */
    "iiiiiip\0"
    "glTextureSubImage1D\0"
    "\0"
-   /* _mesa_function_pool[26536]: Normal3x (will be remapped) */
+   /* _mesa_function_pool[27033]: Normal3x (will be remapped) */
    "iii\0"
    "glNormal3xOES\0"
    "glNormal3x\0"
    "\0"
-   /* _mesa_function_pool[26566]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[27063]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[26610]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[27107]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[26627]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[27124]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[26654]: InvalidateTexSubImage (will be remapped) */
+   /* _mesa_function_pool[27151]: InvalidateTexSubImage (will be remapped) */
    "iiiiiiii\0"
    "glInvalidateTexSubImage\0"
    "\0"
-   /* _mesa_function_pool[26688]: Normal3s (offset 60) */
+   /* _mesa_function_pool[27185]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[26704]: Materialxv (will be remapped) */
+   /* _mesa_function_pool[27201]: Materialxv (will be remapped) */
    "iip\0"
    "glMaterialxvOES\0"
    "glMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[26738]: Normal3i (offset 58) */
+   /* _mesa_function_pool[27235]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[26754]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[27251]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26789]: Normal3b (offset 52) */
+   /* _mesa_function_pool[27286]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[26805]: Normal3d (offset 54) */
+   /* _mesa_function_pool[27302]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[26821]: Normal3f (offset 56) */
+   /* _mesa_function_pool[27318]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[26837]: Indexi (offset 48) */
+   /* _mesa_function_pool[27334]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[26849]: Uniform1uiv (will be remapped) */
+   /* _mesa_function_pool[27346]: Uniform1uiv (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[26885]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[27382]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[26931]: IsRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[27428]: IsRenderbuffer (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "glIsRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[26991]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[27488]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[27009]: Indexf (offset 46) */
+   /* _mesa_function_pool[27506]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[27021]: Indexd (offset 44) */
+   /* _mesa_function_pool[27518]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[27033]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[27530]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[27054]: Indexs (offset 50) */
+   /* _mesa_function_pool[27551]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[27066]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[27563]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[27092]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[27589]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[27148]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[27645]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[27163]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[27660]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[27178]: Color4bv (offset 26) */
+   /* _mesa_function_pool[27675]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[27192]: ProgramUniformMatrix3x2dv (will be remapped) */
+   /* _mesa_function_pool[27689]: ProgramUniformMatrix3x2dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x2dv\0"
    "\0"
-   /* _mesa_function_pool[27227]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[27724]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[27251]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[27748]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[27266]: ActiveTexture (offset 374) */
+   /* _mesa_function_pool[27763]: ActiveTexture (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[27304]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[27801]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[27331]: ColorP4uiv (will be remapped) */
+   /* _mesa_function_pool[27828]: ColorP4uiv (will be remapped) */
    "ip\0"
    "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[27348]: DrawTexxOES (will be remapped) */
+   /* _mesa_function_pool[27845]: DrawTexxOES (will be remapped) */
    "iiiii\0"
    "glDrawTexxOES\0"
    "\0"
-   /* _mesa_function_pool[27369]: SetFenceNV (dynamic) */
+   /* _mesa_function_pool[27866]: SetFenceNV (dynamic) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[27386]: PixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[27883]: PixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[27419]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[27916]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[27444]: GetAttribLocation (will be remapped) */
+   /* _mesa_function_pool[27941]: GetAttribLocation (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[27491]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[27988]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27528]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[28025]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[27544]: MultiTexCoord2dv (offset 385) */
+   /* _mesa_function_pool[28041]: MultiTexCoord2dv (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[27589]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[28086]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[27604]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[28101]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[27620]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[28117]: NamedRenderbufferStorageMultisample (will be remapped) */
+   "iiiii\0"
+   "glNamedRenderbufferStorageMultisample\0"
+   "\0"
+   /* _mesa_function_pool[28162]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[27639]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[28181]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[27659]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[28201]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[27677]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[28219]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[27696]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[28238]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27718]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[28260]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[27761]: ProgramUniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[28303]: ProgramUniformMatrix3x4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x4fv\0"
    "glProgramUniformMatrix3x4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[27827]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[28369]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[27862]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[28404]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[27891]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[28433]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[27951]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[28493]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[27969]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[28511]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[28013]: Frustum (offset 289) */
+   /* _mesa_function_pool[28555]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[28031]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[28573]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[28049]: GetTextureParameteriv (will be remapped) */
+   /* _mesa_function_pool[28591]: GetTextureParameteriv (will be remapped) */
    "iip\0"
    "glGetTextureParameteriv\0"
    "\0"
-   /* _mesa_function_pool[28078]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[28620]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[28096]: DepthRangeArrayv (will be remapped) */
+   /* _mesa_function_pool[28638]: DepthRangeArrayv (will be remapped) */
    "iip\0"
    "glDepthRangeArrayv\0"
    "\0"
-   /* _mesa_function_pool[28120]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[28662]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[28161]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[28703]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28189]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[28731]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[28207]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[28749]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[28241]: TextureParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[28783]: TextureParameterIuiv (will be remapped) */
    "iip\0"
    "glTextureParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[28269]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[28811]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[28303]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[28845]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[28322]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[28864]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[28338]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[28880]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[28355]: TexStorage3D (will be remapped) */
+   /* _mesa_function_pool[28897]: TexStorage3D (will be remapped) */
    "iiiiii\0"
    "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[28378]: FramebufferTexture3D (will be remapped) */
+   /* _mesa_function_pool[28920]: FramebufferTexture3D (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "glFramebufferTexture3DOES\0"
    "\0"
-   /* _mesa_function_pool[28461]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[29003]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[28492]: GetBufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[29034]: GetBufferParameteriv (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[28546]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[29088]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[28570]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[29112]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[28600]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[29142]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[28647]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[29189]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[28662]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[29204]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[28684]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[29226]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[28713]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[29255]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[28739]: IsQuery (will be remapped) */
+   /* _mesa_function_pool[29281]: IsQuery (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[28765]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[29307]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28791]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[29333]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[28817]: CreateShaderProgramv (will be remapped) */
+   /* _mesa_function_pool[29359]: CreateShaderProgramv (will be remapped) */
    "iip\0"
    "glCreateShaderProgramv\0"
    "glCreateShaderProgramvEXT\0"
    "\0"
-   /* _mesa_function_pool[28871]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[29413]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "glBlendEquationi\0"
    "\0"
-   /* _mesa_function_pool[28938]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[29480]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[28985]: PointSizex (will be remapped) */
+   /* _mesa_function_pool[29527]: PointSizex (will be remapped) */
    "i\0"
    "glPointSizexOES\0"
    "glPointSizex\0"
    "\0"
-   /* _mesa_function_pool[29017]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[29559]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[29035]: SecondaryColor3iv (will be remapped) */
+   /* _mesa_function_pool[29577]: SecondaryColor3iv (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[29081]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[29623]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[29124]: VertexAttrib4Niv (will be remapped) */
+   /* _mesa_function_pool[29666]: VertexAttrib4Niv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[29169]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[29711]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[29203]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[29745]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[29228]: LinkProgram (will be remapped) */
+   /* _mesa_function_pool[29770]: LinkProgram (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[29262]: ProgramUniform4d (will be remapped) */
+   /* _mesa_function_pool[29804]: ProgramUniform4d (will be remapped) */
    "iidddd\0"
    "glProgramUniform4d\0"
    "\0"
-   /* _mesa_function_pool[29289]: ProgramUniform4f (will be remapped) */
+   /* _mesa_function_pool[29831]: ProgramUniform4f (will be remapped) */
    "iiffff\0"
    "glProgramUniform4f\0"
    "glProgramUniform4fEXT\0"
    "\0"
-   /* _mesa_function_pool[29338]: ProgramUniform4i (will be remapped) */
+   /* _mesa_function_pool[29880]: ProgramUniform4i (will be remapped) */
    "iiiiii\0"
    "glProgramUniform4i\0"
    "glProgramUniform4iEXT\0"
    "\0"
-   /* _mesa_function_pool[29387]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[29929]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[29414]: GetNamedBufferPointerv (will be remapped) */
+   /* _mesa_function_pool[29956]: GetNamedBufferPointerv (will be remapped) */
    "iip\0"
    "glGetNamedBufferPointerv\0"
    "\0"
-   /* _mesa_function_pool[29444]: VertexAttrib4d (will be remapped) */
+   /* _mesa_function_pool[29986]: VertexAttrib4d (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[29488]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[30030]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[29512]: VertexAttrib4s (will be remapped) */
+   /* _mesa_function_pool[30054]: VertexAttrib4s (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[29556]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[30098]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[29580]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[30122]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[29613]: TexStorage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[30155]: TexStorage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexStorage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[29648]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[30190]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[29668]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[30210]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[29694]: VertexAttribP3uiv (will be remapped) */
+   /* _mesa_function_pool[30236]: VertexAttribP3uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[29720]: ScissorIndexedv (will be remapped) */
+   /* _mesa_function_pool[30262]: ScissorIndexedv (will be remapped) */
    "ip\0"
    "glScissorIndexedv\0"
    "\0"
-   /* _mesa_function_pool[29742]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[30284]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[29772]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[30314]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[29804]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[30346]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[29821]: Uniform2dv (will be remapped) */
+   /* _mesa_function_pool[30363]: Uniform2dv (will be remapped) */
    "iip\0"
    "glUniform2dv\0"
    "\0"
-   /* _mesa_function_pool[29839]: VertexAttrib4dv (will be remapped) */
+   /* _mesa_function_pool[30381]: VertexAttrib4dv (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[29882]: CreateTextures (will be remapped) */
+   /* _mesa_function_pool[30424]: CreateTextures (will be remapped) */
    "iip\0"
    "glCreateTextures\0"
    "\0"
-   /* _mesa_function_pool[29904]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[30446]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[29922]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[30464]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[29945]: CompressedTexSubImage1D (will be remapped) */
+   /* _mesa_function_pool[30487]: CompressedTexSubImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[30009]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[30551]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[30062]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[30604]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[30088]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[30630]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[30110]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[30652]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[30128]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[30670]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[30151]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[30693]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[30201]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[30743]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[30236]: FrontFace (offset 157) */
+   /* _mesa_function_pool[30778]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[30251]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[30793]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[30283]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[30825]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[30302]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[30844]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[30322]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[30864]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[30337]: Lightf (offset 159) */
+   /* _mesa_function_pool[30879]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[30351]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[30893]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[30367]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[30909]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[30388]: Lighti (offset 161) */
+   /* _mesa_function_pool[30930]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[30402]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[30944]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[30433]: GetFragDataIndex (will be remapped) */
+   /* _mesa_function_pool[30975]: GetFragDataIndex (will be remapped) */
    "ip\0"
    "glGetFragDataIndex\0"
    "\0"
-   /* _mesa_function_pool[30456]: Lightx (will be remapped) */
+   /* _mesa_function_pool[30998]: Lightx (will be remapped) */
    "iii\0"
    "glLightxOES\0"
    "glLightx\0"
    "\0"
-   /* _mesa_function_pool[30482]: ProgramUniform3fv (will be remapped) */
+   /* _mesa_function_pool[31024]: ProgramUniform3fv (will be remapped) */
    "iiip\0"
    "glProgramUniform3fv\0"
    "glProgramUniform3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[30531]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[31073]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[30548]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[31090]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[30565]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[31107]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[30610]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[31152]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[30637]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[31179]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[30659]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[31201]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[30684]: UniformMatrix3dv (will be remapped) */
+   /* _mesa_function_pool[31226]: UniformMatrix3dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3dv\0"
    "\0"
-   /* _mesa_function_pool[30709]: PointParameterx (will be remapped) */
+   /* _mesa_function_pool[31251]: PointParameterx (will be remapped) */
    "ii\0"
    "glPointParameterxOES\0"
    "glPointParameterx\0"
    "\0"
-   /* _mesa_function_pool[30752]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[31294]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[30786]: Uniform3dv (will be remapped) */
+   /* _mesa_function_pool[31328]: Uniform3dv (will be remapped) */
    "iip\0"
    "glUniform3dv\0"
    "\0"
-   /* _mesa_function_pool[30804]: PointParameteri (will be remapped) */
+   /* _mesa_function_pool[31346]: PointParameteri (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[30846]: PointParameterf (will be remapped) */
+   /* _mesa_function_pool[31388]: PointParameterf (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[30932]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[31474]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[30959]: VertexAttribBinding (will be remapped) */
+   /* _mesa_function_pool[31501]: VertexAttribBinding (will be remapped) */
    "ii\0"
    "glVertexAttribBinding\0"
    "\0"
-   /* _mesa_function_pool[30985]: TextureSubImage2D (will be remapped) */
+   /* _mesa_function_pool[31527]: TextureSubImage2D (will be remapped) */
    "iiiiiiiip\0"
    "glTextureSubImage2D\0"
    "\0"
-   /* _mesa_function_pool[31016]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[31558]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[31063]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[31605]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[31081]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[31623]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[31113]: ProgramUniform1dv (will be remapped) */
+   /* _mesa_function_pool[31655]: ProgramUniform1dv (will be remapped) */
    "iiip\0"
    "glProgramUniform1dv\0"
    "\0"
-   /* _mesa_function_pool[31139]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[31681]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[31174]: DeleteBuffers (will be remapped) */
+   /* _mesa_function_pool[31716]: DeleteBuffers (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[31213]: GetBufferSubData (will be remapped) */
+   /* _mesa_function_pool[31755]: GetBufferSubData (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[31260]: GetPerfMonitorGroupsAMD (will be remapped) */
+   /* _mesa_function_pool[31802]: GetNamedRenderbufferParameteriv (will be remapped) */
+   "iip\0"
+   "glGetNamedRenderbufferParameteriv\0"
+   "\0"
+   /* _mesa_function_pool[31841]: GetPerfMonitorGroupsAMD (will be remapped) */
    "pip\0"
    "glGetPerfMonitorGroupsAMD\0"
    "\0"
-   /* _mesa_function_pool[31291]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[31872]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[31311]: VertexAttribP2ui (will be remapped) */
+   /* _mesa_function_pool[31892]: VertexAttribP2ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP2ui\0"
    "\0"
-   /* _mesa_function_pool[31336]: ProgramUniform4dv (will be remapped) */
+   /* _mesa_function_pool[31917]: ProgramUniform4dv (will be remapped) */
    "iiip\0"
    "glProgramUniform4dv\0"
    "\0"
-   /* _mesa_function_pool[31362]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[31943]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[31416]: DrawTexivOES (will be remapped) */
+   /* _mesa_function_pool[31997]: DrawTexivOES (will be remapped) */
    "p\0"
    "glDrawTexivOES\0"
    "\0"
-   /* _mesa_function_pool[31434]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[32015]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[31480]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[32061]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[31507]: VertexAttribFormat (will be remapped) */
+   /* _mesa_function_pool[32088]: VertexAttribFormat (will be remapped) */
    "iiiii\0"
    "glVertexAttribFormat\0"
    "\0"
-   /* _mesa_function_pool[31535]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[32116]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[31551]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[32132]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[31567]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[32148]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[31583]: GetProgramPipelineiv (will be remapped) */
+   /* _mesa_function_pool[32164]: GetProgramPipelineiv (will be remapped) */
    "iip\0"
    "glGetProgramPipelineiv\0"
    "glGetProgramPipelineivEXT\0"
    "\0"
-   /* _mesa_function_pool[31637]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[32218]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "glReadBufferNV\0"
    "\0"
-   /* _mesa_function_pool[31668]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[32249]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[31724]: GetTexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[32305]: GetTexParameterIiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[31774]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[32355]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[31790]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[32371]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[31846]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[32427]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[31938]: GetTransformFeedbackVarying (will be remapped) */
+   /* _mesa_function_pool[32519]: GetTransformFeedbackVarying (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVarying\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "\0"
-   /* _mesa_function_pool[32010]: GetNextPerfQueryIdINTEL (will be remapped) */
+   /* _mesa_function_pool[32591]: GetNextPerfQueryIdINTEL (will be remapped) */
    "ip\0"
    "glGetNextPerfQueryIdINTEL\0"
    "\0"
-   /* _mesa_function_pool[32040]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[32621]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[32057]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[32638]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrier\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[32095]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[32676]: GetProgramInterfaceiv (will be remapped) */
+   "iiip\0"
+   "glGetProgramInterfaceiv\0"
+   "\0"
+   /* _mesa_function_pool[32706]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[32154]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[32765]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[32191]: ObjectLabel (will be remapped) */
+   /* _mesa_function_pool[32802]: ObjectLabel (will be remapped) */
    "iiip\0"
    "glObjectLabel\0"
    "\0"
-   /* _mesa_function_pool[32211]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[32822]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[32238]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[32849]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[32256]: CompileShader (will be remapped) */
+   /* _mesa_function_pool[32867]: CompileShader (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[32294]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[32905]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[32309]: TexGendv (offset 189) */
+   /* _mesa_function_pool[32920]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[32325]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[32936]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[32362]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[32973]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[32396]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[33007]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[32423]: GenerateTextureMipmap (will be remapped) */
+   /* _mesa_function_pool[33034]: GenerateTextureMipmap (will be remapped) */
    "i\0"
    "glGenerateTextureMipmap\0"
    "\0"
-   /* _mesa_function_pool[32450]: DeleteProgramsARB (will be remapped) */
+   /* _mesa_function_pool[33061]: DeleteProgramsARB (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[32493]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[33104]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[32509]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[33120]: CreateQueries (will be remapped) */
    "iip\0"
-   "glVertexAttribs1fvNV\0"
+   "glCreateQueries\0"
    "\0"
-   /* _mesa_function_pool[32535]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[33141]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[32553]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[33159]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[32584]: MultiDrawArrays (will be remapped) */
+   /* _mesa_function_pool[33190]: MultiDrawArrays (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[32629]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[33235]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[32666]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[33272]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[32695]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[33301]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "glMapBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[32738]: DispatchCompute (will be remapped) */
+   /* _mesa_function_pool[33344]: DispatchCompute (will be remapped) */
    "iii\0"
    "glDispatchCompute\0"
    "\0"
-   /* _mesa_function_pool[32761]: UseProgramStages (will be remapped) */
+   /* _mesa_function_pool[33367]: UseProgramStages (will be remapped) */
    "iii\0"
    "glUseProgramStages\0"
    "glUseProgramStagesEXT\0"
    "\0"
-   /* _mesa_function_pool[32807]: ProgramUniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[33413]: ProgramUniformMatrix4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4fv\0"
    "glProgramUniformMatrix4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[32869]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[33475]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[32890]: FramebufferRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[33496]: FramebufferRenderbuffer (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "glFramebufferRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[32980]: IsProgramARB (will be remapped) */
+   /* _mesa_function_pool[33586]: IsProgramARB (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[33012]: Map2d (offset 222) */
+   /* _mesa_function_pool[33618]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[33032]: Map2f (offset 223) */
+   /* _mesa_function_pool[33638]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[33052]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[33658]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[33077]: CopyTextureSubImage2D (will be remapped) */
+   /* _mesa_function_pool[33683]: CopyTextureSubImage2D (will be remapped) */
    "iiiiiiii\0"
    "glCopyTextureSubImage2D\0"
    "\0"
-   /* _mesa_function_pool[33111]: MultiTexCoord4s (offset 406) */
+   /* _mesa_function_pool[33717]: MultiTexCoord4s (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[33157]: ViewportIndexedf (will be remapped) */
+   /* _mesa_function_pool[33763]: ViewportIndexedf (will be remapped) */
    "iffff\0"
    "glViewportIndexedf\0"
    "\0"
-   /* _mesa_function_pool[33183]: MultiTexCoord4i (offset 404) */
+   /* _mesa_function_pool[33789]: MultiTexCoord4i (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[33229]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[33835]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[33250]: DebugMessageControl (will be remapped) */
+   /* _mesa_function_pool[33856]: DebugMessageControl (will be remapped) */
    "iiiipi\0"
    "glDebugMessageControlARB\0"
    "glDebugMessageControl\0"
    "\0"
-   /* _mesa_function_pool[33305]: MultiTexCoord4d (offset 400) */
+   /* _mesa_function_pool[33911]: MultiTexCoord4d (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[33351]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[33957]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[33391]: Translatex (will be remapped) */
+   /* _mesa_function_pool[33997]: Translatex (will be remapped) */
    "iii\0"
    "glTranslatexOES\0"
    "glTranslatex\0"
    "\0"
-   /* _mesa_function_pool[33425]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[34031]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[33450]: Indexsv (offset 51) */
+   /* _mesa_function_pool[34056]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[33463]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[34069]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[33506]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[34112]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[33523]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[34129]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[33550]: Translated (offset 303) */
+   /* _mesa_function_pool[34156]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[33568]: Translatef (offset 304) */
+   /* _mesa_function_pool[34174]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[33586]: MultTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[34192]: MultTransposeMatrixd (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[33638]: ProgramUniform4uiv (will be remapped) */
+   /* _mesa_function_pool[34244]: ProgramUniform4uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform4uiv\0"
    "glProgramUniform4uivEXT\0"
    "\0"
-   /* _mesa_function_pool[33689]: GetPerfCounterInfoINTEL (will be remapped) */
+   /* _mesa_function_pool[34295]: GetPerfCounterInfoINTEL (will be remapped) */
    "iiipipppppp\0"
    "glGetPerfCounterInfoINTEL\0"
    "\0"
-   /* _mesa_function_pool[33728]: RenderMode (offset 196) */
+   /* _mesa_function_pool[34334]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[33744]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[34350]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[33787]: SecondaryColor3d (will be remapped) */
+   /* _mesa_function_pool[34393]: SecondaryColor3d (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[33833]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[34439]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[33860]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[34466]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[33878]: LightModelxv (will be remapped) */
+   /* _mesa_function_pool[34484]: LightModelxv (will be remapped) */
    "ip\0"
    "glLightModelxvOES\0"
    "glLightModelxv\0"
    "\0"
-   /* _mesa_function_pool[33915]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[34521]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[33966]: TextureSubImage3D (will be remapped) */
+   /* _mesa_function_pool[34572]: TextureSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glTextureSubImage3D\0"
    "\0"
-   /* _mesa_function_pool[33999]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[34605]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[34018]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[34624]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[34038]: TexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[34644]: TexGenxvOES (will be remapped) */
    "iip\0"
    "glTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[34057]: GetTextureLevelParameterfv (will be remapped) */
+   /* _mesa_function_pool[34663]: GetTextureLevelParameterfv (will be remapped) */
    "iiip\0"
    "glGetTextureLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[34092]: VertexAttrib4Nubv (will be remapped) */
+   /* _mesa_function_pool[34698]: VertexAttrib4Nubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[34139]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[34745]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[34159]: UniformMatrix4x2dv (will be remapped) */
+   /* _mesa_function_pool[34765]: UniformMatrix4x2dv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2dv\0"
    "\0"
-   /* _mesa_function_pool[34186]: VertexAttribPointer (will be remapped) */
+   /* _mesa_function_pool[34792]: VertexAttribPointer (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[34241]: IndexMask (offset 212) */
+   /* _mesa_function_pool[34847]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[34256]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[34862]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[34282]: VertexAttribIFormat (will be remapped) */
+   /* _mesa_function_pool[34888]: VertexAttribIFormat (will be remapped) */
    "iiii\0"
    "glVertexAttribIFormat\0"
    "\0"
-   /* _mesa_function_pool[34310]: CombinerOutputNV (dynamic) */
+   /* _mesa_function_pool[34916]: CombinerOutputNV (dynamic) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[34341]: DrawArraysInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[34947]: DrawArraysInstancedBaseInstance (will be remapped) */
    "iiiii\0"
    "glDrawArraysInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[34382]: CompressedTextureSubImage3D (will be remapped) */
+   /* _mesa_function_pool[34988]: CompressedTextureSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTextureSubImage3D\0"
    "\0"
-   /* _mesa_function_pool[34425]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[35031]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[34439]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[35045]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[34481]: Uniform3ui (will be remapped) */
+   /* _mesa_function_pool[35087]: Uniform3ui (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[34516]: DeletePerfMonitorsAMD (will be remapped) */
+   /* _mesa_function_pool[35122]: DeletePerfMonitorsAMD (will be remapped) */
    "ip\0"
    "glDeletePerfMonitorsAMD\0"
    "\0"
-   /* _mesa_function_pool[34544]: Color4dv (offset 28) */
+   /* _mesa_function_pool[35150]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[34558]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[35164]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[34587]: DisableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[35193]: DisableVertexAttribArray (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[34647]: ProgramUniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[35253]: ProgramUniformMatrix3x2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x2fv\0"
    "glProgramUniformMatrix3x2fvEXT\0"
    "\0"
-   /* _mesa_function_pool[34713]: GetDoublei_v (will be remapped) */
+   /* _mesa_function_pool[35319]: GetDoublei_v (will be remapped) */
    "iip\0"
    "glGetDoublei_v\0"
    "\0"
-   /* _mesa_function_pool[34733]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[35339]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[34758]: ClipPlanex (will be remapped) */
+   /* _mesa_function_pool[35364]: ClipPlanex (will be remapped) */
    "ip\0"
    "glClipPlanexOES\0"
    "glClipPlanex\0"
    "\0"
-   /* _mesa_function_pool[34791]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[35397]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[34838]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[35444]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[34856]: ClipPlanef (will be remapped) */
+   /* _mesa_function_pool[35462]: ClipPlanef (will be remapped) */
    "ip\0"
    "glClipPlanefOES\0"
    "glClipPlanef\0"
    "\0"
-   /* _mesa_function_pool[34889]: ProgramUniform1ui (will be remapped) */
+   /* _mesa_function_pool[35495]: ProgramUniform1ui (will be remapped) */
    "iii\0"
    "glProgramUniform1ui\0"
    "glProgramUniform1uiEXT\0"
    "\0"
-   /* _mesa_function_pool[34937]: SecondaryColorPointer (will be remapped) */
+   /* _mesa_function_pool[35543]: SecondaryColorPointer (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[34994]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[35600]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[35013]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[35619]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[35033]: LineStipple (offset 167) */
+   /* _mesa_function_pool[35639]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[35051]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[35657]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[35077]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[35683]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[35104]: GenRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[35710]: GenRenderbuffers (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "glGenRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[35171]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[35777]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[35225]: IsEnabledi (will be remapped) */
+   /* _mesa_function_pool[35831]: IsEnabledi (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[35264]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[35870]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[35294]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[35900]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[35310]: GetVertexAttribPointerv (will be remapped) */
+   /* _mesa_function_pool[35916]: GetVertexAttribPointerv (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[35398]: CreatePerfQueryINTEL (will be remapped) */
+   /* _mesa_function_pool[36004]: CreatePerfQueryINTEL (will be remapped) */
    "ip\0"
    "glCreatePerfQueryINTEL\0"
    "\0"
-   /* _mesa_function_pool[35425]: NewList (dynamic) */
+   /* _mesa_function_pool[36031]: NewList (dynamic) */
    "ii\0"
    "glNewList\0"
    "\0"
-   /* _mesa_function_pool[35439]: TexBuffer (will be remapped) */
+   /* _mesa_function_pool[36045]: TexBuffer (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[35471]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[36077]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[35488]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[36094]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[35504]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[36110]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[35520]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[36126]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[35536]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[36142]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[35561]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[36167]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[35577]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[36183]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[35604]: Uniform1ui (will be remapped) */
+   /* _mesa_function_pool[36210]: Uniform1ui (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[35637]: TexStorage1D (will be remapped) */
+   /* _mesa_function_pool[36243]: TexStorage1D (will be remapped) */
    "iiii\0"
    "glTexStorage1D\0"
    "\0"
-   /* _mesa_function_pool[35658]: BlitFramebuffer (will be remapped) */
+   /* _mesa_function_pool[36264]: BlitFramebuffer (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[35709]: TextureParameterf (will be remapped) */
+   /* _mesa_function_pool[36315]: TextureParameterf (will be remapped) */
    "iif\0"
    "glTextureParameterf\0"
    "\0"
-   /* _mesa_function_pool[35734]: FramebufferTexture1D (will be remapped) */
+   /* _mesa_function_pool[36340]: FramebufferTexture1D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[35790]: TextureParameteri (will be remapped) */
+   /* _mesa_function_pool[36396]: TextureParameteri (will be remapped) */
    "iii\0"
    "glTextureParameteri\0"
    "\0"
-   /* _mesa_function_pool[35815]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[36421]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[35831]: TexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[36437]: TexCoordP4ui (will be remapped) */
    "ii\0"
    "glTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[35850]: VertexAttrib1sv (will be remapped) */
+   /* _mesa_function_pool[36456]: VertexAttrib1sv (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[35893]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[36499]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[35917]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[36523]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[35932]: MultiTexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[36538]: MultiTexCoordP2ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[35957]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[36563]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[35978]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[36584]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[36002]: GetVertexAttribfv (will be remapped) */
+   /* _mesa_function_pool[36608]: GetVertexAttribfv (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[36050]: MultiTexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[36656]: MultiTexCoordP4uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[36076]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[36682]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "glTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[36106]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[36712]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[36125]: BlendColor (offset 336) */
+   /* _mesa_function_pool[36731]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[36160]: Materiali (offset 171) */
+   /* _mesa_function_pool[36766]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[36177]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[36783]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[36201]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[36807]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[36241]: CompressedTexSubImage2D (will be remapped) */
+   /* _mesa_function_pool[36847]: CompressedTexSubImage2D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[36307]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[36913]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[36324]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[36930]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[36350]: MultiTexCoord3sv (offset 399) */
+   /* _mesa_function_pool[36956]: MultiTexCoord3sv (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[36395]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[37001]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[36422]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[37028]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[36439]: MultiTexCoord4sv (offset 407) */
+   /* _mesa_function_pool[37045]: MultiTexCoord4sv (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[36484]: VertexBindingDivisor (will be remapped) */
+   /* _mesa_function_pool[37090]: VertexBindingDivisor (will be remapped) */
    "ii\0"
    "glVertexBindingDivisor\0"
    "\0"
-   /* _mesa_function_pool[36511]: GetPerfMonitorCounterInfoAMD (will be remapped) */
+   /* _mesa_function_pool[37117]: GetPerfMonitorCounterInfoAMD (will be remapped) */
    "iiip\0"
    "glGetPerfMonitorCounterInfoAMD\0"
    "\0"
-   /* _mesa_function_pool[36548]: UniformBlockBinding (will be remapped) */
+   /* _mesa_function_pool[37154]: UniformBlockBinding (will be remapped) */
    "iii\0"
    "glUniformBlockBinding\0"
    "\0"
-   /* _mesa_function_pool[36575]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[37181]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[36591]: CompressedTextureSubImage2D (will be remapped) */
+   /* _mesa_function_pool[37197]: CompressedTextureSubImage2D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTextureSubImage2D\0"
    "\0"
-   /* _mesa_function_pool[36632]: VertexAttrib4Nusv (will be remapped) */
+   /* _mesa_function_pool[37238]: VertexAttrib4Nusv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[36679]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[37285]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[36714]: VertexP2ui (will be remapped) */
+   /* _mesa_function_pool[37320]: VertexP2ui (will be remapped) */
    "ii\0"
    "glVertexP2ui\0"
    "\0"
-   /* _mesa_function_pool[36731]: ProgramUniform2fv (will be remapped) */
+   /* _mesa_function_pool[37337]: ProgramUniform2fv (will be remapped) */
    "iiip\0"
    "glProgramUniform2fv\0"
    "glProgramUniform2fvEXT\0"
    "\0"
-   /* _mesa_function_pool[36780]: GetTextureLevelParameteriv (will be remapped) */
+   /* _mesa_function_pool[37386]: GetTextureLevelParameteriv (will be remapped) */
    "iiip\0"
    "glGetTextureLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[36815]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[37421]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[36834]: BindAttribLocation (will be remapped) */
+   /* _mesa_function_pool[37440]: BindAttribLocation (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[36884]: TextureStorage2DEXT (will be remapped) */
+   /* _mesa_function_pool[37490]: TextureStorage2DEXT (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[36914]: TextureParameterIiv (will be remapped) */
+   /* _mesa_function_pool[37520]: TextureParameterIiv (will be remapped) */
    "iip\0"
    "glTextureParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[36941]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[37547]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[36967]: DrawTransformFeedbackInstanced (will be remapped) */
+   /* _mesa_function_pool[37573]: DrawTransformFeedbackInstanced (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackInstanced\0"
    "\0"
-   /* _mesa_function_pool[37005]: CopyTextureSubImage1D (will be remapped) */
+   /* _mesa_function_pool[37611]: CopyTextureSubImage1D (will be remapped) */
    "iiiiii\0"
    "glCopyTextureSubImage1D\0"
    "\0"
-   /* _mesa_function_pool[37037]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[37643]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[37056]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[37662]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[37084]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[37690]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[37121]: VertexAttribI1iv (will be remapped) */
+   /* _mesa_function_pool[37727]: VertexAttribI1iv (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[37166]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[37772]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[37181]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[37787]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[37228]: SampleMaski (will be remapped) */
+   /* _mesa_function_pool[37834]: SampleMaski (will be remapped) */
    "ii\0"
    "glSampleMaski\0"
    "\0"
-   /* _mesa_function_pool[37246]: GetFloati_v (will be remapped) */
+   /* _mesa_function_pool[37852]: GetFloati_v (will be remapped) */
    "iip\0"
    "glGetFloati_v\0"
    "\0"
-   /* _mesa_function_pool[37265]: MultiTexCoord2iv (offset 389) */
+   /* _mesa_function_pool[37871]: MultiTexCoord2iv (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[37310]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[37916]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[37330]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[37936]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[37390]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[37996]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[37418]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[38024]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[37444]: GenLists (offset 5) */
+   /* _mesa_function_pool[38050]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[37458]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[38064]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[37478]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[38084]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[37498]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[38104]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[37518]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[38124]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[37546]: GetActiveAttrib (will be remapped) */
+   /* _mesa_function_pool[38152]: GetActiveAttrib (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[37594]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[38200]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[37632]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[38238]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[37650]: ClearBufferData (will be remapped) */
+   /* _mesa_function_pool[38256]: ClearBufferData (will be remapped) */
    "iiiip\0"
    "glClearBufferData\0"
    "\0"
-   /* _mesa_function_pool[37675]: Color3usv (offset 24) */
+   /* _mesa_function_pool[38281]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[37690]: CopyImageSubData (will be remapped) */
+   /* _mesa_function_pool[38296]: CopyImageSubData (will be remapped) */
    "iiiiiiiiiiiiiii\0"
    "glCopyImageSubData\0"
    "\0"
-   /* _mesa_function_pool[37726]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[38332]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[37775]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[38381]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[37793]: ClipControl (will be remapped) */
+   /* _mesa_function_pool[38399]: ClipControl (will be remapped) */
    "ii\0"
    "glClipControl\0"
    "\0"
-   /* _mesa_function_pool[37811]: DrawTexfOES (will be remapped) */
+   /* _mesa_function_pool[38417]: DrawTexfOES (will be remapped) */
    "fffff\0"
    "glDrawTexfOES\0"
    "\0"
-   /* _mesa_function_pool[37832]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[38438]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[37854]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[38460]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[37884]: Accum (offset 213) */
+   /* _mesa_function_pool[38490]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[37896]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[38502]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[37917]: Color4x (will be remapped) */
+   /* _mesa_function_pool[38523]: Color4x (will be remapped) */
    "iiii\0"
    "glColor4xOES\0"
    "glColor4x\0"
    "\0"
-   /* _mesa_function_pool[37946]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[38552]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[38004]: Color4s (offset 33) */
+   /* _mesa_function_pool[38610]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[38020]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[38626]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[38045]: EnableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[38651]: EnableVertexAttribArray (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[38103]: Color4i (offset 31) */
+   /* _mesa_function_pool[38709]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[38119]: Color4f (offset 29) */
+   /* _mesa_function_pool[38725]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[38135]: Color4d (offset 27) */
+   /* _mesa_function_pool[38741]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[38151]: Color4b (offset 25) */
+   /* _mesa_function_pool[38757]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[38167]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[38773]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[38189]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[38795]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[38219]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[38825]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[38237]: VertexAttribLFormat (will be remapped) */
+   /* _mesa_function_pool[38843]: VertexAttribLFormat (will be remapped) */
    "iiii\0"
    "glVertexAttribLFormat\0"
    "\0"
-   /* _mesa_function_pool[38265]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[38871]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[38293]: ShaderSource (will be remapped) */
+   /* _mesa_function_pool[38899]: ShaderSource (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[38332]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[38938]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[38347]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[38953]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[38382]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[38988]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[38399]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[39005]: CreateSamplers (will be remapped) */
+   "ip\0"
+   "glCreateSamplers\0"
+   "\0"
+   /* _mesa_function_pool[39026]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[38444]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[39071]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[38476]: BufferData (will be remapped) */
+   /* _mesa_function_pool[39103]: BufferData (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[38511]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[39138]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[38557]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[39184]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[38584]: GetTexParameterPointervAPPLE (dynamic) */
+   /* _mesa_function_pool[39211]: GetTexParameterPointervAPPLE (dynamic) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[38620]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[39247]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "glTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[38650]: GetVertexAttribiv (will be remapped) */
+   /* _mesa_function_pool[39277]: GetVertexAttribiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[38698]: TexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[39325]: TexCoordP2uiv (will be remapped) */
    "ip\0"
    "glTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[38718]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[39345]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[38762]: Uniform3fv (will be remapped) */
+   /* _mesa_function_pool[39389]: Uniform3fv (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[38796]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[39423]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "glBlendEquationOES\0"
    "\0"
-   /* _mesa_function_pool[38853]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[39480]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[38878]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[39505]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[38942]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[39569]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[38961]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[39588]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[38987]: PushName (offset 201) */
+   /* _mesa_function_pool[39614]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[39001]: GenFencesNV (dynamic) */
+   /* _mesa_function_pool[39628]: GenFencesNV (dynamic) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[39019]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[39646]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[39044]: DeleteRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[39671]: DeleteRenderbuffers (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "glDeleteRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[39120]: VertexAttrib1dv (will be remapped) */
+   /* _mesa_function_pool[39747]: VertexAttrib1dv (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[39163]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[39790]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[39197]: IsShader (will be remapped) */
+   /* _mesa_function_pool[39824]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[39211]: Rotated (offset 299) */
+   /* _mesa_function_pool[39838]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[39227]: GenPerfMonitorsAMD (will be remapped) */
+   /* _mesa_function_pool[39854]: GenPerfMonitorsAMD (will be remapped) */
    "ip\0"
    "glGenPerfMonitorsAMD\0"
    "\0"
-   /* _mesa_function_pool[39252]: PointParameterxv (will be remapped) */
+   /* _mesa_function_pool[39879]: PointParameterxv (will be remapped) */
    "ip\0"
    "glPointParameterxvOES\0"
    "glPointParameterxv\0"
    "\0"
-   /* _mesa_function_pool[39297]: Rotatex (will be remapped) */
+   /* _mesa_function_pool[39924]: Rotatex (will be remapped) */
    "iiii\0"
    "glRotatexOES\0"
    "glRotatex\0"
    "\0"
-   /* _mesa_function_pool[39326]: FramebufferTextureLayer (will be remapped) */
+   /* _mesa_function_pool[39953]: FramebufferTextureLayer (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[39417]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[40044]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[39433]: ProgramUniformMatrix3fv (will be remapped) */
+   /* _mesa_function_pool[40060]: ProgramUniformMatrix3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3fv\0"
    "glProgramUniformMatrix3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[39495]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[40122]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[39512]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[40139]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[39549]: MultiDrawArraysIndirect (will be remapped) */
+   /* _mesa_function_pool[40176]: MultiDrawArraysIndirect (will be remapped) */
    "ipii\0"
    "glMultiDrawArraysIndirect\0"
    "\0"
-   /* _mesa_function_pool[39581]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[40208]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[39620]: ProgramUniformMatrix4dv (will be remapped) */
+   /* _mesa_function_pool[40247]: ProgramUniformMatrix4dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4dv\0"
    "\0"
-   /* _mesa_function_pool[39653]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[40280]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[39677]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[40304]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[39697]: SecondaryColor3bv (will be remapped) */
+   /* _mesa_function_pool[40324]: SecondaryColor3bv (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[39743]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[40370]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[39771]: GetCombinerOutputParameterivNV (dynamic) */
+   /* _mesa_function_pool[40398]: GetCombinerOutputParameterivNV (dynamic) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[39810]: DrawTexxvOES (will be remapped) */
+   /* _mesa_function_pool[40437]: DrawTexxvOES (will be remapped) */
    "p\0"
    "glDrawTexxvOES\0"
    "\0"
-   /* _mesa_function_pool[39828]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[40455]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[39850]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[40477]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[39865]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[40492]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[39882]: FogCoorddv (will be remapped) */
+   /* _mesa_function_pool[40509]: FogCoorddv (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[39914]: VDPAUUnregisterSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[40541]: VDPAUUnregisterSurfaceNV (will be remapped) */
    "i\0"
    "glVDPAUUnregisterSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[39944]: ColorP3ui (will be remapped) */
+   /* _mesa_function_pool[40571]: ColorP3ui (will be remapped) */
    "ii\0"
    "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[39960]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[40587]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[39982]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[40609]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[40015]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[40642]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[40050]: Flush (offset 217) */
+   /* _mesa_function_pool[40677]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[40060]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[40687]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[40106]: FogCoordd (will be remapped) */
+   /* _mesa_function_pool[40733]: FogCoordd (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[40136]: Uniform3iv (will be remapped) */
+   /* _mesa_function_pool[40763]: Uniform3iv (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[40170]: TexStorage2DMultisample (will be remapped) */
+   /* _mesa_function_pool[40797]: TexStorage2DMultisample (will be remapped) */
    "iiiiii\0"
    "glTexStorage2DMultisample\0"
    "\0"
-   /* _mesa_function_pool[40204]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[40831]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[40224]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[40851]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[40248]: VertexAttrib4iv (will be remapped) */
+   /* _mesa_function_pool[40875]: VertexAttrib4iv (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[40291]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[40918]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "glCopyTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[40368]: PolygonOffsetClampEXT (will be remapped) */
+   /* _mesa_function_pool[40995]: PolygonOffsetClampEXT (will be remapped) */
    "fff\0"
    "glPolygonOffsetClampEXT\0"
    "\0"
-   /* _mesa_function_pool[40397]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[41024]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[40417]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[41044]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[40439]: Indexiv (offset 49) */
+   /* _mesa_function_pool[41066]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[40452]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[41079]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[40467]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[41094]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[40482]: TexEnvx (will be remapped) */
+   /* _mesa_function_pool[41109]: TexEnvx (will be remapped) */
    "iii\0"
    "glTexEnvxOES\0"
    "glTexEnvx\0"
    "\0"
-   /* _mesa_function_pool[40510]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[41137]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[40535]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[41162]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[40591]: InvalidateBufferSubData (will be remapped) */
+   /* _mesa_function_pool[41218]: InvalidateBufferSubData (will be remapped) */
    "iii\0"
    "glInvalidateBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[40622]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[41249]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[40649]: ClearTexImage (will be remapped) */
+   /* _mesa_function_pool[41276]: ClearTexImage (will be remapped) */
    "iiiip\0"
    "glClearTexImage\0"
    "\0"
-   /* _mesa_function_pool[40672]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[41299]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[40692]: BeginPerfQueryINTEL (will be remapped) */
+   /* _mesa_function_pool[41319]: BeginPerfQueryINTEL (will be remapped) */
    "i\0"
    "glBeginPerfQueryINTEL\0"
    "\0"
-   /* _mesa_function_pool[40717]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[41344]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[40743]: CompressedTextureSubImage1D (will be remapped) */
+   /* _mesa_function_pool[41370]: CompressedTextureSubImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTextureSubImage1D\0"
    "\0"
-   /* _mesa_function_pool[40782]: ProgramUniformMatrix4x2dv (will be remapped) */
+   /* _mesa_function_pool[41409]: ProgramUniformMatrix4x2dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x2dv\0"
    "\0"
-   /* _mesa_function_pool[40817]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[41444]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[40875]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[41502]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[40891]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[41518]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[40915]: Color4fv (offset 30) */
+   /* _mesa_function_pool[41542]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[40929]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[41556]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[40953]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[41580]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[40974]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[41601]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[41009]: Lightiv (offset 162) */
+   /* _mesa_function_pool[41636]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[41024]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[41651]: GetTexParameterIuiv (will be remapped) */
    "iip\0"
-   "glGetTexParameteriv\0"
+   "glGetTexParameterIuivEXT\0"
+   "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[41049]: TransformFeedbackVaryings (will be remapped) */
+   /* _mesa_function_pool[41703]: TransformFeedbackVaryings (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryings\0"
    "glTransformFeedbackVaryingsEXT\0"
    "\0"
-   /* _mesa_function_pool[41114]: VertexAttrib3sv (will be remapped) */
+   /* _mesa_function_pool[41768]: VertexAttrib3sv (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[41157]: IsVertexArray (will be remapped) */
+   /* _mesa_function_pool[41811]: IsVertexArray (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "glIsVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[41216]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[41870]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[41238]: ProgramUniform4ui (will be remapped) */
+   /* _mesa_function_pool[41892]: ProgramUniform4ui (will be remapped) */
    "iiiiii\0"
    "glProgramUniform4ui\0"
    "glProgramUniform4uiEXT\0"
    "\0"
-   /* _mesa_function_pool[41289]: Uniform1f (will be remapped) */
+   /* _mesa_function_pool[41943]: Uniform1f (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[41320]: Uniform1d (will be remapped) */
+   /* _mesa_function_pool[41974]: Uniform1d (will be remapped) */
    "id\0"
    "glUniform1d\0"
    "\0"
-   /* _mesa_function_pool[41336]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[41990]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[41365]: Uniform1i (will be remapped) */
+   /* _mesa_function_pool[42019]: Uniform1i (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[41396]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[42050]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[41419]: PixelTexGenSGIX (dynamic) */
+   /* _mesa_function_pool[42073]: PixelTexGenSGIX (dynamic) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[41440]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[42094]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[41467]: UseProgram (will be remapped) */
+   /* _mesa_function_pool[42121]: UseProgram (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[41505]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[42159]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[41530]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[42184]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[41565]: GetFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[42219]: GetFragDataLocation (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[41616]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[42270]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[41635]: ClearNamedBufferSubData (will be remapped) */
+   /* _mesa_function_pool[42289]: ClearNamedBufferSubData (will be remapped) */
    "iiiiiip\0"
    "glClearNamedBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[41670]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[42324]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[41693]: GetFenceivNV (dynamic) */
+   /* _mesa_function_pool[42347]: GetFenceivNV (dynamic) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[41713]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[42367]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "glCurrentPaletteMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[41768]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[42422]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "glGenVertexArraysOES\0"
    "\0"
-   /* _mesa_function_pool[41811]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[42465]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[41854]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[42508]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[41878]: Color3s (offset 17) */
+   /* _mesa_function_pool[42532]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[41893]: TextureStorage2DMultisample (will be remapped) */
+   /* _mesa_function_pool[42547]: TextureStorage2DMultisample (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DMultisample\0"
    "\0"
-   /* _mesa_function_pool[41931]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[42585]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[41955]: Color3i (offset 15) */
+   /* _mesa_function_pool[42609]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[41970]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[42624]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[41988]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[42642]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[42006]: Color3b (offset 9) */
+   /* _mesa_function_pool[42660]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[42021]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[42675]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[42045]: Color3f (offset 13) */
+   /* _mesa_function_pool[42699]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[42060]: Color3d (offset 11) */
+   /* _mesa_function_pool[42714]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[42075]: GetVertexAttribdv (will be remapped) */
+   /* _mesa_function_pool[42729]: GetVertexAttribdv (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[42123]: GetBufferPointerv (will be remapped) */
+   /* _mesa_function_pool[42777]: GetBufferPointerv (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "glGetBufferPointervOES\0"
    "\0"
-   /* _mesa_function_pool[42194]: GenFramebuffers (will be remapped) */
+   /* _mesa_function_pool[42848]: GenFramebuffers (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "glGenFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[42258]: GenBuffers (will be remapped) */
+   /* _mesa_function_pool[42912]: GenBuffers (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[42291]: ClearDepthx (will be remapped) */
+   /* _mesa_function_pool[42945]: ClearDepthx (will be remapped) */
    "i\0"
    "glClearDepthxOES\0"
    "glClearDepthx\0"
    "\0"
-   /* _mesa_function_pool[42325]: BlendEquationSeparate (will be remapped) */
+   /* _mesa_function_pool[42979]: BlendEquationSeparate (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "glBlendEquationSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[42434]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[43088]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[42469]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[43123]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[42494]: VertexAttribIPointer (will be remapped) */
+   /* _mesa_function_pool[43148]: VertexAttribs1fvNV (will be remapped) */
+   "iip\0"
+   "glVertexAttribs1fvNV\0"
+   "\0"
+   /* _mesa_function_pool[43174]: VertexAttribIPointer (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[42550]: ProgramUniform4fv (will be remapped) */
+   /* _mesa_function_pool[43230]: ProgramUniform4fv (will be remapped) */
    "iiip\0"
    "glProgramUniform4fv\0"
    "glProgramUniform4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[42599]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[43279]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[42618]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[43298]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[42636]: CopyTextureSubImage3D (will be remapped) */
+   /* _mesa_function_pool[43316]: CopyTextureSubImage3D (will be remapped) */
    "iiiiiiiii\0"
    "glCopyTextureSubImage3D\0"
    "\0"
-   /* _mesa_function_pool[42671]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[43351]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[42690]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[43370]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[42709]: TextureView (will be remapped) */
+   /* _mesa_function_pool[43389]: TextureView (will be remapped) */
    "iiiiiiii\0"
    "glTextureView\0"
    "\0"
-   /* _mesa_function_pool[42733]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[43413]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[42749]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[43429]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "glTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[42816]: Bitmap (offset 8) */
+   /* _mesa_function_pool[43496]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[42834]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[43514]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[42885]: DrawTransformFeedbackStream (will be remapped) */
+   /* _mesa_function_pool[43565]: DrawTransformFeedbackStream (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackStream\0"
    "\0"
-   /* _mesa_function_pool[42920]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[43600]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[42938]: EndPerfQueryINTEL (will be remapped) */
+   /* _mesa_function_pool[43618]: EndPerfQueryINTEL (will be remapped) */
    "i\0"
    "glEndPerfQueryINTEL\0"
    "\0"
-   /* _mesa_function_pool[42961]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[43641]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[42988]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[43668]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[43025]: GetActiveUniform (will be remapped) */
+   /* _mesa_function_pool[43705]: GetActiveUniform (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[43075]: AlphaFuncx (will be remapped) */
+   /* _mesa_function_pool[43755]: AlphaFuncx (will be remapped) */
    "ii\0"
    "glAlphaFuncxOES\0"
    "glAlphaFuncx\0"
    "\0"
-   /* _mesa_function_pool[43108]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[43788]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[43153]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[43833]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[43173]: Map1d (offset 220) */
+   /* _mesa_function_pool[43853]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[43189]: Map1f (offset 221) */
+   /* _mesa_function_pool[43869]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[43205]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[43885]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[43257]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[43937]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[43294]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[43974]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[43315]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[43995]: GetProgramResourceiv (will be remapped) */
+   "iiiipipp\0"
+   "glGetProgramResourceiv\0"
+   "\0"
+   /* _mesa_function_pool[44028]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[43339]: Rotatef (offset 300) */
+   /* _mesa_function_pool[44052]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[43355]: GetFinalCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[44068]: GetFinalCombinerInputParameterivNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[43397]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[44110]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[43422]: BindTextures (will be remapped) */
+   /* _mesa_function_pool[44135]: BindTextures (will be remapped) */
    "iip\0"
    "glBindTextures\0"
    "\0"
-   /* _mesa_function_pool[43442]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[44155]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[43469]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[44182]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[43493]: Rectiv (offset 91) */
+   /* _mesa_function_pool[44206]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[43506]: MultiTexCoord1iv (offset 381) */
+   /* _mesa_function_pool[44219]: MultiTexCoord1iv (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[43551]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[44264]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[43574]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[44287]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[43594]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[44307]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[43609]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[44322]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[43635]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[44348]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[43650]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[44363]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[43667]: DiscardFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[44380]: DiscardFramebufferEXT (will be remapped) */
    "iip\0"
    "glDiscardFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[43696]: Uniform2f (will be remapped) */
+   /* _mesa_function_pool[44409]: Uniform2f (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[43728]: Uniform2d (will be remapped) */
+   /* _mesa_function_pool[44441]: Uniform2d (will be remapped) */
    "idd\0"
    "glUniform2d\0"
    "\0"
-   /* _mesa_function_pool[43745]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[44458]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[43770]: LineWidth (offset 168) */
+   /* _mesa_function_pool[44483]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[43785]: Uniform2i (will be remapped) */
+   /* _mesa_function_pool[44498]: Uniform2i (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[43817]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[44530]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[43855]: Lightxv (will be remapped) */
+   /* _mesa_function_pool[44568]: Lightxv (will be remapped) */
    "iip\0"
    "glLightxvOES\0"
    "glLightxv\0"
    "\0"
-   /* _mesa_function_pool[43883]: DepthRangeIndexed (will be remapped) */
+   /* _mesa_function_pool[44596]: DepthRangeIndexed (will be remapped) */
    "idd\0"
    "glDepthRangeIndexed\0"
    "\0"
-   /* _mesa_function_pool[43908]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[44621]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[43972]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[44685]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[44003]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[44716]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[44040]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[44753]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[44061]: TexImage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[44774]: TexImage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexImage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[44094]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[44807]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[44118]: GetUniformBlockIndex (will be remapped) */
+   /* _mesa_function_pool[44831]: GetUniformBlockIndex (will be remapped) */
    "ip\0"
    "glGetUniformBlockIndex\0"
    "\0"
-   /* _mesa_function_pool[44145]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[44858]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[44164]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[44877]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[44217]: SampleCoverage (will be remapped) */
+   /* _mesa_function_pool[44930]: SampleCoverage (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[44258]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[44971]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[44289]: Color3iv (offset 16) */
+   /* _mesa_function_pool[45002]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[44303]: DrawElements (offset 311) */
+   /* _mesa_function_pool[45016]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[44324]: ScissorArrayv (will be remapped) */
+   /* _mesa_function_pool[45037]: ScissorArrayv (will be remapped) */
    "iip\0"
    "glScissorArrayv\0"
    "\0"
-   /* _mesa_function_pool[44345]: GetInternalformativ (will be remapped) */
+   /* _mesa_function_pool[45058]: GetInternalformativ (will be remapped) */
    "iiiip\0"
    "glGetInternalformativ\0"
    "\0"
-   /* _mesa_function_pool[44374]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[45087]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[44391]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[45104]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[44407]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[45120]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[44421]: FinishFenceNV (dynamic) */
+   /* _mesa_function_pool[45134]: FinishFenceNV (dynamic) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[44440]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[45153]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[44459]: NamedBufferData (will be remapped) */
+   /* _mesa_function_pool[45172]: NamedBufferData (will be remapped) */
    "iipi\0"
    "glNamedBufferData\0"
    "\0"
-   /* _mesa_function_pool[44483]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[45196]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "glGetTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[44519]: GetFirstPerfQueryIdINTEL (will be remapped) */
+   /* _mesa_function_pool[45232]: GetFirstPerfQueryIdINTEL (will be remapped) */
    "p\0"
    "glGetFirstPerfQueryIdINTEL\0"
    "\0"
-   /* _mesa_function_pool[44549]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[45262]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[44571]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[45284]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[44607]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[45320]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[44636]: UnmapBuffer (will be remapped) */
+   /* _mesa_function_pool[45349]: UnmapBuffer (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "glUnmapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[44687]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[45400]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[44704]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[45417]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[44721]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[45434]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[44744]: Materialf (offset 169) */
+   /* _mesa_function_pool[45457]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[44761]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[45474]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[44787]: ProgramUniform1uiv (will be remapped) */
+   /* _mesa_function_pool[45500]: ProgramUniform1uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform1uiv\0"
    "glProgramUniform1uivEXT\0"
    "\0"
-   /* _mesa_function_pool[44838]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[45551]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[44856]: Materialx (will be remapped) */
+   /* _mesa_function_pool[45569]: Materialx (will be remapped) */
    "iii\0"
    "glMaterialxOES\0"
    "glMaterialx\0"
    "\0"
-   /* _mesa_function_pool[44888]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[45601]: GetQueryBufferObjectiv (will be remapped) */
+   "iiii\0"
+   "glGetQueryBufferObjectiv\0"
+   "\0"
+   /* _mesa_function_pool[45632]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[44906]: BindBuffer (will be remapped) */
+   /* _mesa_function_pool[45650]: BindBuffer (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[44939]: ProgramUniform1i (will be remapped) */
+   /* _mesa_function_pool[45683]: ProgramUniform1i (will be remapped) */
    "iii\0"
    "glProgramUniform1i\0"
    "glProgramUniform1iEXT\0"
    "\0"
-   /* _mesa_function_pool[44985]: ProgramUniform1f (will be remapped) */
+   /* _mesa_function_pool[45729]: ProgramUniform1f (will be remapped) */
    "iif\0"
    "glProgramUniform1f\0"
    "glProgramUniform1fEXT\0"
    "\0"
-   /* _mesa_function_pool[45031]: ProgramUniform1d (will be remapped) */
+   /* _mesa_function_pool[45775]: ProgramUniform1d (will be remapped) */
    "iid\0"
    "glProgramUniform1d\0"
    "\0"
-   /* _mesa_function_pool[45055]: WindowPos3iv (will be remapped) */
+   /* _mesa_function_pool[45799]: WindowPos3iv (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[45110]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[45854]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[45173]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[45917]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[45200]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[45944]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[45218]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[45962]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[45245]: Recti (offset 90) */
+   /* _mesa_function_pool[45989]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[45259]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[46003]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[45304]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[46048]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[45325]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[46069]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[45350]: Rectf (offset 88) */
+   /* _mesa_function_pool[46094]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[45364]: Rectd (offset 86) */
+   /* _mesa_function_pool[46108]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[45378]: MultMatrixx (will be remapped) */
+   /* _mesa_function_pool[46122]: MultMatrixx (will be remapped) */
    "p\0"
    "glMultMatrixxOES\0"
    "glMultMatrixx\0"
    "\0"
-   /* _mesa_function_pool[45412]: Rects (offset 92) */
+   /* _mesa_function_pool[46156]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[45426]: CombinerParameterfNV (dynamic) */
+   /* _mesa_function_pool[46170]: CombinerParameterfNV (dynamic) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[45453]: GetVertexAttribIiv (will be remapped) */
+   /* _mesa_function_pool[46197]: GetVertexAttribIiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[45503]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[46247]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[45525]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[46269]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[45544]: TexEnvxv (will be remapped) */
+   /* _mesa_function_pool[46288]: TexEnvxv (will be remapped) */
    "iip\0"
    "glTexEnvxvOES\0"
    "glTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[45574]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[46318]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[45593]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[46337]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[45621]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[46365]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[45640]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[46384]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[45659]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[46403]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[45677]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[46421]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[45700]: ProgramUniformMatrix3dv (will be remapped) */
+   /* _mesa_function_pool[46444]: ProgramUniformMatrix3dv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3dv\0"
    "\0"
-   /* _mesa_function_pool[45733]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[46477]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[45753]: GetActiveUniformBlockiv (will be remapped) */
+   /* _mesa_function_pool[46497]: GetActiveUniformBlockiv (will be remapped) */
    "iiip\0"
    "glGetActiveUniformBlockiv\0"
    "\0"
-   /* _mesa_function_pool[45785]: GetPerfMonitorCountersAMD (will be remapped) */
+   /* _mesa_function_pool[46529]: GetPerfMonitorCountersAMD (will be remapped) */
    "ippip\0"
    "glGetPerfMonitorCountersAMD\0"
    "\0"
-   /* _mesa_function_pool[45820]: ObjectPtrLabel (will be remapped) */
+   /* _mesa_function_pool[46564]: ObjectPtrLabel (will be remapped) */
    "pip\0"
    "glObjectPtrLabel\0"
    "\0"
-   /* _mesa_function_pool[45842]: Rectfv (offset 89) */
+   /* _mesa_function_pool[46586]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[45855]: BindImageTexture (will be remapped) */
+   /* _mesa_function_pool[46599]: BindImageTexture (will be remapped) */
    "iiiiiii\0"
    "glBindImageTexture\0"
    "\0"
-   /* _mesa_function_pool[45883]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[46627]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "glClearDepthfOES\0"
    "\0"
-   /* _mesa_function_pool[45917]: VertexP4uiv (will be remapped) */
+   /* _mesa_function_pool[46661]: VertexP4uiv (will be remapped) */
    "ip\0"
    "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[45935]: MinSampleShading (will be remapped) */
+   /* _mesa_function_pool[46679]: MinSampleShading (will be remapped) */
    "f\0"
    "glMinSampleShadingARB\0"
    "glMinSampleShading\0"
    "\0"
-   /* _mesa_function_pool[45979]: GetRenderbufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[46723]: GetRenderbufferParameteriv (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "glGetRenderbufferParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[46077]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[46821]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[46107]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[46851]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[46130]: WindowPos2sv (will be remapped) */
+   /* _mesa_function_pool[46874]: WindowPos2sv (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[46185]: VertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[46929]: VertexArrayRangeNV (dynamic) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[46210]: GetPerfMonitorCounterStringAMD (will be remapped) */
+   /* _mesa_function_pool[46954]: GetPerfMonitorCounterStringAMD (will be remapped) */
    "iiipp\0"
    "glGetPerfMonitorCounterStringAMD\0"
    "\0"
-   /* _mesa_function_pool[46250]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[46994]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[46275]: Uniform4iv (will be remapped) */
+   /* _mesa_function_pool[47019]: Uniform4iv (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
@@ -6442,928 +6534,951 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   { 18866, CompressedTexImage1D_remap_index },
-   { 16267, CompressedTexImage2D_remap_index },
-   { 11917, CompressedTexImage3D_remap_index },
-   { 29945, CompressedTexSubImage1D_remap_index },
-   { 36241, CompressedTexSubImage2D_remap_index },
-   {  6133, CompressedTexSubImage3D_remap_index },
-   {  4097, GetCompressedTexImage_remap_index },
-   { 18091, LoadTransposeMatrixd_remap_index },
-   { 18039, LoadTransposeMatrixf_remap_index },
-   { 33586, MultTransposeMatrixd_remap_index },
-   { 13223, MultTransposeMatrixf_remap_index },
-   { 44217, SampleCoverage_remap_index },
-   {  3343, BlendFuncSeparate_remap_index },
-   { 21743, FogCoordPointer_remap_index },
-   { 40106, FogCoordd_remap_index },
-   { 39882, FogCoorddv_remap_index },
-   { 32584, MultiDrawArrays_remap_index },
-   { 30846, PointParameterf_remap_index },
-   {  4841, PointParameterfv_remap_index },
-   { 30804, PointParameteri_remap_index },
-   {  8540, PointParameteriv_remap_index },
-   {  5263, SecondaryColor3b_remap_index },
-   { 39697, SecondaryColor3bv_remap_index },
-   { 33787, SecondaryColor3d_remap_index },
-   { 12050, SecondaryColor3dv_remap_index },
-   {  5359, SecondaryColor3i_remap_index },
-   { 29035, SecondaryColor3iv_remap_index },
-   {  5139, SecondaryColor3s_remap_index },
-   { 15553, SecondaryColor3sv_remap_index },
-   { 21896, SecondaryColor3ub_remap_index },
-   {  7046, SecondaryColor3ubv_remap_index },
-   { 21974, SecondaryColor3ui_remap_index },
-   { 24017, SecondaryColor3uiv_remap_index },
-   { 21787, SecondaryColor3us_remap_index },
-   {  9540, SecondaryColor3usv_remap_index },
-   { 34937, SecondaryColorPointer_remap_index },
-   { 11675, WindowPos2d_remap_index },
-   { 17080, WindowPos2dv_remap_index },
-   { 11622, WindowPos2f_remap_index },
-   { 23314, WindowPos2fv_remap_index },
-   { 11728, WindowPos2i_remap_index },
-   {  6387, WindowPos2iv_remap_index },
-   { 11781, WindowPos2s_remap_index },
-   { 46130, WindowPos2sv_remap_index },
-   { 15800, WindowPos3d_remap_index },
-   { 15284, WindowPos3dv_remap_index },
-   { 15887, WindowPos3f_remap_index },
-   {  8399, WindowPos3fv_remap_index },
-   { 15996, WindowPos3i_remap_index },
-   { 45055, WindowPos3iv_remap_index },
-   { 16112, WindowPos3s_remap_index },
-   { 24798, WindowPos3sv_remap_index },
-   {  6269, BeginQuery_remap_index },
-   { 44906, BindBuffer_remap_index },
-   { 38476, BufferData_remap_index },
-   { 10084, BufferSubData_remap_index },
-   { 31174, DeleteBuffers_remap_index },
-   { 22241, DeleteQueries_remap_index },
-   { 19743, EndQuery_remap_index },
-   { 42258, GenBuffers_remap_index },
-   {  1877, GenQueries_remap_index },
-   { 28492, GetBufferParameteriv_remap_index },
-   { 42123, GetBufferPointerv_remap_index },
-   { 31213, GetBufferSubData_remap_index },
-   {  8078, GetQueryObjectiv_remap_index },
-   {  7705, GetQueryObjectuiv_remap_index },
-   { 12243, GetQueryiv_remap_index },
-   { 18529, IsBuffer_remap_index },
-   { 28739, IsQuery_remap_index },
-   { 12382, MapBuffer_remap_index },
-   { 44636, UnmapBuffer_remap_index },
+   { 19246, CompressedTexImage1D_remap_index },
+   { 16653, CompressedTexImage2D_remap_index },
+   { 12196, CompressedTexImage3D_remap_index },
+   { 30487, CompressedTexSubImage1D_remap_index },
+   { 36847, CompressedTexSubImage2D_remap_index },
+   {  6344, CompressedTexSubImage3D_remap_index },
+   {  4308, GetCompressedTexImage_remap_index },
+   { 18477, LoadTransposeMatrixd_remap_index },
+   { 18425, LoadTransposeMatrixf_remap_index },
+   { 34192, MultTransposeMatrixd_remap_index },
+   { 13502, MultTransposeMatrixf_remap_index },
+   { 44930, SampleCoverage_remap_index },
+   {  3522, BlendFuncSeparate_remap_index },
+   { 22177, FogCoordPointer_remap_index },
+   { 40733, FogCoordd_remap_index },
+   { 40509, FogCoorddv_remap_index },
+   { 33190, MultiDrawArrays_remap_index },
+   { 31388, PointParameterf_remap_index },
+   {  5052, PointParameterfv_remap_index },
+   { 31346, PointParameteri_remap_index },
+   {  8745, PointParameteriv_remap_index },
+   {  5474, SecondaryColor3b_remap_index },
+   { 40324, SecondaryColor3bv_remap_index },
+   { 34393, SecondaryColor3d_remap_index },
+   { 12329, SecondaryColor3dv_remap_index },
+   {  5570, SecondaryColor3i_remap_index },
+   { 29577, SecondaryColor3iv_remap_index },
+   {  5350, SecondaryColor3s_remap_index },
+   { 15905, SecondaryColor3sv_remap_index },
+   { 22330, SecondaryColor3ub_remap_index },
+   {  7257, SecondaryColor3ubv_remap_index },
+   { 22408, SecondaryColor3ui_remap_index },
+   { 24451, SecondaryColor3uiv_remap_index },
+   { 22221, SecondaryColor3us_remap_index },
+   {  9838, SecondaryColor3usv_remap_index },
+   { 35543, SecondaryColorPointer_remap_index },
+   { 11954, WindowPos2d_remap_index },
+   { 17466, WindowPos2dv_remap_index },
+   { 11901, WindowPos2f_remap_index },
+   { 23748, WindowPos2fv_remap_index },
+   { 12007, WindowPos2i_remap_index },
+   {  6598, WindowPos2iv_remap_index },
+   { 12060, WindowPos2s_remap_index },
+   { 46874, WindowPos2sv_remap_index },
+   { 16186, WindowPos3d_remap_index },
+   { 15636, WindowPos3dv_remap_index },
+   { 16273, WindowPos3f_remap_index },
+   {  8604, WindowPos3fv_remap_index },
+   { 16382, WindowPos3i_remap_index },
+   { 45799, WindowPos3iv_remap_index },
+   { 16498, WindowPos3s_remap_index },
+   { 25232, WindowPos3sv_remap_index },
+   {  6480, BeginQuery_remap_index },
+   { 45650, BindBuffer_remap_index },
+   { 39103, BufferData_remap_index },
+   { 10382, BufferSubData_remap_index },
+   { 31716, DeleteBuffers_remap_index },
+   { 22675, DeleteQueries_remap_index },
+   { 20158, EndQuery_remap_index },
+   { 42912, GenBuffers_remap_index },
+   {  1987, GenQueries_remap_index },
+   { 29034, GetBufferParameteriv_remap_index },
+   { 42777, GetBufferPointerv_remap_index },
+   { 31755, GetBufferSubData_remap_index },
+   {  8283, GetQueryObjectiv_remap_index },
+   {  7910, GetQueryObjectuiv_remap_index },
+   { 12522, GetQueryiv_remap_index },
+   { 18909, IsBuffer_remap_index },
+   { 29281, IsQuery_remap_index },
+   { 12661, MapBuffer_remap_index },
+   { 45349, UnmapBuffer_remap_index },
    {   315, AttachShader_remap_index },
-   { 36834, BindAttribLocation_remap_index },
-   { 42325, BlendEquationSeparate_remap_index },
-   { 32256, CompileShader_remap_index },
-   { 14691, CreateProgram_remap_index },
-   { 31063, CreateShader_remap_index },
-   { 20601, DeleteProgram_remap_index },
-   { 32238, DeleteShader_remap_index },
-   { 44145, DetachShader_remap_index },
-   { 34587, DisableVertexAttribArray_remap_index },
-   { 23095, DrawBuffers_remap_index },
-   { 38045, EnableVertexAttribArray_remap_index },
-   { 37546, GetActiveAttrib_remap_index },
-   { 43025, GetActiveUniform_remap_index },
-   { 17678, GetAttachedShaders_remap_index },
-   { 27444, GetAttribLocation_remap_index },
-   { 11304, GetProgramInfoLog_remap_index },
-   { 22830, GetProgramiv_remap_index },
-   {  3838, GetShaderInfoLog_remap_index },
-   {  7396, GetShaderSource_remap_index },
-   { 17414, GetShaderiv_remap_index },
-   {  6320, GetUniformLocation_remap_index },
-   { 13376, GetUniformfv_remap_index },
-   {  2134, GetUniformiv_remap_index },
-   { 35310, GetVertexAttribPointerv_remap_index },
-   { 42075, GetVertexAttribdv_remap_index },
-   { 36002, GetVertexAttribfv_remap_index },
-   { 38650, GetVertexAttribiv_remap_index },
-   {  4291, IsProgram_remap_index },
-   { 39197, IsShader_remap_index },
-   { 29228, LinkProgram_remap_index },
-   { 38293, ShaderSource_remap_index },
-   { 38265, StencilFuncSeparate_remap_index },
-   { 36324, StencilMaskSeparate_remap_index },
-   { 37726, StencilOpSeparate_remap_index },
-   { 41289, Uniform1f_remap_index },
-   {  8254, Uniform1fv_remap_index },
-   { 41365, Uniform1i_remap_index },
-   { 18737, Uniform1iv_remap_index },
-   { 43696, Uniform2f_remap_index },
-   { 22996, Uniform2fv_remap_index },
-   { 43785, Uniform2i_remap_index },
-   { 20843, Uniform2iv_remap_index },
-   {   916, Uniform3f_remap_index },
-   { 38762, Uniform3fv_remap_index },
-   {   836, Uniform3i_remap_index },
-   { 40136, Uniform3iv_remap_index },
-   {  4624, Uniform4f_remap_index },
-   {  8951, Uniform4fv_remap_index },
-   {  4571, Uniform4i_remap_index },
-   { 46275, Uniform4iv_remap_index },
-   { 10220, UniformMatrix2fv_remap_index },
-   { 23751, UniformMatrix3fv_remap_index },
-   { 10760, UniformMatrix4fv_remap_index },
-   { 41467, UseProgram_remap_index },
-   { 25256, ValidateProgram_remap_index },
-   { 18825, VertexAttrib1d_remap_index },
-   { 39120, VertexAttrib1dv_remap_index },
-   { 18975, VertexAttrib1s_remap_index },
-   { 35850, VertexAttrib1sv_remap_index },
-   {  8212, VertexAttrib2d_remap_index },
-   { 24549, VertexAttrib2dv_remap_index },
-   {  8124, VertexAttrib2s_remap_index },
-   { 14824, VertexAttrib2sv_remap_index },
-   { 12277, VertexAttrib3d_remap_index },
-   { 22920, VertexAttrib3dv_remap_index },
-   { 12152, VertexAttrib3s_remap_index },
-   { 41114, VertexAttrib3sv_remap_index },
-   { 12428, VertexAttrib4Nbv_remap_index },
-   { 29124, VertexAttrib4Niv_remap_index },
-   { 21179, VertexAttrib4Nsv_remap_index },
-   {  1466, VertexAttrib4Nub_remap_index },
-   { 34092, VertexAttrib4Nubv_remap_index },
-   { 10834, VertexAttrib4Nuiv_remap_index },
-   { 36632, VertexAttrib4Nusv_remap_index },
-   {  9470, VertexAttrib4bv_remap_index },
-   { 29444, VertexAttrib4d_remap_index },
-   { 29839, VertexAttrib4dv_remap_index },
-   { 40248, VertexAttrib4iv_remap_index },
-   { 29512, VertexAttrib4s_remap_index },
-   { 19843, VertexAttrib4sv_remap_index },
-   { 10474, VertexAttrib4ubv_remap_index },
-   { 21134, VertexAttrib4uiv_remap_index },
-   {  1392, VertexAttrib4usv_remap_index },
-   { 34186, VertexAttribPointer_remap_index },
-   { 30610, UniformMatrix2x3fv_remap_index },
-   {   949, UniformMatrix2x4fv_remap_index },
-   { 10807, UniformMatrix3x2fv_remap_index },
-   { 45218, UniformMatrix3x4fv_remap_index },
-   { 40622, UniformMatrix4x2fv_remap_index },
-   { 12195, UniformMatrix4x3fv_remap_index },
-   { 17320, BeginConditionalRender_remap_index },
-   { 25340, BeginTransformFeedback_remap_index },
-   {  8036, BindBufferBase_remap_index },
-   {  7924, BindBufferRange_remap_index },
-   { 23478, BindFragDataLocation_remap_index },
-   { 24657, ClampColor_remap_index },
-   { 17705, ClearBufferfi_remap_index },
-   { 17529, ClearBufferfv_remap_index },
-   { 21602, ClearBufferiv_remap_index },
-   { 39960, ClearBufferuiv_remap_index },
-   { 13766, ColorMaski_remap_index },
-   {  6098, Disablei_remap_index },
-   { 15854, Enablei_remap_index },
-   { 24065, EndConditionalRender_remap_index },
-   { 20406, EndTransformFeedback_remap_index },
-   { 12616, GetBooleani_v_remap_index },
-   { 41565, GetFragDataLocation_remap_index },
-   { 21623, GetIntegeri_v_remap_index },
-   { 29804, GetStringi_remap_index },
-   { 31724, GetTexParameterIiv_remap_index },
-   { 13962, GetTexParameterIuiv_remap_index },
-   { 31938, GetTransformFeedbackVarying_remap_index },
-   {  2952, GetUniformuiv_remap_index },
-   { 45453, GetVertexAttribIiv_remap_index },
-   { 21434, GetVertexAttribIuiv_remap_index },
-   { 35225, IsEnabledi_remap_index },
-   { 20659, TexParameterIiv_remap_index },
-   { 17135, TexParameterIuiv_remap_index },
-   { 41049, TransformFeedbackVaryings_remap_index },
-   { 35604, Uniform1ui_remap_index },
-   { 26849, Uniform1uiv_remap_index },
-   { 26177, Uniform2ui_remap_index },
-   { 13808, Uniform2uiv_remap_index },
-   { 34481, Uniform3ui_remap_index },
-   { 19902, Uniform3uiv_remap_index },
-   { 12539, Uniform4ui_remap_index },
-   { 18771, Uniform4uiv_remap_index },
-   { 37121, VertexAttribI1iv_remap_index },
-   { 12003, VertexAttribI1uiv_remap_index },
-   {  7753, VertexAttribI4bv_remap_index },
-   { 10671, VertexAttribI4sv_remap_index },
-   {  8751, VertexAttribI4ubv_remap_index },
-   {  7212, VertexAttribI4usv_remap_index },
-   { 42494, VertexAttribIPointer_remap_index },
-   {  8698, PrimitiveRestartIndex_remap_index },
-   { 35439, TexBuffer_remap_index },
+   { 37440, BindAttribLocation_remap_index },
+   { 42979, BlendEquationSeparate_remap_index },
+   { 32867, CompileShader_remap_index },
+   { 14976, CreateProgram_remap_index },
+   { 31605, CreateShader_remap_index },
+   { 21016, DeleteProgram_remap_index },
+   { 32849, DeleteShader_remap_index },
+   { 44858, DetachShader_remap_index },
+   { 35193, DisableVertexAttribArray_remap_index },
+   { 23529, DrawBuffers_remap_index },
+   { 38651, EnableVertexAttribArray_remap_index },
+   { 38152, GetActiveAttrib_remap_index },
+   { 43705, GetActiveUniform_remap_index },
+   { 18064, GetAttachedShaders_remap_index },
+   { 27941, GetAttribLocation_remap_index },
+   { 11583, GetProgramInfoLog_remap_index },
+   { 23264, GetProgramiv_remap_index },
+   {  4049, GetShaderInfoLog_remap_index },
+   {  7601, GetShaderSource_remap_index },
+   { 17800, GetShaderiv_remap_index },
+   {  6531, GetUniformLocation_remap_index },
+   { 13655, GetUniformfv_remap_index },
+   {  2244, GetUniformiv_remap_index },
+   { 35916, GetVertexAttribPointerv_remap_index },
+   { 42729, GetVertexAttribdv_remap_index },
+   { 36608, GetVertexAttribfv_remap_index },
+   { 39277, GetVertexAttribiv_remap_index },
+   {  4502, IsProgram_remap_index },
+   { 39824, IsShader_remap_index },
+   { 29770, LinkProgram_remap_index },
+   { 38899, ShaderSource_remap_index },
+   { 38871, StencilFuncSeparate_remap_index },
+   { 36930, StencilMaskSeparate_remap_index },
+   { 38332, StencilOpSeparate_remap_index },
+   { 41943, Uniform1f_remap_index },
+   {  8459, Uniform1fv_remap_index },
+   { 42019, Uniform1i_remap_index },
+   { 19117, Uniform1iv_remap_index },
+   { 44409, Uniform2f_remap_index },
+   { 23430, Uniform2fv_remap_index },
+   { 44498, Uniform2i_remap_index },
+   { 21258, Uniform2iv_remap_index },
+   {   922, Uniform3f_remap_index },
+   { 39389, Uniform3fv_remap_index },
+   {   842, Uniform3i_remap_index },
+   { 40763, Uniform3iv_remap_index },
+   {  4835, Uniform4f_remap_index },
+   {  9215, Uniform4fv_remap_index },
+   {  4782, Uniform4i_remap_index },
+   { 47019, Uniform4iv_remap_index },
+   { 10518, UniformMatrix2fv_remap_index },
+   { 24185, UniformMatrix3fv_remap_index },
+   { 11039, UniformMatrix4fv_remap_index },
+   { 42121, UseProgram_remap_index },
+   { 25690, ValidateProgram_remap_index },
+   { 19205, VertexAttrib1d_remap_index },
+   { 39747, VertexAttrib1dv_remap_index },
+   { 19355, VertexAttrib1s_remap_index },
+   { 36456, VertexAttrib1sv_remap_index },
+   {  8417, VertexAttrib2d_remap_index },
+   { 24983, VertexAttrib2dv_remap_index },
+   {  8329, VertexAttrib2s_remap_index },
+   { 15109, VertexAttrib2sv_remap_index },
+   { 12556, VertexAttrib3d_remap_index },
+   { 23354, VertexAttrib3dv_remap_index },
+   { 12431, VertexAttrib3s_remap_index },
+   { 41768, VertexAttrib3sv_remap_index },
+   { 12707, VertexAttrib4Nbv_remap_index },
+   { 29666, VertexAttrib4Niv_remap_index },
+   { 21594, VertexAttrib4Nsv_remap_index },
+   {  1506, VertexAttrib4Nub_remap_index },
+   { 34698, VertexAttrib4Nubv_remap_index },
+   { 11113, VertexAttrib4Nuiv_remap_index },
+   { 37238, VertexAttrib4Nusv_remap_index },
+   {  9768, VertexAttrib4bv_remap_index },
+   { 29986, VertexAttrib4d_remap_index },
+   { 30381, VertexAttrib4dv_remap_index },
+   { 40875, VertexAttrib4iv_remap_index },
+   { 30054, VertexAttrib4s_remap_index },
+   { 20258, VertexAttrib4sv_remap_index },
+   { 10772, VertexAttrib4ubv_remap_index },
+   { 21549, VertexAttrib4uiv_remap_index },
+   {  1432, VertexAttrib4usv_remap_index },
+   { 34792, VertexAttribPointer_remap_index },
+   { 31152, UniformMatrix2x3fv_remap_index },
+   {   955, UniformMatrix2x4fv_remap_index },
+   { 11086, UniformMatrix3x2fv_remap_index },
+   { 45962, UniformMatrix3x4fv_remap_index },
+   { 41249, UniformMatrix4x2fv_remap_index },
+   { 12474, UniformMatrix4x3fv_remap_index },
+   { 17706, BeginConditionalRender_remap_index },
+   { 25774, BeginTransformFeedback_remap_index },
+   {  8241, BindBufferBase_remap_index },
+   {  8129, BindBufferRange_remap_index },
+   { 23912, BindFragDataLocation_remap_index },
+   { 25091, ClampColor_remap_index },
+   { 18091, ClearBufferfi_remap_index },
+   { 17915, ClearBufferfv_remap_index },
+   { 22017, ClearBufferiv_remap_index },
+   { 40587, ClearBufferuiv_remap_index },
+   { 14045, ColorMaski_remap_index },
+   {  6309, Disablei_remap_index },
+   { 16240, Enablei_remap_index },
+   { 24499, EndConditionalRender_remap_index },
+   { 20821, EndTransformFeedback_remap_index },
+   { 12895, GetBooleani_v_remap_index },
+   { 42219, GetFragDataLocation_remap_index },
+   { 22038, GetIntegeri_v_remap_index },
+   { 30346, GetStringi_remap_index },
+   { 32305, GetTexParameterIiv_remap_index },
+   { 41651, GetTexParameterIuiv_remap_index },
+   { 32519, GetTransformFeedbackVarying_remap_index },
+   {  3062, GetUniformuiv_remap_index },
+   { 46197, GetVertexAttribIiv_remap_index },
+   { 21849, GetVertexAttribIuiv_remap_index },
+   { 35831, IsEnabledi_remap_index },
+   { 21074, TexParameterIiv_remap_index },
+   { 17521, TexParameterIuiv_remap_index },
+   { 41703, TransformFeedbackVaryings_remap_index },
+   { 36210, Uniform1ui_remap_index },
+   { 27346, Uniform1uiv_remap_index },
+   { 26674, Uniform2ui_remap_index },
+   { 14087, Uniform2uiv_remap_index },
+   { 35087, Uniform3ui_remap_index },
+   { 20317, Uniform3uiv_remap_index },
+   { 12818, Uniform4ui_remap_index },
+   { 19151, Uniform4uiv_remap_index },
+   { 37727, VertexAttribI1iv_remap_index },
+   { 12282, VertexAttribI1uiv_remap_index },
+   {  7958, VertexAttribI4bv_remap_index },
+   { 22132, VertexAttribI4sv_remap_index },
+   {  8989, VertexAttribI4ubv_remap_index },
+   {   451, VertexAttribI4usv_remap_index },
+   { 43174, VertexAttribIPointer_remap_index },
+   {  8936, PrimitiveRestartIndex_remap_index },
+   { 36045, TexBuffer_remap_index },
    {   111, FramebufferTexture_remap_index },
-   { 25092, GetBufferParameteri64v_remap_index },
-   { 18457, GetInteger64i_v_remap_index },
-   { 42834, VertexAttribDivisor_remap_index },
-   { 45935, MinSampleShading_remap_index },
-   {  7441, BindProgramARB_remap_index },
-   { 32450, DeleteProgramsARB_remap_index },
-   { 15941, GenProgramsARB_remap_index },
-   { 14867, GetProgramEnvParameterdvARB_remap_index },
-   { 31139, GetProgramEnvParameterfvARB_remap_index },
-   { 32629, GetProgramLocalParameterdvARB_remap_index },
-   { 39512, GetProgramLocalParameterfvARB_remap_index },
-   { 23680, GetProgramStringARB_remap_index },
-   {  8584, GetProgramivARB_remap_index },
-   { 32980, IsProgramARB_remap_index },
-   { 18159, ProgramEnvParameter4dARB_remap_index },
-   {  2735, ProgramEnvParameter4dvARB_remap_index },
-   { 40817, ProgramEnvParameter4fARB_remap_index },
-   { 25845, ProgramEnvParameter4fvARB_remap_index },
-   { 24115, ProgramLocalParameter4dARB_remap_index },
-   {  4153, ProgramLocalParameter4dvARB_remap_index },
-   { 32154, ProgramLocalParameter4fARB_remap_index },
-   { 20190, ProgramLocalParameter4fvARB_remap_index },
-   { 33052, ProgramStringARB_remap_index },
-   { 12575, VertexAttrib1fARB_remap_index },
-   { 33463, VertexAttrib1fvARB_remap_index },
-   { 23272, VertexAttrib2fARB_remap_index },
-   { 14059, VertexAttrib2fvARB_remap_index },
+   { 25526, GetBufferParameteri64v_remap_index },
+   { 18837, GetInteger64i_v_remap_index },
+   { 43514, VertexAttribDivisor_remap_index },
+   { 46679, MinSampleShading_remap_index },
+   {  7646, BindProgramARB_remap_index },
+   { 33061, DeleteProgramsARB_remap_index },
+   { 16327, GenProgramsARB_remap_index },
+   { 15152, GetProgramEnvParameterdvARB_remap_index },
+   { 31681, GetProgramEnvParameterfvARB_remap_index },
+   { 33235, GetProgramLocalParameterdvARB_remap_index },
+   { 40139, GetProgramLocalParameterfvARB_remap_index },
+   { 24114, GetProgramStringARB_remap_index },
+   {  8822, GetProgramivARB_remap_index },
+   { 33586, IsProgramARB_remap_index },
+   { 18545, ProgramEnvParameter4dARB_remap_index },
+   {  2845, ProgramEnvParameter4dvARB_remap_index },
+   { 41444, ProgramEnvParameter4fARB_remap_index },
+   { 26342, ProgramEnvParameter4fvARB_remap_index },
+   { 24549, ProgramLocalParameter4dARB_remap_index },
+   {  4364, ProgramLocalParameter4dvARB_remap_index },
+   { 32765, ProgramLocalParameter4fARB_remap_index },
+   { 20605, ProgramLocalParameter4fvARB_remap_index },
+   { 33658, ProgramStringARB_remap_index },
+   { 12854, VertexAttrib1fARB_remap_index },
+   { 34069, VertexAttrib1fvARB_remap_index },
+   { 23706, VertexAttrib2fARB_remap_index },
+   { 14311, VertexAttrib2fvARB_remap_index },
    {   334, VertexAttrib3fARB_remap_index },
-   { 27718, VertexAttrib3fvARB_remap_index },
-   { 26566, VertexAttrib4fARB_remap_index },
-   { 15241, VertexAttrib4fvARB_remap_index },
-   { 37832, AttachObjectARB_remap_index },
-   { 23724, CreateProgramObjectARB_remap_index },
-   { 17603, CreateShaderObjectARB_remap_index },
-   { 16326, DeleteObjectARB_remap_index },
-   { 40417, DetachObjectARB_remap_index },
-   { 38189, GetAttachedObjectsARB_remap_index },
-   { 20457, GetHandleARB_remap_index },
-   { 21551, GetInfoLogARB_remap_index },
-   { 22407, GetObjectParameterfvARB_remap_index },
-   { 44258, GetObjectParameterivARB_remap_index },
-   {  5878, DrawArraysInstancedARB_remap_index },
-   {  7620, DrawElementsInstancedARB_remap_index },
-   { 14648, BindFramebuffer_remap_index },
-   {  8607, BindRenderbuffer_remap_index },
-   { 35658, BlitFramebuffer_remap_index },
-   {  6591, CheckFramebufferStatus_remap_index },
-   { 21035, DeleteFramebuffers_remap_index },
-   { 39044, DeleteRenderbuffers_remap_index },
-   { 32890, FramebufferRenderbuffer_remap_index },
-   { 35734, FramebufferTexture1D_remap_index },
-   { 24438, FramebufferTexture2D_remap_index },
-   { 28378, FramebufferTexture3D_remap_index },
-   { 39326, FramebufferTextureLayer_remap_index },
-   { 42194, GenFramebuffers_remap_index },
-   { 35104, GenRenderbuffers_remap_index },
-   {  7864, GenerateMipmap_remap_index },
-   {  5562, GetFramebufferAttachmentParameteriv_remap_index },
-   { 45979, GetRenderbufferParameteriv_remap_index },
-   {  6775, IsFramebuffer_remap_index },
-   { 26931, IsRenderbuffer_remap_index },
-   {   663, RenderbufferStorage_remap_index },
-   { 15724, RenderbufferStorageMultisample_remap_index },
-   { 20093, FramebufferTextureFaceARB_remap_index },
-   {  5489, FlushMappedBufferRange_remap_index },
-   { 32695, MapBufferRange_remap_index },
-   { 13901, BindVertexArray_remap_index },
-   {  1160, DeleteVertexArrays_remap_index },
-   { 41768, GenVertexArrays_remap_index },
-   { 41157, IsVertexArray_remap_index },
-   { 13681, GetActiveUniformBlockName_remap_index },
-   { 45753, GetActiveUniformBlockiv_remap_index },
-   { 21944, GetActiveUniformName_remap_index },
-   { 14795, GetActiveUniformsiv_remap_index },
-   { 44118, GetUniformBlockIndex_remap_index },
-   { 10931, GetUniformIndices_remap_index },
-   { 36548, UniformBlockBinding_remap_index },
-   { 45173, CopyBufferSubData_remap_index },
-   { 45503, ClientWaitSync_remap_index },
-   { 11879, DeleteSync_remap_index },
-   { 36575, FenceSync_remap_index },
-   { 40397, GetInteger64v_remap_index },
-   { 42690, GetSynciv_remap_index },
-   { 16382, IsSync_remap_index },
-   { 35294, WaitSync_remap_index },
-   { 13716, DrawElementsBaseVertex_remap_index },
-   { 17793, DrawElementsInstancedBaseVertex_remap_index },
-   { 39581, DrawRangeElementsBaseVertex_remap_index },
-   { 43817, MultiDrawElementsBaseVertex_remap_index },
-   { 25590, ProvokingVertex_remap_index },
-   {  5823, GetMultisamplefv_remap_index },
-   { 37228, SampleMaski_remap_index },
-   {  2006, TexImage2DMultisample_remap_index },
-   { 44061, TexImage3DMultisample_remap_index },
-   { 24226, BlendEquationSeparateiARB_remap_index },
-   { 28871, BlendEquationiARB_remap_index },
-   {  3890, BlendFuncSeparateiARB_remap_index },
-   { 26094, BlendFunciARB_remap_index },
-   {  1713, BindFragDataLocationIndexed_remap_index },
-   { 30433, GetFragDataIndex_remap_index },
-   {  2934, BindSampler_remap_index },
-   { 45304, DeleteSamplers_remap_index },
-   { 37775, GenSamplers_remap_index },
-   {  2602, GetSamplerParameterIiv_remap_index },
-   {  6067, GetSamplerParameterIuiv_remap_index },
-   { 24520, GetSamplerParameterfv_remap_index },
-   { 26270, GetSamplerParameteriv_remap_index },
-   { 27589, IsSampler_remap_index },
-   {  9011, SamplerParameterIiv_remap_index },
-   { 12966, SamplerParameterIuiv_remap_index },
-   { 30659, SamplerParameterf_remap_index },
-   { 40717, SamplerParameterfv_remap_index },
-   { 45325, SamplerParameteri_remap_index },
-   { 29668, SamplerParameteriv_remap_index },
-   { 24607, GetQueryObjecti64v_remap_index },
-   {  4213, GetQueryObjectui64v_remap_index },
-   { 13523, QueryCounter_remap_index },
-   { 39944, ColorP3ui_remap_index },
-   {  6930, ColorP3uiv_remap_index },
-   { 18557, ColorP4ui_remap_index },
-   { 27331, ColorP4uiv_remap_index },
-   { 14495, MultiTexCoordP1ui_remap_index },
-   { 27066, MultiTexCoordP1uiv_remap_index },
-   { 35932, MultiTexCoordP2ui_remap_index },
-   {  9324, MultiTexCoordP2uiv_remap_index },
-   { 27419, MultiTexCoordP3ui_remap_index },
+   { 28260, VertexAttrib3fvARB_remap_index },
+   { 27063, VertexAttrib4fARB_remap_index },
+   { 15593, VertexAttrib4fvARB_remap_index },
+   { 38438, AttachObjectARB_remap_index },
+   { 24158, CreateProgramObjectARB_remap_index },
+   { 17989, CreateShaderObjectARB_remap_index },
+   { 16712, DeleteObjectARB_remap_index },
+   { 41044, DetachObjectARB_remap_index },
+   { 38795, GetAttachedObjectsARB_remap_index },
+   { 20872, GetHandleARB_remap_index },
+   { 21966, GetInfoLogARB_remap_index },
+   { 22841, GetObjectParameterfvARB_remap_index },
+   { 44971, GetObjectParameterivARB_remap_index },
+   {  6089, DrawArraysInstancedARB_remap_index },
+   {  7825, DrawElementsInstancedARB_remap_index },
+   { 14933, BindFramebuffer_remap_index },
+   {  8845, BindRenderbuffer_remap_index },
+   { 36264, BlitFramebuffer_remap_index },
+   {  6802, CheckFramebufferStatus_remap_index },
+   { 21450, DeleteFramebuffers_remap_index },
+   { 39671, DeleteRenderbuffers_remap_index },
+   { 33496, FramebufferRenderbuffer_remap_index },
+   { 36340, FramebufferTexture1D_remap_index },
+   { 24872, FramebufferTexture2D_remap_index },
+   { 28920, FramebufferTexture3D_remap_index },
+   { 39953, FramebufferTextureLayer_remap_index },
+   { 42848, GenFramebuffers_remap_index },
+   { 35710, GenRenderbuffers_remap_index },
+   {  8069, GenerateMipmap_remap_index },
+   {  5773, GetFramebufferAttachmentParameteriv_remap_index },
+   { 46723, GetRenderbufferParameteriv_remap_index },
+   {  6986, IsFramebuffer_remap_index },
+   { 27428, IsRenderbuffer_remap_index },
+   {   669, RenderbufferStorage_remap_index },
+   { 16076, RenderbufferStorageMultisample_remap_index },
+   { 20508, FramebufferTextureFaceARB_remap_index },
+   {  5700, FlushMappedBufferRange_remap_index },
+   { 33301, MapBufferRange_remap_index },
+   { 14180, BindVertexArray_remap_index },
+   {  1166, DeleteVertexArrays_remap_index },
+   { 42422, GenVertexArrays_remap_index },
+   { 41811, IsVertexArray_remap_index },
+   { 13960, GetActiveUniformBlockName_remap_index },
+   { 46497, GetActiveUniformBlockiv_remap_index },
+   { 22378, GetActiveUniformName_remap_index },
+   { 15080, GetActiveUniformsiv_remap_index },
+   { 44831, GetUniformBlockIndex_remap_index },
+   { 11210, GetUniformIndices_remap_index },
+   { 37154, UniformBlockBinding_remap_index },
+   { 45917, CopyBufferSubData_remap_index },
+   { 46247, ClientWaitSync_remap_index },
+   { 12158, DeleteSync_remap_index },
+   { 37181, FenceSync_remap_index },
+   { 41024, GetInteger64v_remap_index },
+   { 43370, GetSynciv_remap_index },
+   { 16768, IsSync_remap_index },
+   { 35900, WaitSync_remap_index },
+   { 13995, DrawElementsBaseVertex_remap_index },
+   { 18179, DrawElementsInstancedBaseVertex_remap_index },
+   { 40208, DrawRangeElementsBaseVertex_remap_index },
+   { 44530, MultiDrawElementsBaseVertex_remap_index },
+   { 26054, ProvokingVertex_remap_index },
+   {  6034, GetMultisamplefv_remap_index },
+   { 37834, SampleMaski_remap_index },
+   {  2116, TexImage2DMultisample_remap_index },
+   { 44774, TexImage3DMultisample_remap_index },
+   { 24660, BlendEquationSeparateiARB_remap_index },
+   { 29413, BlendEquationiARB_remap_index },
+   {  4101, BlendFuncSeparateiARB_remap_index },
+   { 26591, BlendFunciARB_remap_index },
+   {  1823, BindFragDataLocationIndexed_remap_index },
+   { 30975, GetFragDataIndex_remap_index },
+   {  3044, BindSampler_remap_index },
+   { 46048, DeleteSamplers_remap_index },
+   { 38381, GenSamplers_remap_index },
+   {  2712, GetSamplerParameterIiv_remap_index },
+   {  6278, GetSamplerParameterIuiv_remap_index },
+   { 24954, GetSamplerParameterfv_remap_index },
+   { 26767, GetSamplerParameteriv_remap_index },
+   { 28086, IsSampler_remap_index },
+   {  9275, SamplerParameterIiv_remap_index },
+   { 13245, SamplerParameterIuiv_remap_index },
+   { 31201, SamplerParameterf_remap_index },
+   { 41344, SamplerParameterfv_remap_index },
+   { 46069, SamplerParameteri_remap_index },
+   { 30210, SamplerParameteriv_remap_index },
+   { 25041, GetQueryObjecti64v_remap_index },
+   {  4424, GetQueryObjectui64v_remap_index },
+   { 13802, QueryCounter_remap_index },
+   { 40571, ColorP3ui_remap_index },
+   {  7141, ColorP3uiv_remap_index },
+   { 18937, ColorP4ui_remap_index },
+   { 27828, ColorP4uiv_remap_index },
+   { 14780, MultiTexCoordP1ui_remap_index },
+   { 27563, MultiTexCoordP1uiv_remap_index },
+   { 36538, MultiTexCoordP2ui_remap_index },
+   {  9622, MultiTexCoordP2uiv_remap_index },
+   { 27916, MultiTexCoordP3ui_remap_index },
    {   425, MultiTexCoordP3uiv_remap_index },
-   { 42469, MultiTexCoordP4ui_remap_index },
-   { 36050, MultiTexCoordP4uiv_remap_index },
-   { 38382, NormalP3ui_remap_index },
-   { 26991, NormalP3uiv_remap_index },
-   { 43397, SecondaryColorP3ui_remap_index },
-   {  6015, SecondaryColorP3uiv_remap_index },
+   { 43123, MultiTexCoordP4ui_remap_index },
+   { 36656, MultiTexCoordP4uiv_remap_index },
+   { 38988, NormalP3ui_remap_index },
+   { 27488, NormalP3uiv_remap_index },
+   { 44110, SecondaryColorP3ui_remap_index },
+   {  6226, SecondaryColorP3uiv_remap_index },
    {   162, TexCoordP1ui_remap_index },
-   {   643, TexCoordP1uiv_remap_index },
-   { 27677, TexCoordP2ui_remap_index },
-   { 38698, TexCoordP2uiv_remap_index },
-   { 15599, TexCoordP3ui_remap_index },
-   { 18627, TexCoordP3uiv_remap_index },
-   { 35831, TexCoordP4ui_remap_index },
-   {  1796, TexCoordP4uiv_remap_index },
-   { 15668, VertexAttribP1ui_remap_index },
-   {  4265, VertexAttribP1uiv_remap_index },
-   { 31311, VertexAttribP2ui_remap_index },
-   {  5185, VertexAttribP2uiv_remap_index },
-   {  1514, VertexAttribP3ui_remap_index },
-   { 29694, VertexAttribP3uiv_remap_index },
-   {  4546, VertexAttribP4ui_remap_index },
-   { 16958, VertexAttribP4uiv_remap_index },
-   { 36714, VertexP2ui_remap_index },
-   { 16748, VertexP2uiv_remap_index },
-   { 23707, VertexP3ui_remap_index },
-   {  6302, VertexP3uiv_remap_index },
-   {  3208, VertexP4ui_remap_index },
-   { 45917, VertexP4uiv_remap_index },
-   {   811, DrawArraysIndirect_remap_index },
-   { 24770, DrawElementsIndirect_remap_index },
-   {  6730, GetUniformdv_remap_index },
-   { 41320, Uniform1d_remap_index },
-   { 14930, Uniform1dv_remap_index },
-   { 43728, Uniform2d_remap_index },
-   { 29821, Uniform2dv_remap_index },
-   {   898, Uniform3d_remap_index },
-   { 30786, Uniform3dv_remap_index },
-   {  4605, Uniform4d_remap_index },
-   { 20271, Uniform4dv_remap_index },
-   {  4188, UniformMatrix2dv_remap_index },
-   { 23636, UniformMatrix2x3dv_remap_index },
-   { 16703, UniformMatrix2x4dv_remap_index },
-   { 30684, UniformMatrix3dv_remap_index },
-   {  4469, UniformMatrix3x2dv_remap_index },
-   {  5211, UniformMatrix3x4dv_remap_index },
-   { 17550, UniformMatrix4dv_remap_index },
-   { 34159, UniformMatrix4x2dv_remap_index },
-   { 19051, UniformMatrix4x3dv_remap_index },
-   { 11330, BindTransformFeedback_remap_index },
-   { 11202, DeleteTransformFeedbacks_remap_index },
-   { 37390, DrawTransformFeedback_remap_index },
-   {  4047, GenTransformFeedbacks_remap_index },
-   { 34733, IsTransformFeedback_remap_index },
-   { 32211, PauseTransformFeedback_remap_index },
-   { 37056, ResumeTransformFeedback_remap_index },
-   { 23566, BeginQueryIndexed_remap_index },
-   { 42885, DrawTransformFeedbackStream_remap_index },
-   { 19992, EndQueryIndexed_remap_index },
-   { 22786, GetQueryIndexediv_remap_index },
-   { 45883, ClearDepthf_remap_index },
-   { 25158, DepthRangef_remap_index },
-   { 39982, GetShaderPrecisionFormat_remap_index },
-   {  3317, ReleaseShaderCompiler_remap_index },
-   { 26408, ShaderBinary_remap_index },
-   { 20475, GetProgramBinary_remap_index },
-   { 12473, ProgramBinary_remap_index },
-   { 12708, ProgramParameteri_remap_index },
-   { 28096, DepthRangeArrayv_remap_index },
-   { 43883, DepthRangeIndexed_remap_index },
-   { 34713, GetDoublei_v_remap_index },
-   { 37246, GetFloati_v_remap_index },
-   { 44324, ScissorArrayv_remap_index },
-   { 26211, ScissorIndexed_remap_index },
-   { 29720, ScissorIndexedv_remap_index },
-   { 19433, ViewportArrayv_remap_index },
-   { 33157, ViewportIndexedf_remap_index },
-   { 20523, ViewportIndexedfv_remap_index },
-   {  8798, GetGraphicsResetStatusARB_remap_index },
-   { 31480, GetnColorTableARB_remap_index },
-   {  2868, GetnCompressedTexImageARB_remap_index },
-   {  1260, GetnConvolutionFilterARB_remap_index },
-   {  5059, GetnHistogramARB_remap_index },
-   { 19318, GetnMapdvARB_remap_index },
-   { 12857, GetnMapfvARB_remap_index },
-   { 35957, GetnMapivARB_remap_index },
-   { 40929, GetnMinmaxARB_remap_index },
-   {  3743, GetnPixelMapfvARB_remap_index },
-   {  6041, GetnPixelMapuivARB_remap_index },
-   { 12126, GetnPixelMapusvARB_remap_index },
-   { 23180, GetnPolygonStippleARB_remap_index },
-   { 30201, GetnSeparableFilterARB_remap_index },
-   { 10519, GetnTexImageARB_remap_index },
-   { 29203, GetnUniformdvARB_remap_index },
-   { 35536, GetnUniformfvARB_remap_index },
-   {  3292, GetnUniformivARB_remap_index },
-   { 14320, GetnUniformuivARB_remap_index },
-   { 26627, ReadnPixelsARB_remap_index },
-   { 34341, DrawArraysInstancedBaseInstance_remap_index },
-   { 10716, DrawElementsInstancedBaseInstance_remap_index },
-   {  2680, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
-   { 36967, DrawTransformFeedbackInstanced_remap_index },
-   { 14014, DrawTransformFeedbackStreamInstanced_remap_index },
-   { 44345, GetInternalformativ_remap_index },
-   { 20620, GetActiveAtomicCounterBufferiv_remap_index },
-   { 45855, BindImageTexture_remap_index },
-   { 22320, MemoryBarrier_remap_index },
-   { 35637, TexStorage1D_remap_index },
-   { 24380, TexStorage2D_remap_index },
-   { 28355, TexStorage3D_remap_index },
-   {  1437, TextureStorage1DEXT_remap_index },
-   { 36884, TextureStorage2DEXT_remap_index },
-   { 23241, TextureStorage3DEXT_remap_index },
-   { 37650, ClearBufferData_remap_index },
-   {  2172, ClearBufferSubData_remap_index },
-   { 32738, DispatchCompute_remap_index },
-   {  6675, DispatchComputeIndirect_remap_index },
-   { 37690, CopyImageSubData_remap_index },
-   { 42709, TextureView_remap_index },
-   { 22680, BindVertexBuffer_remap_index },
-   { 30959, VertexAttribBinding_remap_index },
-   { 31507, VertexAttribFormat_remap_index },
-   { 34282, VertexAttribIFormat_remap_index },
-   { 38237, VertexAttribLFormat_remap_index },
-   { 36484, VertexBindingDivisor_remap_index },
-   { 39549, MultiDrawArraysIndirect_remap_index },
-   { 19016, MultiDrawElementsIndirect_remap_index },
-   { 18951, TexBufferRange_remap_index },
-   { 40170, TexStorage2DMultisample_remap_index },
-   { 29613, TexStorage3DMultisample_remap_index },
-   {  3489, BufferStorage_remap_index },
-   { 40649, ClearTexImage_remap_index },
-   { 13649, ClearTexSubImage_remap_index },
-   {  4360, BindBuffersBase_remap_index },
-   { 15214, BindBuffersRange_remap_index },
-   { 11177, BindImageTextures_remap_index },
-   {  2848, BindSamplers_remap_index },
-   { 43422, BindTextures_remap_index },
-   { 26243, BindVertexBuffers_remap_index },
-   { 37793, ClipControl_remap_index },
-   { 20547, BindTextureUnit_remap_index },
-   { 23591, ClearNamedBufferData_remap_index },
-   { 41635, ClearNamedBufferSubData_remap_index },
-   { 40743, CompressedTextureSubImage1D_remap_index },
-   { 36591, CompressedTextureSubImage2D_remap_index },
-   { 34382, CompressedTextureSubImage3D_remap_index },
-   {  2902, CopyNamedBufferSubData_remap_index },
-   { 37005, CopyTextureSubImage1D_remap_index },
-   { 33077, CopyTextureSubImage2D_remap_index },
-   { 42636, CopyTextureSubImage3D_remap_index },
-   {  5779, CreateBuffers_remap_index },
-   { 29882, CreateTextures_remap_index },
-   { 14460, FlushMappedNamedBufferRange_remap_index },
-   { 32423, GenerateTextureMipmap_remap_index },
+   {   649, TexCoordP1uiv_remap_index },
+   { 28219, TexCoordP2ui_remap_index },
+   { 39325, TexCoordP2uiv_remap_index },
+   { 15951, TexCoordP3ui_remap_index },
+   { 19007, TexCoordP3uiv_remap_index },
+   { 36437, TexCoordP4ui_remap_index },
+   {  1906, TexCoordP4uiv_remap_index },
+   { 16020, VertexAttribP1ui_remap_index },
+   {  4476, VertexAttribP1uiv_remap_index },
+   { 31892, VertexAttribP2ui_remap_index },
+   {  5396, VertexAttribP2uiv_remap_index },
+   {  1554, VertexAttribP3ui_remap_index },
+   { 30236, VertexAttribP3uiv_remap_index },
+   {  4757, VertexAttribP4ui_remap_index },
+   { 17344, VertexAttribP4uiv_remap_index },
+   { 37320, VertexP2ui_remap_index },
+   { 17134, VertexP2uiv_remap_index },
+   { 24141, VertexP3ui_remap_index },
+   {  6513, VertexP3uiv_remap_index },
+   {  3356, VertexP4ui_remap_index },
+   { 46661, VertexP4uiv_remap_index },
+   {   817, DrawArraysIndirect_remap_index },
+   { 25204, DrawElementsIndirect_remap_index },
+   {  6941, GetUniformdv_remap_index },
+   { 41974, Uniform1d_remap_index },
+   { 15215, Uniform1dv_remap_index },
+   { 44441, Uniform2d_remap_index },
+   { 30363, Uniform2dv_remap_index },
+   {   904, Uniform3d_remap_index },
+   { 31328, Uniform3dv_remap_index },
+   {  4816, Uniform4d_remap_index },
+   { 20686, Uniform4dv_remap_index },
+   {  4399, UniformMatrix2dv_remap_index },
+   { 24070, UniformMatrix2x3dv_remap_index },
+   { 17089, UniformMatrix2x4dv_remap_index },
+   { 31226, UniformMatrix3dv_remap_index },
+   {  4680, UniformMatrix3x2dv_remap_index },
+   {  5422, UniformMatrix3x4dv_remap_index },
+   { 17936, UniformMatrix4dv_remap_index },
+   { 34765, UniformMatrix4x2dv_remap_index },
+   { 19431, UniformMatrix4x3dv_remap_index },
+   { 11609, BindTransformFeedback_remap_index },
+   { 11481, DeleteTransformFeedbacks_remap_index },
+   { 37996, DrawTransformFeedback_remap_index },
+   {  4258, GenTransformFeedbacks_remap_index },
+   { 35339, IsTransformFeedback_remap_index },
+   { 32822, PauseTransformFeedback_remap_index },
+   { 37662, ResumeTransformFeedback_remap_index },
+   { 24000, BeginQueryIndexed_remap_index },
+   { 43565, DrawTransformFeedbackStream_remap_index },
+   { 20407, EndQueryIndexed_remap_index },
+   { 23220, GetQueryIndexediv_remap_index },
+   { 46627, ClearDepthf_remap_index },
+   { 25592, DepthRangef_remap_index },
+   { 40609, GetShaderPrecisionFormat_remap_index },
+   {  3496, ReleaseShaderCompiler_remap_index },
+   { 26905, ShaderBinary_remap_index },
+   { 20890, GetProgramBinary_remap_index },
+   { 12752, ProgramBinary_remap_index },
+   { 12987, ProgramParameteri_remap_index },
+   { 28638, DepthRangeArrayv_remap_index },
+   { 44596, DepthRangeIndexed_remap_index },
+   { 35319, GetDoublei_v_remap_index },
+   { 37852, GetFloati_v_remap_index },
+   { 45037, ScissorArrayv_remap_index },
+   { 26708, ScissorIndexed_remap_index },
+   { 30262, ScissorIndexedv_remap_index },
+   { 19848, ViewportArrayv_remap_index },
+   { 33763, ViewportIndexedf_remap_index },
+   { 20938, ViewportIndexedfv_remap_index },
+   {  9036, GetGraphicsResetStatusARB_remap_index },
+   { 32061, GetnColorTableARB_remap_index },
+   {  2978, GetnCompressedTexImageARB_remap_index },
+   {  1266, GetnConvolutionFilterARB_remap_index },
+   {  5270, GetnHistogramARB_remap_index },
+   { 19733, GetnMapdvARB_remap_index },
+   { 13136, GetnMapfvARB_remap_index },
+   { 36563, GetnMapivARB_remap_index },
+   { 41556, GetnMinmaxARB_remap_index },
+   {  3954, GetnPixelMapfvARB_remap_index },
+   {  6252, GetnPixelMapuivARB_remap_index },
+   { 12405, GetnPixelMapusvARB_remap_index },
+   { 23614, GetnPolygonStippleARB_remap_index },
+   { 30743, GetnSeparableFilterARB_remap_index },
+   { 10817, GetnTexImageARB_remap_index },
+   { 29745, GetnUniformdvARB_remap_index },
+   { 36142, GetnUniformfvARB_remap_index },
+   {  3471, GetnUniformivARB_remap_index },
+   { 14605, GetnUniformuivARB_remap_index },
+   { 27124, ReadnPixelsARB_remap_index },
+   { 34947, DrawArraysInstancedBaseInstance_remap_index },
+   { 10995, DrawElementsInstancedBaseInstance_remap_index },
+   {  2790, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
+   { 37573, DrawTransformFeedbackInstanced_remap_index },
+   { 14266, DrawTransformFeedbackStreamInstanced_remap_index },
+   { 45058, GetInternalformativ_remap_index },
+   { 21035, GetActiveAtomicCounterBufferiv_remap_index },
+   { 46599, BindImageTexture_remap_index },
+   { 22754, MemoryBarrier_remap_index },
+   { 36243, TexStorage1D_remap_index },
+   { 24814, TexStorage2D_remap_index },
+   { 28897, TexStorage3D_remap_index },
+   {  1477, TextureStorage1DEXT_remap_index },
+   { 37490, TextureStorage2DEXT_remap_index },
+   { 23675, TextureStorage3DEXT_remap_index },
+   { 38256, ClearBufferData_remap_index },
+   {  2282, ClearBufferSubData_remap_index },
+   { 33344, DispatchCompute_remap_index },
+   {  6886, DispatchComputeIndirect_remap_index },
+   { 38296, CopyImageSubData_remap_index },
+   { 43389, TextureView_remap_index },
+   { 23114, BindVertexBuffer_remap_index },
+   { 31501, VertexAttribBinding_remap_index },
+   { 32088, VertexAttribFormat_remap_index },
+   { 34888, VertexAttribIFormat_remap_index },
+   { 38843, VertexAttribLFormat_remap_index },
+   { 37090, VertexBindingDivisor_remap_index },
+   { 40176, MultiDrawArraysIndirect_remap_index },
+   { 19396, MultiDrawElementsIndirect_remap_index },
+   { 32676, GetProgramInterfaceiv_remap_index },
+   {  3373, GetProgramResourceIndex_remap_index },
+   {  1398, GetProgramResourceLocation_remap_index },
+   {  1668, GetProgramResourceLocationIndex_remap_index },
+   { 14384, GetProgramResourceName_remap_index },
+   { 43995, GetProgramResourceiv_remap_index },
+   { 19331, TexBufferRange_remap_index },
+   { 40797, TexStorage2DMultisample_remap_index },
+   { 30155, TexStorage3DMultisample_remap_index },
+   {  3668, BufferStorage_remap_index },
+   { 41276, ClearTexImage_remap_index },
+   { 13928, ClearTexSubImage_remap_index },
+   {  4571, BindBuffersBase_remap_index },
+   { 15566, BindBuffersRange_remap_index },
+   { 11456, BindImageTextures_remap_index },
+   {  2958, BindSamplers_remap_index },
+   { 44135, BindTextures_remap_index },
+   { 26740, BindVertexBuffers_remap_index },
+   { 38399, ClipControl_remap_index },
+   { 20962, BindTextureUnit_remap_index },
+   { 24025, ClearNamedBufferData_remap_index },
+   { 42289, ClearNamedBufferSubData_remap_index },
+   { 41370, CompressedTextureSubImage1D_remap_index },
+   { 37197, CompressedTextureSubImage2D_remap_index },
+   { 34988, CompressedTextureSubImage3D_remap_index },
+   {  3012, CopyNamedBufferSubData_remap_index },
+   { 37611, CopyTextureSubImage1D_remap_index },
+   { 33683, CopyTextureSubImage2D_remap_index },
+   { 43316, CopyTextureSubImage3D_remap_index },
+   {  5990, CreateBuffers_remap_index },
+   { 15475, CreateProgramPipelines_remap_index },
+   { 33120, CreateQueries_remap_index },
+   {  9066, CreateRenderbuffers_remap_index },
+   { 39005, CreateSamplers_remap_index },
+   { 30424, CreateTextures_remap_index },
+   {  1707, CreateTransformFeedbacks_remap_index },
+   { 14745, FlushMappedNamedBufferRange_remap_index },
+   { 33034, GenerateTextureMipmap_remap_index },
    {   391, GetCompressedTextureImage_remap_index },
-   {  4684, GetNamedBufferParameteri64v_remap_index },
-   { 24193, GetNamedBufferParameteriv_remap_index },
-   { 29414, GetNamedBufferPointerv_remap_index },
-   { 11543, GetNamedBufferSubData_remap_index },
-   { 18354, GetTextureImage_remap_index },
-   { 34057, GetTextureLevelParameterfv_remap_index },
-   { 36780, GetTextureLevelParameteriv_remap_index },
-   { 14618, GetTextureParameterIiv_remap_index },
-   { 22543, GetTextureParameterIuiv_remap_index },
-   { 24916, GetTextureParameterfv_remap_index },
-   { 28049, GetTextureParameteriv_remap_index },
-   {  9609, MapNamedBuffer_remap_index },
-   { 12354, MapNamedBufferRange_remap_index },
-   { 44459, NamedBufferData_remap_index },
-   { 11082, NamedBufferStorage_remap_index },
-   { 18924, NamedBufferSubData_remap_index },
-   { 22161, TextureBuffer_remap_index },
-   { 11424, TextureBufferRange_remap_index },
-   { 36914, TextureParameterIiv_remap_index },
-   { 28241, TextureParameterIuiv_remap_index },
-   { 35709, TextureParameterf_remap_index },
-   {  2202, TextureParameterfv_remap_index },
-   { 35790, TextureParameteri_remap_index },
-   { 25193, TextureParameteriv_remap_index },
-   { 10310, TextureStorage1D_remap_index },
-   { 14592, TextureStorage2D_remap_index },
-   { 41893, TextureStorage2DMultisample_remap_index },
-   { 18573, TextureStorage3D_remap_index },
-   {  3253, TextureStorage3DMultisample_remap_index },
-   { 26507, TextureSubImage1D_remap_index },
-   { 30985, TextureSubImage2D_remap_index },
-   { 33966, TextureSubImage3D_remap_index },
-   {  4447, UnmapNamedBuffer_remap_index },
-   {  6704, InvalidateBufferData_remap_index },
-   { 40591, InvalidateBufferSubData_remap_index },
-   { 22280, InvalidateFramebuffer_remap_index },
-   { 16650, InvalidateSubFramebuffer_remap_index },
-   { 12514, InvalidateTexImage_remap_index },
-   { 26654, InvalidateTexSubImage_remap_index },
-   { 13275, PolygonOffsetEXT_remap_index },
-   { 37811, DrawTexfOES_remap_index },
-   { 26076, DrawTexfvOES_remap_index },
-   {  1013, DrawTexiOES_remap_index },
-   { 31416, DrawTexivOES_remap_index },
-   { 12661, DrawTexsOES_remap_index },
-   { 22474, DrawTexsvOES_remap_index },
-   { 27348, DrawTexxOES_remap_index },
-   { 39810, DrawTexxvOES_remap_index },
-   { 25481, PointSizePointerOES_remap_index },
-   {   976, QueryMatrixxOES_remap_index },
-   { 20056, SampleMaskSGIS_remap_index },
-   { 34439, SamplePatternSGIS_remap_index },
-   { 43745, ColorPointerEXT_remap_index },
-   { 28765, EdgeFlagPointerEXT_remap_index },
-   { 13352, IndexPointerEXT_remap_index },
-   { 13542, NormalPointerEXT_remap_index },
-   { 28161, TexCoordPointerEXT_remap_index },
-   { 25298, VertexPointerEXT_remap_index },
-   { 43667, DiscardFramebufferEXT_remap_index },
-   { 11126, ActiveShaderProgram_remap_index },
-   { 16908, BindProgramPipeline_remap_index },
-   { 28817, CreateShaderProgramv_remap_index },
-   {  3641, DeleteProgramPipelines_remap_index },
-   { 26299, GenProgramPipelines_remap_index },
-   {  8288, GetProgramPipelineInfoLog_remap_index },
-   { 31583, GetProgramPipelineiv_remap_index },
-   { 26362, IsProgramPipeline_remap_index },
-   { 45733, LockArraysEXT_remap_index },
-   { 45031, ProgramUniform1d_remap_index },
-   { 31113, ProgramUniform1dv_remap_index },
-   { 44985, ProgramUniform1f_remap_index },
-   {  9786, ProgramUniform1fv_remap_index },
-   { 44939, ProgramUniform1i_remap_index },
-   { 15454, ProgramUniform1iv_remap_index },
-   { 34889, ProgramUniform1ui_remap_index },
-   { 44787, ProgramUniform1uiv_remap_index },
-   {  2384, ProgramUniform2d_remap_index },
-   {  9715, ProgramUniform2dv_remap_index },
-   {  2337, ProgramUniform2f_remap_index },
-   { 36731, ProgramUniform2fv_remap_index },
-   {  2409, ProgramUniform2i_remap_index },
-   { 21668, ProgramUniform2iv_remap_index },
-   {  7291, ProgramUniform2ui_remap_index },
-   {  9132, ProgramUniform2uiv_remap_index },
-   {  4719, ProgramUniform3d_remap_index },
-   {  4658, ProgramUniform3dv_remap_index },
-   {  4745, ProgramUniform3f_remap_index },
-   { 30482, ProgramUniform3fv_remap_index },
-   {  4793, ProgramUniform3i_remap_index },
-   { 13567, ProgramUniform3iv_remap_index },
-   { 15503, ProgramUniform3ui_remap_index },
-   { 18303, ProgramUniform3uiv_remap_index },
-   { 29262, ProgramUniform4d_remap_index },
-   { 31336, ProgramUniform4dv_remap_index },
-   { 29289, ProgramUniform4f_remap_index },
-   { 42550, ProgramUniform4fv_remap_index },
-   { 29338, ProgramUniform4i_remap_index },
-   {  1910, ProgramUniform4iv_remap_index },
-   { 41238, ProgramUniform4ui_remap_index },
-   { 33638, ProgramUniform4uiv_remap_index },
-   { 13616, ProgramUniformMatrix2dv_remap_index },
-   { 20128, ProgramUniformMatrix2fv_remap_index },
-   { 16347, ProgramUniformMatrix2x3dv_remap_index },
-   { 22614, ProgramUniformMatrix2x3fv_remap_index },
-   {  1842, ProgramUniformMatrix2x4dv_remap_index },
-   {  7970, ProgramUniformMatrix2x4fv_remap_index },
-   { 45700, ProgramUniformMatrix3dv_remap_index },
-   { 39433, ProgramUniformMatrix3fv_remap_index },
-   { 27192, ProgramUniformMatrix3x2dv_remap_index },
-   { 34647, ProgramUniformMatrix3x2fv_remap_index },
-   { 23060, ProgramUniformMatrix3x4dv_remap_index },
-   { 27761, ProgramUniformMatrix3x4fv_remap_index },
-   { 39620, ProgramUniformMatrix4dv_remap_index },
-   { 32807, ProgramUniformMatrix4fv_remap_index },
-   { 40782, ProgramUniformMatrix4x2dv_remap_index },
-   {  2271, ProgramUniformMatrix4x2fv_remap_index },
-   { 14174, ProgramUniformMatrix4x3dv_remap_index },
-   {  7534, ProgramUniformMatrix4x3fv_remap_index },
-   { 40204, UnlockArraysEXT_remap_index },
-   { 32761, UseProgramStages_remap_index },
-   {  1655, ValidateProgramPipeline_remap_index },
-   { 16984, DebugMessageCallback_remap_index },
-   { 33250, DebugMessageControl_remap_index },
-   { 16185, DebugMessageInsert_remap_index },
-   {  7094, GetDebugMessageLog_remap_index },
-   {  6885, GetObjectLabel_remap_index },
-   { 12682, GetObjectPtrLabel_remap_index },
-   { 32191, ObjectLabel_remap_index },
-   { 45820, ObjectPtrLabel_remap_index },
-   { 18807, PopDebugGroup_remap_index },
-   { 14984, PushDebugGroup_remap_index },
-   {  8652, SecondaryColor3fEXT_remap_index },
-   {  8166, SecondaryColor3fvEXT_remap_index },
-   { 30151, MultiDrawElementsEXT_remap_index },
-   { 11258, FogCoordfEXT_remap_index },
-   { 19078, FogCoordfvEXT_remap_index },
-   {  4338, ResizeBuffersMESA_remap_index },
-   { 35893, WindowPos4dMESA_remap_index },
-   { 28662, WindowPos4dvMESA_remap_index },
-   {  4496, WindowPos4fMESA_remap_index },
-   { 11895, WindowPos4fvMESA_remap_index },
-   {  9422, WindowPos4iMESA_remap_index },
-   {  3816, WindowPos4ivMESA_remap_index },
-   { 29488, WindowPos4sMESA_remap_index },
-   {  1107, WindowPos4svMESA_remap_index },
-   { 30251, MultiModeDrawArraysIBM_remap_index },
-   { 20808, MultiModeDrawElementsIBM_remap_index },
-   { 34558, AreProgramsResidentNV_remap_index },
-   { 42021, ExecuteProgramNV_remap_index },
-   { 31081, GetProgramParameterdvNV_remap_index },
-   { 38444, GetProgramParameterfvNV_remap_index },
-   { 20225, GetProgramStringNV_remap_index },
-   { 16574, GetProgramivNV_remap_index },
-   { 19363, GetTrackMatrixivNV_remap_index },
-   { 19805, GetVertexAttribdvNV_remap_index },
-   { 17930, GetVertexAttribfvNV_remap_index },
-   { 16801, GetVertexAttribivNV_remap_index },
-   { 38167, LoadProgramNV_remap_index },
-   { 20908, ProgramParameters4dvNV_remap_index },
-   { 21520, ProgramParameters4fvNV_remap_index },
-   {  6486, RequestResidentProgramsNV_remap_index },
-   { 30637, TrackMatrixNV_remap_index },
-   { 46107, VertexAttrib1dNV_remap_index },
-   { 29556, VertexAttrib1dvNV_remap_index },
-   { 29922, VertexAttrib1fNV_remap_index },
-   { 44094, VertexAttrib1fvNV_remap_index },
-   { 22118, VertexAttrib1sNV_remap_index },
-   { 40224, VertexAttrib1svNV_remap_index },
-   { 19339, VertexAttrib2dNV_remap_index },
-   { 36177, VertexAttrib2dvNV_remap_index },
-   { 28546, VertexAttrib2fNV_remap_index },
-   { 27227, VertexAttrib2fvNV_remap_index },
-   { 13448, VertexAttrib2sNV_remap_index },
-   {  5991, VertexAttrib2svNV_remap_index },
-   { 38853, VertexAttrib3dNV_remap_index },
-   { 40891, VertexAttrib3dvNV_remap_index },
-   {  5238, VertexAttrib3fNV_remap_index },
-   { 43315, VertexAttrib3fvNV_remap_index },
-   {  7478, VertexAttrib3sNV_remap_index },
-   { 19390, VertexAttrib3svNV_remap_index },
-   {  8854, VertexAttrib4dNV_remap_index },
-   {  3566, VertexAttrib4dvNV_remap_index },
-   {  8925, VertexAttrib4fNV_remap_index },
-   { 43469, VertexAttrib4fvNV_remap_index },
-   { 18415, VertexAttrib4sNV_remap_index },
-   { 11470, VertexAttrib4svNV_remap_index },
-   {  1628, VertexAttrib4ubNV_remap_index },
-   { 11233, VertexAttrib4ubvNV_remap_index },
-   { 30402, VertexAttribPointerNV_remap_index },
-   { 28713, VertexAttribs1dvNV_remap_index },
-   { 32509, VertexAttribs1fvNV_remap_index },
-   {  6460, VertexAttribs1svNV_remap_index },
-   { 44761, VertexAttribs2dvNV_remap_index },
-   {  4520, VertexAttribs2fvNV_remap_index },
-   { 28791, VertexAttribs2svNV_remap_index },
-   {  1816, VertexAttribs3dvNV_remap_index },
-   { 37418, VertexAttribs3fvNV_remap_index },
-   { 14769, VertexAttribs3svNV_remap_index },
-   { 26050, VertexAttribs4dvNV_remap_index },
-   { 25632, VertexAttribs4fvNV_remap_index },
-   { 21717, VertexAttribs4svNV_remap_index },
-   { 33833, VertexAttribs4ubvNV_remap_index },
-   { 43972, GetTexBumpParameterfvATI_remap_index },
-   { 10957, GetTexBumpParameterivATI_remap_index },
-   { 37518, TexBumpParameterfvATI_remap_index },
-   {  8897, TexBumpParameterivATI_remap_index },
-   {  9643, AlphaFragmentOp1ATI_remap_index },
-   {  3590, AlphaFragmentOp2ATI_remap_index },
-   { 10125, AlphaFragmentOp3ATI_remap_index },
-   { 35077, BeginFragmentShaderATI_remap_index },
-   {  3863, BindFragmentShaderATI_remap_index },
-   {  7503, ColorFragmentOp1ATI_remap_index },
-   { 13414, ColorFragmentOp2ATI_remap_index },
-   { 25219, ColorFragmentOp3ATI_remap_index },
-   { 17745, DeleteFragmentShaderATI_remap_index },
-   { 46250, EndFragmentShaderATI_remap_index },
-   { 24166, GenFragmentShadersATI_remap_index },
-   { 43551, PassTexCoordATI_remap_index },
-   { 37498, SampleMapATI_remap_index },
-   { 36679, SetFragmentShaderConstantATI_remap_index },
-   {  8828, ActiveStencilFaceEXT_remap_index },
-   {  8454, BindVertexArrayAPPLE_remap_index },
-   { 17250, GenVertexArraysAPPLE_remap_index },
-   { 37084, GetProgramNamedParameterdvNV_remap_index },
-   { 23916, GetProgramNamedParameterfvNV_remap_index },
-   { 44003, ProgramNamedParameter4dNV_remap_index },
-   { 40015, ProgramNamedParameter4dvNV_remap_index },
-   { 43257, ProgramNamedParameter4fNV_remap_index },
-   { 26754, ProgramNamedParameter4fvNV_remap_index },
-   { 25539, PrimitiveRestartNV_remap_index },
-   { 26028, GetTexGenxvOES_remap_index },
-   { 15339, TexGenxOES_remap_index },
-   { 34038, TexGenxvOES_remap_index },
-   {  8378, DepthBoundsEXT_remap_index },
-   {  6230, BindFramebufferEXT_remap_index },
-   { 43609, BindRenderbufferEXT_remap_index },
-   { 32666, BufferParameteriAPPLE_remap_index },
-   { 41530, FlushMappedBufferRangeAPPLE_remap_index },
-   { 29081, VertexAttribI1iEXT_remap_index },
-   { 11834, VertexAttribI1uiEXT_remap_index },
-   { 21241, VertexAttribI2iEXT_remap_index },
-   { 43108, VertexAttribI2ivEXT_remap_index },
-   { 26885, VertexAttribI2uiEXT_remap_index },
-   { 37181, VertexAttribI2uivEXT_remap_index },
-   { 20324, VertexAttribI3iEXT_remap_index },
-   { 45259, VertexAttribI3ivEXT_remap_index },
-   { 23848, VertexAttribI3uiEXT_remap_index },
-   { 22022, VertexAttribI3uivEXT_remap_index },
-   { 40060, VertexAttribI4iEXT_remap_index },
-   {  7001, VertexAttribI4ivEXT_remap_index },
-   {  2632, VertexAttribI4uiEXT_remap_index },
-   { 28938, VertexAttribI4uivEXT_remap_index },
-   {  3130, ClearColorIiEXT_remap_index },
-   {  1235, ClearColorIuiEXT_remap_index },
-   { 25562, BindBufferOffsetEXT_remap_index },
-   { 19110, BeginPerfMonitorAMD_remap_index },
-   { 34516, DeletePerfMonitorsAMD_remap_index },
-   {  5731, EndPerfMonitorAMD_remap_index },
-   { 39227, GenPerfMonitorsAMD_remap_index },
-   { 13140, GetPerfMonitorCounterDataAMD_remap_index },
-   { 36511, GetPerfMonitorCounterInfoAMD_remap_index },
-   { 46210, GetPerfMonitorCounterStringAMD_remap_index },
-   { 45785, GetPerfMonitorCountersAMD_remap_index },
-   { 15055, GetPerfMonitorGroupStringAMD_remap_index },
-   { 31260, GetPerfMonitorGroupsAMD_remap_index },
-   { 14554, SelectPerfMonitorCountersAMD_remap_index },
-   { 15152, GetObjectParameterivAPPLE_remap_index },
-   { 45593, ObjectPurgeableAPPLE_remap_index },
-   {  1959, ObjectUnpurgeableAPPLE_remap_index },
-   { 44549, ActiveProgramEXT_remap_index },
-   { 28684, CreateShaderProgramEXT_remap_index },
-   { 38961, UseShaderProgramEXT_remap_index },
-   { 32057, TextureBarrierNV_remap_index },
-   {  2228, VDPAUFiniNV_remap_index },
-   {   869, VDPAUGetSurfaceivNV_remap_index },
-   { 25074, VDPAUInitNV_remap_index },
-   { 22592, VDPAUIsSurfaceNV_remap_index },
-   {  6750, VDPAUMapSurfacesNV_remap_index },
-   {  3171, VDPAURegisterOutputSurfaceNV_remap_index },
-   { 13038, VDPAURegisterVideoSurfaceNV_remap_index },
-   { 11573, VDPAUSurfaceAccessNV_remap_index },
-   {  5032, VDPAUUnmapSurfacesNV_remap_index },
-   { 39914, VDPAUUnregisterSurfaceNV_remap_index },
-   { 40692, BeginPerfQueryINTEL_remap_index },
-   { 35398, CreatePerfQueryINTEL_remap_index },
-   { 17181, DeletePerfQueryINTEL_remap_index },
-   { 42938, EndPerfQueryINTEL_remap_index },
-   { 44519, GetFirstPerfQueryIdINTEL_remap_index },
-   { 32010, GetNextPerfQueryIdINTEL_remap_index },
-   { 33689, GetPerfCounterInfoINTEL_remap_index },
-   {   780, GetPerfQueryDataINTEL_remap_index },
-   { 23446, GetPerfQueryIdByNameINTEL_remap_index },
-   { 21002, GetPerfQueryInfoINTEL_remap_index },
-   { 40368, PolygonOffsetClampEXT_remap_index },
-   { 21403, StencilFuncSeparateATI_remap_index },
-   {  5956, ProgramEnvParameters4fvEXT_remap_index },
-   { 32325, ProgramLocalParameters4fvEXT_remap_index },
-   {  4004, EGLImageTargetRenderbufferStorageOES_remap_index },
-   {  3768, EGLImageTargetTexture2DOES_remap_index },
-   { 43075, AlphaFuncx_remap_index },
-   { 20369, ClearColorx_remap_index },
-   { 42291, ClearDepthx_remap_index },
-   { 37917, Color4x_remap_index },
-   { 25012, DepthRangex_remap_index },
-   {  2456, Fogx_remap_index },
-   { 15618, Fogxv_remap_index },
-   {  9099, Frustumf_remap_index },
-   {  9196, Frustumx_remap_index },
-   { 20289, LightModelx_remap_index },
-   { 33878, LightModelxv_remap_index },
-   { 30456, Lightx_remap_index },
-   { 43855, Lightxv_remap_index },
-   {  3698, LineWidthx_remap_index },
-   {  3455, LoadMatrixx_remap_index },
-   { 44856, Materialx_remap_index },
-   { 26704, Materialxv_remap_index },
-   { 45378, MultMatrixx_remap_index },
-   { 10588, MultiTexCoord4x_remap_index },
-   { 26536, Normal3x_remap_index },
-   { 16238, Orthof_remap_index },
-   { 16454, Orthox_remap_index },
-   { 28985, PointSizex_remap_index },
+   {  4895, GetNamedBufferParameteri64v_remap_index },
+   { 24627, GetNamedBufferParameteriv_remap_index },
+   { 29956, GetNamedBufferPointerv_remap_index },
+   { 11822, GetNamedBufferSubData_remap_index },
+   { 31802, GetNamedRenderbufferParameteriv_remap_index },
+   { 26183, GetQueryBufferObjecti64v_remap_index },
+   { 45601, GetQueryBufferObjectiv_remap_index },
+   {  9396, GetQueryBufferObjectui64v_remap_index },
+   {  3102, GetQueryBufferObjectuiv_remap_index },
+   {  3178, GetTextureImage_remap_index },
+   { 34663, GetTextureLevelParameterfv_remap_index },
+   { 37386, GetTextureLevelParameteriv_remap_index },
+   { 14903, GetTextureParameterIiv_remap_index },
+   { 22977, GetTextureParameterIuiv_remap_index },
+   { 25350, GetTextureParameterfv_remap_index },
+   { 28591, GetTextureParameteriv_remap_index },
+   { 16152, GetTransformFeedbacki64_v_remap_index },
+   {  3909, GetTransformFeedbacki_v_remap_index },
+   { 25898, GetTransformFeedbackiv_remap_index },
+   {  9907, MapNamedBuffer_remap_index },
+   { 12633, MapNamedBufferRange_remap_index },
+   { 45172, NamedBufferData_remap_index },
+   { 11361, NamedBufferStorage_remap_index },
+   { 19304, NamedBufferSubData_remap_index },
+   {  8789, NamedRenderbufferStorage_remap_index },
+   { 28117, NamedRenderbufferStorageMultisample_remap_index },
+   { 22595, TextureBuffer_remap_index },
+   { 11703, TextureBufferRange_remap_index },
+   { 37520, TextureParameterIiv_remap_index },
+   { 28783, TextureParameterIuiv_remap_index },
+   { 36315, TextureParameterf_remap_index },
+   {  2312, TextureParameterfv_remap_index },
+   { 36396, TextureParameteri_remap_index },
+   { 25627, TextureParameteriv_remap_index },
+   { 10608, TextureStorage1D_remap_index },
+   { 14877, TextureStorage2D_remap_index },
+   { 42547, TextureStorage2DMultisample_remap_index },
+   { 18953, TextureStorage3D_remap_index },
+   {  3432, TextureStorage3DMultisample_remap_index },
+   { 27004, TextureSubImage1D_remap_index },
+   { 31527, TextureSubImage2D_remap_index },
+   { 34572, TextureSubImage3D_remap_index },
+   { 19458, TransformFeedbackBufferBase_remap_index },
+   { 15269, TransformFeedbackBufferRange_remap_index },
+   {  4658, UnmapNamedBuffer_remap_index },
+   {  6915, InvalidateBufferData_remap_index },
+   { 41218, InvalidateBufferSubData_remap_index },
+   { 22714, InvalidateFramebuffer_remap_index },
+   { 17036, InvalidateSubFramebuffer_remap_index },
+   { 12793, InvalidateTexImage_remap_index },
+   { 27151, InvalidateTexSubImage_remap_index },
+   { 13554, PolygonOffsetEXT_remap_index },
+   { 38417, DrawTexfOES_remap_index },
+   { 26573, DrawTexfvOES_remap_index },
+   {  1019, DrawTexiOES_remap_index },
+   { 31997, DrawTexivOES_remap_index },
+   { 12940, DrawTexsOES_remap_index },
+   { 22908, DrawTexsvOES_remap_index },
+   { 27845, DrawTexxOES_remap_index },
+   { 40437, DrawTexxvOES_remap_index },
+   { 25945, PointSizePointerOES_remap_index },
+   {   982, QueryMatrixxOES_remap_index },
+   { 20471, SampleMaskSGIS_remap_index },
+   { 35045, SamplePatternSGIS_remap_index },
+   { 44458, ColorPointerEXT_remap_index },
+   { 29307, EdgeFlagPointerEXT_remap_index },
+   { 13631, IndexPointerEXT_remap_index },
+   { 13821, NormalPointerEXT_remap_index },
+   { 28703, TexCoordPointerEXT_remap_index },
+   { 25732, VertexPointerEXT_remap_index },
+   { 44380, DiscardFramebufferEXT_remap_index },
+   { 11405, ActiveShaderProgram_remap_index },
+   { 17294, BindProgramPipeline_remap_index },
+   { 29359, CreateShaderProgramv_remap_index },
+   {  3820, DeleteProgramPipelines_remap_index },
+   { 26796, GenProgramPipelines_remap_index },
+   {  8493, GetProgramPipelineInfoLog_remap_index },
+   { 32164, GetProgramPipelineiv_remap_index },
+   { 26859, IsProgramPipeline_remap_index },
+   { 46477, LockArraysEXT_remap_index },
+   { 45775, ProgramUniform1d_remap_index },
+   { 31655, ProgramUniform1dv_remap_index },
+   { 45729, ProgramUniform1f_remap_index },
+   { 10084, ProgramUniform1fv_remap_index },
+   { 45683, ProgramUniform1i_remap_index },
+   { 15806, ProgramUniform1iv_remap_index },
+   { 35495, ProgramUniform1ui_remap_index },
+   { 45500, ProgramUniform1uiv_remap_index },
+   {  2494, ProgramUniform2d_remap_index },
+   { 10013, ProgramUniform2dv_remap_index },
+   {  2447, ProgramUniform2f_remap_index },
+   { 37337, ProgramUniform2fv_remap_index },
+   {  2519, ProgramUniform2i_remap_index },
+   { 22083, ProgramUniform2iv_remap_index },
+   {  7496, ProgramUniform2ui_remap_index },
+   {  9430, ProgramUniform2uiv_remap_index },
+   {  4930, ProgramUniform3d_remap_index },
+   {  4869, ProgramUniform3dv_remap_index },
+   {  4956, ProgramUniform3f_remap_index },
+   { 31024, ProgramUniform3fv_remap_index },
+   {  5004, ProgramUniform3i_remap_index },
+   { 13846, ProgramUniform3iv_remap_index },
+   { 15855, ProgramUniform3ui_remap_index },
+   { 18689, ProgramUniform3uiv_remap_index },
+   { 29804, ProgramUniform4d_remap_index },
+   { 31917, ProgramUniform4dv_remap_index },
+   { 29831, ProgramUniform4f_remap_index },
+   { 43230, ProgramUniform4fv_remap_index },
+   { 29880, ProgramUniform4i_remap_index },
+   {  2020, ProgramUniform4iv_remap_index },
+   { 41892, ProgramUniform4ui_remap_index },
+   { 34244, ProgramUniform4uiv_remap_index },
+   { 13895, ProgramUniformMatrix2dv_remap_index },
+   { 20543, ProgramUniformMatrix2fv_remap_index },
+   { 16733, ProgramUniformMatrix2x3dv_remap_index },
+   { 23048, ProgramUniformMatrix2x3fv_remap_index },
+   {  1952, ProgramUniformMatrix2x4dv_remap_index },
+   {  8175, ProgramUniformMatrix2x4fv_remap_index },
+   { 46444, ProgramUniformMatrix3dv_remap_index },
+   { 40060, ProgramUniformMatrix3fv_remap_index },
+   { 27689, ProgramUniformMatrix3x2dv_remap_index },
+   { 35253, ProgramUniformMatrix3x2fv_remap_index },
+   { 23494, ProgramUniformMatrix3x4dv_remap_index },
+   { 28303, ProgramUniformMatrix3x4fv_remap_index },
+   { 40247, ProgramUniformMatrix4dv_remap_index },
+   { 33413, ProgramUniformMatrix4fv_remap_index },
+   { 41409, ProgramUniformMatrix4x2dv_remap_index },
+   {  2381, ProgramUniformMatrix4x2fv_remap_index },
+   { 14459, ProgramUniformMatrix4x3dv_remap_index },
+   {  7739, ProgramUniformMatrix4x3fv_remap_index },
+   { 40831, UnlockArraysEXT_remap_index },
+   { 33367, UseProgramStages_remap_index },
+   {  1765, ValidateProgramPipeline_remap_index },
+   { 17370, DebugMessageCallback_remap_index },
+   { 33856, DebugMessageControl_remap_index },
+   { 16571, DebugMessageInsert_remap_index },
+   {  7305, GetDebugMessageLog_remap_index },
+   {  7096, GetObjectLabel_remap_index },
+   { 12961, GetObjectPtrLabel_remap_index },
+   { 32802, ObjectLabel_remap_index },
+   { 46564, ObjectPtrLabel_remap_index },
+   { 19187, PopDebugGroup_remap_index },
+   { 15307, PushDebugGroup_remap_index },
+   {  8890, SecondaryColor3fEXT_remap_index },
+   {  8371, SecondaryColor3fvEXT_remap_index },
+   { 30693, MultiDrawElementsEXT_remap_index },
+   { 11537, FogCoordfEXT_remap_index },
+   { 19493, FogCoordfvEXT_remap_index },
+   {  4549, ResizeBuffersMESA_remap_index },
+   { 36499, WindowPos4dMESA_remap_index },
+   { 29204, WindowPos4dvMESA_remap_index },
+   {  4707, WindowPos4fMESA_remap_index },
+   { 12174, WindowPos4fvMESA_remap_index },
+   {  9720, WindowPos4iMESA_remap_index },
+   {  4027, WindowPos4ivMESA_remap_index },
+   { 30030, WindowPos4sMESA_remap_index },
+   {  1113, WindowPos4svMESA_remap_index },
+   { 30793, MultiModeDrawArraysIBM_remap_index },
+   { 21223, MultiModeDrawElementsIBM_remap_index },
+   { 35164, AreProgramsResidentNV_remap_index },
+   { 42675, ExecuteProgramNV_remap_index },
+   { 31623, GetProgramParameterdvNV_remap_index },
+   { 39071, GetProgramParameterfvNV_remap_index },
+   { 20640, GetProgramStringNV_remap_index },
+   { 16960, GetProgramivNV_remap_index },
+   { 19778, GetTrackMatrixivNV_remap_index },
+   { 20220, GetVertexAttribdvNV_remap_index },
+   { 18316, GetVertexAttribfvNV_remap_index },
+   { 17187, GetVertexAttribivNV_remap_index },
+   { 38773, LoadProgramNV_remap_index },
+   { 21323, ProgramParameters4dvNV_remap_index },
+   { 21935, ProgramParameters4fvNV_remap_index },
+   {  6697, RequestResidentProgramsNV_remap_index },
+   { 31179, TrackMatrixNV_remap_index },
+   { 46851, VertexAttrib1dNV_remap_index },
+   { 30098, VertexAttrib1dvNV_remap_index },
+   { 30464, VertexAttrib1fNV_remap_index },
+   { 44807, VertexAttrib1fvNV_remap_index },
+   { 22552, VertexAttrib1sNV_remap_index },
+   { 40851, VertexAttrib1svNV_remap_index },
+   { 19754, VertexAttrib2dNV_remap_index },
+   { 36783, VertexAttrib2dvNV_remap_index },
+   { 29088, VertexAttrib2fNV_remap_index },
+   { 27724, VertexAttrib2fvNV_remap_index },
+   { 13727, VertexAttrib2sNV_remap_index },
+   {  6202, VertexAttrib2svNV_remap_index },
+   { 39480, VertexAttrib3dNV_remap_index },
+   { 41518, VertexAttrib3dvNV_remap_index },
+   {  5449, VertexAttrib3fNV_remap_index },
+   { 44028, VertexAttrib3fvNV_remap_index },
+   {  7683, VertexAttrib3sNV_remap_index },
+   { 19805, VertexAttrib3svNV_remap_index },
+   {  9118, VertexAttrib4dNV_remap_index },
+   {  3745, VertexAttrib4dvNV_remap_index },
+   {  9189, VertexAttrib4fNV_remap_index },
+   { 44182, VertexAttrib4fvNV_remap_index },
+   { 18795, VertexAttrib4sNV_remap_index },
+   { 11749, VertexAttrib4svNV_remap_index },
+   {  1738, VertexAttrib4ubNV_remap_index },
+   { 11512, VertexAttrib4ubvNV_remap_index },
+   { 30944, VertexAttribPointerNV_remap_index },
+   { 29255, VertexAttribs1dvNV_remap_index },
+   { 43148, VertexAttribs1fvNV_remap_index },
+   {  6671, VertexAttribs1svNV_remap_index },
+   { 45474, VertexAttribs2dvNV_remap_index },
+   {  4731, VertexAttribs2fvNV_remap_index },
+   { 29333, VertexAttribs2svNV_remap_index },
+   {  1926, VertexAttribs3dvNV_remap_index },
+   { 38024, VertexAttribs3fvNV_remap_index },
+   { 15054, VertexAttribs3svNV_remap_index },
+   { 26547, VertexAttribs4dvNV_remap_index },
+   { 26096, VertexAttribs4fvNV_remap_index },
+   { 10969, VertexAttribs4svNV_remap_index },
+   { 34439, VertexAttribs4ubvNV_remap_index },
+   { 44685, GetTexBumpParameterfvATI_remap_index },
+   { 11236, GetTexBumpParameterivATI_remap_index },
+   { 38124, TexBumpParameterfvATI_remap_index },
+   {  9161, TexBumpParameterivATI_remap_index },
+   {  9941, AlphaFragmentOp1ATI_remap_index },
+   {  3769, AlphaFragmentOp2ATI_remap_index },
+   { 10423, AlphaFragmentOp3ATI_remap_index },
+   { 35683, BeginFragmentShaderATI_remap_index },
+   {  4074, BindFragmentShaderATI_remap_index },
+   {  7708, ColorFragmentOp1ATI_remap_index },
+   { 13693, ColorFragmentOp2ATI_remap_index },
+   { 25653, ColorFragmentOp3ATI_remap_index },
+   { 18131, DeleteFragmentShaderATI_remap_index },
+   { 46994, EndFragmentShaderATI_remap_index },
+   { 24600, GenFragmentShadersATI_remap_index },
+   { 44264, PassTexCoordATI_remap_index },
+   { 38104, SampleMapATI_remap_index },
+   { 37285, SetFragmentShaderConstantATI_remap_index },
+   {  9092, ActiveStencilFaceEXT_remap_index },
+   {  8659, BindVertexArrayAPPLE_remap_index },
+   { 17636, GenVertexArraysAPPLE_remap_index },
+   { 37690, GetProgramNamedParameterdvNV_remap_index },
+   { 24350, GetProgramNamedParameterfvNV_remap_index },
+   { 44716, ProgramNamedParameter4dNV_remap_index },
+   { 40642, ProgramNamedParameter4dvNV_remap_index },
+   { 43937, ProgramNamedParameter4fNV_remap_index },
+   { 27251, ProgramNamedParameter4fvNV_remap_index },
+   { 26003, PrimitiveRestartNV_remap_index },
+   { 26525, GetTexGenxvOES_remap_index },
+   { 15691, TexGenxOES_remap_index },
+   { 34644, TexGenxvOES_remap_index },
+   {  8583, DepthBoundsEXT_remap_index },
+   {  6441, BindFramebufferEXT_remap_index },
+   { 44322, BindRenderbufferEXT_remap_index },
+   { 33272, BufferParameteriAPPLE_remap_index },
+   { 42184, FlushMappedBufferRangeAPPLE_remap_index },
+   { 29623, VertexAttribI1iEXT_remap_index },
+   { 12113, VertexAttribI1uiEXT_remap_index },
+   { 21656, VertexAttribI2iEXT_remap_index },
+   { 43788, VertexAttribI2ivEXT_remap_index },
+   { 27382, VertexAttribI2uiEXT_remap_index },
+   { 37787, VertexAttribI2uivEXT_remap_index },
+   { 20739, VertexAttribI3iEXT_remap_index },
+   { 46003, VertexAttribI3ivEXT_remap_index },
+   { 24282, VertexAttribI3uiEXT_remap_index },
+   { 22456, VertexAttribI3uivEXT_remap_index },
+   { 40687, VertexAttribI4iEXT_remap_index },
+   {  7212, VertexAttribI4ivEXT_remap_index },
+   {  2742, VertexAttribI4uiEXT_remap_index },
+   { 29480, VertexAttribI4uivEXT_remap_index },
+   {  3278, ClearColorIiEXT_remap_index },
+   {  1241, ClearColorIuiEXT_remap_index },
+   { 26026, BindBufferOffsetEXT_remap_index },
+   { 19525, BeginPerfMonitorAMD_remap_index },
+   { 35122, DeletePerfMonitorsAMD_remap_index },
+   {  5942, EndPerfMonitorAMD_remap_index },
+   { 39854, GenPerfMonitorsAMD_remap_index },
+   { 13419, GetPerfMonitorCounterDataAMD_remap_index },
+   { 37117, GetPerfMonitorCounterInfoAMD_remap_index },
+   { 46954, GetPerfMonitorCounterStringAMD_remap_index },
+   { 46529, GetPerfMonitorCountersAMD_remap_index },
+   { 15378, GetPerfMonitorGroupStringAMD_remap_index },
+   { 31841, GetPerfMonitorGroupsAMD_remap_index },
+   { 14839, SelectPerfMonitorCountersAMD_remap_index },
+   { 15504, GetObjectParameterivAPPLE_remap_index },
+   { 46337, ObjectPurgeableAPPLE_remap_index },
+   {  2069, ObjectUnpurgeableAPPLE_remap_index },
+   { 45262, ActiveProgramEXT_remap_index },
+   { 29226, CreateShaderProgramEXT_remap_index },
+   { 39588, UseShaderProgramEXT_remap_index },
+   { 32638, TextureBarrierNV_remap_index },
+   {  2338, VDPAUFiniNV_remap_index },
+   {   875, VDPAUGetSurfaceivNV_remap_index },
+   { 25508, VDPAUInitNV_remap_index },
+   { 23026, VDPAUIsSurfaceNV_remap_index },
+   {  6961, VDPAUMapSurfacesNV_remap_index },
+   {  3319, VDPAURegisterOutputSurfaceNV_remap_index },
+   { 13317, VDPAURegisterVideoSurfaceNV_remap_index },
+   { 11852, VDPAUSurfaceAccessNV_remap_index },
+   {  5243, VDPAUUnmapSurfacesNV_remap_index },
+   { 40541, VDPAUUnregisterSurfaceNV_remap_index },
+   { 41319, BeginPerfQueryINTEL_remap_index },
+   { 36004, CreatePerfQueryINTEL_remap_index },
+   { 17567, DeletePerfQueryINTEL_remap_index },
+   { 43618, EndPerfQueryINTEL_remap_index },
+   { 45232, GetFirstPerfQueryIdINTEL_remap_index },
+   { 32591, GetNextPerfQueryIdINTEL_remap_index },
+   { 34295, GetPerfCounterInfoINTEL_remap_index },
+   {   786, GetPerfQueryDataINTEL_remap_index },
+   { 23880, GetPerfQueryIdByNameINTEL_remap_index },
+   { 21417, GetPerfQueryInfoINTEL_remap_index },
+   { 40995, PolygonOffsetClampEXT_remap_index },
+   { 21818, StencilFuncSeparateATI_remap_index },
+   {  6167, ProgramEnvParameters4fvEXT_remap_index },
+   { 32936, ProgramLocalParameters4fvEXT_remap_index },
+   {  4215, EGLImageTargetRenderbufferStorageOES_remap_index },
+   {  3979, EGLImageTargetTexture2DOES_remap_index },
+   { 43755, AlphaFuncx_remap_index },
+   { 20784, ClearColorx_remap_index },
+   { 42945, ClearDepthx_remap_index },
+   { 38523, Color4x_remap_index },
+   { 25446, DepthRangex_remap_index },
+   {  2566, Fogx_remap_index },
+   { 15970, Fogxv_remap_index },
+   {  9363, Frustumf_remap_index },
+   {  9494, Frustumx_remap_index },
+   { 20704, LightModelx_remap_index },
+   { 34484, LightModelxv_remap_index },
+   { 30998, Lightx_remap_index },
+   { 44568, Lightxv_remap_index },
+   {  3877, LineWidthx_remap_index },
+   {  3634, LoadMatrixx_remap_index },
+   { 45569, Materialx_remap_index },
+   { 27201, Materialxv_remap_index },
+   { 46122, MultMatrixx_remap_index },
+   { 10886, MultiTexCoord4x_remap_index },
+   { 27033, Normal3x_remap_index },
+   { 16624, Orthof_remap_index },
+   { 16840, Orthox_remap_index },
+   { 29527, PointSizex_remap_index },
    {    70, PolygonOffsetx_remap_index },
-   { 39297, Rotatex_remap_index },
-   { 20959, SampleCoveragex_remap_index },
-   { 13298, Scalex_remap_index },
-   { 40482, TexEnvx_remap_index },
-   { 45544, TexEnvxv_remap_index },
-   {  2038, TexParameterx_remap_index },
-   { 33391, Translatex_remap_index },
-   { 34856, ClipPlanef_remap_index },
-   { 34758, ClipPlanex_remap_index },
-   {   741, GetClipPlanef_remap_index },
-   {   604, GetClipPlanex_remap_index },
-   { 20877, GetFixedv_remap_index },
-   {  1294, GetLightxv_remap_index },
-   { 23953, GetMaterialxv_remap_index },
-   { 22438, GetTexEnvxv_remap_index },
-   { 17630, GetTexParameterxv_remap_index },
-   { 30709, PointParameterx_remap_index },
-   { 39252, PointParameterxv_remap_index },
-   { 20014, TexParameterxv_remap_index },
+   { 39924, Rotatex_remap_index },
+   { 21374, SampleCoveragex_remap_index },
+   { 13577, Scalex_remap_index },
+   { 41109, TexEnvx_remap_index },
+   { 46288, TexEnvxv_remap_index },
+   {  2148, TexParameterx_remap_index },
+   { 33997, Translatex_remap_index },
+   { 35462, ClipPlanef_remap_index },
+   { 35364, ClipPlanex_remap_index },
+   {   747, GetClipPlanef_remap_index },
+   {   610, GetClipPlanex_remap_index },
+   { 21292, GetFixedv_remap_index },
+   {  1300, GetLightxv_remap_index },
+   { 24387, GetMaterialxv_remap_index },
+   { 22872, GetTexEnvxv_remap_index },
+   { 18016, GetTexParameterxv_remap_index },
+   { 31251, PointParameterx_remap_index },
+   { 39879, PointParameterxv_remap_index },
+   { 20429, TexParameterxv_remap_index },
    {    -1, -1 }
 };
 
 /* these functions are in the ABI, but have alternative names */
 static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
-   { 36125, _gloffset_BlendColor },
+   { 36731, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 38796, _gloffset_BlendEquation },
+   { 39423, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   {  5688, _gloffset_ColorSubTable },
-   { 22339, _gloffset_CopyColorSubTable },
+   {  5899, _gloffset_ColorSubTable },
+   { 22773, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {  1328, _gloffset_GetConvolutionParameteriv },
-   { 14362, _gloffset_ConvolutionParameterfv },
-   { 17467, _gloffset_CopyConvolutionFilter1D },
-   { 19526, _gloffset_SeparableFilter2D },
-   { 20753, _gloffset_GetConvolutionFilter },
-   { 24715, _gloffset_ConvolutionFilter1D },
-   { 27092, _gloffset_ConvolutionFilter2D },
-   { 30009, _gloffset_GetSeparableFilter },
-   { 31668, _gloffset_ConvolutionParameteri },
-   { 31790, _gloffset_ConvolutionParameterf },
-   { 37946, _gloffset_ConvolutionParameteriv },
-   { 43908, _gloffset_GetConvolutionParameterfv },
-   { 45110, _gloffset_CopyConvolutionFilter2D },
+   {  1334, _gloffset_GetConvolutionParameteriv },
+   { 14647, _gloffset_ConvolutionParameterfv },
+   { 17853, _gloffset_CopyConvolutionFilter1D },
+   { 19941, _gloffset_SeparableFilter2D },
+   { 21168, _gloffset_GetConvolutionFilter },
+   { 25149, _gloffset_ConvolutionFilter1D },
+   { 27589, _gloffset_ConvolutionFilter2D },
+   { 30551, _gloffset_GetSeparableFilter },
+   { 32249, _gloffset_ConvolutionParameteri },
+   { 32371, _gloffset_ConvolutionParameterf },
+   { 38552, _gloffset_ConvolutionParameteriv },
+   { 44621, _gloffset_GetConvolutionParameterfv },
+   { 45854, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 28600, _gloffset_CopyTexImage2D },
-   { 31434, _gloffset_CopyTexImage1D },
-   { 33915, _gloffset_CopyTexSubImage1D },
-   { 40291, _gloffset_CopyTexSubImage3D },
-   { 44164, _gloffset_CopyTexSubImage2D },
+   { 29142, _gloffset_CopyTexImage2D },
+   { 32015, _gloffset_CopyTexImage1D },
+   { 34521, _gloffset_CopyTexSubImage1D },
+   { 40918, _gloffset_CopyTexSubImage3D },
+   { 44877, _gloffset_CopyTexSubImage2D },
    /* from GL_EXT_draw_range_elements */
-   { 25977, _gloffset_DrawRangeElements },
+   { 26474, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {  4931, _gloffset_GetHistogramParameterfv },
-   {  8480, _gloffset_GetHistogramParameteriv },
-   {  9909, _gloffset_Minmax },
-   { 14709, _gloffset_GetMinmax },
-   { 22963, _gloffset_Histogram },
-   { 31362, _gloffset_GetMinmaxParameteriv },
-   { 32362, _gloffset_ResetMinmax },
-   { 33351, _gloffset_GetHistogram },
-   { 35171, _gloffset_GetMinmaxParameterfv },
-   { 36201, _gloffset_ResetHistogram },
+   {  5142, _gloffset_GetHistogramParameterfv },
+   {  8685, _gloffset_GetHistogramParameteriv },
+   { 10207, _gloffset_Minmax },
+   { 14994, _gloffset_GetMinmax },
+   { 23397, _gloffset_Histogram },
+   { 31943, _gloffset_GetMinmaxParameteriv },
+   { 32973, _gloffset_ResetMinmax },
+   { 33957, _gloffset_GetHistogram },
+   { 35777, _gloffset_GetMinmaxParameterfv },
+   { 36807, _gloffset_ResetHistogram },
    /* from GL_EXT_paletted_texture */
-   { 14224, _gloffset_ColorTable },
-   { 19135, _gloffset_GetColorTableParameterfv },
-   { 27891, _gloffset_GetColorTable },
-   { 31846, _gloffset_GetColorTableParameteriv },
+   { 14509, _gloffset_ColorTable },
+   { 19550, _gloffset_GetColorTableParameterfv },
+   { 28433, _gloffset_GetColorTable },
+   { 32427, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  2488, _gloffset_TexSubImage1D },
-   { 38511, _gloffset_TexSubImage2D },
+   {  2598, _gloffset_TexSubImage1D },
+   { 39138, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   { 23389, _gloffset_TexImage3D },
-   { 42749, _gloffset_TexSubImage3D },
+   { 23823, _gloffset_TexImage3D },
+   { 43429, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  4384, _gloffset_GenTextures },
-   {  9243, _gloffset_BindTexture },
-   { 18273, _gloffset_IsTexture },
-   { 23798, _gloffset_PrioritizeTextures },
-   { 28120, _gloffset_DeleteTextures },
-   { 43205, _gloffset_AreTexturesResident },
+   {  4595, _gloffset_GenTextures },
+   {  9541, _gloffset_BindTexture },
+   { 18659, _gloffset_IsTexture },
+   { 24232, _gloffset_PrioritizeTextures },
+   { 28662, _gloffset_DeleteTextures },
+   { 43885, _gloffset_AreTexturesResident },
    /* from GL_EXT_vertex_array */
-   { 19624, _gloffset_ArrayElement },
-   { 30752, _gloffset_DrawArrays },
-   { 40974, _gloffset_GetPointerv },
+   { 20039, _gloffset_ArrayElement },
+   { 31294, _gloffset_DrawArrays },
+   { 41601, _gloffset_GetPointerv },
    /* from GL_NV_read_buffer */
-   { 31637, _gloffset_ReadBuffer },
+   { 32218, _gloffset_ReadBuffer },
    /* from GL_OES_blend_subtract */
-   { 38796, _gloffset_BlendEquation },
+   { 39423, _gloffset_BlendEquation },
    /* from GL_OES_texture_3D */
-   { 23389, _gloffset_TexImage3D },
-   { 40291, _gloffset_CopyTexSubImage3D },
-   { 42749, _gloffset_TexSubImage3D },
+   { 23823, _gloffset_TexImage3D },
+   { 40918, _gloffset_CopyTexSubImage3D },
+   { 43429, _gloffset_TexSubImage3D },
    /* from GL_OES_texture_cube_map */
-   { 17859, _gloffset_TexGeni },
-   { 17887, _gloffset_TexGenf },
-   { 21319, _gloffset_GetTexGenfv },
-   { 36076, _gloffset_TexGeniv },
-   { 38620, _gloffset_TexGenfv },
-   { 44483, _gloffset_GetTexGeniv },
+   { 18245, _gloffset_TexGeni },
+   { 18273, _gloffset_TexGenf },
+   { 21734, _gloffset_GetTexGenfv },
+   { 36682, _gloffset_TexGeniv },
+   { 39247, _gloffset_TexGenfv },
+   { 45196, _gloffset_GetTexGeniv },
    /* from GL_SGI_color_table */
-   {  2792, _gloffset_ColorTableParameteriv },
-   { 14224, _gloffset_ColorTable },
-   { 18217, _gloffset_ColorTableParameterfv },
-   { 19135, _gloffset_GetColorTableParameterfv },
-   { 27891, _gloffset_GetColorTable },
-   { 27969, _gloffset_CopyColorTable },
-   { 31846, _gloffset_GetColorTableParameteriv },
+   {  2902, _gloffset_ColorTableParameteriv },
+   { 14509, _gloffset_ColorTable },
+   { 18603, _gloffset_ColorTableParameterfv },
+   { 19550, _gloffset_GetColorTableParameterfv },
+   { 28433, _gloffset_GetColorTable },
+   { 28511, _gloffset_CopyColorTable },
+   { 32427, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c b/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c
index 8fe751693..582e3af96 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c
@@ -214,6 +214,8 @@ ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
     glUseProgram(glamor->texture_shader);
     glViewport(0, 0, glamor->width, glamor->height);
+    if (!ephyr_glamor_gles2)
+        glDisable(GL_COLOR_LOGIC_OP);
 
     glVertexAttribPointer(glamor->texture_shader_position_loc,
                           2, GL_FLOAT, FALSE, 0, position);
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index 0baf35929..14d4a6c23 100755
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -449,7 +449,7 @@ hostx_init(void)
     else
 #endif
         HostX.conn = xcb_connect(NULL, &HostX.screen);
-    if (xcb_connection_has_error(HostX.conn)) {
+    if (!HostX.conn || xcb_connection_has_error(HostX.conn)) {
         fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n");
         exit(1);
     }
@@ -1433,9 +1433,10 @@ ephyr_glamor_init(ScreenPtr screen)
     ephyr_glamor_set_window_size(scrpriv->glamor,
                                  scrpriv->win_width, scrpriv->win_height);
 
-    glamor_init(screen,
-                GLAMOR_USE_SCREEN |
-                GLAMOR_USE_PICTURE_SCREEN);
+    if (!glamor_init(screen, 0)) {
+        FatalError("Failed to initialize glamor\n");
+        return FALSE;
+    }
 
     return TRUE;
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c
index c06aaaee1..97a1f97b2 100644
--- a/xorg-server/hw/xfree86/common/xf86Events.c
+++ b/xorg-server/hw/xfree86/common/xf86Events.c
@@ -583,10 +583,11 @@ xf86VTEnter(void)
     /* Turn screen saver off when switching back */
     dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
-    /* If we use systemd-logind it will enable input devices for us */
-    if (!systemd_logind_controls_session())
-        for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next)
+    for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
+        /* Devices with server managed fds get enabled on logind resume */
+        if (!(pInfo->flags & XI86_SERVER_FD))
             xf86EnableInputDeviceForVTSwitch(pInfo);
+    }
 
     for (ih = InputHandlers; ih; ih = ih->next) {
         if (ih->is_input)
diff --git a/xorg-server/hw/xfree86/common/xf86platformBus.c b/xorg-server/hw/xfree86/common/xf86platformBus.c
index 15988b8b1..c1aaba41a 100644
--- a/xorg-server/hw/xfree86/common/xf86platformBus.c
+++ b/xorg-server/hw/xfree86/common/xf86platformBus.c
@@ -153,8 +153,10 @@ xf86_check_platform_slot(const struct xf86_platform_device *pd)
     for (i = 0; i < xf86NumEntities; i++) {
         const EntityPtr u = xf86Entities[i];
 
-        if (pd->pdev && u->bus.type == BUS_PCI)
-            return !MATCH_PCI_DEVICES(pd->pdev, u->bus.id.pci);
+        if (pd->pdev && u->bus.type == BUS_PCI &&
+            MATCH_PCI_DEVICES(pd->pdev, u->bus.id.pci)) {
+            return FALSE;
+        }
         if ((u->bus.type == BUS_PLATFORM) && (pd == u->bus.id.plat)) {
             return FALSE;
         }
@@ -426,6 +428,10 @@ xf86platformProbeDev(DriverPtr drvp)
 
     /* find the main device or any device specificed in xorg.conf */
     for (i = 0; i < numDevs; i++) {
+        /* skip inactive devices */
+        if (!devList[i]->active)
+            continue;
+
         for (j = 0; j < xf86_num_platform_devices; j++) {
             if (devList[i]->busID && *devList[i]->busID) {
                 if (xf86PlatformDeviceCheckBusID(&xf86_platform_devices[j], devList[i]->busID))
@@ -449,10 +455,14 @@ xf86platformProbeDev(DriverPtr drvp)
             continue;
     }
 
-    /* if autoaddgpu devices is enabled then go find a few more and add them as GPU screens */
-    if (xf86Info.autoAddGPU && numDevs) {
+    /* if autoaddgpu devices is enabled then go find any unclaimed platform
+     * devices and add them as GPU screens */
+    if (xf86Info.autoAddGPU) {
         for (j = 0; j < xf86_num_platform_devices; j++) {
-            probeSingleDevice(&xf86_platform_devices[j], drvp, devList[0], PLATFORM_PROBE_GPU_SCREEN);
+            if (probeSingleDevice(&xf86_platform_devices[j], drvp,
+                                  devList ?  devList[0] : NULL,
+                                  PLATFORM_PROBE_GPU_SCREEN))
+                foundScreen = TRUE;
         }
     }
 
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/driver.c b/xorg-server/hw/xfree86/drivers/modesetting/driver.c
index d52517d1a..e2f3846ca 100644
--- a/xorg-server/hw/xfree86/drivers/modesetting/driver.c
+++ b/xorg-server/hw/xfree86/drivers/modesetting/driver.c
@@ -1049,10 +1049,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
 
 #ifdef GLAMOR
     if (ms->drmmode.glamor) {
-        if (!glamor_init(pScreen,
-                         GLAMOR_USE_EGL_SCREEN |
-                         GLAMOR_USE_SCREEN |
-                         GLAMOR_USE_PICTURE_SCREEN)) {
+        if (!glamor_init(pScreen, GLAMOR_USE_EGL_SCREEN)) {
             xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                        "Failed to initialize glamor at ScreenInit() time.\n");
             return FALSE;
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index 9d592a7eb..a1947241b 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -3026,6 +3026,27 @@ xf86OutputSetEDIDProperty(xf86OutputPtr output, void *data, int data_len)
     }
 }
 
+#define TILE_ATOM_NAME		"TILE"
+/* changing this in the future could be tricky as people may hardcode 8 */
+#define TILE_PROP_NUM_ITEMS		8
+static void
+xf86OutputSetTileProperty(xf86OutputPtr output)
+{
+    Atom tile_atom = MakeAtom(TILE_ATOM_NAME, sizeof(TILE_ATOM_NAME) - 1, TRUE);
+
+    /* This may get called before the RandR resources have been created */
+    if (output->randr_output == NULL)
+        return;
+
+    if (output->tile_info.group_id != 0) {
+        RRChangeOutputProperty(output->randr_output, tile_atom, XA_INTEGER, 32,
+                               PropModeReplace, TILE_PROP_NUM_ITEMS, (uint32_t *)&output->tile_info, FALSE, TRUE);
+    }
+    else {
+        RRDeleteOutputProperty(output->randr_output, tile_atom);
+    }
+}
+
 #endif
 
 /* Pull out a phyiscal size from a detailed timing if available. */
@@ -3071,6 +3092,38 @@ handle_detailed_physical_size(struct detailed_monitor_section
     }
 }
 
+Bool
+xf86OutputParseKMSTile(const char *tile_data, int tile_length,
+                       struct xf86CrtcTileInfo *tile_info)
+{
+    int ret;
+
+    ret = sscanf(tile_data, "%d:%d:%d:%d:%d:%d:%d:%d",
+                 &tile_info->group_id,
+                 &tile_info->flags,
+                 &tile_info->num_h_tile,
+                 &tile_info->num_v_tile,
+                 &tile_info->tile_h_loc,
+                 &tile_info->tile_v_loc,
+                 &tile_info->tile_h_size,
+                 &tile_info->tile_v_size);
+    if (ret != 8)
+        return FALSE;
+    return TRUE;
+}
+
+void
+xf86OutputSetTile(xf86OutputPtr output, struct xf86CrtcTileInfo *tile_info)
+{
+    if (tile_info)
+        output->tile_info = *tile_info;
+    else
+        memset(&output->tile_info, 0, sizeof(output->tile_info));
+#ifdef RANDR_12_INTERFACE
+    xf86OutputSetTileProperty(output);
+#endif
+}
+
 /**
  * Set the EDID information for the specified output
  */
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.h b/xorg-server/hw/xfree86/modes/xf86Crtc.h
index 692bf40b9..3c5bbcfd5 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.h
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -70,6 +70,17 @@ typedef enum _xf86OutputStatus {
     XF86OutputStatusUnknown
 } xf86OutputStatus;
 
+struct xf86CrtcTileInfo {
+    uint32_t group_id;
+    uint32_t flags;
+    uint32_t num_h_tile;
+    uint32_t num_v_tile;
+    uint32_t tile_h_loc;
+    uint32_t tile_v_loc;
+    uint32_t tile_h_size;
+    uint32_t tile_v_size;
+};
+
 typedef struct _xf86CrtcFuncs {
    /**
     * Turns the crtc on/off, or sets intermediate power levels if available.
@@ -226,7 +237,7 @@ typedef struct _xf86CrtcFuncs {
 
 } xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
 
-#define XF86_CRTC_VERSION 5
+#define XF86_CRTC_VERSION 6
 
 struct _xf86Crtc {
     /**
@@ -500,7 +511,7 @@ typedef struct _xf86OutputFuncs {
      (*destroy) (xf86OutputPtr output);
 } xf86OutputFuncsRec, *xf86OutputFuncsPtr;
 
-#define XF86_OUTPUT_VERSION 2
+#define XF86_OUTPUT_VERSION 3
 
 struct _xf86Output {
     /**
@@ -615,6 +626,8 @@ struct _xf86Output {
     BoxRec initialTotalArea;
     BoxRec initialTrackingArea;
     INT16 initialBorder[4];
+
+    struct xf86CrtcTileInfo tile_info;
 };
 
 typedef struct _xf86ProviderFuncs {
@@ -881,6 +894,15 @@ extern _X_EXPORT void
  xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon);
 
 /**
+ * Set the TILE information for the specified output
+ */
+extern _X_EXPORT void
+xf86OutputSetTile(xf86OutputPtr output, struct xf86CrtcTileInfo *tile_info);
+
+extern _X_EXPORT Bool
+xf86OutputParseKMSTile(const char *tile_data, int tile_length, struct xf86CrtcTileInfo *tile_info);
+
+/**
  * Return the list of modes supported by the EDID information
  * stored in 'output'
  */
diff --git a/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c b/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c
index 49758f465..4ad41a374 100644
--- a/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c
+++ b/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c
@@ -40,8 +40,6 @@
 
 #include "systemd-logind.h"
 
-#define DBUS_TIMEOUT 500 /* Wait max 0.5 seconds */
-
 struct systemd_logind_info {
     DBusConnection *conn;
     char *session;
@@ -130,7 +128,7 @@ systemd_logind_take_fd(int _major, int _minor, const char *path,
     }
 
     reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
-                                                      DBUS_TIMEOUT, &error);
+                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
     if (!reply) {
         LogMessage(X_ERROR, "systemd-logind: failed to take device %s: %s\n",
                    path, error.message);
@@ -207,7 +205,7 @@ systemd_logind_release_fd(int _major, int _minor, int fd)
     }
 
     reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
-                                                      DBUS_TIMEOUT, &error);
+                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
     if (!reply)
         LogMessage(X_ERROR, "systemd-logind: failed to release device: %s\n",
                    error.message);
@@ -289,7 +287,7 @@ systemd_logind_ack_pause(struct systemd_logind_info *info,
     }
 
     reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
-                                                      DBUS_TIMEOUT, &error);
+                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
     if (!reply)
         LogMessage(X_ERROR, "systemd-logind: failed to ack pause: %s\n",
                    error.message);
@@ -313,6 +311,9 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data)
     dbus_int32_t major, minor;
     char *pause_str;
 
+    if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
     dbus_error_init(&error);
 
     if (dbus_message_is_signal(message,
@@ -454,7 +455,7 @@ connect_hook(DBusConnection *connection, void *data)
     }
 
     reply = dbus_connection_send_with_reply_and_block(connection, msg,
-                                                      DBUS_TIMEOUT, &error);
+                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
     if (!reply) {
         LogMessage(X_ERROR, "systemd-logind: failed to get session: %s\n",
                    error.message);
@@ -489,7 +490,7 @@ connect_hook(DBusConnection *connection, void *data)
     }
 
     reply = dbus_connection_send_with_reply_and_block(connection, msg,
-                                                      DBUS_TIMEOUT, &error);
+                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
     if (!reply) {
         LogMessage(X_ERROR, "systemd-logind: TakeControl failed: %s\n",
                    error.message);
@@ -561,7 +562,7 @@ systemd_logind_release_control(struct systemd_logind_info *info)
     }
 
     reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
-                                                      DBUS_TIMEOUT, &error);
+                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
     if (!reply) {
         LogMessage(X_ERROR, "systemd-logind: ReleaseControl failed: %s\n",
                    error.message);
diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index d7229cecb..851ce4842 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -43,6 +43,7 @@
 #include "darwinEvents.h"
 #include "pseudoramiX.h"
 #include "extension.h"
+#include "nonsdk_extinit.h"
 #include "glx_extinit.h"
 #define _APPLEWM_SERVER_
 #include "applewmExt.h"
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index d0a525ff4..30f2218b6 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -54,6 +54,8 @@
 #include "damage.h"
 #endif
 
+#include "nonsdk_extinit.h"
+
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
 // From NSApplication.h
 extern const double NSAppKitVersionNumber;
diff --git a/xorg-server/hw/xwayland/Makefile.am b/xorg-server/hw/xwayland/Makefile.am
index 994554088..ab1bbb6a5 100644
--- a/xorg-server/hw/xwayland/Makefile.am
+++ b/xorg-server/hw/xwayland/Makefile.am
@@ -43,6 +43,7 @@ xwayland-glamor.c : $(nodist_Xwayland_SOURCES)
 glamor_lib = $(top_builddir)/glamor/libglamor.la
 
 Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL
+Xwayland_DEPENDENCIES = $(glamor_lib)
 endif
 
 EXTRA_DIST = drm.xml
diff --git a/xorg-server/hw/xwayland/xwayland-glamor.c b/xorg-server/hw/xwayland/xwayland-glamor.c
index dd8551840..d06006c70 100644
--- a/xorg-server/hw/xwayland/xwayland-glamor.c
+++ b/xorg-server/hw/xwayland/xwayland-glamor.c
@@ -549,11 +549,7 @@ xwl_glamor_init(struct xwl_screen *xwl_screen)
         return FALSE;
     }
 
-    if (!glamor_init(xwl_screen->screen,
-                     GLAMOR_INVERTED_Y_AXIS |
-                     GLAMOR_USE_EGL_SCREEN |
-                     GLAMOR_USE_SCREEN |
-                     GLAMOR_USE_PICTURE_SCREEN)) {
+    if (!glamor_init(xwl_screen->screen, GLAMOR_USE_EGL_SCREEN)) {
         ErrorF("Failed to initialize glamor\n");
         return FALSE;
     }
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index fe4755c03..5a3d80f7f 100755
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -53,6 +53,11 @@ typedef HRESULT  (__stdcall *  SHGETFOLDERPATHPROC)(HWND hwndOwner,
                                                     HANDLE hToken,
                                                     DWORD dwFlags, LPTSTR pszPath);
 #endif
+
+#include "winmonitors.h"
+#include "nonsdk_extinit.h"
+#include "pseudoramiX/pseudoramiX.h"
+
 #include "glx_extinit.h"
 #ifdef XWIN_GLX_WINDOWS
 #include "glx/glwindows.h"
@@ -754,13 +759,12 @@ winUseMsg(void)
     ErrorF("-engine engine_type_id\n"
            "\tOverride the server's automatically selected engine type:\n"
            "\t\t1 - Shadow GDI\n"
-           "\t\t2 - Shadow DirectDraw\n"
            "\t\t4 - Shadow DirectDraw4 Non-Locking\n"
         );
 
     ErrorF("-fullscreen\n" "\tRun the server in fullscreen mode.\n");
 
-    ErrorF("-hostintitle\n"
+    ErrorF("-[no]hostintitle\n"
            "\tIn multiwindow mode, add remote host names to window titles.\n");
 
     ErrorF("-ignoreinput\n" "\tIgnore keyboard and mouse input.\n");
@@ -987,6 +991,59 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
         }
     }
 
+  /*
+     Unless full xinerama has been explicitly enabled, register all native screens with pseudoramiX
+  */
+  if (!noPanoramiXExtension)
+      noPseudoramiXExtension = TRUE;
+
+  if ((g_ScreenInfo[0].fMultipleMonitors) && !noPseudoramiXExtension)
+    {
+      int pass;
+
+      PseudoramiXExtensionInit();
+
+      /* Add primary monitor on pass 0, other monitors on pass 1, to ensure
+       the primary monitor is first in XINERAMA list */
+      for (pass = 0; pass < 2; pass++)
+        {
+          int iMonitor;
+
+          for (iMonitor = 1; ; iMonitor++)
+            {
+              struct GetMonitorInfoData data;
+              QueryMonitor(iMonitor, &data);
+              if (data.bMonitorSpecifiedExists)
+                {
+                  MONITORINFO mi;
+                  mi.cbSize = sizeof(MONITORINFO);
+
+                  if (GetMonitorInfo(data.monitorHandle, &mi))
+                    {
+                      /* pass == 1 XOR primary monitor flags is set */
+                      if ((!(pass == 1)) != (!(mi.dwFlags & MONITORINFOF_PRIMARY)))
+                        {
+                          /*
+                            Note the screen origin in a normalized coordinate space where (0,0) is at the top left
+                            of the native virtual desktop area
+                          */
+                          data.monitorOffsetX = data.monitorOffsetX - GetSystemMetrics(SM_XVIRTUALSCREEN);
+                          data.monitorOffsetY = data.monitorOffsetY - GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+                          winDebug ("InitOutput - screen %d added at virtual desktop coordinate (%d,%d) (pseudoramiX) \n",
+                                    iMonitor-1, data.monitorOffsetX, data.monitorOffsetY);
+
+                          PseudoramiXAddScreen(data.monitorOffsetX, data.monitorOffsetY,
+                                               data.monitorWidth, data.monitorHeight);
+                        }
+                    }
+                }
+              else
+                break;
+            }
+        }
+    }
+
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
 
     /* Generate a cookie used by internal clients for authorization */
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index 0ea8ba769..4da3d12a4 100755
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -71,12 +71,12 @@ SRCS =	InitInput.c \
 	winmsgwindow.c \
 	winmultiwindowclass.c \
 	winmultiwindowicons.c \
+	winos.c \
 	winprefs.c \
 	winprefsyacc.y \
 	winprefslex.l \
 	winprocarg.c \
 	winscrinit.c \
-	winshaddd.c \
 	winshadddnl.c \
 	winshadgdi.c \
 	wintaskbar.c \
diff --git a/xorg-server/hw/xwin/XWin.exe.manifest b/xorg-server/hw/xwin/XWin.exe.manifest
index 477334fb3..bd44b1066 100644
--- a/xorg-server/hw/xwin/XWin.exe.manifest
+++ b/xorg-server/hw/xwin/XWin.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<description>The XWin X Windows server for Cygwin.</description>
+	<description>The XWin X Windows server</description>
 	<dependency>
 	   <dependentAssembly>
 	     <assemblyIdentity
@@ -18,4 +18,18 @@
 	     <dpiAware>true</dpiAware>
 	   </asmv3:windowsSettings>
 	</asmv3:application>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows Vista -->
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows 10 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+        </application>
+    </compatibility>
 </assembly>
diff --git a/xorg-server/hw/xwin/glx/gen_gl_wrappers.py b/xorg-server/hw/xwin/glx/gen_gl_wrappers.py
index 840e4366b..a24c5b580 100755
--- a/xorg-server/hw/xwin/glx/gen_gl_wrappers.py
+++ b/xorg-server/hw/xwin/glx/gen_gl_wrappers.py
@@ -219,6 +219,36 @@ if dispatchheader :
 
     del dispatch['glby_offset']
 
+def ParseCmdRettype(cmd):
+    proto=noneStr(cmd.elem.find('proto'))
+    rettype=noneStr(proto.text)
+    if rettype.lower()!="void ":
+        plist = ([t for t in proto.itertext()])
+        rettype = ''.join(plist[:-1])
+    rettype=rettype.strip()
+    return rettype
+
+def ParseCmdParams(cmd):
+    params = cmd.elem.findall('param')
+    plist=[]
+    for param in params:
+        # construct the formal parameter definition from ptype and name
+        # elements, also using any text found around these in the
+        # param element, in the order it appears in the document
+        paramtype = ''
+        # also extract the formal parameter name from the name element
+        paramname = ''
+        for t in param.iter():
+            if t.tag == 'ptype' or t.tag == 'param':
+                paramtype = paramtype + noneStr(t.text)
+            if t.tag == 'name':
+                paramname = t.text + '_'
+                paramtype = paramtype + ' ' + paramname
+            if t.tail is not None:
+                paramtype = paramtype + t.tail.strip()
+        plist.append((paramtype, paramname))
+    return plist
+
 class PreResolveOutputGenerator(OutputGenerator):
     def __init__(self,
                  errFile = sys.stderr,
@@ -281,28 +311,15 @@ class MyOutputGenerator(OutputGenerator):
             return
 
         self.wrappers[name]=1
+        rettype=ParseCmdRettype(cmd)
 
-        proto=noneStr(cmd.elem.find('proto'))
-        rettype=noneStr(proto.text)
-        if rettype.lower()!="void ":
-            plist = ([t for t in proto.itertext()])
-            rettype = ''.join(plist[:-1])
-            #ptype=proto.find("ptype")
-            #if ptype!=None:
-            #    rettype = (noneStr(ptype.text))+" "
         if staticwrappers: self.outFile.write("static ")
-        self.outFile.write("%s__stdcall %sWrapper("%(rettype, name))
-        params = cmd.elem.findall('param')
-        plist=[]
-        for param in params:
-            paramlist = ([t for t in param.itertext()])
-            paramtype = ''.join(paramlist[:-1])
-            paramname = paramlist[-1]
-            plist.append((paramtype, paramname))
+        self.outFile.write("%s __stdcall %sWrapper("%(rettype, name))
+        plist=ParseCmdParams(cmd)
         Comma=""
         if len(plist):
             for ptype, pname in plist:
-                self.outFile.write("%s%s%s_"%(Comma, ptype, pname))
+                self.outFile.write("%s%s"%(Comma, ptype))
                 Comma=", "
         else:
             self.outFile.write("void")
@@ -323,7 +340,7 @@ class MyOutputGenerator(OutputGenerator):
                 self.outFile.write("  return %s( "%(name))
             Comma=""
             for ptype, pname in plist:
-                self.outFile.write("%s%s_"%(Comma, pname))
+                self.outFile.write("%s%s"%(Comma, pname))
                 Comma=", "
         else:
             if rettype.lower()=="void ":
@@ -348,7 +365,7 @@ class MyOutputGenerator(OutputGenerator):
   return RESOLVED_PROC(PFN%sPROC)( """%(name.upper()))
             Comma=""
             for ptype, pname in plist:
-                self.outFile.write("%s%s_"%(Comma, pname))
+                self.outFile.write("%s%s"%(Comma, pname))
                 Comma=", "
         self.outFile.write(" );\n}\n\n")
 
diff --git a/xorg-server/hw/xwin/makefile b/xorg-server/hw/xwin/makefile
index 530e02c85..be1088f19 100755
--- a/xorg-server/hw/xwin/makefile
+++ b/xorg-server/hw/xwin/makefile
@@ -99,12 +99,12 @@ SRCS =	InitInput.c \
 	winmsgwindow.c \
 	winmultiwindowclass.c \
 	winmultiwindowicons.c \
+	winos.c \
 	winprefs.c \
 	winprefsyacc.y \
 	winprefslex.l \
 	winprocarg.c \
 	winscrinit.c \
-	winshaddd.c \
 	winshadddnl.c \
 	winshadgdi.c \
 	wintaskbar.c \
diff --git a/xorg-server/hw/xwin/man/XWin.man b/xorg-server/hw/xwin/man/XWin.man
index 15a57db02..d68ee2a41 100644
--- a/xorg-server/hw/xwin/man/XWin.man
+++ b/xorg-server/hw/xwin/man/XWin.man
@@ -76,6 +76,9 @@ preceeding \fB\-screen\fP parameter.
 .B \-[no]multimonitors or \-[no]multiplemonitors
 Create a screen 0 that covers all monitors [the primary monitor] on a system with
 multiple monitors.
+Fake XINERAMA data is created describing the individual monitors,
+(This is similar to the 'merged framebuffer' or 'pseudo-xinerama' mode provided by
+some drivers for the xorg X server).
 This option is currently enabled by default in \fB\-multiwindow\fP mode.
 .TP 8
 .B "\-screen \fIscreen_number\fP [\fIW\fP \fIH\fP [\fIX\fP \fIY\fP] | [[\fIW\fPx\fIH\fP[+\fIX\fP+\fIY\fP]][@\fIM\fP]] ] "
@@ -167,9 +170,10 @@ on its own is equivalent to \fB\-resize=randr\fP
 
 .SH OPTIONS FOR MULTIWINDOW MODE
 .TP 8
-.B \-hostintitle
+.B \-[no]hostintitle
 Add the host name to the window title for X applications which are running
 on remote hosts, when that information is available and it's useful to do so.
+The default is enabled.
 
 .SH OPTIONS CONTROLLING WINDOWS INTEGRATION
 .TP 8
@@ -244,9 +248,6 @@ functionality does not provide a benefit at any number of boxes; we
 can only determine the usefulness of this feature through testing.
 This option probably has limited effect on current \fIWindows\fP versions
 as they already perform GDI batching.
-This parameter works in conjunction with engines 1, 2, and 4 (Shadow
-GDI, Shadow DirectDraw, and Shadow DirectDraw Non-Locking,
-respectively).
 .TP 8
 .B "\-engine \fIengine_type_id\fP"
 This option, which is intended for Cygwin/X developers,
@@ -261,8 +262,6 @@ The engine type ids are:
 .RS
 .IP 1 4
 Shadow GDI
-.IP 2 4
-Shadow DirectDraw
 .IP 4 4
 Shadow DirectDraw Non-Locking
 .RE
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index c4847670e..7b4a8425c 100644..100755
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -96,7 +96,6 @@
 
 #define WIN_SERVER_NONE		0x0L    /* 0 */
 #define WIN_SERVER_SHADOW_GDI	0x1L    /* 1 */
-#define WIN_SERVER_SHADOW_DD	0x2L    /* 2 */
 #define WIN_SERVER_SHADOW_DDNL	0x4L    /* 4 */
 
 #define AltMapIndex		Mod1MapIndex
@@ -431,37 +430,20 @@ typedef struct _winPrivScreenRec {
     int iE3BCachedPress;
     Bool fE3BFakeButton2Sent;
 
-    /* Privates used by shadow fb GDI server */
+    /* Privates used by shadow fb GDI engine */
     HBITMAP hbmpShadow;
     HDC hdcScreen;
     HDC hdcShadow;
     HWND hwndScreen;
     BITMAPINFOHEADER *pbmih;
 
-    /* Privates used by shadow fb and primary fb DirectDraw servers */
+    /* Privates used by shadow fb DirectDraw Nonlocking engine */
     LPDIRECTDRAW pdd;
-    LPDIRECTDRAWSURFACE	pddsPrimary;
-    LPDIRECTDRAW2 pdd2;
-
-    /* Privates used by shadow fb DirectDraw server */
-    LPDIRECTDRAWSURFACE	pddsShadow;
-    LPDDSURFACEDESC pddsdShadow;
-
-#ifdef XWIN_PRIMARYFB
-    /* Privates used by primary fb DirectDraw server */
-    LPDIRECTDRAWSURFACE	pddsOffscreen;
-    LPDDSURFACEDESC pddsdOffscreen;
-    LPDDSURFACEDESC pddsdPrimary;
-#endif
-
-    /* Privates used by shadow fb DirectDraw Nonlocking server */
     LPDIRECTDRAW4 pdd4;
     LPDIRECTDRAWSURFACE4 pddsShadow4;
     LPDIRECTDRAWSURFACE4 pddsPrimary4;
-    BOOL fRetryCreateSurface;
-
-    /* Privates used by both shadow fb DirectDraw servers */
     LPDIRECTDRAWCLIPPER pddcPrimary;
+    BOOL fRetryCreateSurface;
 
 #ifdef XWIN_MULTIWINDOWEXTWM
     /* Privates used by multi-window external window manager */
@@ -889,13 +871,6 @@ Bool
  winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv);
 
 /*
- * winshaddd.c
- */
-
-Bool
- winSetEngineFunctionsShadowDD(ScreenPtr pScreen);
-
-/*
  * winshadddnl.c
  */
 
@@ -1194,6 +1169,12 @@ Bool
 winCreateMsgWindowThread(void);
 
 /*
+ * winos.c
+ */
+void
+winOS(void);
+
+/*
  * END DDX and DIX Function Prototypes
  */
 
diff --git a/xorg-server/hw/xwin/winengine.c b/xorg-server/hw/xwin/winengine.c
index dc6ec7e9d..6961930c1 100755
--- a/xorg-server/hw/xwin/winengine.c
+++ b/xorg-server/hw/xwin/winengine.c
@@ -54,16 +54,9 @@ static HMODULE g_hmodDirectDraw = NULL;
 void
 winDetectSupportedEngines(void)
 {
-    OSVERSIONINFO osvi;
-
     /* Initialize the engine support flags */
     g_dwEnginesSupported = WIN_SERVER_SHADOW_GDI;
 
-    /* Get operating system version information */
-    ZeroMemory(&osvi, sizeof(osvi));
-    osvi.dwOSVersionInfoSize = sizeof(osvi);
-    GetVersionEx(&osvi);
-
     /* Do we have DirectDraw? */
     if (g_hmodDirectDraw != NULL) {
         LPDIRECTDRAW lpdd = NULL;
@@ -85,12 +78,6 @@ winDetectSupportedEngines(void)
                           "winDetectSupportedEngines - DirectDraw not installed\n");
             return;
         }
-        else {
-            /* We have DirectDraw */
-	          winDebug (
-                          "winDetectSupportedEngines - DirectDraw installed, allowing ShadowDD\n");
-            g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD;
-        }
 
         /* Try to query for DirectDraw4 interface */
         ddrval = IDirectDraw_QueryInterface(lpdd,
@@ -187,9 +174,6 @@ winSetEngine(ScreenPtr pScreen)
         case WIN_SERVER_SHADOW_GDI:
             winSetEngineFunctionsShadowGDI(pScreen);
             break;
-        case WIN_SERVER_SHADOW_DD:
-            winSetEngineFunctionsShadowDD(pScreen);
-            break;
         case WIN_SERVER_SHADOW_DDNL:
             winSetEngineFunctionsShadowDDNL(pScreen);
             break;
@@ -209,16 +193,6 @@ winSetEngine(ScreenPtr pScreen)
         return TRUE;
     }
 
-    /* ShadowDD is next in line */
-    if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DD) {
-        winDebug ("winSetEngine - Using Shadow DirectDraw\n");
-        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DD;
-
-        /* Set engine function pointers */
-        winSetEngineFunctionsShadowDD(pScreen);
-        return TRUE;
-    }
-
     /* ShadowGDI is next in line */
     if (g_dwEnginesSupported & WIN_SERVER_SHADOW_GDI) {
         winDebug ("winSetEngine - Using Shadow GDI DIB\n");
diff --git a/xorg-server/hw/xwin/winglobals.c b/xorg-server/hw/xwin/winglobals.c
index 46202369e..564b0c28c 100755
--- a/xorg-server/hw/xwin/winglobals.c
+++ b/xorg-server/hw/xwin/winglobals.c
@@ -79,7 +79,7 @@ Bool g_fSoftwareCursor = FALSE;
 Bool g_fSilentDupError = FALSE;
 Bool g_fNativeGl = TRUE;
 Bool g_fswrastwgl = FALSE;
-Bool g_fHostInTitle = FALSE;
+Bool g_fHostInTitle = TRUE;
 pthread_mutex_t g_pmTerminating = PTHREAD_MUTEX_INITIALIZER;
 
 #ifdef XWIN_CLIPBOARD
diff --git a/xorg-server/hw/xwin/winos.c b/xorg-server/hw/xwin/winos.c
new file mode 100644
index 000000000..0d825bb83
--- /dev/null
+++ b/xorg-server/hw/xwin/winos.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010-2014 Colin Harrison All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ *
+ * Author: Colin Harrison
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS)(HANDLE, PBOOL);
+
+static const char*
+IsWow64(void)
+{
+#ifdef __x86_64__
+    return " (64-bit)";
+#else
+    WINBOOL bIsWow64;
+    LPFN_ISWOW64PROCESS fnIsWow64Process =
+        (LPFN_ISWOW64PROCESS) GetProcAddress(GetModuleHandle(TEXT("kernel32")),
+                                             "IsWow64Process");
+    if (NULL != fnIsWow64Process) {
+        if (fnIsWow64Process(GetCurrentProcess(), &bIsWow64))
+            return bIsWow64 ? " (WoW64)" : " (32-bit)";
+    }
+
+    /* OS doesn't support IsWow64Process() */
+    return "";
+#endif
+}
+
+/*
+ * Report the OS version
+ */
+
+void
+winOS(void)
+{
+    OSVERSIONINFOEX osvi = {0};
+
+    /* Get operating system version information */
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    GetVersionEx((LPOSVERSIONINFO)&osvi);
+
+    ErrorF("OS: Windows NT %d.%d build %d%s\n",
+           (int)osvi.dwMajorVersion, (int)osvi.dwMinorVersion,
+           (int)osvi.dwBuildNumber, IsWow64());
+}
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index dd328ee80..c2c97324e 100755
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -31,6 +31,10 @@ from The Open Group.
 #include <xwin-config.h>
 #endif
 
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
 #include <../xfree86/common/xorgVersion.h>
 #include "win.h"
 #include "winconfig.h"
@@ -1115,6 +1119,11 @@ ddxProcessArgument(int argc, char *argv[], int i)
         return 1;
     }
 
+    if (IS_OPTION("-nohostintitle")) {
+        g_fHostInTitle = FALSE;
+        return 1;
+    }
+
     return 0;
 }
 
@@ -1202,6 +1211,17 @@ winLogVersionInfo(void)
     ErrorF("Vendor: %s\n", XVENDORNAME);
     ErrorF("Release: %d.%d.%d.%d\n\n", XORG_VERSION_MAJOR,
            XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP);
+#ifdef HAVE_SYS_UTSNAME_H
+    {
+        struct utsname name;
+
+        if (uname(&name) >= 0) {
+            ErrorF("OS: %s %s %s %s %s\n", name.sysname, name.nodename,
+                   name.release, name.version, name.machine);
+        }
+    }
+#endif
+    winOS();
     if (strlen(BUILDERSTRING))
         ErrorF("%s\n", BUILDERSTRING);
     ErrorF("Contact: %s\n", BUILDERADDR);
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index 9f106f77c..fde6f9427 100755
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -216,15 +216,19 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
         winDebug("winScreenInit - Using software cursor\n");  
 #endif
 
-    /*
-       Note the screen origin in a normalized coordinate space where (0,0) is at the top left
-       of the native virtual desktop area
-     */
-    pScreen->x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
-    pScreen->y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
+    if (!noPanoramiXExtension) {
+        /*
+           Note the screen origin in a normalized coordinate space where (0,0) is at the top left
+           of the native virtual desktop area
+         */
+        pScreen->x =
+            pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
+        pScreen->y =
+            pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
 
-    winDebug("Screen %d added at virtual desktop coordinate (%d,%d).\n",
-           pScreen->myNum, pScreen->x, pScreen->y);
+        winDebug("Screen %d added at virtual desktop coordinate (%d,%d).\n",
+               pScreen->myNum, pScreen->x, pScreen->y);
+    }
     winDebug("winScreenInit - returning\n");
 
     return TRUE;
@@ -306,8 +310,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     if (pScreenInfo->dwDepth == 8
         && (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
             || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
-                && pScreenInfo->fFullScreen)
-            || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
                 && pScreenInfo->fFullScreen))) {
         winSetColormapFunctions(pScreen);
 
@@ -377,7 +379,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 
     /* Initialize the shadow framebuffer layer */
     if ((pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
-         || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
          || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)
 #ifdef XWIN_MULTIWINDOWEXTWM
         && !pScreenInfo->fMWExtWM
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
deleted file mode 100644
index 688cc58d2..000000000
--- a/xorg-server/hw/xwin/winshaddd.c
+++ /dev/null
@@ -1,1198 +0,0 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *The above copyright notice and this permission notice shall be
- *included in all copies or substantial portions of the Software.
- *
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of the XFree86 Project
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from the XFree86 Project.
- *
- * Authors:	Dakshinamurthy Karra
- *		Suhaib M Siddiqi
- *		Peter Busch
- *		Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-#include "winprefs.h"
-
-/*
- * Local prototypes
- */
-
-static Bool
- winAllocateFBShadowDD(ScreenPtr pScreen);
-
-static void
- winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf);
-
-static Bool
- winCloseScreenShadowDD(ScreenPtr pScreen);
-
-static Bool
- winInitVisualsShadowDD(ScreenPtr pScreen);
-
-static Bool
- winAdjustVideoModeShadowDD(ScreenPtr pScreen);
-
-static Bool
- winBltExposedRegionsShadowDD(ScreenPtr pScreen);
-
-static Bool
- winActivateAppShadowDD(ScreenPtr pScreen);
-
-static Bool
- winRedrawScreenShadowDD(ScreenPtr pScreen);
-
-static Bool
- winRealizeInstalledPaletteShadowDD(ScreenPtr pScreen);
-
-static Bool
- winInstallColormapShadowDD(ColormapPtr pColormap);
-
-static Bool
- winStoreColorsShadowDD(ColormapPtr pmap, int ndef, xColorItem * pdefs);
-
-static Bool
- winCreateColormapShadowDD(ColormapPtr pColormap);
-
-static Bool
- winDestroyColormapShadowDD(ColormapPtr pColormap);
-
-static Bool
- winCreatePrimarySurfaceShadowDD(ScreenPtr pScreen);
-
-static Bool
- winReleasePrimarySurfaceShadowDD(ScreenPtr pScreen);
-
-/*
- * Create the primary surface and attach the clipper.
- * Used for both the initial surface creation and during
- * WM_DISPLAYCHANGE messages.
- */
-
-static Bool
-winCreatePrimarySurfaceShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    HRESULT ddrval = DD_OK;
-    DDSURFACEDESC ddsd;
-
-    /* Describe the primary surface */
-    ZeroMemory(&ddsd, sizeof(ddsd));
-    ddsd.dwSize = sizeof(ddsd);
-    ddsd.dwFlags = DDSD_CAPS;
-    ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-
-    /* Create the primary surface */
-    ddrval = IDirectDraw2_CreateSurface(pScreenPriv->pdd2,
-                                        &ddsd, &pScreenPriv->pddsPrimary, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winCreatePrimarySurfaceShadowDD - Could not create primary "
-               "surface: %08x\n", (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    winDebug("winCreatePrimarySurfaceShadowDD - Created primary surface\n");
-
-    /*
-     * Attach a clipper to the primary surface that will clip our blits to our
-     * display window.
-     */
-    ddrval = IDirectDrawSurface2_SetClipper(pScreenPriv->pddsPrimary,
-                                            pScreenPriv->pddcPrimary);
-    if (FAILED(ddrval)) {
-        ErrorF("winCreatePrimarySurfaceShadowDD - Primary attach clipper "
-               "failed: %08x\n", (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    winDebug("winCreatePrimarySurfaceShadowDD - Attached clipper to "
-             "primary surface\n");
-
-    /* Everything was correct */
-    return TRUE;
-}
-
-/*
- * Detach the clipper and release the primary surface.
- * Called from WM_DISPLAYCHANGE.
- */
-
-static Bool
-winReleasePrimarySurfaceShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-
-    winDebug ("winReleasePrimarySurfaceShadowDD - Hello\n");
-
-    /* Release the primary surface and clipper, if they exist */
-    if (pScreenPriv->pddsPrimary) {
-        /*
-         * Detach the clipper from the primary surface.
-         * NOTE: We do this explicity for clarity.  The Clipper is not released.
-         */
-        IDirectDrawSurface2_SetClipper(pScreenPriv->pddsPrimary, NULL);
-
-        winDebug ("winReleasePrimarySurfaceShadowDD - Detached clipper\n");
-
-        /* Release the primary surface */
-        IDirectDrawSurface2_Release(pScreenPriv->pddsPrimary);
-        pScreenPriv->pddsPrimary = NULL;
-    }
-
-    winDebug ("winReleasePrimarySurfaceShadowDD - Released primary surface\n");
-
-    return TRUE;
-}
-
-/*
- * Create a DirectDraw surface for the shadow framebuffer; also create
- * a primary surface object so we can blit to the display.
- *
- * Install a DirectDraw clipper on our primary surface object
- * that clips our blits to the unobscured client area of our display window.
- */
-
-static Bool
-winAllocateFBShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    HRESULT ddrval = DD_OK;
-    DDSURFACEDESC ddsd;
-    DDSURFACEDESC *pddsdShadow = NULL;
-
-    winDebug("winAllocateFBShadowDD\n");
-
-    /* Create a clipper */
-    ddrval = (*g_fpDirectDrawCreateClipper) (0,
-                                             &pScreenPriv->pddcPrimary, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winAllocateFBShadowDD - Could not create clipper: %08x\n",
-               (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    winDebug("winAllocateFBShadowDD - Created a clipper\n");
-
-    /* Attach the clipper to our display window */
-    ddrval = IDirectDrawClipper_SetHWnd(pScreenPriv->pddcPrimary,
-                                        0, pScreenPriv->hwndScreen);
-    if (FAILED(ddrval)) {
-        ErrorF("winAllocateFBShadowDD - Clipper not attached to "
-               "window: %08x\n", (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    winDebug("winAllocateFBShadowDD - Attached clipper to window\n");
-
-    /* Create a DirectDraw object, store the address at lpdd */
-    ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winAllocateFBShadowDD - Could not start DirectDraw: %08x\n",
-               (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    winDebug("winAllocateFBShadowDD () - Created and initialized DD\n");
-
-    /* Get a DirectDraw2 interface pointer */
-    ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
-                                        &IID_IDirectDraw2,
-                                        (LPVOID *) &pScreenPriv->pdd2);
-    if (FAILED(ddrval)) {
-        ErrorF("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
-               (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    /* Are we full screen? */
-    if (pScreenInfo->fFullScreen) {
-        DDSURFACEDESC ddsdCurrent;
-        DWORD dwRefreshRateCurrent = 0;
-        HDC hdc = NULL;
-
-        /* Set the cooperative level to full screen */
-        ddrval = IDirectDraw2_SetCooperativeLevel(pScreenPriv->pdd2,
-                                                  pScreenPriv->hwndScreen,
-                                                  DDSCL_EXCLUSIVE
-                                                  | DDSCL_FULLSCREEN);
-        if (FAILED(ddrval)) {
-            ErrorF("winAllocateFBShadowDD - Could not set "
-                   "cooperative level: %08x\n", (unsigned int) ddrval);
-            return FALSE;
-        }
-
-        /*
-         * We only need to get the current refresh rate for comparison
-         * if a refresh rate has been passed on the command line.
-         */
-        if (pScreenInfo->dwRefreshRate != 0) {
-            ZeroMemory(&ddsdCurrent, sizeof(ddsdCurrent));
-            ddsdCurrent.dwSize = sizeof(ddsdCurrent);
-
-            /* Get information about current display settings */
-            ddrval = IDirectDraw2_GetDisplayMode(pScreenPriv->pdd2,
-                                                 &ddsdCurrent);
-            if (FAILED(ddrval)) {
-                ErrorF("winAllocateFBShadowDD - Could not get current "
-                       "refresh rate: %08x.  Continuing.\n",
-                       (unsigned int) ddrval);
-                dwRefreshRateCurrent = 0;
-            }
-            else {
-                /* Grab the current refresh rate */
-                dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;
-            }
-        }
-
-        /* Clean up the refresh rate */
-        if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate) {
-            /*
-             * Refresh rate is non-specified or equal to current.
-             */
-            pScreenInfo->dwRefreshRate = 0;
-        }
-
-        /* Grab a device context for the screen */
-        hdc = GetDC(NULL);
-        if (hdc == NULL) {
-            ErrorF("winAllocateFBShadowDD - GetDC () failed\n");
-            return FALSE;
-        }
-
-        /* Only change the video mode when different than current mode */
-        if (!pScreenInfo->fMultipleMonitors
-            && (pScreenInfo->dwWidth != GetSystemMetrics(SM_CXSCREEN)
-                || pScreenInfo->dwHeight != GetSystemMetrics(SM_CYSCREEN)
-                || pScreenInfo->dwBPP != GetDeviceCaps(hdc, BITSPIXEL)
-                || pScreenInfo->dwRefreshRate != 0)) {
-            winDebug ("winAllocateFBShadowDD - Changing video mode\n");
-
-            /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */
-            ddrval = IDirectDraw2_SetDisplayMode(pScreenPriv->pdd2,
-                                                 pScreenInfo->dwWidth,
-                                                 pScreenInfo->dwHeight,
-                                                 pScreenInfo->dwBPP,
-                                                 pScreenInfo->dwRefreshRate, 0);
-            if (FAILED(ddrval)) {
-                ErrorF("winAllocateFBShadowDD - Could not set "
-                       "full screen display mode: %08x\n",
-                       (unsigned int) ddrval);
-                ErrorF
-                    ("winAllocateFBShadowDD - Using default driver refresh rate\n");
-                ddrval =
-                    IDirectDraw2_SetDisplayMode(pScreenPriv->pdd2,
-                                                pScreenInfo->dwWidth,
-                                                pScreenInfo->dwHeight,
-                                                pScreenInfo->dwBPP, 0, 0);
-                if (FAILED(ddrval)) {
-                    ErrorF
-                        ("winAllocateFBShadowDD - Could not set default refresh rate "
-                         "full screen display mode: %08x\n",
-                         (unsigned int) ddrval);
-                    return FALSE;
-                }
-            }
-        }
-        else {
-            winDebug ("winAllocateFBShadowDD - Not changing video mode\n");
-        }
-
-        /* Release our DC */
-        ReleaseDC(NULL, hdc);
-        hdc = NULL;
-    }
-    else {
-        /* Set the cooperative level for windowed mode */
-        ddrval = IDirectDraw2_SetCooperativeLevel(pScreenPriv->pdd2,
-                                                  pScreenPriv->hwndScreen,
-                                                  DDSCL_NORMAL);
-        if (FAILED(ddrval)) {
-            ErrorF("winAllocateFBShadowDD - Could not set "
-                   "cooperative level: %08x\n", (unsigned int) ddrval);
-            return FALSE;
-        }
-    }
-
-    /* Create the primary surface */
-    if (!winCreatePrimarySurfaceShadowDD(pScreen)) {
-        ErrorF("winAllocateFBShadowDD - winCreatePrimarySurfaceShadowDD "
-               "failed\n");
-        return FALSE;
-    }
-
-    /* Describe the shadow surface to be created */
-    /* NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
-     * as drawing, locking, and unlocking take forever
-     * with video memory surfaces.  In addition,
-     * video memory is a somewhat scarce resource,
-     * so you shouldn't be allocating video memory when
-     * you have the option of using system memory instead.
-     */
-    ZeroMemory(&ddsd, sizeof(ddsd));
-    ddsd.dwSize = sizeof(ddsd);
-    ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-    ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
-    ddsd.dwHeight = pScreenInfo->dwHeight;
-    ddsd.dwWidth = pScreenInfo->dwWidth;
-
-    /* Create the shadow surface */
-    ddrval = IDirectDraw2_CreateSurface(pScreenPriv->pdd2,
-                                        &ddsd, &pScreenPriv->pddsShadow, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winAllocateFBShadowDD - Could not create shadow "
-               "surface: %08x\n", (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    winDebug("winAllocateFBShadowDD - Created shadow\n");
-
-    /* Allocate a DD surface description for our screen privates */
-    pddsdShadow = pScreenPriv->pddsdShadow = malloc(sizeof(DDSURFACEDESC));
-    if (pddsdShadow == NULL) {
-        ErrorF("winAllocateFBShadowDD - Could not allocate surface "
-               "description memory\n");
-        return FALSE;
-    }
-    ZeroMemory(pddsdShadow, sizeof(*pddsdShadow));
-    pddsdShadow->dwSize = sizeof(*pddsdShadow);
-
-    winDebug("winAllocateFBShadowDD - Locking shadow\n");
-
-    /* Lock the shadow surface */
-    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
-                                      NULL, pddsdShadow, DDLOCK_WAIT, NULL);
-    if (FAILED(ddrval) || pddsdShadow->lpSurface == NULL) {
-        ErrorF("winAllocateFBShadowDD - Could not lock shadow "
-               "surface: %08x\n", (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    winDebug("winAllocateFBShadowDD - Locked shadow\n");
-
-    /* We don't know how to deal with anything other than RGB */
-    if (!(pddsdShadow->ddpfPixelFormat.dwFlags & DDPF_RGB)) {
-        ErrorF("winAllocateFBShadowDD - Color format other than RGB\n");
-        return FALSE;
-    }
-
-    /* Grab the pitch from the surface desc */
-    pScreenInfo->dwStride = (pddsdShadow->u1.lPitch * 8)
-        / pScreenInfo->dwBPP;
-
-    /* Save the pointer to our surface memory */
-    pScreenInfo->pfb = pddsdShadow->lpSurface;
-
-    /* Grab the color depth and masks from the surface description */
-    pScreenPriv->dwRedMask = pddsdShadow->ddpfPixelFormat.u2.dwRBitMask;
-    pScreenPriv->dwGreenMask = pddsdShadow->ddpfPixelFormat.u3.dwGBitMask;
-    pScreenPriv->dwBlueMask = pddsdShadow->ddpfPixelFormat.u4.dwBBitMask;
-
-    winDebug("winAllocateFBShadowDD - Returning\n");
-
-    return TRUE;
-}
-
-static void
-winFreeFBShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
-    /* Free the shadow surface, if there is one */
-    if (pScreenPriv->pddsShadow) {
-        IDirectDrawSurface2_Unlock(pScreenPriv->pddsShadow, NULL);
-        IDirectDrawSurface2_Release(pScreenPriv->pddsShadow);
-        pScreenPriv->pddsShadow = NULL;
-    }
-
-    /* Detach the clipper from the primary surface and release the primary surface, if there is one */
-    winReleasePrimarySurfaceShadowDD(pScreen);
-
-    /* Release the clipper object */
-    if (pScreenPriv->pddcPrimary) {
-        IDirectDrawClipper_Release(pScreenPriv->pddcPrimary);
-        pScreenPriv->pddcPrimary = NULL;
-    }
-
-    /* Free the DirectDraw2 object, if there is one */
-    if (pScreenPriv->pdd2) {
-        IDirectDraw2_RestoreDisplayMode(pScreenPriv->pdd2);
-        IDirectDraw2_Release(pScreenPriv->pdd2);
-        pScreenPriv->pdd2 = NULL;
-    }
-
-    /* Free the DirectDraw object, if there is one */
-    if (pScreenPriv->pdd) {
-        IDirectDraw_Release(pScreenPriv->pdd);
-        pScreenPriv->pdd = NULL;
-    }
-
-    /* Invalidate the ScreenInfo's fb pointer */
-    pScreenInfo->pfb = NULL;
-}
-
-/*
- * Transfer the damaged regions of the shadow framebuffer to the display.
- */
-
-static void
-winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    RegionPtr damage = shadowDamage(pBuf);
-    HRESULT ddrval = DD_OK;
-    RECT rcDest, rcSrc;
-    POINT ptOrigin;
-    DWORD dwBox = RegionNumRects(damage);
-    BoxPtr pBox = RegionRects(damage);
-    HRGN hrgnCombined = NULL;
-
-    /*
-     * Return immediately if the app is not active
-     * and we are fullscreen, or if we have a bad display depth
-     */
-    if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
-        || pScreenPriv->fBadDepth)
-        return;
-
-    /* Return immediately if we didn't get needed surfaces */
-    if (!pScreenPriv->pddsPrimary || !pScreenPriv->pddsShadow)
-        return;
-
-    /* Get the origin of the window in the screen coords */
-    ptOrigin.x = pScreenInfo->dwXOffset;
-    ptOrigin.y = pScreenInfo->dwYOffset;
-    MapWindowPoints(pScreenPriv->hwndScreen,
-                    HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
-
-    /* Unlock the shadow surface, so we can blit */
-    ddrval = IDirectDrawSurface2_Unlock(pScreenPriv->pddsShadow, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winShadowUpdateDD - Unlock failed\n");
-        return;
-    }
-
-    /*
-     * Handle small regions with multiple blits,
-     * handle large regions by creating a clipping region and
-     * doing a single blit constrained to that clipping region.
-     */
-    if (pScreenInfo->dwClipUpdatesNBoxes == 0
-        || dwBox < pScreenInfo->dwClipUpdatesNBoxes) {
-        /* Loop through all boxes in the damaged region */
-        while (dwBox--) {
-            /* Assign damage box to source rectangle */
-            rcSrc.left = pBox->x1;
-            rcSrc.top = pBox->y1;
-            rcSrc.right = pBox->x2;
-            rcSrc.bottom = pBox->y2;
-
-            /* Calculate destination rectange */
-            rcDest.left = ptOrigin.x + rcSrc.left;
-            rcDest.top = ptOrigin.y + rcSrc.top;
-            rcDest.right = ptOrigin.x + rcSrc.right;
-            rcDest.bottom = ptOrigin.y + rcSrc.bottom;
-
-            /* Blit the damaged areas */
-            ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
-                                             &rcDest,
-                                             pScreenPriv->pddsShadow,
-                                             &rcSrc, DDBLT_WAIT, NULL);
-
-            /* Get a pointer to the next box */
-            ++pBox;
-        }
-    }
-    else {
-        BoxPtr pBoxExtents = RegionExtents(damage);
-
-        /* Compute a GDI region from the damaged region */
-        hrgnCombined =
-            CreateRectRgn(pBoxExtents->x1, pBoxExtents->y1, pBoxExtents->x2,
-                          pBoxExtents->y2);
-
-        /* Install the GDI region as a clipping region */
-        SelectClipRgn(pScreenPriv->hdcScreen, hrgnCombined);
-        DeleteObject(hrgnCombined);
-        hrgnCombined = NULL;
-
-        /* Calculating a bounding box for the source is easy */
-        rcSrc.left = pBoxExtents->x1;
-        rcSrc.top = pBoxExtents->y1;
-        rcSrc.right = pBoxExtents->x2;
-        rcSrc.bottom = pBoxExtents->y2;
-
-        /* Calculating a bounding box for the destination is trickier */
-        rcDest.left = ptOrigin.x + rcSrc.left;
-        rcDest.top = ptOrigin.y + rcSrc.top;
-        rcDest.right = ptOrigin.x + rcSrc.right;
-        rcDest.bottom = ptOrigin.y + rcSrc.bottom;
-
-        /* Our Blt should be clipped to the invalidated region */
-        ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
-                                         &rcDest,
-                                         pScreenPriv->pddsShadow,
-                                         &rcSrc, DDBLT_WAIT, NULL);
-
-        /* Reset the clip region */
-        SelectClipRgn(pScreenPriv->hdcScreen, NULL);
-    }
-
-    /* Relock the shadow surface */
-    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
-                                      NULL,
-                                      pScreenPriv->pddsdShadow,
-                                      DDLOCK_WAIT, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winShadowUpdateDD - Lock failed\n");
-        return;
-    }
-
-    /* Has our memory pointer changed? */
-    if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface) {
-      extern const char *g_pszLogFile;
-        ErrorF("winShadowUpdateDD - Memory location of the shadow "
-               "surface has changed, trying to update the root window "
-               "pixmap header to point to the new address.  If you get "
-               "this message and " PROJECT_NAME " freezes or crashes "
-               "after this message then send a problem report and your "
-               "%s file to " BUILDERADDR "\n", g_pszLogFile);
-
-        /* Location of shadow framebuffer has changed */
-        winUpdateFBPointer(pScreen, pScreenPriv->pddsdShadow->lpSurface);
-    }
-}
-
-static Bool
-winInitScreenShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-
-    /* Get a device context for the screen  */
-    pScreenPriv->hdcScreen = GetDC(pScreenPriv->hwndScreen);
-
-    return winAllocateFBShadowDD(pScreen);
-}
-
-/*
- * Call the wrapped CloseScreen function.
- *
- * Free our resources and private structures.
- */
-
-static Bool
-winCloseScreenShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    Bool fReturn;
-
-    winDebug("winCloseScreenShadowDD - Freeing screen resources\n");
-
-    /* Flag that the screen is closed */
-    pScreenPriv->fClosed = TRUE;
-    pScreenPriv->fActive = FALSE;
-
-    /* Call the wrapped CloseScreen procedure */
-    WIN_UNWRAP(CloseScreen);
-    if (pScreen->CloseScreen)
-        fReturn = (*pScreen->CloseScreen) (pScreen);
-
-    winFreeFBShadowDD(pScreen);
-
-    /* Free the screen DC */
-    ReleaseDC(pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
-
-    /* Delete the window property */
-    RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
-
-    /* Delete tray icon, if we have one */
-    if (!pScreenInfo->fNoTrayIcon && !pref.fNoTrayIcon)
-        winDeleteNotifyIcon(pScreenPriv);
-
-    /* Free the exit confirmation dialog box, if it exists */
-    if (g_hDlgExit != NULL) {
-        DestroyWindow(g_hDlgExit);
-        g_hDlgExit = NULL;
-    }
-
-    /* Kill our window */
-    if (pScreenPriv->hwndScreen) {
-        DestroyWindow(pScreenPriv->hwndScreen);
-        pScreenPriv->hwndScreen = NULL;
-    }
-
-#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
-    /* Destroy the thread startup mutex */
-    if (pScreenPriv->pmServerStarted) pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
-#endif
-
-    /* Kill our screeninfo's pointer to the screen */
-    pScreenInfo->pScreen = NULL;
-
-    /* Free the screen privates for this screen */
-    free((void *) pScreenPriv);
-
-    return fReturn;
-}
-
-/*
- * Tell mi what sort of visuals we need.
- *
- * Generally we only need one visual, as our screen can only
- * handle one format at a time, I believe.  You may want
- * to verify that last sentence.
- */
-
-static Bool
-winInitVisualsShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    DWORD dwRedBits, dwGreenBits, dwBlueBits;
-
-    /* Count the number of ones in each color mask */
-    dwRedBits = winCountBits(pScreenPriv->dwRedMask);
-    dwGreenBits = winCountBits(pScreenPriv->dwGreenMask);
-    dwBlueBits = winCountBits(pScreenPriv->dwBlueMask);
-
-    /* Store the maximum number of ones in a color mask as the bitsPerRGB */
-    if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)
-        pScreenPriv->dwBitsPerRGB = 8;
-    else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
-        pScreenPriv->dwBitsPerRGB = dwRedBits;
-    else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
-        pScreenPriv->dwBitsPerRGB = dwGreenBits;
-    else
-        pScreenPriv->dwBitsPerRGB = dwBlueBits;
-
-    winDebug ("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "
-              "bpp %d\n",
-              (unsigned int) pScreenPriv->dwRedMask,
-              (unsigned int) pScreenPriv->dwGreenMask,
-              (unsigned int) pScreenPriv->dwBlueMask,
-              (int) pScreenPriv->dwBitsPerRGB,
-              (int) pScreenInfo->dwDepth, (int) pScreenInfo->dwBPP);
-
-    /* Create a single visual according to the Windows screen depth */
-    switch (pScreenInfo->dwDepth) {
-    case 24:
-    case 16:
-    case 15:
-        /* Create the real visual */
-        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
-                                      TrueColorMask,
-                                      pScreenPriv->dwBitsPerRGB,
-                                      TrueColor,
-                                      pScreenPriv->dwRedMask,
-                                      pScreenPriv->dwGreenMask,
-                                      pScreenPriv->dwBlueMask)) {
-            ErrorF("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
-                   "failed for TrueColor\n");
-            return FALSE;
-        }
-
-#ifdef XWIN_EMULATEPSEUDO
-        if (!pScreenInfo->fEmulatePseudo)
-            break;
-
-        /* Setup a pseudocolor visual */
-        if (!miSetVisualTypesAndMasks(8, PseudoColorMask, 8, -1, 0, 0, 0)) {
-            ErrorF("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
-                   "failed for PseudoColor\n");
-            return FALSE;
-        }
-#endif
-        break;
-
-    case 8:
-        if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
-                                      pScreenInfo->fFullScreen
-                                      ? PseudoColorMask : StaticColorMask,
-                                      pScreenPriv->dwBitsPerRGB,
-                                      pScreenInfo->fFullScreen
-                                      ? PseudoColor : StaticColor,
-                                      pScreenPriv->dwRedMask,
-                                      pScreenPriv->dwGreenMask,
-                                      pScreenPriv->dwBlueMask)) {
-            ErrorF("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
-                   "failed\n");
-            return FALSE;
-        }
-        break;
-
-    default:
-        ErrorF("winInitVisualsShadowDD - Unknown screen depth\n");
-        return FALSE;
-    }
-
-    winDebug("winInitVisualsShadowDD - Returning\n");
-
-    return TRUE;
-}
-
-/*
- * Adjust the user proposed video mode
- */
-
-static Bool
-winAdjustVideoModeShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    HDC hdc = NULL;
-    DWORD dwBPP;
-
-    /* We're in serious trouble if we can't get a DC */
-    hdc = GetDC(NULL);
-    if (hdc == NULL) {
-        ErrorF("winAdjustVideoModeShadowDD - GetDC () failed\n");
-        return FALSE;
-    }
-
-    /* Query GDI for current display depth */
-    dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
-
-    /* DirectDraw can only change the depth in fullscreen mode */
-    if (!(pScreenInfo->fFullScreen && (pScreenInfo->dwBPP != WIN_DEFAULT_BPP))) {
-        /* Otherwise, We'll use GDI's depth */
-        pScreenInfo->dwBPP = dwBPP;
-    }
-
-    /* Release our DC */
-    ReleaseDC(NULL, hdc);
-    return TRUE;
-}
-
-/*
- * Blt exposed regions to the screen
- */
-
-static Bool
-winBltExposedRegionsShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    RECT rcSrc, rcDest;
-    POINT ptOrigin;
-    HDC hdcUpdate = NULL;
-    PAINTSTRUCT ps;
-    HRESULT ddrval = DD_OK;
-    Bool fReturn = TRUE;
-    Bool fLocked = TRUE;
-    int i;
-
-    /* BeginPaint gives us an hdc that clips to the invalidated region */
-    hdcUpdate = BeginPaint(pScreenPriv->hwndScreen, &ps);
-    if (hdcUpdate == NULL) {
-        ErrorF("winBltExposedRegionsShadowDD - BeginPaint () returned "
-               "a NULL device context handle.  Aborting blit attempt.\n");
-        return FALSE;
-    }
-
-    /* Unlock the shadow surface, so we can blit */
-    ddrval = IDirectDrawSurface2_Unlock(pScreenPriv->pddsShadow, NULL);
-    if (FAILED(ddrval)) {
-        fReturn = FALSE;
-        goto winBltExposedRegionsShadowDD_Exit;
-    }
-    else {
-        /* Flag that we have unlocked the shadow surface */
-        fLocked = FALSE;
-    }
-
-    /* Get the origin of the window in the screen coords */
-    ptOrigin.x = pScreenInfo->dwXOffset;
-    ptOrigin.y = pScreenInfo->dwYOffset;
-
-    MapWindowPoints(pScreenPriv->hwndScreen,
-                    HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
-    rcDest.left = ptOrigin.x;
-    rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
-    rcDest.top = ptOrigin.y;
-    rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
-
-    /* Source can be enter shadow surface, as Blt should clip */
-    rcSrc.left = 0;
-    rcSrc.top = 0;
-    rcSrc.right = pScreenInfo->dwWidth;
-    rcSrc.bottom = pScreenInfo->dwHeight;
-
-    /* Try to regain the primary surface and blit again if we've lost it */
-    for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i) {
-        /* Our Blt should be clipped to the invalidated region */
-        ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
-                                         &rcDest,
-                                         pScreenPriv->pddsShadow,
-                                         &rcSrc, DDBLT_WAIT, NULL);
-        if (ddrval == DDERR_SURFACELOST) {
-            /* Surface was lost */
-            ErrorF("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "
-                   "reported that the primary surface was lost, "
-                   "trying to restore, retry: %d\n", i + 1);
-
-            /* Try to restore the surface, once */
-            ddrval = IDirectDrawSurface2_Restore(pScreenPriv->pddsPrimary);
-            ErrorF("winBltExposedRegionsShadowDD - "
-                   "IDirectDrawSurface2_Restore returned: ");
-            if (ddrval == DD_OK)
-                ErrorF("DD_OK\n");
-            else if (ddrval == DDERR_WRONGMODE)
-                ErrorF("DDERR_WRONGMODE\n");
-            else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
-                ErrorF("DDERR_INCOMPATIBLEPRIMARY\n");
-            else if (ddrval == DDERR_UNSUPPORTED)
-                ErrorF("DDERR_UNSUPPORTED\n");
-            else if (ddrval == DDERR_INVALIDPARAMS)
-                ErrorF("DDERR_INVALIDPARAMS\n");
-            else if (ddrval == DDERR_INVALIDOBJECT)
-                ErrorF("DDERR_INVALIDOBJECT\n");
-            else
-                ErrorF("unknown error: %08x\n", (unsigned int) ddrval);
-
-            /* Loop around to try the blit one more time */
-            continue;
-        }
-        else if (FAILED(ddrval)) {
-            fReturn = FALSE;
-            ErrorF("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "
-                   "failed, but surface not lost: %08x %d\n",
-                   (unsigned int) ddrval, (int) ddrval);
-            goto winBltExposedRegionsShadowDD_Exit;
-        }
-        else {
-            /* Success, stop looping */
-            break;
-        }
-    }
-
-    /* Relock the shadow surface */
-    ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
-                                      NULL,
-                                      pScreenPriv->pddsdShadow,
-                                      DDLOCK_WAIT, NULL);
-    if (FAILED(ddrval)) {
-        fReturn = FALSE;
-        ErrorF("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Lock "
-               "failed\n");
-        goto winBltExposedRegionsShadowDD_Exit;
-    }
-    else {
-        /* Indicate that we have relocked the shadow surface */
-        fLocked = TRUE;
-    }
-
-    /* Has our memory pointer changed? */
-    if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
-        winUpdateFBPointer(pScreen, pScreenPriv->pddsdShadow->lpSurface);
-
- winBltExposedRegionsShadowDD_Exit:
-    /* EndPaint frees the DC */
-    if (hdcUpdate != NULL)
-        EndPaint(pScreenPriv->hwndScreen, &ps);
-
-    /*
-     * Relock the surface if it is not locked.  We don't care if locking fails,
-     * as it will cause the server to shutdown within a few more operations.
-     */
-    if (!fLocked) {
-        IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
-                                 NULL,
-                                 pScreenPriv->pddsdShadow, DDLOCK_WAIT, NULL);
-
-        /* Has our memory pointer changed? */
-        if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
-            winUpdateFBPointer(pScreen, pScreenPriv->pddsdShadow->lpSurface);
-
-        fLocked = TRUE;
-    }
-    return fReturn;
-}
-
-/*
- * Do any engine-specific appliation-activation processing
- */
-
-static Bool
-winActivateAppShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-
-    /*
-     * Do we have a surface?
-     * Are we active?
-     * Are we fullscreen?
-     */
-    if (pScreenPriv != NULL
-        && pScreenPriv->pddsPrimary != NULL && pScreenPriv->fActive) {
-        /* Primary surface was lost, restore it */
-        IDirectDrawSurface2_Restore(pScreenPriv->pddsPrimary);
-    }
-
-    return TRUE;
-}
-
-/*
- * Reblit the shadow framebuffer to the screen.
- */
-
-static Bool
-winRedrawScreenShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    HRESULT ddrval = DD_OK;
-    RECT rcSrc, rcDest;
-    POINT ptOrigin;
-
-    /* Get the origin of the window in the screen coords */
-    ptOrigin.x = pScreenInfo->dwXOffset;
-    ptOrigin.y = pScreenInfo->dwYOffset;
-    MapWindowPoints(pScreenPriv->hwndScreen,
-                    HWND_DESKTOP, (LPPOINT) &ptOrigin, 1);
-    rcDest.left = ptOrigin.x;
-    rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
-    rcDest.top = ptOrigin.y;
-    rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
-
-    /* Source can be entire shadow surface, as Blt should clip for us */
-    rcSrc.left = 0;
-    rcSrc.top = 0;
-    rcSrc.right = pScreenInfo->dwWidth;
-    rcSrc.bottom = pScreenInfo->dwHeight;
-
-    /* Redraw the whole window, to take account for the new colors */
-    ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
-                                     &rcDest,
-                                     pScreenPriv->pddsShadow,
-                                     &rcSrc, DDBLT_WAIT, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winRedrawScreenShadowDD - IDirectDrawSurface_Blt () "
-               "failed: %08x\n", (unsigned int) ddrval);
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-/*
- * Realize the currently installed colormap
- */
-
-static Bool
-winRealizeInstalledPaletteShadowDD(ScreenPtr pScreen)
-{
-    return TRUE;
-}
-
-/*
- * Install the specified colormap
- */
-
-static Bool
-winInstallColormapShadowDD(ColormapPtr pColormap)
-{
-    ScreenPtr pScreen = pColormap->pScreen;
-
-    winScreenPriv(pScreen);
-    winCmapPriv(pColormap);
-    HRESULT ddrval = DD_OK;
-
-    /* Install the DirectDraw palette on the primary surface */
-    ddrval = IDirectDrawSurface2_SetPalette(pScreenPriv->pddsPrimary,
-                                            pCmapPriv->lpDDPalette);
-    if (FAILED(ddrval)) {
-        ErrorF("winInstallColormapShadowDD - Failed installing the "
-               "DirectDraw palette.\n");
-        return FALSE;
-    }
-
-    /* Save a pointer to the newly installed colormap */
-    pScreenPriv->pcmapInstalled = pColormap;
-
-    return TRUE;
-}
-
-/*
- * Store the specified colors in the specified colormap
- */
-
-static Bool
-winStoreColorsShadowDD(ColormapPtr pColormap, int ndef, xColorItem * pdefs)
-{
-    ScreenPtr pScreen = pColormap->pScreen;
-
-    winScreenPriv(pScreen);
-    winCmapPriv(pColormap);
-    ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
-    HRESULT ddrval = DD_OK;
-
-    /* Put the X colormap entries into the Windows logical palette */
-    ddrval = IDirectDrawPalette_SetEntries(pCmapPriv->lpDDPalette,
-                                           0,
-                                           pdefs[0].pixel,
-                                           ndef,
-                                           pCmapPriv->peColors
-                                           + pdefs[0].pixel);
-    if (FAILED(ddrval)) {
-        ErrorF("winStoreColorsShadowDD - SetEntries () failed\n");
-        return FALSE;
-    }
-
-    /* Don't install the DirectDraw palette if the colormap is not installed */
-    if (pColormap != curpmap) {
-        return TRUE;
-    }
-
-    if (!winInstallColormapShadowDD(pColormap)) {
-        ErrorF("winStoreColorsShadowDD - Failed installing colormap\n");
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-/*
- * Colormap initialization procedure
- */
-
-static Bool
-winCreateColormapShadowDD(ColormapPtr pColormap)
-{
-    HRESULT ddrval = DD_OK;
-    ScreenPtr pScreen = pColormap->pScreen;
-
-    winScreenPriv(pScreen);
-    winCmapPriv(pColormap);
-
-    /* Create a DirectDraw palette */
-    ddrval = IDirectDraw2_CreatePalette(pScreenPriv->pdd,
-                                        DDPCAPS_8BIT | DDPCAPS_ALLOW256,
-                                        pCmapPriv->peColors,
-                                        &pCmapPriv->lpDDPalette, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winCreateColormapShadowDD - CreatePalette failed\n");
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-/*
- * Colormap destruction procedure
- */
-
-static Bool
-winDestroyColormapShadowDD(ColormapPtr pColormap)
-{
-    winScreenPriv(pColormap->pScreen);
-    winCmapPriv(pColormap);
-    HRESULT ddrval = DD_OK;
-
-    /*
-     * Is colormap to be destroyed the default?
-     *
-     * Non-default colormaps should have had winUninstallColormap
-     * called on them before we get here.  The default colormap
-     * will not have had winUninstallColormap called on it.  Thus,
-     * we need to handle the default colormap in a special way.
-     */
-    if (pColormap->flags & IsDefault) {
-        winDebug("winDestroyColormapShadowDD - Destroying default "
-                 "colormap\n");
-
-        /*
-         * FIXME: Walk the list of all screens, popping the default
-         * palette out of each screen device context.
-         */
-
-        /* Pop the palette out of the primary surface */
-        ddrval = IDirectDrawSurface2_SetPalette(pScreenPriv->pddsPrimary, NULL);
-        if (FAILED(ddrval)) {
-            ErrorF("winDestroyColormapShadowDD - Failed freeing the "
-                   "default colormap DirectDraw palette.\n");
-            return FALSE;
-        }
-
-        /* Clear our private installed colormap pointer */
-        pScreenPriv->pcmapInstalled = NULL;
-    }
-
-    /* Release the palette */
-    IDirectDrawPalette_Release(pCmapPriv->lpDDPalette);
-
-    /* Invalidate the colormap privates */
-    pCmapPriv->lpDDPalette = NULL;
-
-    return TRUE;
-}
-
-/*
- * Set engine specific functions
- */
-
-Bool
-winSetEngineFunctionsShadowDD(ScreenPtr pScreen)
-{
-    winScreenPriv(pScreen);
-    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
-    /* Set our pointers */
-    pScreenPriv->pwinAllocateFB = winAllocateFBShadowDD;
-    pScreenPriv->pwinFreeFB = winFreeFBShadowDD;
-    pScreenPriv->pwinShadowUpdate = winShadowUpdateDD;
-    pScreenPriv->pwinInitScreen = winInitScreenShadowDD;
-    pScreenPriv->pwinCloseScreen = winCloseScreenShadowDD;
-    pScreenPriv->pwinInitVisuals = winInitVisualsShadowDD;
-    pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDD;
-    if (pScreenInfo->fFullScreen)
-        pScreenPriv->pwinCreateBoundingWindow =
-            winCreateBoundingWindowFullScreen;
-    else
-        pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
-    pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
-    pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDD;
-    pScreenPriv->pwinActivateApp = winActivateAppShadowDD;
-    pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDD;
-    pScreenPriv->pwinRealizeInstalledPalette
-        = winRealizeInstalledPaletteShadowDD;
-    pScreenPriv->pwinInstallColormap = winInstallColormapShadowDD;
-    pScreenPriv->pwinStoreColors = winStoreColorsShadowDD;
-    pScreenPriv->pwinCreateColormap = winCreateColormapShadowDD;
-    pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDD;
-    pScreenPriv->pwinHotKeyAltTab =
-        (winHotKeyAltTabProcPtr) (void (*)(void)) NoopDDA;
-    pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDD;
-    pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDD;
-#ifdef XWIN_MULTIWINDOW
-    pScreenPriv->pwinFinishCreateWindowsWindow =
-        (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA;
-#endif
-
-    return TRUE;
-}
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index a88f7c68d..d260f6ad2 100755
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -162,8 +162,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
          * their own mode when they become active.
          */
         if (s_pScreenInfo->fFullScreen
-            && (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
-                || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)) {
+            || (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)) {
             break;
         }
 
@@ -186,8 +185,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
          */
         if (s_pScreenInfo->dwBPP !=
             GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL)) {
-            if ((s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD ||
-                 s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)) {
+            if (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL) {
                 /* Cannot display the visual until the depth is restored */
                 winDebug ("winWindowProc - Disruptive change in depth\n");
 
diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am
index 168b00f70..738b582e9 100644
--- a/xorg-server/include/Makefile.am
+++ b/xorg-server/include/Makefile.am
@@ -33,6 +33,7 @@ sdk_HEADERS =		\
 	misc.h		\
 	miscstruct.h	\
 	opaque.h	\
+	nonsdk_extinit.h	\
 	optionstr.h	\
 	os.h		\
 	pixmap.h	\
diff --git a/xorg-server/include/extinit.h b/xorg-server/include/extinit.h
index fa5f29378..4ad4fcac0 100644
--- a/xorg-server/include/extinit.h
+++ b/xorg-server/include/extinit.h
@@ -163,11 +163,6 @@ extern void SELinuxExtensionInit(void);
 extern void XTestExtensionInit(void);
 #endif
 
-#ifdef INXQUARTZ
-extern _X_EXPORT Bool noPseudoramiXExtension;
-extern void PseudoramiXExtensionInit(void);
-#endif
-
 #if defined(XV)
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/XvMC.h>
diff --git a/xorg-server/include/nonsdk_extinit.h b/xorg-server/include/nonsdk_extinit.h
new file mode 100644
index 000000000..da8d370bd
--- /dev/null
+++ b/xorg-server/include/nonsdk_extinit.h
@@ -0,0 +1,35 @@
+/***********************************************************
+
+Copyright 2014 Jon TURNEY
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+******************************************************************/
+
+#ifndef NONSDK_EXT_INIT_H
+#define NONSDK_EXT_INIT_H
+
+/* this is separate from extinit.h to avoid references to these symbols being
+   pulled in by sdksyms */
+
+extern _X_EXPORT Bool noPseudoramiXExtension;
+extern void PseudoramiXExtensionInit(void);
+
+#endif
diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h
index fc428c8cf..be532ff55 100644
--- a/xorg-server/include/protocol-versions.h
+++ b/xorg-server/include/protocol-versions.h
@@ -73,7 +73,7 @@
 
 /* RandR */
 #define SERVER_RANDR_MAJOR_VERSION		1
-#define SERVER_RANDR_MINOR_VERSION		4
+#define SERVER_RANDR_MINOR_VERSION		5
 
 /* Record */
 #define SERVER_RECORD_MAJOR_VERSION		1
diff --git a/xorg-server/makefile b/xorg-server/makefile
index f721a6c1e..80f668181 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -26,7 +26,8 @@ INCLUDELIBFILES =  \
  Xi\$(OBJDIR)\libXi.lib \
  xkb\$(OBJDIR)\libxkb.lib \
  render\$(OBJDIR)\librender.lib \
- present\$(OBJDIR)\libpresent.lib
+ present\$(OBJDIR)\libpresent.lib \
+ pseudoramiX\$(OBJDIR)\libPseudoramiX.lib
 
 INCLUDENOSERVLIBFILES =  \
  $(MHMAKECONF)\libX11\$(NOSERVOBJDIR)\libX11.lib \
diff --git a/xorg-server/mi/mifillarc.c b/xorg-server/mi/mifillarc.c
index 246d70ff4..888519edf 100644
--- a/xorg-server/mi/mifillarc.c
+++ b/xorg-server/mi/mifillarc.c
@@ -660,6 +660,11 @@ miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs_all, xArc * parcs)
             if (narcs && nspans + arc->height > MAX_SPANS_PER_LOOP)
                 break;
             nspans += arc->height;
+
+            /* A pie-slice arc may add another pile of spans */
+            if (pGC->arcMode == ArcPieSlice &&
+                (-FULLCIRCLE < arc->angle2 && arc->angle2 < FULLCIRCLE))
+                nspans += (arc->height + 1) >> 1;
         }
 
         pts = points = malloc (sizeof (DDXPointRec) * nspans +
diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c
index 5872bf534..086d2c3fb 100644
--- a/xorg-server/mi/miinitext.c
+++ b/xorg-server/mi/miinitext.c
@@ -108,6 +108,9 @@ SOFTWARE.
 #include "misc.h"
 #include "extension.h"
 #include "extinit.h"
+#ifdef INXQUARTZ
+#include "nonsdk_extinit.h"
+#endif
 #include "micmap.h"
 #include "globals.h"
 
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 3af277b72..64796a052 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -361,6 +361,7 @@ vpnprintf(char *string, int size_in, const char *f, va_list args)
     uint64_t ui;
     int64_t si;
     size_t size = size_in;
+    int precision;
 
     for (; f_idx < f_len && s_idx < size - 1; f_idx++) {
         int length_modifier = 0;
@@ -371,9 +372,29 @@ vpnprintf(char *string, int size_in, const char *f, va_list args)
 
         f_idx++;
 
-        /* silently swallow digit length modifiers */
-        while (f_idx < f_len && ((f[f_idx] >= '0' && f[f_idx] <= '9') || f[f_idx] == '.'))
+        /* silently swallow minimum field width */
+        if (f[f_idx] == '*') {
             f_idx++;
+            va_arg(args, int);
+        } else {
+            while (f_idx < f_len && ((f[f_idx] >= '0' && f[f_idx] <= '9')))
+                f_idx++;
+        }
+
+        /* is there a precision? */
+        precision = size;
+        if (f[f_idx] == '.') {
+            f_idx++;
+            if (f[f_idx] == '*') {
+                f_idx++;
+                /* precision is supplied in an int argument */
+                precision = va_arg(args, int);
+            } else {
+                /* silently swallow precision digits */
+                while (f_idx < f_len && ((f[f_idx] >= '0' && f[f_idx] <= '9')))
+                    f_idx++;
+            }
+        }
 
         /* non-digit length modifiers */
         if (f_idx < f_len) {
@@ -389,9 +410,8 @@ vpnprintf(char *string, int size_in, const char *f, va_list args)
         switch (f[f_idx]) {
         case 's':
             string_arg = va_arg(args, char*);
-            p_len = strlen_sigsafe(string_arg);
 
-            for (i = 0; i < p_len && s_idx < size - 1; i++)
+            for (i = 0; string_arg[i] != 0 && s_idx < size - 1 && s_idx < precision; i++)
                 string[s_idx++] = string_arg[i];
             break;
 
diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c
index 6025be1cc..2c8538ba6 100644
--- a/xorg-server/os/xdmcp.c
+++ b/xorg-server/os/xdmcp.c
@@ -48,6 +48,11 @@
 #include <netdir.h>
 #endif
 
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
+#include <X11/Xtrans/Xtrans.h>
+
 #ifdef XDMCP
 #undef REQUEST
 
@@ -249,6 +254,14 @@ XdmcpUseMsg(void)
     ErrorF("-displayID display-id  manufacturer display ID for request\n");
 }
 
+static void
+XdmcpDefaultListen(void)
+{
+    /* Even when configured --disable-listen-tcp, we should listen on tcp in
+       XDMCP modes */
+    _XSERVTransListen("tcp");
+}
+
 int
 XdmcpOptions(int argc, char **argv, int i)
 {
@@ -256,11 +269,13 @@ XdmcpOptions(int argc, char **argv, int i)
         get_manager_by_name(argc, argv, i++);
         XDM_INIT_STATE = XDM_QUERY;
         AccessUsingXdmcp();
+        XdmcpDefaultListen();
         return i + 1;
     }
     if (strcmp(argv[i], "-broadcast") == 0) {
         XDM_INIT_STATE = XDM_BROADCAST;
         AccessUsingXdmcp();
+        XdmcpDefaultListen();
         return i + 1;
     }
 #if defined(IPv6) && defined(AF_INET6)
@@ -268,6 +283,7 @@ XdmcpOptions(int argc, char **argv, int i)
         i = get_mcast_options(argc, argv, ++i);
         XDM_INIT_STATE = XDM_MULTICAST;
         AccessUsingXdmcp();
+        XdmcpDefaultListen();
         return i + 1;
     }
 #endif
@@ -275,6 +291,7 @@ XdmcpOptions(int argc, char **argv, int i)
         get_manager_by_name(argc, argv, i++);
         XDM_INIT_STATE = XDM_INDIRECT;
         AccessUsingXdmcp();
+        XdmcpDefaultListen();
         return i + 1;
     }
     if (strcmp(argv[i], "-port") == 0) {
diff --git a/xorg-server/pseudoramiX/makefile b/xorg-server/pseudoramiX/makefile
new file mode 100644
index 000000000..3ea88ba35
--- /dev/null
+++ b/xorg-server/pseudoramiX/makefile
@@ -0,0 +1,9 @@
+# Fake Xinerama extension
+
+LIBRARY=libPseudoramiX
+
+libPseudoramiX_la_SOURCES = pseudoramiX.c pseudoramiX.h
+
+CSRCS = $(filter %.c,$(libPseudoramiX_la_SOURCES))
+
+
diff --git a/xorg-server/pseudoramiX/pseudoramiX.c b/xorg-server/pseudoramiX/pseudoramiX.c
index f47c7836d..e59ca1312 100644
--- a/xorg-server/pseudoramiX/pseudoramiX.c
+++ b/xorg-server/pseudoramiX/pseudoramiX.c
@@ -39,7 +39,7 @@
 
 #include "pseudoramiX.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "nonsdk_extinit.h"
 #include "dixstruct.h"
 #include "window.h"
 #include <X11/extensions/panoramiXproto.h>
@@ -49,6 +49,7 @@
 #define DEBUG_LOG PseudoramiXDebug
 
 Bool noPseudoramiXExtension = FALSE;
+extern Bool noRRXineramaExtension;
 
 extern int
 ProcPanoramiXQueryVersion(ClientPtr client);
@@ -190,6 +191,9 @@ PseudoramiXExtensionInit(void)
         }
     }
 
+    /* Do not allow RRXinerama to initialize if we did */
+    noRRXineramaExtension = success;
+
     if (!success) {
         ErrorF("%s Extension (PseudoramiX) failed to initialize\n",
                PANORAMIX_PROTOCOL_NAME);
diff --git a/xorg-server/pseudoramiX/pseudoramiX.h b/xorg-server/pseudoramiX/pseudoramiX.h
index f063919dd..5393062ee 100644
--- a/xorg-server/pseudoramiX/pseudoramiX.h
+++ b/xorg-server/pseudoramiX/pseudoramiX.h
@@ -2,8 +2,6 @@
  * Minimal implementation of PanoramiX/Xinerama
  */
 
-extern int noPseudoramiXExtension;
-
 void
 PseudoramiXAddScreen(int x, int y, int w, int h);
 void
diff --git a/xorg-server/randr/Makefile.am b/xorg-server/randr/Makefile.am
index ccaff3f02..90dc9ec9a 100644
--- a/xorg-server/randr/Makefile.am
+++ b/xorg-server/randr/Makefile.am
@@ -15,6 +15,7 @@ librandr_la_SOURCES =	\
 	rrdispatch.c	\
 	rrinfo.c	\
 	rrmode.c	\
+	rrmonitor.c	\
 	rroutput.c	\
 	rrpointer.c	\
 	rrproperty.c	\
diff --git a/xorg-server/randr/makefile b/xorg-server/randr/makefile
index 9f32cf77d..51dd96ed1 100644..100755
--- a/xorg-server/randr/makefile
+++ b/xorg-server/randr/makefile
@@ -10,6 +10,7 @@ librandr_la_SOURCES =	\
 	rrdispatch.c	\

 	rrinfo.c	\

 	rrmode.c	\

+	rrmonitor.c	\

 	rroutput.c	\

 	rrpointer.c	\

 	rrproperty.c	\

diff --git a/xorg-server/randr/randr.c b/xorg-server/randr/randr.c
index 02707efd9..24a2deadb 100644
--- a/xorg-server/randr/randr.c
+++ b/xorg-server/randr/randr.c
@@ -98,6 +98,8 @@ RRCloseScreen(ScreenPtr pScreen)
     if (pScrPriv->provider)
         RRProviderDestroy(pScrPriv->provider);
 
+    RRMonitorClose(pScreen);
+
     free(pScrPriv->crtcs);
     free(pScrPriv->outputs);
     free(pScrPriv);
@@ -333,6 +335,8 @@ RRScreenInit(ScreenPtr pScreen)
     pScrPriv->numCrtcs = 0;
     pScrPriv->crtcs = NULL;
 
+    RRMonitorInit(pScreen);
+
     RRNScreens += 1;            /* keep count of screens that implement randr */
     return TRUE;
 }
diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h
index 13e6a8596..438a52aeb 100644
--- a/xorg-server/randr/randrstr.h
+++ b/xorg-server/randr/randrstr.h
@@ -80,6 +80,7 @@ typedef struct _rrProperty RRPropertyRec, *RRPropertyPtr;
 typedef struct _rrCrtc RRCrtcRec, *RRCrtcPtr;
 typedef struct _rrOutput RROutputRec, *RROutputPtr;
 typedef struct _rrProvider RRProviderRec, *RRProviderPtr;
+typedef struct _rrMonitor RRMonitorRec, *RRMonitorPtr;
 
 struct _rrMode {
     int refcnt;
@@ -169,6 +170,22 @@ struct _rrProvider {
     struct _rrProvider *output_source;
 };
 
+typedef struct _rrMonitorGeometry {
+    BoxRec box;
+    CARD32 mmWidth;
+    CARD32 mmHeight;
+} RRMonitorGeometryRec, *RRMonitorGeometryPtr;
+
+struct _rrMonitor {
+    Atom name;
+    ScreenPtr pScreen;
+    int numOutputs;
+    RROutput *outputs;
+    Bool primary;
+    Bool automatic;
+    RRMonitorGeometryRec geometry;
+};
+
 #if RANDR_12_INTERFACE
 typedef Bool (*RRScreenSetSizeProcPtr) (ScreenPtr pScreen,
                                         CARD16 width,
@@ -338,6 +355,9 @@ typedef struct _rrScrPriv {
 
     RRProviderDestroyProcPtr rrProviderDestroy;
 
+    int numMonitors;
+    RRMonitorPtr *monitors;
+
 } rrScrPrivRec, *rrScrPrivPtr;
 
 extern _X_EXPORT DevPrivateKeyRec rrPrivKeyRec;
@@ -981,6 +1001,30 @@ extern _X_EXPORT void
  RRXineramaExtensionInit(void);
 #endif
 
+void
+RRMonitorInit(ScreenPtr screen);
+
+Bool
+RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret, int *nmon_ret);
+
+int
+RRMonitorCountList(ScreenPtr screen);
+
+void
+RRMonitorFreeList(RRMonitorPtr monitors, int nmon);
+
+void
+RRMonitorClose(ScreenPtr screen);
+
+int
+ProcRRGetMonitors(ClientPtr client);
+
+int
+ProcRRSetMonitor(ClientPtr client);
+
+int
+ProcRRDeleteMonitor(ClientPtr client);
+
 #endif                          /* _RANDRSTR_H_ */
 
 /*
diff --git a/xorg-server/randr/rrdispatch.c b/xorg-server/randr/rrdispatch.c
index 3fbbc7b14..27d405ac8 100644
--- a/xorg-server/randr/rrdispatch.c
+++ b/xorg-server/randr/rrdispatch.c
@@ -254,4 +254,7 @@ int (*ProcRandrVector[RRNumberRequests]) (ClientPtr) = {
         ProcRRChangeProviderProperty, /* 39 */
         ProcRRDeleteProviderProperty, /* 40 */
         ProcRRGetProviderProperty,    /* 41 */
+        ProcRRGetMonitors,            /* 42 */
+        ProcRRSetMonitor,             /* 43 */
+        ProcRRDeleteMonitor,          /* 44 */
 };
diff --git a/xorg-server/randr/rrmonitor.c b/xorg-server/randr/rrmonitor.c
new file mode 100644
index 000000000..fbdd352f6
--- /dev/null
+++ b/xorg-server/randr/rrmonitor.c
@@ -0,0 +1,748 @@
+/*
+ * Copyright © 2014 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include "randrstr.h"
+#include "swaprep.h"
+
+static Atom
+RRMonitorCrtcName(RRCrtcPtr crtc)
+{
+    char        name[20];
+
+    if (crtc->numOutputs) {
+        RROutputPtr     output = crtc->outputs[0];
+        return MakeAtom(output->name, output->nameLength, TRUE);
+    }
+    sprintf(name, "Monitor-%08x", crtc->id);
+    return MakeAtom(name, strlen(name), TRUE);
+}
+
+static Bool
+RRMonitorCrtcPrimary(RRCrtcPtr crtc)
+{
+    ScreenPtr screen = crtc->pScreen;
+    rrScrPrivPtr pScrPriv = rrGetScrPriv(screen);
+    int o;
+
+    for (o = 0; o < crtc->numOutputs; o++)
+        if (crtc->outputs[o] == pScrPriv->primaryOutput)
+            return TRUE;
+    return FALSE;
+}
+
+#define DEFAULT_PIXELS_PER_MM   (96.0 / 25.4)
+
+static void
+RRMonitorGetCrtcGeometry(RRCrtcPtr crtc, RRMonitorGeometryPtr geometry)
+{
+    ScreenPtr screen = crtc->pScreen;
+    rrScrPrivPtr pScrPriv = rrGetScrPriv(screen);
+    BoxRec      panned_area;
+
+    /* Check to see if crtc is panned and return the full area when applicable. */
+    if (pScrPriv && pScrPriv->rrGetPanning &&
+        pScrPriv->rrGetPanning(screen, crtc, &panned_area, NULL, NULL) &&
+        (panned_area.x2 > panned_area.x1) &&
+        (panned_area.y2 > panned_area.y1)) {
+        geometry->box = panned_area;
+    }
+    else {
+        int width, height;
+
+        RRCrtcGetScanoutSize(crtc, &width, &height);
+        geometry->box.x1 = crtc->x;
+        geometry->box.y1 = crtc->y;
+        geometry->box.x2 = geometry->box.x1 + width;
+        geometry->box.y2 = geometry->box.y1 + height;
+    }
+    if (crtc->numOutputs && crtc->outputs[0]->mmWidth && crtc->outputs[0]->mmHeight) {
+        RROutputPtr output = crtc->outputs[0];
+        geometry->mmWidth = output->mmWidth;
+        geometry->mmHeight = output->mmHeight;
+    } else {
+        geometry->mmWidth = floor ((geometry->box.x2 - geometry->box.x1) / DEFAULT_PIXELS_PER_MM + 0.5);
+        geometry->mmHeight = floor ((geometry->box.y2 - geometry->box.y1) / DEFAULT_PIXELS_PER_MM + 0.5);
+    }
+}
+
+static Bool
+RRMonitorSetFromServer(RRCrtcPtr crtc, RRMonitorPtr monitor)
+{
+    int o;
+
+    monitor->name = RRMonitorCrtcName(crtc);
+    monitor->pScreen = crtc->pScreen;
+    monitor->numOutputs = crtc->numOutputs;
+    monitor->outputs = calloc(crtc->numOutputs, sizeof(RRCrtc));
+    if (!monitor->outputs)
+        return FALSE;
+    for (o = 0; o < crtc->numOutputs; o++)
+        monitor->outputs[o] = crtc->outputs[o]->id;
+    monitor->primary = RRMonitorCrtcPrimary(crtc);
+    monitor->automatic = TRUE;
+    RRMonitorGetCrtcGeometry(crtc, &monitor->geometry);
+    return TRUE;
+}
+
+static Bool
+RRMonitorAutomaticGeometry(RRMonitorPtr monitor)
+{
+    return (monitor->geometry.box.x1 == 0 &&
+            monitor->geometry.box.y1 == 0 &&
+            monitor->geometry.box.x2 == 0 &&
+            monitor->geometry.box.y2 == 0);
+}
+
+static void
+RRMonitorGetGeometry(RRMonitorPtr monitor, RRMonitorGeometryPtr geometry)
+{
+    if (RRMonitorAutomaticGeometry(monitor) && monitor->numOutputs > 0) {
+        ScreenPtr               screen = monitor->pScreen;
+        rrScrPrivPtr            pScrPriv = rrGetScrPriv(screen);
+        RRMonitorGeometryRec    first = { .box = { 0, 0, 0, 0 }, .mmWidth = 0, .mmHeight = 0 };
+        RRMonitorGeometryRec    this;
+        int                     c, o, co;
+        int                     active_crtcs = 0;
+
+        *geometry = first;
+        for (o = 0; o < monitor->numOutputs; o++) {
+            RRCrtcPtr   crtc = NULL;
+            Bool        in_use = FALSE;
+
+            for (c = 0; !in_use && c < pScrPriv->numCrtcs; c++) {
+                crtc = pScrPriv->crtcs[c];
+                if (!crtc->mode)
+                    continue;
+                for (co = 0; !in_use && co < crtc->numOutputs; co++)
+                    if (monitor->outputs[o] == crtc->outputs[co]->id)
+                        in_use = TRUE;
+            }
+
+            if (!in_use)
+                continue;
+
+            RRMonitorGetCrtcGeometry(crtc, &this);
+
+            if (active_crtcs == 0) {
+                first = this;
+                *geometry = this;
+            } else {
+                geometry->box.x1 = min(this.box.x1, geometry->box.x1);
+                geometry->box.x2 = max(this.box.x2, geometry->box.x2);
+                geometry->box.y1 = min(this.box.y1, geometry->box.y1);
+                geometry->box.y2 = max(this.box.y2, geometry->box.y2);
+            }
+            active_crtcs++;
+        }
+
+        /* Adjust physical sizes to account for total area */
+        if (active_crtcs > 1 && first.box.x2 != first.box.x1 && first.box.y2 != first.box.y1) {
+            geometry->mmWidth = (this.box.x2 - this.box.x1) / (first.box.x2 - first.box.x1) * first.mmWidth;
+            geometry->mmHeight = (this.box.y2 - this.box.y1) / (first.box.y2 - first.box.y1) * first.mmHeight;
+        }
+    } else {
+        *geometry = monitor->geometry;
+    }
+}
+
+static Bool
+RRMonitorSetFromClient(RRMonitorPtr client_monitor, RRMonitorPtr monitor)
+{
+    monitor->name = client_monitor->name;
+    monitor->pScreen = client_monitor->pScreen;
+    monitor->numOutputs = client_monitor->numOutputs;
+    monitor->outputs = calloc(client_monitor->numOutputs, sizeof (RROutput));
+    if (!monitor->outputs && client_monitor->numOutputs)
+        return FALSE;
+    memcpy(monitor->outputs, client_monitor->outputs, client_monitor->numOutputs * sizeof (RROutput));
+    monitor->primary = client_monitor->primary;
+    monitor->automatic = client_monitor->automatic;
+    RRMonitorGetGeometry(client_monitor, &monitor->geometry);
+    return TRUE;
+}
+
+typedef struct _rrMonitorList {
+    int         num_client;
+    int         num_server;
+    RRCrtcPtr   *server_crtc;
+    int         num_crtcs;
+    int         client_primary;
+    int         server_primary;
+} RRMonitorListRec, *RRMonitorListPtr;
+
+static Bool
+RRMonitorInitList(ScreenPtr screen, RRMonitorListPtr mon_list, Bool get_active)
+{
+    rrScrPrivPtr        pScrPriv = rrGetScrPriv(screen);
+    int                 m, o, c, sc;
+    int                 numCrtcs;
+    ScreenPtr           slave;
+
+    if (!RRGetInfo(screen, FALSE))
+        return FALSE;
+
+    /* Count the number of crtcs in this and any slave screens */
+    numCrtcs = pScrPriv->numCrtcs;
+    xorg_list_for_each_entry(slave, &screen->output_slave_list, output_head) {
+        rrScrPrivPtr pSlavePriv;
+        pSlavePriv = rrGetScrPriv(slave);
+        numCrtcs += pSlavePriv->numCrtcs;
+    }
+    mon_list->num_crtcs = numCrtcs;
+
+    mon_list->server_crtc = calloc(numCrtcs * 2, sizeof (RRCrtcPtr));
+    if (!mon_list->server_crtc)
+        return FALSE;
+
+    /* Collect pointers to all of the active crtcs */
+    c = 0;
+    for (sc = 0; sc < pScrPriv->numCrtcs; sc++, c++) {
+        if (pScrPriv->crtcs[sc]->mode != NULL)
+            mon_list->server_crtc[c] = pScrPriv->crtcs[sc];
+    }
+
+    xorg_list_for_each_entry(slave, &screen->output_slave_list, output_head) {
+        rrScrPrivPtr pSlavePriv;
+        pSlavePriv = rrGetScrPriv(slave);
+        for (sc = 0; sc < pSlavePriv->numCrtcs; sc++, c++) {
+            if (pSlavePriv->crtcs[sc]->mode != NULL)
+                mon_list->server_crtc[c] = pSlavePriv->crtcs[sc];
+        }
+    }
+
+    /* Walk the list of client-defined monitors, clearing the covered
+     * CRTCs from the full list and finding whether one of the
+     * monitors is primary
+     */
+    mon_list->num_client = pScrPriv->numMonitors;
+    mon_list->client_primary = -1;
+
+    for (m = 0; m < pScrPriv->numMonitors; m++) {
+        RRMonitorPtr monitor = pScrPriv->monitors[m];
+        if (get_active) {
+            RRMonitorGeometryRec geom;
+
+            RRMonitorGetGeometry(monitor, &geom);
+            if (geom.box.x2 - geom.box.x1 == 0 ||
+                geom.box.y2 - geom.box.y1 == 0) {
+                mon_list->num_client--;
+                continue;
+            }
+        }
+        if (monitor->primary && mon_list->client_primary == -1)
+            mon_list->client_primary = m;
+        for (o = 0; o < monitor->numOutputs; o++) {
+            for (c = 0; c < numCrtcs; c++) {
+                RRCrtcPtr       crtc = mon_list->server_crtc[c];
+                if (crtc) {
+                    int             co;
+                    for (co = 0; co < crtc->numOutputs; co++)
+                        if (crtc->outputs[co]->id == monitor->outputs[o]) {
+                            mon_list->server_crtc[c] = NULL;
+                            break;
+                        }
+                }
+            }
+        }
+    }
+
+    /* Now look at the active CRTCs, and count
+     * those not covered by a client monitor, as well
+     * as finding whether one of them is marked primary
+     */
+    mon_list->num_server = 0;
+    mon_list->server_primary = -1;
+
+    for (c = 0; c < mon_list->num_crtcs; c++) {
+        RRCrtcPtr       crtc = mon_list->server_crtc[c];
+
+        if (!crtc)
+            continue;
+
+        mon_list->num_server++;
+
+        if (RRMonitorCrtcPrimary(crtc) && mon_list->server_primary == -1)
+            mon_list->server_primary = c;
+    }
+    return TRUE;
+}
+
+static void
+RRMonitorFiniList(RRMonitorListPtr list)
+{
+    free(list->server_crtc);
+}
+
+/* Construct a complete list of protocol-visible monitors, including
+ * the manually generated ones as well as those generated
+ * automatically from the remaining CRCTs
+ */
+
+Bool
+RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret, int *nmon_ret)
+{
+    rrScrPrivPtr        pScrPriv = rrGetScrPriv(screen);
+    RRMonitorListRec    list;
+    int                 m, c;
+    RRMonitorPtr        mon, monitors;
+    Bool                has_primary = FALSE;
+
+    if (!pScrPriv)
+        return FALSE;
+
+    if (!RRMonitorInitList(screen, &list, get_active))
+        return FALSE;
+
+    monitors = calloc(list.num_client + list.num_server, sizeof (RRMonitorRec));
+    if (!monitors) {
+        RRMonitorFiniList(&list);
+        return FALSE;
+    }
+
+    mon = monitors;
+
+    /* Fill in the primary monitor data first
+     */
+    if (list.client_primary >= 0) {
+        RRMonitorSetFromClient(pScrPriv->monitors[list.client_primary], mon);
+        mon++;
+    } else if (list.server_primary >= 0) {
+        RRMonitorSetFromServer(pScrPriv->crtcs[list.server_primary], mon);
+        mon++;
+    }
+
+    /* Fill in the client-defined monitors next
+     */
+    for (m = 0; m < pScrPriv->numMonitors; m++) {
+        if (m == list.client_primary)
+            continue;
+        if (get_active) {
+            RRMonitorGeometryRec geom;
+
+            RRMonitorGetGeometry(pScrPriv->monitors[m], &geom);
+            if (geom.box.x2 - geom.box.x1 == 0 ||
+                geom.box.y2 - geom.box.y1 == 0) {
+                continue;
+            }
+        }
+        RRMonitorSetFromClient(pScrPriv->monitors[m], mon);
+        if (has_primary)
+            mon->primary = FALSE;
+        else if (mon->primary)
+            has_primary = TRUE;
+        mon++;
+    }
+
+    /* And finish with the list of crtc-inspired monitors
+     */
+    for (c = 0; c < pScrPriv->numCrtcs; c++) {
+        RRCrtcPtr crtc = pScrPriv->crtcs[c];
+        if (c == list.server_primary && list.client_primary < 0)
+            continue;
+
+        if (!list.server_crtc[c])
+            continue;
+
+        RRMonitorSetFromServer(crtc, mon);
+        if (has_primary)
+            mon->primary = FALSE;
+        else if (mon->primary)
+            has_primary = TRUE;
+        mon++;
+    }
+
+    RRMonitorFiniList(&list);
+    *nmon_ret = list.num_client + list.num_server;
+    *monitors_ret = monitors;
+    return TRUE;
+}
+
+int
+RRMonitorCountList(ScreenPtr screen)
+{
+    RRMonitorListRec    list;
+    int                 nmon;
+
+    if (!RRMonitorInitList(screen, &list, FALSE))
+        return -1;
+    nmon = list.num_client + list.num_server;
+    RRMonitorFiniList(&list);
+    return nmon;
+}
+
+static void
+RRMonitorFree(RRMonitorPtr monitor)
+{
+    free(monitor);
+}
+
+static RRMonitorPtr
+RRMonitorAlloc(int noutput)
+{
+    RRMonitorPtr        monitor;
+
+    monitor = calloc(1, sizeof (RRMonitorRec) + noutput * sizeof (RROutput));
+    if (!monitor)
+        return NULL;
+    monitor->numOutputs = noutput;
+    monitor->outputs = (RROutput *) (monitor + 1);
+    return monitor;
+}
+
+static int
+RRMonitorDelete(ClientPtr client, ScreenPtr screen, Atom name)
+{
+    rrScrPrivPtr        pScrPriv = rrGetScrPriv(screen);
+    int                 m;
+
+    if (!pScrPriv) {
+        client->errorValue = name;
+        return BadAtom;
+    }
+
+    for (m = 0; m < pScrPriv->numMonitors; m++) {
+        RRMonitorPtr    monitor = pScrPriv->monitors[m];
+        if (monitor->name == name) {
+            memmove(pScrPriv->monitors + m, pScrPriv->monitors + m + 1,
+                    (pScrPriv->numMonitors - (m + 1)) * sizeof (RRMonitorPtr));
+            --pScrPriv->numMonitors;
+            RRMonitorFree(monitor);
+            return Success;
+        }
+    }
+
+    client->errorValue = name;
+    return BadValue;
+}
+
+static Bool
+RRMonitorMatchesOutputName(ScreenPtr screen, Atom name)
+{
+    rrScrPrivPtr        pScrPriv = rrGetScrPriv(screen);
+    int                 o;
+    const char          *str = NameForAtom(name);
+    int                 len = strlen(str);
+
+    for (o = 0; o < pScrPriv->numOutputs; o++) {
+        RROutputPtr     output = pScrPriv->outputs[o];
+
+        if (output->nameLength == len && !memcmp(output->name, str, len))
+            return TRUE;
+    }
+    return FALSE;
+}
+
+static int
+RRMonitorAdd(ClientPtr client, ScreenPtr screen, RRMonitorPtr monitor)
+{
+    rrScrPrivPtr        pScrPriv = rrGetScrPriv(screen);
+    int                 m;
+    ScreenPtr           slave;
+    RRMonitorPtr        *monitors;
+
+    if (!pScrPriv)
+        return BadAlloc;
+
+    /* 	'name' must not match the name of any Output on the screen, or
+     *	a Value error results.
+     */
+
+    if (RRMonitorMatchesOutputName(screen, monitor->name)) {
+        client->errorValue = monitor->name;
+        return BadValue;
+    }
+
+    xorg_list_for_each_entry(slave, &screen->output_slave_list, output_head) {
+        if (RRMonitorMatchesOutputName(slave, monitor->name)) {
+            client->errorValue = monitor->name;
+            return BadValue;
+        }
+    }
+
+    /* 'name' must not match the name of any Monitor on the screen, or
+     * a Value error results.
+     */
+
+    for (m = 0; m < pScrPriv->numMonitors; m++) {
+        if (pScrPriv->monitors[m]->name == monitor->name) {
+            client->errorValue = monitor->name;
+            return BadValue;
+        }
+    }
+
+    /* Allocate space for the new pointer. This is done before
+     * removing matching monitors as it may fail, and the request
+     * needs to not have any side-effects on failure
+     */
+    if (pScrPriv->numMonitors)
+        monitors = realloc(pScrPriv->monitors,
+                           (pScrPriv->numMonitors + 1) * sizeof (RRMonitorPtr));
+    else
+        monitors = malloc(sizeof (RRMonitorPtr));
+
+    if (!monitors)
+        return BadAlloc;
+
+    pScrPriv->monitors = monitors;
+
+    for (m = 0; m < pScrPriv->numMonitors; m++) {
+        RRMonitorPtr    existing = pScrPriv->monitors[m];
+        int             o, eo;
+
+	/* If 'name' matches an existing Monitor on the screen, the
+         * existing one will be deleted as if RRDeleteMonitor were called.
+         */
+        if (existing->name == monitor->name) {
+            (void) RRMonitorDelete(client, screen, existing->name);
+            continue;
+        }
+
+        /* For each output in 'info.outputs', each one is removed from all
+         * pre-existing Monitors. If removing the output causes the list
+         * of outputs for that Monitor to become empty, then that
+         * Monitor will be deleted as if RRDeleteMonitor were called.
+         */
+
+        for (eo = 0; eo < existing->numOutputs; eo++) {
+            for (o = 0; o < monitor->numOutputs; o++) {
+                if (monitor->outputs[o] == existing->outputs[eo]) {
+                    memmove(existing->outputs + eo, existing->outputs + eo + 1,
+                            (existing->numOutputs - (eo + 1)) * sizeof (RROutput));
+                    --existing->numOutputs;
+                    --eo;
+                    break;
+                }
+            }
+            if (existing->numOutputs == 0) {
+                (void) RRMonitorDelete(client, screen, existing->name);
+                break;
+            }
+        }
+        if (monitor->primary)
+            existing->primary = FALSE;
+    }
+
+    /* Add the new one to the list
+     */
+    pScrPriv->monitors[pScrPriv->numMonitors++] = monitor;
+
+    return Success;
+}
+
+void
+RRMonitorFreeList(RRMonitorPtr monitors, int nmon)
+{
+    int m;
+
+    for (m = 0; m < nmon; m++)
+        free(monitors[m].outputs);
+    free(monitors);
+}
+
+void
+RRMonitorInit(ScreenPtr screen)
+{
+    rrScrPrivPtr pScrPriv = rrGetScrPriv(screen);
+
+    if (!pScrPriv)
+        return;
+
+    pScrPriv->numMonitors = 0;
+    pScrPriv->monitors = NULL;
+}
+
+void
+RRMonitorClose(ScreenPtr screen)
+{
+    rrScrPrivPtr        pScrPriv = rrGetScrPriv(screen);
+    int                 m;
+
+    if (!pScrPriv)
+        return;
+
+    for (m = 0; m < pScrPriv->numMonitors; m++)
+        RRMonitorFree(pScrPriv->monitors[m]);
+    free(pScrPriv->monitors);
+    pScrPriv->monitors = NULL;
+    pScrPriv->numMonitors = 0;
+}
+
+static CARD32
+RRMonitorTimestamp(ScreenPtr screen)
+{
+    rrScrPrivPtr        pScrPriv = rrGetScrPriv(screen);
+
+    /* XXX should take client monitor changes into account */
+    return pScrPriv->lastConfigTime.milliseconds;
+}
+
+int
+ProcRRGetMonitors(ClientPtr client)
+{
+    REQUEST(xRRGetMonitorsReq);
+    xRRGetMonitorsReply rep = {
+        .type = X_Reply,
+        .sequenceNumber = client->sequence,
+        .length = 0,
+    };
+    WindowPtr           window;
+    ScreenPtr           screen;
+    int                 r;
+    RRMonitorPtr        monitors;
+    int                 nmonitors;
+    int                 noutputs;
+    int                 m;
+    Bool                get_active;
+    REQUEST_SIZE_MATCH(xRRGetMonitorsReq);
+    r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess);
+    if (r != Success)
+        return r;
+    screen = window->drawable.pScreen;
+
+    get_active = stuff->get_active;
+    if (!RRMonitorMakeList(screen, get_active, &monitors, &nmonitors))
+        return BadAlloc;
+
+    rep.timestamp = RRMonitorTimestamp(screen);
+
+    noutputs = 0;
+    for (m = 0; m < nmonitors; m++) {
+        rep.length += SIZEOF(xRRMonitorInfo) >> 2;
+        rep.length += monitors[m].numOutputs;
+        noutputs += monitors[m].numOutputs;
+    }
+
+    rep.nmonitors = nmonitors;
+    rep.noutputs = noutputs;
+
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber);
+        swapl(&rep.length);
+        swapl(&rep.timestamp);
+        swapl(&rep.nmonitors);
+        swapl(&rep.noutputs);
+    }
+    WriteToClient(client, sizeof(xRRGetMonitorsReply), &rep);
+
+    client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write;
+
+    for (m = 0; m < nmonitors; m++) {
+        RRMonitorPtr    monitor = &monitors[m];
+        xRRMonitorInfo  info = {
+            .name = monitor->name,
+            .primary = monitor->primary,
+            .automatic = monitor->automatic,
+            .noutput = monitor->numOutputs,
+            .x = monitor->geometry.box.x1,
+            .y = monitor->geometry.box.y1,
+            .width = monitor->geometry.box.x2 - monitor->geometry.box.x1,
+            .height = monitor->geometry.box.y2 - monitor->geometry.box.y1,
+            .widthInMillimeters = monitor->geometry.mmWidth,
+            .heightInMillimeters = monitor->geometry.mmHeight,
+        };
+        if (client->swapped) {
+            swapl(&info.name);
+            swaps(&info.noutput);
+            swaps(&info.x);
+            swaps(&info.y);
+            swaps(&info.width);
+            swaps(&info.height);
+            swapl(&info.widthInMillimeters);
+            swapl(&info.heightInMillimeters);
+        }
+
+        WriteToClient(client, sizeof(xRRMonitorInfo), &info);
+        WriteSwappedDataToClient(client, monitor->numOutputs * sizeof (RROutput), monitor->outputs);
+    }
+
+    RRMonitorFreeList(monitors, nmonitors);
+
+    return Success;
+}
+
+int
+ProcRRSetMonitor(ClientPtr client)
+{
+    REQUEST(xRRSetMonitorReq);
+    WindowPtr           window;
+    ScreenPtr           screen;
+    RRMonitorPtr        monitor;
+    int                 r;
+
+    REQUEST_AT_LEAST_SIZE(xRRSetMonitorReq);
+
+    if (stuff->monitor.noutput != stuff->length - (SIZEOF(xRRSetMonitorReq) >> 2))
+        return BadLength;
+
+    r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess);
+    if (r != Success)
+        return r;
+    screen = window->drawable.pScreen;
+
+    if (!ValidAtom(stuff->monitor.name))
+        return BadAtom;
+
+    /* Allocate the new monitor */
+    monitor = RRMonitorAlloc(stuff->monitor.noutput);
+    if (!monitor)
+        return BadAlloc;
+
+    /* Fill in the bits from the request */
+    monitor->pScreen = screen;
+    monitor->name = stuff->monitor.name;
+    monitor->primary = stuff->monitor.primary;
+    monitor->automatic = FALSE;
+    memcpy(monitor->outputs, stuff + 1, stuff->monitor.noutput * sizeof (RROutput));
+    monitor->geometry.box.x1 = stuff->monitor.x;
+    monitor->geometry.box.y1 = stuff->monitor.y;
+    monitor->geometry.box.x2 = stuff->monitor.x + stuff->monitor.width;
+    monitor->geometry.box.y2 = stuff->monitor.y + stuff->monitor.height;
+    monitor->geometry.mmWidth = stuff->monitor.widthInMillimeters;
+    monitor->geometry.mmHeight = stuff->monitor.heightInMillimeters;
+
+    r = RRMonitorAdd(client, screen, monitor);
+    if (r != Success)
+        RRMonitorFree(monitor);
+    return r;
+}
+
+int
+ProcRRDeleteMonitor(ClientPtr client)
+{
+    REQUEST(xRRDeleteMonitorReq);
+    WindowPtr           window;
+    ScreenPtr           screen;
+    int                 r;
+
+    REQUEST_SIZE_MATCH(xRRDeleteMonitorReq);
+    r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess);
+    if (r != Success)
+        return r;
+    screen = window->drawable.pScreen;
+
+    if (!ValidAtom(stuff->name)) {
+        client->errorValue = stuff->name;
+        return BadAtom;
+    }
+
+    return RRMonitorDelete(client, screen, stuff->name);
+}
diff --git a/xorg-server/randr/rrsdispatch.c b/xorg-server/randr/rrsdispatch.c
index 47558cf75..cf2a3b024 100644
--- a/xorg-server/randr/rrsdispatch.c
+++ b/xorg-server/randr/rrsdispatch.c
@@ -565,6 +565,41 @@ static int SProcRRGetProviderProperty(ClientPtr client)
     return ProcRandrVector[stuff->randrReqType] (client);
 }
 
+static int SProcRRGetMonitors(ClientPtr client) {
+    REQUEST(xRRGetMonitorsReq);
+
+    REQUEST_SIZE_MATCH(xRRGetMonitorsReq);
+    swaps(&stuff->length);
+    swapl(&stuff->window);
+    return ProcRandrVector[stuff->randrReqType] (client);
+}
+
+static int SProcRRSetMonitor(ClientPtr client) {
+    REQUEST(xRRSetMonitorReq);
+
+    REQUEST_AT_LEAST_SIZE(xRRGetMonitorsReq);
+    swaps(&stuff->length);
+    swapl(&stuff->window);
+    swapl(&stuff->monitor.name);
+    swaps(&stuff->monitor.noutput);
+    swaps(&stuff->monitor.x);
+    swaps(&stuff->monitor.y);
+    swaps(&stuff->monitor.width);
+    swaps(&stuff->monitor.height);
+    SwapRestL(stuff);
+    return ProcRandrVector[stuff->randrReqType] (client);
+}
+
+static int SProcRRDeleteMonitor(ClientPtr client) {
+    REQUEST(xRRDeleteMonitorReq);
+
+    REQUEST_SIZE_MATCH(xRRDeleteMonitorReq);
+    swaps(&stuff->length);
+    swapl(&stuff->window);
+    swapl(&stuff->name);
+    return ProcRandrVector[stuff->randrReqType] (client);
+}
+
 int (*SProcRandrVector[RRNumberRequests]) (ClientPtr) = {
     SProcRRQueryVersion,        /* 0 */
 /* we skip 1 to make old clients fail pretty immediately */
@@ -614,4 +649,7 @@ int (*SProcRandrVector[RRNumberRequests]) (ClientPtr) = {
         SProcRRChangeProviderProperty,  /* 39 */
         SProcRRDeleteProviderProperty,  /* 40 */
         SProcRRGetProviderProperty,     /* 41 */
+        SProcRRGetMonitors,            /* 42 */
+        SProcRRSetMonitor,             /* 43 */
+        SProcRRDeleteMonitor,          /* 44 */
 };
diff --git a/xorg-server/randr/rrxinerama.c b/xorg-server/randr/rrxinerama.c
index 0b9dd8a0e..d82d28ab4 100644..100755
--- a/xorg-server/randr/rrxinerama.c
+++ b/xorg-server/randr/rrxinerama.c
@@ -84,6 +84,8 @@ static int ProcRRXineramaIsActive(ClientPtr client);
 static int ProcRRXineramaQueryScreens(ClientPtr client);
 static int SProcRRXineramaDispatch(ClientPtr client);
 
+Bool noRRXineramaExtension = FALSE;
+
 /* Proc */
 
 int
@@ -146,35 +148,10 @@ ProcRRXineramaGetState(ClientPtr client)
     return Success;
 }
 
-static Bool
-RRXineramaCrtcActive(RRCrtcPtr crtc)
-{
-    return crtc->mode != NULL && crtc->numOutputs > 0;
-}
-
 static int
 RRXineramaScreenCount(ScreenPtr pScreen)
 {
-    int i, n;
-    ScreenPtr slave;
-
-    n = 0;
-    if (rrGetScrPriv(pScreen)) {
-        rrScrPriv(pScreen);
-        for (i = 0; i < pScrPriv->numCrtcs; i++)
-            if (RRXineramaCrtcActive(pScrPriv->crtcs[i]))
-                n++;
-    }
-
-    xorg_list_for_each_entry(slave, &pScreen->output_slave_list, output_head) {
-        rrScrPrivPtr pSlavePriv;
-        pSlavePriv = rrGetScrPriv(slave);
-        for (i = 0; i < pSlavePriv->numCrtcs; i++)
-            if (RRXineramaCrtcActive(pSlavePriv->crtcs[i]))
-                n++;
-    }
-
-    return n;
+    return RRMonitorCountList(pScreen);
 }
 
 static Bool
@@ -273,42 +250,16 @@ ProcRRXineramaIsActive(ClientPtr client)
 }
 
 static void
-RRXineramaWriteCrtc(ClientPtr client, RRCrtcPtr crtc)
+RRXineramaWriteMonitor(ClientPtr client, RRMonitorPtr monitor)
 {
     xXineramaScreenInfo scratch;
 
-    if (RRXineramaCrtcActive(crtc)) {
-        ScreenPtr pScreen = crtc->pScreen;
-        rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-        BoxRec panned_area;
-
-        /* Check to see if crtc is panned and return the full area when applicable. */
-        if (pScrPriv && pScrPriv->rrGetPanning &&
-            pScrPriv->rrGetPanning(pScreen, crtc, &panned_area, NULL, NULL) &&
-            (panned_area.x2 > panned_area.x1) &&
-            (panned_area.y2 > panned_area.y1)) {
-            scratch.x_org = panned_area.x1;
-            scratch.y_org = panned_area.y1;
-            scratch.width = panned_area.x2 - panned_area.x1;
-            scratch.height = panned_area.y2 - panned_area.y1;
-        }
-        else {
-            int width, height;
-
-            RRCrtcGetScanoutSize(crtc, &width, &height);
-            scratch.x_org = crtc->x;
-            scratch.y_org = crtc->y;
-            scratch.width = width;
-            scratch.height = height;
-        }
-        if (client->swapped) {
-            swaps(&scratch.x_org);
-            swaps(&scratch.y_org);
-            swaps(&scratch.width);
-            swaps(&scratch.height);
-        }
-        WriteToClient(client, sz_XineramaScreenInfo, &scratch);
-    }
+    scratch.x_org = monitor->geometry.box.x1;
+    scratch.y_org = monitor->geometry.box.y1;
+    scratch.width = monitor->geometry.box.x2 - monitor->geometry.box.x1;
+    scratch.height = monitor->geometry.box.y2 - monitor->geometry.box.y1;
+
+    WriteToClient(client, sz_XineramaScreenInfo, &scratch);
 }
 
 int
@@ -316,21 +267,23 @@ ProcRRXineramaQueryScreens(ClientPtr client)
 {
     xXineramaQueryScreensReply rep;
     ScreenPtr pScreen = screenInfo.screens[RR_XINERAMA_SCREEN];
-    int n = 0;
-    int i;
+    int m;
+    RRMonitorPtr monitors = NULL;
+    int nmonitors = 0;
 
     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
 
     if (RRXineramaScreenActive(pScreen)) {
         RRGetInfo(pScreen, FALSE);
-        n = RRXineramaScreenCount(pScreen);
+        if (!RRMonitorMakeList(pScreen, TRUE, &monitors, &nmonitors))
+            return BadAlloc;
     }
 
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.length = bytes_to_int32(n * sz_XineramaScreenInfo);
-    rep.number = n;
+    rep.length = bytes_to_int32(nmonitors * sz_XineramaScreenInfo);
+    rep.number = nmonitors;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -339,40 +292,11 @@ ProcRRXineramaQueryScreens(ClientPtr client)
     }
     WriteToClient(client, sizeof(xXineramaQueryScreensReply), &rep);
 
-    if (n) {
-        ScreenPtr slave;
-        rrScrPriv(pScreen);
-        int has_primary = 0;
-        RRCrtcPtr primary_crtc = NULL;
-
-        if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) {
-            has_primary = 1;
-            primary_crtc = pScrPriv->primaryOutput->crtc;
-            RRXineramaWriteCrtc(client, pScrPriv->primaryOutput->crtc);
-        }
-
-        for (i = 0; i < pScrPriv->numCrtcs; i++) {
-            if (has_primary &&
-                primary_crtc == pScrPriv->crtcs[i]) {
-                has_primary = 0;
-                continue;
-            }
-            RRXineramaWriteCrtc(client, pScrPriv->crtcs[i]);
-        }
-
-        xorg_list_for_each_entry(slave, &pScreen->output_slave_list, output_head) {
-            rrScrPrivPtr pSlavePriv;
-            pSlavePriv = rrGetScrPriv(slave);
-            for (i = 0; i < pSlavePriv->numCrtcs; i++) {
-                if (has_primary &&
-                    primary_crtc == pSlavePriv->crtcs[i]) {
-                    has_primary = 0;
-                    continue;
-                }
-                RRXineramaWriteCrtc(client, pSlavePriv->crtcs[i]);
-            }
-        }
-    }
+    for (m = 0; m < nmonitors; m++)
+        RRXineramaWriteMonitor(client, &monitors[m]);
+
+    if (monitors)
+        RRMonitorFreeList(monitors, nmonitors);
 
     return Success;
 }
@@ -487,6 +411,9 @@ RRXineramaExtensionInit(void)
         return;
 #endif
 
+    if (noRRXineramaExtension)
+      return;
+
     /*
      * Xinerama isn't capable enough to have multiple protocol screens each
      * with their own output geometry.  So if there's more than one protocol
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 803de50ac..a75f02942 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3833,6 +3833,12 @@
             <_description>Spanish (Latin American, Sun dead keys)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Spanish (Latin American, Dvorak)</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index fa3c7ec97..1687bc810 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -43,6 +43,7 @@ xkb_symbols "basic" {
     key <AB08>  { [     comma,  semicolon,       periodcentered,     multiply	] };
     key <AB09>	{ [    period,      colon,                U2026,     division 	] };
     key <AB10>	{ [     minus, underscore,               endash,     emdash	] };
+    key <LSGT>	{ [     less,     greater,                  bar,     NoSymbol   ] };
 
     include "kpdl(comma)"
 
diff --git a/xorg-server/xkeyboard-config/symbols/latam b/xorg-server/xkeyboard-config/symbols/latam
index 47c8976e7..f6717a415 100644
--- a/xorg-server/xkeyboard-config/symbols/latam
+++ b/xorg-server/xkeyboard-config/symbols/latam
@@ -66,3 +66,64 @@ xkb_symbols "deadtilde" {
 
     key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
 };
+
+// Latin American Spanish Dvorak mapping (note R-H exchange)
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+
+    name[Group1]="Spanish (Latin American, Dvorak)";
+
+    key <TLDE> {[          bar,     degree,        notsign,      notsign ]};
+    key <AE01> {[            1,     exclam,            bar,   exclamdown ]};
+    key <AE02> {[            2,   quotedbl,             at,    oneeighth ]};
+    key <AE03> {[            3, numbersign, periodcentered,     sterling ]};
+    key <AE04> {[            4,     dollar,     asciitilde,       dollar ]};
+    key <AE05> {[            5,    percent,        onehalf, threeeighths ]};
+    key <AE06> {[            6,  ampersand,        notsign,  fiveeighths ]};
+    key <AE07> {[            7,      slash,      braceleft, seveneighths ]};
+    key <AE08> {[            8,  parenleft,    bracketleft,    trademark ]};
+    key <AE09> {[            9, parenright,   bracketright,    plusminus ]};
+    key <AE10> {[            0,      equal,     braceright,       degree ]};
+    key <AE11> {[   apostrophe,   question,      backslash, questiondown ]};
+    key <AE12> {[ questiondown, exclamdown,   dead_cedilla,  dead_ogonek ]};
+
+    key <AD01> {[     period,          colon,             at                 ]};
+    key <AD02> {[      comma,      semicolon                                 ]};
+    key <AD03> {[     ntilde,         Ntilde,        lstroke,        Lstroke ]};
+    key <AD04> {[          p,              P,      paragraph                 ]};
+    key <AD05> {[          y,              Y,            yen                 ]};
+    key <AD06> {[          f,              F,         tslash,         Tslash ]};
+    key <AD07> {[          g,              G,        dstroke,        Dstroke ]};
+    key <AD08> {[          c,              C,           cent,      copyright ]};
+    key <AD09> {[          h,              H,        hstroke,        Hstroke ]};
+    key <AD10> {[          l,              L,       sterling                 ]};
+    key <AD11> {[ dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ]};
+    key <AD12> {[       plus,       asterisk,     asciitilde,    dead_macron ]};
+
+    key <AC01> {[          a,            A,              ae,         AE ]};
+    key <AC02> {[          o,            O,          oslash,     Oslash ]};
+    key <AC03> {[          e,            E,        EuroSign             ]};
+    key <AC04> {[          u,            U,           aring,      Aring ]};
+    key <AC05> {[          i,            I,              oe,         OE ]};
+    key <AC06> {[          d,            D,             eth,        ETH ]};
+    key <AC07> {[          r,            R,      registered,  trademark ]};
+    key <AC08> {[          t,            T,           thorn,      THORN ]};
+    key <AC09> {[          n,            N,             eng,        ENG ]};
+    key <AC10> {[          s,            S,          ssharp,    section ]};
+    key <AC11> {[  braceleft,  bracketleft, dead_circumflex,  braceleft ]};
+    key <BKSL> {[ braceright, bracketright,      dead_grave, braceright ]};
+
+    key <LSGT> {[       less,    greater, guillemotleft, guillemotright ]};
+    key <AB01> {[      minus, underscore,        hyphen, macron         ]};
+    key <AB02> {[          q,          Q,      currency                 ]};
+    key <AB03> {[          j,          J                                ]};
+    key <AB04> {[          k,          K,           kra                 ]};
+    key <AB05> {[          x,          X,       multiply, division      ]};
+    key <AB06> {[          b,          B                                ]};
+    key <AB07> {[          m,          M,            mu                 ]};
+    key <AB08> {[          w,          W                                ]};
+    key <AB09> {[          v,          V                                ]};
+    key <AB10> {[          z,          Z                                ]};
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo
index 3b555f8c3..cce79f7ef 100644
--- a/xorg-server/xkeyboard-config/symbols/typo
+++ b/xorg-server/xkeyboard-config/symbols/typo
@@ -1,56 +1,67 @@
-// typographic keyboard
+// Typographic Keyboard
 // Sergei Stolyarov <sergei@regolit.com>
-//
+
 // Initial contribution by Alexey Ten <alexeyten+deb@gmail.com>
 // Additional contribution and code cleanup by Artur Dryomov <artur.dryomov@gmail.com>
-//
-// Mainly based on the layout proposed by Ilya Birman,
+
+// Mainly based on the layout proposed by Ilya Birman
 // http://ilyabirman.ru/projects/typography-layout/
 
-// default layout
 default  partial
 xkb_symbols "base" {
-// 1st keyboard row
-    key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
-    key <AE01> { [NoSymbol, NoSymbol, onesuperior, exclamdown] }; // "1"
-    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] }; // "2"
-    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] }; // "3"
-    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] }; // "4"
-    key <AE05> { [NoSymbol, NoSymbol, permille] }; // "5"
-    key <AE06> { [NoSymbol, NoSymbol, uparrow] }; // "6"
-    key <AE07> { [NoSymbol, NoSymbol, ampersand, questiondown] }; // "7"
-    key <AE08> { [NoSymbol, NoSymbol, infinity, oneeighth] }; // "8"
-    key <AE09> { [NoSymbol, NoSymbol, leftarrow] }; // "9"
-    key <AE10> { [NoSymbol, NoSymbol, rightarrow] }; // "0"
-    key <AE11> { [NoSymbol, NoSymbol, emdash, endash] }; // "-"
-    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] }; // "="
-
-// 2nd keyboard row
-    key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
-    key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
-    key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
-    key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
-    key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
-    key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [
-    key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright] }; // ]
-
-// 3rd keyboard row
-    key <AC01> { [NoSymbol, NoSymbol, U0301] }; // "a"
-    key <AC02> { [NoSymbol, NoSymbol, section] }; // "s"
-    key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"
-    key <AC04> { [NoSymbol, NoSymbol, sterling] }; // "f"
-    key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"
-    key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"
-    key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"
-    key <AC10> { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";"
-    key <AC11> { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'"
-
-// 4th keyboard row
-    key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"
-    key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
-    key <AB04> { [NoSymbol, NoSymbol, downarrow, U25CA] }; // "v"
-    key <AB07> { [NoSymbol, NoSymbol, U2212, enfilledcircbullet] }; // "m"
-    key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
-    key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."
-    key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"
+
+    // 1st keyboard row
+    key <TLDE> { [ NoSymbol,   NoSymbol,              NoSymbol,              approxeq ] }; // "~"
+    key <AE01> { [ NoSymbol,   NoSymbol,           onesuperior,            exclamdown ] }; // "1"
+    key <AE02> { [ NoSymbol,   NoSymbol,           twosuperior,               onehalf ] }; // "2"
+    key <AE03> { [ NoSymbol,   NoSymbol,         threesuperior,              onethird ] }; // "3"
+    key <AE04> { [ NoSymbol,   NoSymbol,                dollar,            onequarter ] }; // "4"
+    key <AE05> { [ NoSymbol,   NoSymbol,                 U2030,              NoSymbol ] }; // "5"
+    key <AE06> { [ NoSymbol,   NoSymbol,               uparrow,              NoSymbol ] }; // "6"
+    key <AE07> { [ NoSymbol,   NoSymbol,             ampersand,          questiondown ] }; // "7"
+    key <AE08> { [ NoSymbol,   NoSymbol,              infinity,             oneeighth ] }; // "8"
+    key <AE09> { [ NoSymbol,   NoSymbol,             leftarrow,              NoSymbol ] }; // "9"
+    key <AE10> { [ NoSymbol,   NoSymbol,            rightarrow,              NoSymbol ] }; // "0"
+    key <AE11> { [ NoSymbol,   NoSymbol,                emdash,                endash ] }; // "-"
+    key <AE12> { [ NoSymbol,   NoSymbol,              notequal,             plusminus ] }; // "="
+
+    // 2nd keyboard row
+    key <AD03> { [ NoSymbol,   NoSymbol,              EuroSign,              NoSymbol ] }; // "e"
+    key <AD04> { [ NoSymbol,   NoSymbol,            registered,              NoSymbol ] }; // "r"
+    key <AD05> { [ NoSymbol,   NoSymbol,             trademark,              NoSymbol ] }; // "t"
+    key <AD06> { [ NoSymbol,   NoSymbol,                   yen,              NoSymbol ] }; // "y"
+    key <AD10> { [ NoSymbol,   NoSymbol,                 acute,           doubleacute ] }; // "p"
+    key <AD11> { [ NoSymbol,   NoSymbol,           bracketleft,             braceleft ] }; // "["
+    key <AD12> { [ NoSymbol,   NoSymbol,          bracketright,            braceright ] }; // "]"
+
+    // 3rd keyboard row
+    key <AC01> { [ NoSymbol,   NoSymbol,                 U0301,              NoSymbol ] }; // "a"
+    key <AC02> { [ NoSymbol,   NoSymbol,               section,              NoSymbol ] }; // "s"
+    key <AC03> { [ NoSymbol,   NoSymbol,                degree,              division ] }; // "d"
+    key <AC04> { [ NoSymbol,   NoSymbol,              sterling,              NoSymbol ] }; // "f"
+    key <AC07> { [ NoSymbol,   NoSymbol,    doublelowquotemark,    singlelowquotemark ] }; // "j"
+    key <AC08> { [ NoSymbol,   NoSymbol,   leftdoublequotemark,   leftsinglequotemark ] }; // "k"
+    key <AC09> { [ NoSymbol,   NoSymbol,  rightdoublequotemark,  rightsinglequotemark ] }; // "l"
+    key <AC10> { [ NoSymbol,   NoSymbol,   leftsinglequotemark,               minutes ] }; // ";"
+    key <AC11> { [ NoSymbol,   NoSymbol,  rightsinglequotemark,               seconds ] }; // "'"
+
+    // 4th keyboard row
+    key <AB02> { [ NoSymbol,   NoSymbol,              multiply,                 U22C5 ] }; // "x"
+    key <AB03> { [ NoSymbol,   NoSymbol,             copyright,                  cent ] }; // "c"
+    key <AB04> { [ NoSymbol,   NoSymbol,             downarrow,                 U25CA ] }; // "v"
+    key <AB07> { [ NoSymbol,   NoSymbol,                 U2212,    enfilledcircbullet ] }; // "m"
+    key <AB08> { [ NoSymbol,   NoSymbol,         guillemotleft,                  less ] }; // ","
+    key <AB09> { [ NoSymbol,   NoSymbol,        guillemotright,               greater ] }; // "."
+    key <AB10> { [ NoSymbol,   NoSymbol,              ellipsis,              NoSymbol ] }; // "/"
+
+    // 5th keyboard row
+    key <SPCE> { [    space,      space,          nobreakspace,          nobreakspace ] }; // " "
+
+    // Reference
+    // U+2030 PER MILLE SIGN
+    // U+0301 COMBINING ACUTE ACCENT
+    // U+22C5 DOT OPERATOR
+    // U+25CA LOZENGE
+    // U+2212 MINUS SIGN
+
 };