From ce086ebd89633d8d967cd65bacf5b05c1ac555ed Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 16 Oct 2012 17:21:39 -0700 Subject: mesa: Throw an error for a new query on an already-active query target. There's a similar test below, but it's not the same: that one checks whether this query object is already active (potentially on another target). Reviewed-by: Brian Paul Reviewed-by: Ian Romanick --- src/mesa/main/queryobj.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 18792cf6c0e..ac036490849 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -301,6 +301,19 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id) return; } + /* From the GL_ARB_occlusion_query spec: + * + * "If BeginQueryARB is called while another query is already in + * progress with the same target, an INVALID_OPERATION error is + * generated." + */ + if (*bindpt) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glBeginQuery{Indexed}(target=%s is active)", + _mesa_lookup_enum_by_nr(target)); + return; + } + if (id == 0) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQuery{Indexed}(id==0)"); return; -- cgit v1.2.3