Mesa (master): mesa: Return 0 for GL_CURRENT_QUERY with a mismatched query target.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: ab7188e1992e655031550d611178c55abe33d5c5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab7188e1992e655031550d611178c55abe33d5c5

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Oct 16 17:36:42 2012 -0700

mesa: Return 0 for GL_CURRENT_QUERY with a mismatched query target.

With the previous two commits, this fixes piglit
GL_ARB_occlusion_query2/api.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/queryobj.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 735e4d1..65e8571 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -532,7 +532,7 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
          }
          break;
       case GL_CURRENT_QUERY_ARB:
-         *params = q ? q->Id : 0;
+         *params = (q && q->Target == target) ? q->Id : 0;
          break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetQuery{Indexed}iv(pname)");