diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-10-29 12:45:04 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-10-29 12:46:59 +0800 |
| commit | 9de5c6a1cb1428154c371f4331b55b5161957b50 (patch) | |
| tree | d4a40efee4d53646fb0350c7e4cf1472bd42a98c /src/mapi/glapi/gen/gl_x86_asm.py | |
| parent | 815faa448cccc38aebb1b60ecf0bd7e6bf8f277e (diff) | |
| parent | b762db62c2972506fa78a5ed72f796113fc9b0d1 (diff) | |
Merge branch 'glapi-reorg'
Conflicts:
src/mapi/glapi/glapi_sparc.S
src/mapi/glapi/glapi_x86.S
src/mapi/glapi/glapidispatch.h
src/mapi/glapi/glapioffsets.h
src/mapi/glapi/glprocs.h
Diffstat (limited to 'src/mapi/glapi/gen/gl_x86_asm.py')
| -rw-r--r-- | src/mapi/glapi/gen/gl_x86_asm.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py index 10dfa1ddb3..3b1d035f04 100644 --- 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)' @@ -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' |