diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml index 5eb53b14e..7312f9b35 100644 --- a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml @@ -5,23 +5,21 @@ <category name="GL_APPLE_vertex_array_object" number="273"> <enum name="VERTEX_ARRAY_BINDING_APPLE" value="0x85B5"/> - <function name="BindVertexArrayAPPLE" offset="assign" - static_dispatch="false" deprecated="3.1"> + <function name="BindVertexArrayAPPLE" deprecated="3.1"> <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArraysAPPLE" static_dispatch="false" alias="DeleteVertexArrays"> + <function name="DeleteVertexArraysAPPLE" alias="DeleteVertexArrays"> <param name="n" type="GLsizei"/> <param name="arrays" type="const GLuint *"/> </function> - <function name="GenVertexArraysAPPLE" offset="assign" - static_dispatch="false" deprecated="3.1"> + <function name="GenVertexArraysAPPLE" deprecated="3.1"> <param name="n" type="GLsizei"/> <param name="arrays" type="GLuint *" count="n" output="true"/> </function> - <function name="IsVertexArrayAPPLE" static_dispatch="false" alias="IsVertexArray"> + <function name="IsVertexArrayAPPLE" alias="IsVertexArray"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> |