From: Ian Romanick Date: Sat, 18 Aug 2012 00:12:12 +0000 (-0700) Subject: mesa: Disallow VertexAttribPointer without a VAO in a core context X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=792214e8d45675b756e02a5e39bfe2ab32f7383d;p=mesa.git mesa: Disallow VertexAttribPointer without a VAO in a core context Signed-off-by: Ian Romanick --- diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 8a123337154..bb185aee9b9 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -133,6 +133,23 @@ update_array(struct gl_context *ctx, GLsizei elementSize; GLenum format = GL_RGBA; + /* Page 407 (page 423 of the PDF) of the OpenGL 3.0 spec says: + * + * "Client vertex arrays - all vertex array attribute pointers must + * refer to buffer objects (section 2.9.2). The default vertex array + * object (the name zero) is also deprecated. Calling + * VertexAttribPointer when no buffer object or no vertex array object + * is bound will generate an INVALID_OPERATION error..." + * + * The check for VBOs is handled below. + */ + if (ctx->API == API_OPENGL_CORE + && (ctx->Array.ArrayObj == ctx->Array.DefaultArrayObj)) { + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(no array object bound)", + func); + return; + } + if (_mesa_is_gles(ctx)) { /* Once Mesa gets support for GL_OES_vertex_half_float this mask will * change. Adding support for this extension isn't quite as trivial as