glapi: Add uniform buffer object API

[mesa.git] / src / mapi / glapi / gen / gl_x86_asm.py

diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
index 10dfa1ddb34ec7b15a3bfa95db52b6dc30773b79..b43b65dd8292405e652d1e80a622d18636ac880d 100644 (file)
--- a/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/src/mapi/glapi/gen/gl_x86_asm.py
@@ -54,7 +54,6 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 
        def printRealHeader(self):
                print '#include "x86/assyntax.h"'
-               print '#include "glapi/glapioffsets.h"'
                print ''
                print '#if defined(STDCALL_API)'
                print '# if defined(USE_MGL_NAMESPACE)'
@@ -74,12 +73,12 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                print '#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))'
                print ''
                print '#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)'
-               print '#define GLOBL_FN(x) GLOBL x ; .type x, function'
+               print '#define GLOBL_FN(x) GLOBL x ; .type x, @function'
                print '#else'
                print '#define GLOBL_FN(x) GLOBL x'
                print '#endif'
                print ''
-               print '#if defined(PTHREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
+               print '#if defined(PTHREADS) || defined(WIN32)'
                print '#  define THREADS'
                print '#endif'
                print ''
@@ -215,7 +214,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                        stack = self.get_stack_size(f)
                        alt = "%s@%u" % (name, stack)
 
-                       print '\tGL_STUB(%s, _gloffset_%s, %s)' % (name, f.name, alt)
+                       print '\tGL_STUB(%s, %d, %s)' % (name, f.offset, alt)
 
                        if not f.is_static_entry_point(f.name):
                                print '\tHIDDEN(GL_PREFIX(%s, %s))' % (name, alt)
@@ -230,7 +229,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
                                if f.is_static_entry_point(n):
                                        if n != f.name:
                                                alt2 = "%s@%u" % (n, stack)
-                                               text = '\tGL_STUB_ALIAS(%s, _gloffset_%s, %s, %s, %s)' % (n, f.name, alt2, name, alt)
+                                               text = '\tGL_STUB_ALIAS(%s, %d, %s, %s, %s)' % (n, f.offset, alt2, name, alt)
 
                                                if f.has_different_protocol(n):
                                                        print '#ifndef GLX_INDIRECT_RENDERING'