aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-14 08:14:45 +0200
committermarha <marha@users.sourceforge.net>2011-06-14 08:14:45 +0200
commit6b441c10eeb02569204ff50ba8c3b739037b8141 (patch)
treef9c0dd95a41268546aeecdd31c8588c617749cd1 /mesalib/src/mapi/glapi/gen
parent0d495843cebea4ae94a3138db2bf51da80a16391 (diff)
parent4d74e36f359d22b50302c82a922b79ac24dd3e23 (diff)
downloadvcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.gz
vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.tar.bz2
vcxsrv-6b441c10eeb02569204ff50ba8c3b739037b8141.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_gentable.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py
index 0dfebf87f..73986f272 100644
--- a/mesalib/src/mapi/glapi/gen/gl_gentable.py
+++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py
@@ -42,7 +42,6 @@ header = """
#include "glapi.h"
#include "glapitable.h"
-#include "main/dispatch.h"
struct _glapi_table *
_glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
@@ -50,7 +49,10 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
char symboln[512];
if(!disp)
- return NULL;
+ return NULL;
+
+ if(symbol_prefix == NULL)
+ symbol_prefix = "";
"""
footer = """
@@ -60,8 +62,9 @@ footer = """
body_template = """
if(!disp->%(name)s) {
- snprintf(symboln, sizeof(symboln), "%%s%(entry_point)s", symbol_prefix);
- SET_%(name)s(disp, dlsym(handle, symboln));
+ snprintf(symboln, sizeof(symboln), "%%s%(entry_point)s", symbol_prefix);
+ _glapi_proc *procp = (_glapi_proc *)&disp->%(name)s;
+ *procp = (_glapi_proc) dlsym(handle, symboln);
}
"""