summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-11-03 23:28:36 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-11-03 23:28:36 +0000
commit2fbaddfa695986ed04e4d648bb91632fd66f326b (patch)
tree56bf135bc12bd7989f791ce67aed2fb9d718e6ea
parentd2f80777e804742267efd700396275174928332d (diff)
check for USE_MGL_NAMESPACE
-rw-r--r--src/mesa/glapi/gl_x86-64_asm.py4
-rw-r--r--src/mesa/glapi/gl_x86_asm.py4
-rw-r--r--src/mesa/glapi/glthread.h8
3 files changed, 15 insertions, 1 deletions
diff --git a/src/mesa/glapi/gl_x86-64_asm.py b/src/mesa/glapi/gl_x86-64_asm.py
index 2a375d1ae9..1e1279b8f1 100644
--- a/src/mesa/glapi/gl_x86-64_asm.py
+++ b/src/mesa/glapi/gl_x86-64_asm.py
@@ -141,6 +141,10 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '# define THREADS'
print '#endif'
print ''
+ print '#ifdef USE_MGL_NAMESPACE'
+ print '#define _glapi_Dispatch _mglapi_Dispatch'
+ print '#endif'
+ print ''
print '\t.text'
print ''
print '#ifdef GLX_USE_TLS'
diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index 977e0329cc..5ae3e2608e 100644
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -79,6 +79,10 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '# define THREADS'
print '#endif'
print ''
+ print '#ifdef USE_MGL_NAMESPACE'
+ print '#define _glapi_Dispatch _mglapi_Dispatch'
+ print '#endif'
+ print ''
print '#ifdef GLX_USE_TLS'
print ''
print '# define GL_STUB(fn,off,fn_alt)\t\t\t\\'
diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h
index 0958cd1b32..a61086d0dc 100644
--- a/src/mesa/glapi/glthread.h
+++ b/src/mesa/glapi/glthread.h
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.5.1
+ * Version: 6.5.2
*
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
@@ -64,6 +64,12 @@
#define GLTHREAD_H
+#if defined(USE_MGL_NAMESPACE)
+#define _glapi_Dispatch _mglapi_Dispatch
+#endif
+
+
+
#if (defined(PTHREADS) || defined(SOLARIS_THREADS) ||\
defined(WIN32_THREADS) || defined(USE_XTHREADS) || defined(BEOS_THREADS)) \
&& !defined(THREADS)