https://bugs.freedesktop.org/show_bug.cgi?id=91015

--- Comment #3 from Ian Romanick idr@freedesktop.org --- The following two piglit commits are probably necessary:

commit 49e326474d5ed487d04ff6bef1efae376e4a2492 Author: Eduardo Lima Mitev elima@igalia.com Date: Mon Feb 16 11:10:30 2015 +0100

arb_occlusion_query2: Checks that query obj passed to glBeginQuery matches target

From the OpenGL 3.3 spec, section "2.14. ASYNCHRONOUS QUERIES", page 94:

"[...] if id is the name of an existing query object whose type does not match target, [...] the error INVALID_OPERATION is generated."

Similar wording exists in the OpenGL ES 3.0.0 spec, section "2.13. ASYNCHRONOUS QUERIES", page 82.

This patch adds a check for this situation.

Reviewed-by: Ian Romanick ian.d.romanick@intel.com

commit 0eff6819639d8c84c98f8fa0bd0b254a69aead60 Author: Eduardo Lima Mitev elima@igalia.com Date: Sat Feb 14 13:29:52 2015 +0100

arb_occlusion_query2: expect an error when target mismatch in glBeginQuery()

From the OpenGL 3.3 spec, section "2.14. ASYNCHRONOUS QUERIES", page 94:

"[...] if id is the name of an existing query object whose type does not match target, [...] the error INVALID_OPERATION is generated."

Similar wording exists in the OpenGL ES 3.0.0 spec, section "2.13. ASYNCHRONOUS QUERIES", page 82.

Hence, trying to call BeginQuery on a query object which has already been bound to a different target should return GL_INVALID_OPERATION.

Reviewed-by: Ian Romanick ian.d.romanick@intel.com