KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: add KHR_no_error support for glBindVertexBuffer() 

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
This commit is contained in:
Timothy Arceri 2017-05-22 15:46:54 +10:00
parent 9db595e0de
commit 9d331739ae
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
<category name="GL_ARB_vertex_attrib_binding" number="125">
<function name="BindVertexBuffer" es2="3.1">
<function name="BindVertexBuffer" es2="3.1" no_error="true">
<param name="bindingindex" type="GLuint"/>
<param name="buffer" type="GLuint"/>
<param name="offset" type="GLintptr"/>

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

@ -1953,7 +1953,7 @@ static ALWAYS_INLINE void
vertex_array_vertex_buffer(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
GLuint bindingIndex, GLuint buffer, GLintptr offset,
GLsizei stride, const char *func)
GLsizei stride, bool no_error, const char *func)
{
struct gl_buffer_object *vbo;
if (buffer ==
@ -1962,7 +1962,7 @@ vertex_array_vertex_buffer(struct gl_context *ctx,
} else if (buffer != 0) {
vbo = _mesa_lookup_bufferobj(ctx, buffer);
if (!vbo && _mesa_is_gles31(ctx)) {
if (!no_error && !vbo && _mesa_is_gles31(ctx)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-gen name)", func);
return;
}
@ -2043,7 +2043,18 @@ vertex_array_vertex_buffer_err(struct gl_context *ctx,
}
vertex_array_vertex_buffer(ctx, vao, bindingIndex, buffer, offset,
stride, func);
stride, false, func);
}
void GLAPIENTRY
_mesa_BindVertexBuffer_no_error(GLuint bindingIndex, GLuint buffer,
GLintptr offset, GLsizei stride)
{
GET_CURRENT_CONTEXT(ctx);
vertex_array_vertex_buffer(ctx, ctx->Array.VAO, bindingIndex,
buffer, offset, stride, true,
"glBindVertexBuffer");
}

3
src/mesa/main/varray.h
View File

@ -360,6 +360,9 @@ _mesa_primitive_restart_index(const struct gl_context *ctx,
return ctx->Array.RestartIndex;
}
extern void GLAPIENTRY
_mesa_BindVertexBuffer_no_error(GLuint bindingIndex, GLuint buffer,
GLintptr offset, GLsizei stride);
extern void GLAPIENTRY
_mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset,
GLsizei stride);