diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
| commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
| tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml | |
| parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
| parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
| download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml index e9b27582a..e4b310ec3 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -24,7 +24,7 @@ <enum name="TRANSFORM_FEEDBACK_BUFFER_MODE_EXT" value="0x8C7F"/> <enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT" value="0x8C76"/> - <function name="BindBufferRangeEXT" offset="assign" mesa_name="-EXT"> + <function name="BindBufferRangeEXT" alias="BindBufferRange"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -39,29 +39,27 @@ <param name="offset" type="GLintptr"/> </function> - <function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT"> + <function name="BindBufferBaseEXT" alias="BindBufferBase"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> + <function name="BeginTransformFeedbackEXT" alias="BeginTransformFeedback"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> + <function name="EndTransformFeedbackEXT" alias="EndTransformFeedback"> </function> - <function name="TransformFeedbackVaryingsEXT" offset="assign" - mesa_name="-EXT"> + <function name="TransformFeedbackVaryingsEXT" alias="TransformFeedbackVaryings"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="varyings" type="const char **"/> <param name="bufferMode" type="GLenum"/> </function> - <function name="GetTransformFeedbackVaryingEXT" offset="assign" - mesa_name="-EXT"> + <function name="GetTransformFeedbackVaryingEXT" alias="GetTransformFeedbackVarying"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> |