diff options
author | marha <marha@users.sourceforge.net> | 2013-07-16 08:59:33 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-07-16 08:59:33 +0200 |
commit | d00d82f6017166fdeb927320ce4c656cb99319fd (patch) | |
tree | 75d388ec743971c4bdcc85b639f8bc35458b27e0 /mesalib/src/mapi/glapi/gen | |
parent | 707c146a74f6ff862be3ebb2470d1f31e29dd907 (diff) | |
parent | 06f4de23ace4de1fd628c37891214f0a4ecb77db (diff) | |
download | vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.tar.gz vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.tar.bz2 vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xcb-proto mesa xkbcomp git update 16 Jul 2013
Conflicts:
mesalib/src/glsl/glsl_symbol_table.cpp
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_debug_output.xml | 2 | ||||
-rw-r--r-- | mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml index f2877a4f7..11f268dc6 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml @@ -72,7 +72,7 @@ <function name="DebugMessageCallbackARB" offset="assign"> <param name="callback" type="GLDEBUGPROCARB"/> - <param name="userParam" type="GLvoid *"/> + <param name="userParam" type="const GLvoid *"/> </function> <function name="GetDebugMessageLogARB" offset="assign"> diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml index e4b310ec3..65259fc1f 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -55,7 +55,7 @@ <function name="TransformFeedbackVaryingsEXT" alias="TransformFeedbackVaryings"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> - <param name="varyings" type="const char **"/> + <param name="varyings" type="const GLchar * const *"/> <param name="bufferMode" type="GLenum"/> </function> |