diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-01 09:36:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-01 09:36:37 +0200 |
| commit | 7ed9dbafdbc724c1030404f29678559134de559b (patch) | |
| tree | c19a8d332c4485b2b84a35ba5dd7b1767b4099b0 /mesalib/src/mapi/glapi | |
| parent | 2cf1e3de4759264eac2fa8ac758ea750636542f8 (diff) | |
| download | vcxsrv-7ed9dbafdbc724c1030404f29678559134de559b.tar.gz vcxsrv-7ed9dbafdbc724c1030404f29678559134de559b.tar.bz2 vcxsrv-7ed9dbafdbc724c1030404f29678559134de559b.zip | |
libxcb mesa pixman xkeyboard-config git update 1 oct 2012
libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef
mesa: c321b1bef15e2807de3f6225c4abcbf48969997a
pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d
xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
Diffstat (limited to 'mesalib/src/mapi/glapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/SConscript | 2 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/es_EXT.xml | 2 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/glX_proto_send.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript index ad007a6f4..c336c2510 100644 --- a/mesalib/src/mapi/glapi/SConscript +++ b/mesalib/src/mapi/glapi/SConscript @@ -48,7 +48,7 @@ for s in mapi_sources: # # Assembly sources # -if env['gcc'] and env['platform'] not in ('darwin', 'windows'): +if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'): GLAPI = '#src/mapi/glapi/' if env['machine'] == 'x86': diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index fc2ec621e..c38e65a24 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -718,7 +718,7 @@ <!-- 93. GL_NV_read_buffer --> <category name="NV_read_buffer"> - <function name="ReadBufferNV" offset="assign"> + <function name="ReadBufferNV" alias="ReadBuffer"> <param name="mode" type="GLenum"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py index 34aa2c31f..0e4b420fd 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py @@ -423,7 +423,7 @@ __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 disp_table = GET_DISPATCH();' + print ' const _glapi_proc *const disp_table = (_glapi_proc *)GET_DISPATCH();' print ' PFNGL%sPROC p =' % (name.upper()) print ' (PFNGL%sPROC) disp_table[%d];' % (name.upper(), func.offset) print ' %sp(%s);' % (ret_string, func.get_called_parameter_string()) |