From 2c91e086563541271668f9ea6ca58689c0c97d44 Mon Sep 17 00:00:00 2001 From: Marta Lofstedt Date: Mon, 26 Oct 2015 11:22:27 +0100 Subject: [PATCH] mesa: Draw Indirect return wrong error code on unalinged From OpenGL 4.4 specification, section 10.4 and Open GL Es 3.1 section 10.5: "An INVALID_VALUE error is generated if indirect is not a multiple of the size, in basic machine units, of uint." However, the current code follow the ARB_draw_indirect: https://www.opengl.org/registry/specs/ARB/draw_indirect.txt "INVALID_OPERATION is generated by DrawArraysIndirect and DrawElementsIndirect if commands source data beyond the end of a buffer object or if is not word aligned." V2: After discussions on the list, it was suggested to only keep the INVALID_VALUE error. Signed-off-by: Marta Lofstedt Reviewed-by: Ian Romanick Reviewed-by: Ilia Mirkin --- src/mesa/main/api_validate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index a46c1944e96..e4cfc9bfdaf 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -702,12 +702,14 @@ valid_draw_indirect(struct gl_context *ctx, return GL_FALSE; - /* From the ARB_draw_indirect specification: - * "An INVALID_OPERATION error is generated [...] if is no - * word aligned." + /* From OpenGL version 4.4. section 10.5 + * and OpenGL ES 3.1, section 10.6: + * + * "An INVALID_VALUE error is generated if indirect is not a + * multiple of the size, in basic machine units, of uint." */ if ((GLsizeiptr)indirect & (sizeof(GLuint) - 1)) { - _mesa_error(ctx, GL_INVALID_OPERATION, + _mesa_error(ctx, GL_INVALID_VALUE, "%s(indirect is not aligned)", name); return GL_FALSE; } -- 2.30.2