fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-23 20:30:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: add KHR_no_error support for glVertex*AttribBinding()

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset 2017-06-26 15:50:48 +02:00
parent 401fa69132
commit 89bc3ed7a3
4 changed files with 32 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

@ -641,7 +641,7 @@
<param name="relativeoffset" type="GLuint" />
</function>
<function name="VertexArrayAttribBinding">
<function name="VertexArrayAttribBinding" no_error="true">
<param name="vaobj" type="GLuint" />
<param name="attribindex" type="GLuint" />
<param name="bindingindex" type="GLuint" />

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

@ -36,7 +36,7 @@
<param name="relativeoffset" type="GLuint"/>
</function>
<function name="VertexAttribBinding" es2="3.1">
<function name="VertexAttribBinding" es2="3.1" no_error="true">
<param name="attribindex" type="GLuint"/>
<param name="bindingindex" type="GLuint"/>
</function>

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

@ -2575,6 +2575,16 @@ vertex_array_attrib_binding(struct gl_context *ctx,
}
void GLAPIENTRY
_mesa_VertexAttribBinding_no_error(GLuint attribIndex, GLuint bindingIndex)
{
GET_CURRENT_CONTEXT(ctx);
vertex_attrib_binding(ctx, ctx->Array.VAO,
VERT_ATTRIB_GENERIC(attribIndex),
VERT_ATTRIB_GENERIC(bindingIndex));
}
void GLAPIENTRY
_mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex)
{
@ -2598,6 +2608,19 @@ _mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex)
}
void GLAPIENTRY
_mesa_VertexArrayAttribBinding_no_error(GLuint vaobj, GLuint attribIndex,
GLuint bindingIndex)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_vertex_array_object *vao = _mesa_lookup_vao(ctx, vaobj);
vertex_attrib_binding(ctx, vao,
VERT_ATTRIB_GENERIC(attribIndex),
VERT_ATTRIB_GENERIC(bindingIndex));
}
void GLAPIENTRY
_mesa_VertexArrayAttribBinding(GLuint vaobj, GLuint attribIndex, GLuint bindingIndex)
{

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

@ -425,9 +425,16 @@ _mesa_VertexArrayAttribLFormat(GLuint vaobj, GLuint attribIndex,
GLint size, GLenum type,
GLuint relativeOffset);
void GLAPIENTRY
_mesa_VertexAttribBinding_no_error(GLuint attribIndex, GLuint bindingIndex);
extern void GLAPIENTRY
_mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex);
void GLAPIENTRY
_mesa_VertexArrayAttribBinding_no_error(GLuint vaobj, GLuint attribIndex,
GLuint bindingIndex);
extern void GLAPIENTRY
_mesa_VertexArrayAttribBinding(GLuint vaobj, GLuint attribIndex,
GLuint bindingIndex);