diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.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 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml index dbd7513c7..e9b27582a 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"> + <function name="BindBufferRangeEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -39,27 +39,29 @@ <param name="offset" type="GLintptr"/> </function> - <function name="BindBufferBaseEXT" offset="assign"> + <function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="BeginTransformFeedbackEXT" offset="assign"> + <function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedbackEXT" offset="assign"> + <function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> </function> - <function name="TransformFeedbackVaryingsEXT" offset="assign"> + <function name="TransformFeedbackVaryingsEXT" offset="assign" + mesa_name="-EXT"> <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"> + <function name="GetTransformFeedbackVaryingEXT" offset="assign" + mesa_name="-EXT"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -108,7 +110,7 @@ <function name="ResumeTransformFeedback" offset="assign" es2="3.0"> </function> - <function name="DrawTransformFeedback" offset="assign"> + <function name="DrawTransformFeedback" offset="assign" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> </function> |