From 63bfcd0be46413dda8c22b914d12f66ea5d5c66d Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 May 2014 19:36:09 +0200 Subject: libX11 mesa xserver pixman git update 23 May 2014 xserver commit db2e708f31a162c6c66643d3559dd5f3e21ee06b libX11 commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82 mesa commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad --- mesalib/src/mapi/glapi/Makefile.am | 4 ++-- mesalib/src/mapi/glapi/Makefile.sources | 4 +++- mesalib/src/mapi/glapi/gen/glX_proto_send.py | 3 +++ mesalib/src/mapi/glapi/gen/gl_gentable.py | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'mesalib/src/mapi/glapi') diff --git a/mesalib/src/mapi/glapi/Makefile.am b/mesalib/src/mapi/glapi/Makefile.am index e425bacea..cadcd69d6 100644 --- a/mesalib/src/mapi/glapi/Makefile.am +++ b/mesalib/src/mapi/glapi/Makefile.am @@ -48,13 +48,13 @@ if HAVE_SHARED_GLAPI AM_CPPFLAGS += \ -DMAPI_MODE_BRIDGE \ -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" -glapi_GLAPI_sources = +glapi_GLAPI_sources = $(GLAPI_UTIL_SOURCES) glapi_ASM_sources = glapi_MAPI_sources = $(MAPI_BRIDGE_FILES) else AM_CPPFLAGS += \ -DMAPI_MODE_UTIL -glapi_GLAPI_sources = $(GLAPI_SOURCES) +glapi_GLAPI_sources = $(GLAPI_SOURCES) $(GLAPI_UTIL_SOURCES) glapi_ASM_sources = $(GLAPI_ASM_SOURCES) glapi_MAPI_sources = $(MAPI_UTIL_FILES) endif diff --git a/mesalib/src/mapi/glapi/Makefile.sources b/mesalib/src/mapi/glapi/Makefile.sources index 04fef6c9e..aae41a88d 100644 --- a/mesalib/src/mapi/glapi/Makefile.sources +++ b/mesalib/src/mapi/glapi/Makefile.sources @@ -1,9 +1,11 @@ # src/mapi/glapi/Makefile.sources +GLAPI_UTIL_SOURCES = \ + glapi_gentable.c + GLAPI_SOURCES = \ glapi_dispatch.c \ glapi_entrypoint.c \ - glapi_gentable.c \ glapi_getproc.c \ glapi_nop.c \ glapi.c \ diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py index a98f63e99..1419a7cc1 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py @@ -947,6 +947,7 @@ class PrintGlxProtoInit_c(gl_XML.gl_print_base): #include "glapi.h" #include +#ifndef GLX_USE_APPLEGL /** * No-op function used to initialize functions that have no GLX protocol @@ -984,6 +985,8 @@ struct _glapi_table * __glXNewIndirectAPI( void ) print """ return (struct _glapi_table *) table; } + +#endif """ return diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py index 35dddc7a0..d45a5e0ff 100644 --- a/mesalib/src/mapi/glapi/gen/gl_gentable.py +++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py @@ -113,7 +113,7 @@ __glapi_gentable_set_remaining_noop(struct _glapi_table *disp) { struct _glapi_table * _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { - struct _glapi_table *disp = calloc(1, sizeof(struct _glapi_table)); + struct _glapi_table *disp = calloc(1, _glapi_get_dispatch_table_size() * sizeof(_glapi_proc)); char symboln[512]; if(!disp) -- cgit v1.2.3