#define _glapi_Dispatch _mglapi_Dispatch when USE_MGL_NAMESPACE is set.

diff --git a/src/mesa/glapi/gl_x86-64_asm.py b/src/mesa/glapi/gl_x86-64_asm.py
index 1e1279b..fa45406 100644 (file)
--- 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 5ae3e26..650331a 100644 (file)
--- 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 1d95829..d8ef5ea 100644 (file)
--- 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 3221dbc..2c01b38 100644 (file)
--- 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