Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/include/scrnintstr.h
	xorg-server/xkb/ddxList.c
	xorg-server/xkb/ddxLoad.c

1 files changed, 42 insertions, 0 deletions

diff --git a/mesalib/src/mapi/glapi/glapi_gentable.c b/mesalib/src/mapi/glapi/glapi_gentable.c
index 27d1f861b..e6e841d5d 100644
--- a/mesalib/src/mapi/glapi/glapi_gentable.c
+++ b/mesalib/src/mapi/glapi/glapi_gentable.c
@@ -6373,6 +6373,48 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
+    if(!disp->TexStorage1D) {
+        void ** procp = (void **) &disp->TexStorage1D;
+        snprintf(symboln, sizeof(symboln), "%sTexStorage1D", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexStorage2D) {
+        void ** procp = (void **) &disp->TexStorage2D;
+        snprintf(symboln, sizeof(symboln), "%sTexStorage2D", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexStorage3D) {
+        void ** procp = (void **) &disp->TexStorage3D;
+        snprintf(symboln, sizeof(symboln), "%sTexStorage3D", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TextureStorage1DEXT) {
+        void ** procp = (void **) &disp->TextureStorage1DEXT;
+        snprintf(symboln, sizeof(symboln), "%sTextureStorage1DEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TextureStorage2DEXT) {
+        void ** procp = (void **) &disp->TextureStorage2DEXT;
+        snprintf(symboln, sizeof(symboln), "%sTextureStorage2DEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TextureStorage3DEXT) {
+        void ** procp = (void **) &disp->TextureStorage3DEXT;
+        snprintf(symboln, sizeof(symboln), "%sTextureStorage3DEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
     if(!disp->PolygonOffsetEXT) {
         void ** procp = (void **) &disp->PolygonOffsetEXT;
         snprintf(symboln, sizeof(symboln), "%sPolygonOffsetEXT", symbol_prefix);