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@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
@@ -532,7 +532,7 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GL_CURRENT_QUERY_ARB:
|
case GL_CURRENT_QUERY_ARB:
|
||||||
*params = q ? q->Id : 0;
|
*params = (q && q->Target == target) ? q->Id : 0;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
_mesa_error(ctx, GL_INVALID_ENUM, "glGetQuery{Indexed}iv(pname)");
|
_mesa_error(ctx, GL_INVALID_ENUM, "glGetQuery{Indexed}iv(pname)");
|
||||||
|
Reference in New Issue
Block a user