diff options
| author | Jason Ekstrand <[email protected]> | 2016-04-04 13:58:05 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-04-04 13:58:05 -0700 |
| commit | 6a049687841d87fc5bbd0fb0a192f03776f67630 (patch) | |
| tree | ddb5d24f705b0451b948906df697082b9f47d0a3 /src/mapi/glapi | |
| parent | fe247bbe922ab862914bc76c10557157a06700ac (diff) | |
| parent | 88ef2476dcdd61000cbae7ded9c8fa52927429d8 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/mapi/glapi')
| -rw-r--r-- | src/mapi/glapi/gen/es_EXT.xml | 34 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 |
2 files changed, 35 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml index 3b2c15ebf5c..bf67eae40d4 100644 --- a/src/mapi/glapi/gen/es_EXT.xml +++ b/src/mapi/glapi/gen/es_EXT.xml @@ -924,6 +924,40 @@ </category> +<category name="GL_EXT_base_instance" number="203"> + + <function name="DrawArraysInstancedBaseInstanceEXT" es2="3.0" + alias="DrawArraysInstancedBaseInstance"> + <param name="mode" type="GLenum"/> + <param name="first" type="GLint"/> + <param name="count" type="GLsizei"/> + <param name="instancecount" type="GLsizei"/> + <param name="baseinstance" type="GLuint"/> + </function> + + <function name="DrawElementsInstancedBaseInstanceEXT" es2="3.0" + alias="DrawElementsInstancedBaseInstance"> + <param name="mode" type="GLenum"/> + <param name="count" type="GLsizei"/> + <param name="type" type="GLenum"/> + <param name="indices" type="const GLvoid *"/> + <param name="instancecount" type="GLsizei"/> + <param name="baseinstance" type="GLuint"/> + </function> + + <function name="DrawElementsInstancedBaseVertexBaseInstanceEXT" es2="3.0" + alias="DrawElementsInstancedBaseVertexBaseInstance"> + <param name="mode" type="GLenum"/> + <param name="count" type="GLsizei"/> + <param name="type" type="GLenum"/> + <param name="indices" type="const GLvoid *"/> + <param name="instancecount" type="GLsizei"/> + <param name="basevertex" type="GLint"/> + <param name="baseinstance" type="GLuint"/> + </function> + +</category> + <category name="GL_EXT_draw_elements_base_vertex" number="204"> <function name="DrawElementsBaseVertexEXT" alias="DrawElementsBaseVertex" diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 8b49f915169..cdd680c70ee 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -12741,7 +12741,7 @@ <enum name="POLYGON_OFFSET_CLAMP_EXT" value="0x8E1B"> <size name="Get" mode="get"/> </enum> - <function name="PolygonOffsetClampEXT"> + <function name="PolygonOffsetClampEXT" es1="1.0" es2="2.0"> <param name="factor" type="GLfloat"/> <param name="units" type="GLfloat"/> <param name="clamp" type="GLfloat"/> |