glthread: sync in glFlush for multiple contexts

[mesa.git] / src / mapi / glapi / gen / ARB_draw_instanced.xml

diff --git a/src/mapi/glapi/gen/ARB_draw_instanced.xml b/src/mapi/glapi/gen/ARB_draw_instanced.xml
index 5741a588c9f180bccbc1c3d960078c06401a42ec..2d67f0a43344a8bd0af107758cb7fa2c712231bb 100644 (file)
--- a/src/mapi/glapi/gen/ARB_draw_instanced.xml
+++ b/src/mapi/glapi/gen/ARB_draw_instanced.xml
@@ -6,36 +6,16 @@
 
 <OpenGLAPI>
 
-<category name="3.1">
-
-  <function name="DrawArraysInstanced" offset="assign">
-    <param name="mode" type="GLenum"/>
-    <param name="first" type="GLint"/>
-    <param name="count" type="GLsizei"/>
-    <param name="primcount" type="GLsizei"/>
-  </function>
-
-  <function name="DrawElementsInstanced" offset="assign">
-    <param name="mode" type="GLenum"/>
-    <param name="count" type="GLsizei"/>
-    <param name="type" type="GLenum"/>
-    <param name="indices" type="const GLvoid *"/>
-    <param name="primcount" type="GLsizei"/>
-  </function>
-
-</category>
-
-
 <category name="GL_ARB_draw_instanced" number="44">
 
-  <function name="DrawArraysInstancedARB" alias="DrawArraysInstanced">
+  <function name="DrawArraysInstancedARB" marshal="custom">
     <param name="mode" type="GLenum"/>
     <param name="first" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="primcount" type="GLsizei"/>
   </function>
 
-  <function name="DrawElementsInstancedARB" alias="DrawElementsInstanced">
+  <function name="DrawElementsInstancedARB" marshal="custom">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
     <param name="type" type="GLenum"/>
@@ -48,14 +28,14 @@
 
 <category name="GL_EXT_draw_instanced" number="327">
 
-  <function name="DrawArraysInstancedEXT"  alias="DrawArraysInstanced">
+  <function name="DrawArraysInstancedEXT"  alias="DrawArraysInstancedARB">
     <param name="mode" type="GLenum"/>
     <param name="first" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="primcount" type="GLsizei"/>
   </function>
 
-  <function name="DrawElementsInstancedEXT" alias="DrawElementsInstanced">
+  <function name="DrawElementsInstancedEXT" alias="DrawElementsInstancedARB">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
     <param name="type" type="GLenum"/>