fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: add KHR_no_error support for glDisableVertexA*A*()

Browse source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Timothy Arceri 2017-06-28 14:09:22 +10:00
parent 73e0140acc
commit d8143a4bde
4 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mapi/glapi/gen/ARB_direct_state_access.xml
View file

@ -584,7 +584,7 @@
<param name="arrays" type="GLuint *" /> <param name="arrays" type="GLuint *" />
</function> </function>
<function name="DisableVertexArrayAttrib"> <function name="DisableVertexArrayAttrib" no_error="true">
<param name="vaobj" type="GLuint" /> <param name="vaobj" type="GLuint" />
<param name="index" type="GLuint" /> <param name="index" type="GLuint" />
</function> </function>

2
src/mapi/glapi/gen/gl_API.xml
View file

@ -5340,7 +5340,7 @@
<glx ignore="true"/> <glx ignore="true"/>
</function> </function>
<function name="DisableVertexAttribArray" es2="2.0"> <function name="DisableVertexAttribArray" es2="2.0" no_error="true">
<param name="index" type="GLuint"/> <param name="index" type="GLuint"/>
<glx ignore="true"/> <glx ignore="true"/>
<glx handcode="true"/> <glx handcode="true"/>

17
src/mesa/main/varray.c
View file

@ -1169,6 +1169,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 void GLAPIENTRY
_mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index) _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index)
{ {
@ -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 * Return info for a vertex attribute array (no alias with legacy
* vertex attributes (pos, normal, color, etc)). This function does * vertex attributes (pos, normal, color, etc)). This function does

6
src/mesa/main/varray.h
View file

@ -238,10 +238,16 @@ _mesa_EnableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index);
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_DisableVertexAttribArray(GLuint index); _mesa_DisableVertexAttribArray(GLuint index);
extern void GLAPIENTRY
_mesa_DisableVertexAttribArray_no_error(GLuint index);
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index); _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index);
extern void GLAPIENTRY
_mesa_DisableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index);
extern void GLAPIENTRY extern void GLAPIENTRY
_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params); _mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params);