diff options
| author | Daniel Borca <[email protected]> | 2004-07-02 10:32:52 +0000 |
|---|---|---|
| committer | Daniel Borca <[email protected]> | 2004-07-02 10:32:52 +0000 |
| commit | 3aa364c8e11f10cc7cec384869ef59ff2f57c249 (patch) | |
| tree | 3e8b7de01593daf5a7cdd31e271ea45f1466623c | |
| parent | d14d103a0c786e895fa6a801587ed5d807df6da4 (diff) | |
put back the correct dispatcher for non-threaded builds.
fixed x86 entrypoints for Mingw/DJGPP.
| -rw-r--r-- | src/mesa/glapi/gl_x86_asm.py | 6 | ||||
| -rw-r--r-- | src/mesa/x86/glapi_x86.S | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py index 346252b7b62..cb2f6d5b209 100644 --- a/src/mesa/glapi/gl_x86_asm.py +++ b/src/mesa/glapi/gl_x86_asm.py @@ -108,7 +108,7 @@ class PrintGenericStubs(gl_XML.FilterGLAPISpecBase): print 'ALIGNTEXT16;\t\t\t\t\t\t\\' print 'GLOBL_FN(GL_PREFIX(fn, fn_alt));\t\t\t\\' print 'GL_PREFIX(fn, fn_alt):\t\t\t\t\t\\' - print '\tMOV_L(CONTENT(GLNAME(_glapi_DispatchTSD)), EAX) ;\t\\' + print '\tMOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX) ;\t\\' print '\tJMP(GL_OFFSET(off))' print '#endif' print '' @@ -138,8 +138,8 @@ class PrintGenericStubs(gl_XML.FilterGLAPISpecBase): print 'EXTERN GLNAME(_glapi_get_dispatch)' print '#endif' print '' - print '\t\tALIGNTEXT16 ; GLOBL gl_dispatch_functions_start' - print 'gl_dispatch_functions_start:' + print '\t\tALIGNTEXT16 ; GLOBL GLNAME(gl_dispatch_functions_start)' + print 'GLNAME(gl_dispatch_functions_start):' print '' return diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S index bc4aca5abc1..4c8044e49cc 100644 --- a/src/mesa/x86/glapi_x86.S +++ b/src/mesa/x86/glapi_x86.S @@ -78,7 +78,7 @@ GL_PREFIX(fn, fn_alt): \ ALIGNTEXT16; \ GLOBL_FN(GL_PREFIX(fn, fn_alt)); \ GL_PREFIX(fn, fn_alt): \ - MOV_L(CONTENT(GLNAME(_glapi_DispatchTSD)), EAX) ; \ + MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX) ; \ JMP(GL_OFFSET(off)) #endif @@ -108,8 +108,8 @@ GLNAME(get_dispatch): EXTERN GLNAME(_glapi_get_dispatch) #endif - ALIGNTEXT16 ; GLOBL gl_dispatch_functions_start -gl_dispatch_functions_start: + ALIGNTEXT16 ; GLOBL GLNAME(gl_dispatch_functions_start) +GLNAME(gl_dispatch_functions_start): GL_STUB(NewList, _gloffset_NewList, NewList@8) GL_STUB(EndList, _gloffset_EndList, EndList@0) |