Merge branch 'gles2-2'

Conflicts:
	src/mesa/drivers/dri/common/dri_util.h

1 files changed, 10 insertions, 2 deletions

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 93594f0b58f..3f093cb6971 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -8747,9 +8747,15 @@ exec_MultiModeDrawElementsIBM(const GLenum * mode,
  * initialized from _mesa_init_api_defaults and from the active vtxfmt
  * struct.
  */
-void
-_mesa_init_save_table(struct _glapi_table *table)
+struct _glapi_table *
+_mesa_create_save_table(void)
 {
+   struct _glapi_table *table;
+
+   table = _mesa_alloc_dispatch_table(sizeof *table);
+   if (table == NULL)
+      return NULL;
+
    _mesa_loopback_init_api_table(table);
 
    /* GL 1.0 */
@@ -9349,6 +9355,8 @@ _mesa_init_save_table(struct _glapi_table *table)
    (void) save_ClearBufferfv;
    (void) save_ClearBufferfi;
 #endif
+
+   return table;
 }