6-8:
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
On 06/28/2017 08:13 AM, Timothy Arceri wrote:
---
src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 +-
src/mapi/glapi/gen/gl_API.xml | 2 +-
src/mesa/main/varray.c | 17 +++++++++++++++++
src/mesa/main/varray.h | 6 ++++++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml
b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 31f8af1..3abb0fa 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -584,7 +584,7 @@
<param name="arrays" type="GLuint *" />
</function>
- <function name="DisableVertexArrayAttrib">
+ <function name="DisableVertexArrayAttrib" no_error="true">
<param name="vaobj" type="GLuint" />
<param name="index" type="GLuint" />
</function>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 1d3dd41..17fea47 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -5340,7 +5340,7 @@
<glx ignore="true"/>
</function>
- <function name="DisableVertexAttribArray" es2="2.0">
+ <function name="DisableVertexAttribArray" es2="2.0" no_error="true">
<param name="index" type="GLuint"/>
<glx ignore="true"/>
<glx handcode="true"/>
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 207fa78..89b1cb3 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 c2fae76..c9163fb 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);
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
