diff options
| author | Brian Paul <[email protected]> | 2012-09-06 08:16:56 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-09-06 18:58:49 -0600 |
| commit | 043f66204b1a190e18747c3befa8826c82dd87a7 (patch) | |
| tree | 6be9d0cf70d702d75f62168b39ab8afa9764b79a | |
| parent | 14f55869a4f9d54442aa4e10089ba1e5ec211b37 (diff) | |
glapi/glx: rename 'table' variable to 'disp_table'
This fixes an issue where the local 'table' variable was hiding the
function parameter name in glGetColorTable(..., void *table).
This should be OK as long as there's never a GL entrypoint that uses
'disp_table' as a parameter name.
Note: This is a candidate for the 9.0 branch.
Reviewed-by: Jose Fonseca <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_send.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index d42f661eaff..34aa2c31f4e 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -423,9 +423,9 @@ __indirect_get_proc_address(const char *name) print '' print '#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)' print ' if (gc->isDirect) {' - print ' const _glapi_proc *const table = GET_DISPATCH();' + print ' const _glapi_proc *const disp_table = GET_DISPATCH();' print ' PFNGL%sPROC p =' % (name.upper()) - print ' (PFNGL%sPROC) table[%d];' % (name.upper(), func.offset) + print ' (PFNGL%sPROC) disp_table[%d];' % (name.upper(), func.offset) print ' %sp(%s);' % (ret_string, func.get_called_parameter_string()) print ' } else' print '#endif' |