summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-06-28 14:09:22 +1000
committerTimothy Arceri <[email protected]>2017-06-29 08:54:11 +1000
commitd8143a4bde01dcbef7d5099fcdde6a810ca2d99a (patch)
tree5df0bbfc81e96c6084fcb40bca1c8cdb936be011 /src/mesa/main
parent73e0140acc118e0a53ac601adba9fe85833ff32c (diff)
mesa: add KHR_no_error support for glDisableVertexA*A*()
Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/varray.c17
-rw-r--r--src/mesa/main/varray.h6
2 files changed, 23 insertions, 0 deletions
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index fcc9a31c896..c67396d7e79 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1170,6 +1170,14 @@ _mesa_DisableVertexAttribArray(GLuint index)
void GLAPIENTRY
+_mesa_DisableVertexAttribArray_no_error(GLuint index)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ disable_vertex_array_attrib(ctx, ctx->Array.VAO, index);
+}
+
+
+void GLAPIENTRY
_mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index)
{
GET_CURRENT_CONTEXT(ctx);
@@ -1195,6 +1203,15 @@ _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index)
}
+void GLAPIENTRY
+_mesa_DisableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_vertex_array_object *vao = _mesa_lookup_vao(ctx, vaobj);
+ disable_vertex_array_attrib(ctx, vao, index);
+}
+
+
/**
* Return info for a vertex attribute array (no alias with legacy
* vertex attributes (pos, normal, color, etc)). This function does
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index be8abf96aeb..ca49042653c 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -238,10 +238,16 @@ _mesa_EnableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index);
extern void GLAPIENTRY
_mesa_DisableVertexAttribArray(GLuint index);
+extern void GLAPIENTRY
+_mesa_DisableVertexAttribArray_no_error(GLuint index);
+
extern void GLAPIENTRY
_mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index);
+extern void GLAPIENTRY
+_mesa_DisableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index);
+
extern void GLAPIENTRY
_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params);