diff options
| author | Brian Paul <[email protected]> | 2010-03-22 09:07:46 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-03-22 09:07:46 -0600 |
| commit | 182c42c8da6edfa66819eef02f4dea310c1f68d7 (patch) | |
| tree | f49df694eae81c9db3c8fe2123bb30ef5a556891 /src/mesa/glapi | |
| parent | 5cb4a3524b54480418b4c4717c4a0f0a8669939c (diff) | |
| parent | ca97f8b9bab80844be613a9253643b7da8e738c7 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/mesa/glapi')
| -rw-r--r-- | src/mesa/glapi/gen/gl_x86_asm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/glapi/gen/gl_x86_asm.py b/src/mesa/glapi/gen/gl_x86_asm.py index a48724ee615..10dfa1ddb34 100644 --- a/src/mesa/glapi/gen/gl_x86_asm.py +++ b/src/mesa/glapi/gen/gl_x86_asm.py @@ -226,11 +226,11 @@ class PrintGenericStubs(gl_XML.gl_print_base): stack = self.get_stack_size(f) alt = "%s@%u" % (name, stack) - if f.is_static_entry_point(f.name): - for n in f.entry_points: + for n in f.entry_points: + 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, f.name, alt) + text = '\tGL_STUB_ALIAS(%s, _gloffset_%s, %s, %s, %s)' % (n, f.name, alt2, name, alt) if f.has_different_protocol(n): print '#ifndef GLX_INDIRECT_RENDERING' |