diff options
| author | Ian Romanick <[email protected]> | 2012-07-31 16:58:41 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-08-08 10:06:26 -0700 |
| commit | 99fee476a102be898a1a093c037e06382f90a5b9 (patch) | |
| tree | 80a730afe812f5324804a1b3884483cade03771e /src/mapi/glapi | |
| parent | f5dffb7e36487ff8a012725aaf78a4b7d3169102 (diff) | |
glx: Don't use glapitable.h at all
When --enable-shared-glapi is used, all non-ABI entries in the table are
lies. Avoiding the use of glapitable.h avoids the lies. The only
entries used in this code are entries that are ABI. For these, the ABI
offset can be used directly.
Since this code is in src/glx, it can't use src/mesa/main/dispatch.h to
get the pretty names for these offsets.
Signed-off-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mapi/glapi')
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_send.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index b90b1674428..ca3a7905605 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -423,7 +423,10 @@ __indirect_get_proc_address(const char *name) print '' print '#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)' print ' if (gc->isDirect) {' - print ' %sGET_DISPATCH()->%s(%s);' % (ret_string, func.name, func.get_called_parameter_string()) + print ' const _glapi_proc *const table = GET_DISPATCH();' + print ' PFNGL%sPROC p =' % (name.upper()) + print ' (PFNGL%sPROC) table[%d];' % (name.upper(), func.offset) + print ' %sp(%s);' % (ret_string, func.get_called_parameter_string()) print ' } else' print '#endif' print ' {' |