mesa: move error handling into disable_vertex_array_attrib() callers
This will let us just call disable_vertex_array_attrib() for KHR_no_error support. Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
parent
d731b18933
commit
73e0140acc
|
@ -1141,14 +1141,8 @@ _mesa_EnableVertexArrayAttrib_no_error(GLuint vaobj, GLuint index)
|
||||||
static void
|
static void
|
||||||
disable_vertex_array_attrib(struct gl_context *ctx,
|
disable_vertex_array_attrib(struct gl_context *ctx,
|
||||||
struct gl_vertex_array_object *vao,
|
struct gl_vertex_array_object *vao,
|
||||||
GLuint index,
|
GLuint index)
|
||||||
const char *func)
|
|
||||||
{
|
{
|
||||||
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {
|
|
||||||
_mesa_error(ctx, GL_INVALID_VALUE, "%s(index)", func);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
assert(VERT_ATTRIB_GENERIC(index) < ARRAY_SIZE(vao->VertexAttrib));
|
assert(VERT_ATTRIB_GENERIC(index) < ARRAY_SIZE(vao->VertexAttrib));
|
||||||
|
|
||||||
if (vao->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Enabled) {
|
if (vao->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Enabled) {
|
||||||
|
@ -1165,8 +1159,13 @@ void GLAPIENTRY
|
||||||
_mesa_DisableVertexAttribArray(GLuint index)
|
_mesa_DisableVertexAttribArray(GLuint index)
|
||||||
{
|
{
|
||||||
GET_CURRENT_CONTEXT(ctx);
|
GET_CURRENT_CONTEXT(ctx);
|
||||||
disable_vertex_array_attrib(ctx, ctx->Array.VAO, index,
|
|
||||||
"glDisableVertexAttribArray");
|
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {
|
||||||
|
_mesa_error(ctx, GL_INVALID_VALUE, "glDisableVertexAttribArray(index)");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
disable_vertex_array_attrib(ctx, ctx->Array.VAO, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1187,7 +1186,12 @@ _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index)
|
||||||
if (!vao)
|
if (!vao)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
disable_vertex_array_attrib(ctx, vao, index, "glDisableVertexArrayAttrib");
|
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {
|
||||||
|
_mesa_error(ctx, GL_INVALID_VALUE, "glDisableVertexArrayAttrib(index)");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
disable_vertex_array_attrib(ctx, vao, index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue