summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-07-19 15:45:01 +0200
committerSamuel Pitoiset <[email protected]>2017-07-31 13:53:40 +0200
commitd88d60ab1d1992a59c7ed6c97b6d6c6990671067 (patch)
tree752c64589a10f56a4258c90ffbb6427e052f4cde
parent1429b5cd59a6030674e4ca6af7c11713b5e1e2c9 (diff)
mesa: add KHR_no_error support to glVertexArrayElementBuffer()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mapi/glapi/gen/ARB_direct_state_access.xml2
-rw-r--r--src/mesa/main/arrayobj.c8
-rw-r--r--src/mesa/main/arrayobj.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 1c62ac6f2e4..7927a4e1f6f 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -594,7 +594,7 @@
<param name="index" type="GLuint" />
</function>
- <function name="VertexArrayElementBuffer">
+ <function name="VertexArrayElementBuffer" no_error="true">
<param name="vaobj" type="GLuint" />
<param name="buffer" type="GLuint" />
</function>
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 89fa473ff87..600177cc5c9 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -687,6 +687,14 @@ vertex_array_element_buffer(struct gl_context *ctx, GLuint vaobj, GLuint buffer,
void GLAPIENTRY
+_mesa_VertexArrayElementBuffer_no_error(GLuint vaobj, GLuint buffer)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ vertex_array_element_buffer(ctx, vaobj, buffer, true);
+}
+
+
+void GLAPIENTRY
_mesa_VertexArrayElementBuffer(GLuint vaobj, GLuint buffer)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 691475fb2fd..1b9900c6e55 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -116,6 +116,9 @@ void GLAPIENTRY _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays);
GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );
+void GLAPIENTRY
+_mesa_VertexArrayElementBuffer_no_error(GLuint vaobj, GLuint buffer);
+
void GLAPIENTRY _mesa_VertexArrayElementBuffer(GLuint vaobj, GLuint buffer);
void GLAPIENTRY _mesa_GetVertexArrayiv(GLuint vaobj, GLenum pname, GLint *param);