summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2016-11-30 17:04:06 -0500
committerEmil Velikov <emil.l.velikov@gmail.com>2016-12-14 19:03:11 +0000
commit69a4fa0c357be8dd36ae1464f43cd8ab8b4ad46e (patch)
treee4d4af567e6d331f79df8728cfd13a0bacd19d32 /src/mesa
parent403d106c9c5eed481cb58ee0104e211c3d8f44f8 (diff)
downloadexternal_mesa3d-69a4fa0c357be8dd36ae1464f43cd8ab8b4ad46e.zip
external_mesa3d-69a4fa0c357be8dd36ae1464f43cd8ab8b4ad46e.tar.gz
external_mesa3d-69a4fa0c357be8dd36ae1464f43cd8ab8b4ad46e.tar.bz2
mesa: only verify that enabled arrays have backing buffers
We were previously also verifying that no backing buffers were available when an array wasn't enabled. This is has no basis in the spec, and it causes GLupeN64 to fail as a result. Fixes: c2e146f487 ("mesa: error out in indirect draw when vertex bindings mismatch") Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com> (cherry picked from commit 7c16552f8dcc869b14cf7ef443a1b5de83b07973)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/api_validate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index d3b4cab..071c16d 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -925,7 +925,7 @@ valid_draw_indirect(struct gl_context *ctx,
* buffer bound.
*/
if (_mesa_is_gles31(ctx) &&
- ctx->Array.VAO->_Enabled != ctx->Array.VAO->VertexAttribBufferMask) {
+ ctx->Array.VAO->_Enabled & ~ctx->Array.VAO->VertexAttribBufferMask) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(No VBO bound)", name);
return GL_FALSE;
}