diff options
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 6 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 1 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 65 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 2 |
4 files changed, 58 insertions, 16 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml index 8cc1ab0479d..0b19166c554 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -518,6 +518,12 @@ <param name="bindingindex" type="GLuint" /> </function> + <function name="VertexArrayBindingDivisor" offset="assign"> + <param name="vaobj" type="GLuint" /> + <param name="bindingindex" type="GLuint" /> + <param name="divisor" type="GLuint" /> + </function> + <!-- Sampler object functions --> <function name="CreateSamplers" offset="assign"> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index bc9832177c4..c1e6283cd92 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -1027,6 +1027,7 @@ const struct function gl_core_functions_possible[] = { { "glVertexArrayAttribIFormat", 45, -1 }, { "glVertexArrayAttribLFormat", 45, -1 }, { "glVertexArrayAttribBinding", 45, -1 }, + { "glVertexArrayBindingDivisor", 45, -1 }, { "glCreateSamplers", 45, -1 }, { "glCreateProgramPipelines", 45, -1 }, { "glCreateQueries", 45, -1 }, diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 90d5bcbcb90..3afbea8ae06 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -2041,19 +2041,43 @@ _mesa_VertexArrayAttribBinding(GLuint vaobj, GLuint attribIndex, GLuint bindingI } -void GLAPIENTRY -_mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor) +static void +vertex_array_binding_divisor(struct gl_context *ctx, + struct gl_vertex_array_object *vao, + GLuint bindingIndex, GLuint divisor, + const char *func) { - GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); if (!ctx->Extensions.ARB_instanced_arrays) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glVertexBindingDivisor()"); + _mesa_error(ctx, GL_INVALID_OPERATION, "%s()", func); return; } /* The ARB_vertex_attrib_binding spec says: * + * "An INVALID_VALUE error is generated if <bindingindex> is greater + * than or equal to the value of MAX_VERTEX_ATTRIB_BINDINGS." + */ + if (bindingIndex >= ctx->Const.MaxVertexAttribBindings) { + _mesa_error(ctx, GL_INVALID_VALUE, + "%s(bindingindex=%u > " + "GL_MAX_VERTEX_ATTRIB_BINDINGS)", + func, bindingIndex); + return; + } + + vertex_binding_divisor(ctx, vao, VERT_ATTRIB_GENERIC(bindingIndex), divisor); +} + + +void GLAPIENTRY +_mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor) +{ + GET_CURRENT_CONTEXT(ctx); + + /* The ARB_vertex_attrib_binding spec says: + * * "An INVALID_OPERATION error is generated if no vertex array object * is bound." */ @@ -2064,21 +2088,30 @@ _mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor) return; } - /* The ARB_vertex_attrib_binding spec says: + vertex_array_binding_divisor(ctx, ctx->Array.VAO, + bindingIndex, divisor, + "glVertexBindingDivisor"); +} + + +void GLAPIENTRY +_mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, GLuint divisor) +{ + struct gl_vertex_array_object *vao; + GET_CURRENT_CONTEXT(ctx); + + /* The ARB_direct_state_access specification says: * - * "An INVALID_VALUE error is generated if <bindingindex> is greater - * than or equal to the value of MAX_VERTEX_ATTRIB_BINDINGS." + * "An INVALID_OPERATION error is generated by VertexArrayBindingDivisor + * if <vaobj> is not [compatibility profile: zero or] the name of an + * existing vertex array object." */ - if (bindingIndex >= ctx->Const.MaxVertexAttribBindings) { - _mesa_error(ctx, GL_INVALID_VALUE, - "glVertexBindingDivisor(bindingindex=%u > " - "GL_MAX_VERTEX_ATTRIB_BINDINGS)", - bindingIndex); - return; - } + vao = _mesa_lookup_vao_err(ctx, vaobj, "glVertexArrayBindingDivisor"); + if (!vao) + return; - vertex_binding_divisor(ctx, ctx->Array.VAO, - VERT_ATTRIB_GENERIC(bindingIndex), divisor); + vertex_array_binding_divisor(ctx, vao, bindingIndex, divisor, + "glVertexArrayBindingDivisor"); } diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index b9544dc7cd7..295c54b31a8 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -340,6 +340,8 @@ _mesa_VertexArrayAttribBinding(GLuint vaobj, GLuint attribIndex, extern void GLAPIENTRY _mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor); +extern void GLAPIENTRY +_mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, GLuint divisor); extern void _mesa_copy_client_array(struct gl_context *ctx, |