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/ARB_vertex_array_object.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/ARB_vertex_array_object.xml')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml index 872548d1a..f2277d2bc 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml @@ -14,9 +14,9 @@ <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE" es2="3.0"> + <function name="DeleteVertexArrays" es2="3.0" offset="assign"> <param name="n" type="GLsizei"/> - <param name="arrays" type="const GLuint *"/> + <param name="arrays" type="const GLuint *" count="n"/> </function> <function name="GenVertexArrays" offset="assign" es2="3.0"> @@ -24,7 +24,7 @@ <param name="arrays" type="GLuint *"/> </function> - <function name="IsVertexArray" alias="IsVertexArrayAPPLE" es2="3.0"> + <function name="IsVertexArray" es2="3.0" offset="assign"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> |