summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-11-03 23:43:14 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-11-03 23:43:14 +0000
commit64d952c92cf9393ec7e02902f2c6960d5028fe64 (patch)
tree90c174a77c67ca67f64362896b372500a56685ab
parentc9365b7ca4fe7ac7e7e56debe50b371c8ed721d6 (diff)
#define _glapi_Dispatch _mglapi_Dispatch when USE_MGL_NAMESPACE is set.
-rw-r--r--src/mesa/glapi/gl_x86-64_asm.py5
-rw-r--r--src/mesa/glapi/gl_x86_asm.py5
-rw-r--r--src/mesa/x86-64/glapi_x86-64.S1
-rw-r--r--src/mesa/x86/glapi_x86.S1
4 files changed, 4 insertions, 8 deletions
diff --git a/src/mesa/glapi/gl_x86-64_asm.py b/src/mesa/glapi/gl_x86-64_asm.py
index 1e1279b8f1..fa45406f47 100644
--- a/src/mesa/glapi/gl_x86-64_asm.py
+++ b/src/mesa/glapi/gl_x86-64_asm.py
@@ -133,6 +133,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print ''
print '# if defined(USE_MGL_NAMESPACE)'
print '# define GL_PREFIX(n) GLNAME(CONCAT(mgl,n))'
+ print '# define _glapi_Dispatch _mglapi_Dispatch'
print '# else'
print '# define GL_PREFIX(n) GLNAME(CONCAT(gl,n))'
print '# endif'
@@ -141,10 +142,6 @@ 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 5ae3e2608e..650331a0c5 100644
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -62,6 +62,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '#else'
print '# if defined(USE_MGL_NAMESPACE)'
print '# define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n))'
+ print '# define _glapi_Dispatch _mglapi_Dispatch'
print '# else'
print '# define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n))'
print '# endif'
@@ -79,10 +80,6 @@ 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/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 1d95829134..d8ef5eae09 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -40,6 +40,7 @@
# if defined(USE_MGL_NAMESPACE)
# define GL_PREFIX(n) GLNAME(CONCAT(mgl,n))
+# define _glapi_Dispatch _mglapi_Dispatch
# else
# define GL_PREFIX(n) GLNAME(CONCAT(gl,n))
# endif
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 3221dbce18..2c01b38aeb 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -38,6 +38,7 @@
#else
# if defined(USE_MGL_NAMESPACE)
# define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n))
+# define _glapi_Dispatch _mglapi_Dispatch
# else
# define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n))
# endif