gallium/draw: initial code to properly support llvm in the draw module

[mesa.git] / src / mesa / glapi / gl_x86-64_asm.py

diff --git a/src/mesa/glapi/gl_x86-64_asm.py b/src/mesa/glapi/gl_x86-64_asm.py
index 2a375d1ae94b90a99001ea619204dd65e8dd360b..31c1a2b93a87ed4adcdb157a1b3cf120c3c3e669 100644 (file)
--- a/src/mesa/glapi/gl_x86-64_asm.py
+++ b/src/mesa/glapi/gl_x86-64_asm.py
@@ -122,7 +122,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                print " * the symbol visibility mode to 'default'."
                print ' */'
                print ''
-               print '#include "../x86/assyntax.h"'
+               print '#include "x86/assyntax.h"'
                print ''
                print '#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303'
                print '#  pragma GCC visibility push(default)'
@@ -133,11 +133,12 @@ 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'
                print ''
-               print '#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
+               print '#if defined(PTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
                print '#  define THREADS'
                print '#endif'
                print ''