zink: remove special casing for occlusion qbos
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Fri, 18 Dec 2020 23:07:00 +0000 (18:07 -0500)
committerMarge Bot <eric+marge@anholt.net>
Mon, 29 Mar 2021 02:50:53 +0000 (02:50 +0000)
this seems fine now

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9811>

src/gallium/drivers/zink/zink_query.c

index 66ef9db..4644846 100644 (file)
@@ -830,9 +830,6 @@ zink_get_query_result_resource(struct pipe_context *pctx,
       /* result happens to be ready or we're waiting */
       if (num_queries == 1 && query->type != PIPE_QUERY_PRIMITIVES_GENERATED &&
                               query->type != PIPE_QUERY_PRIMITIVES_EMITTED &&
-                              /* FIXME: I don't know why, but occlusion is broken here */
-                              query->type != PIPE_QUERY_OCCLUSION_PREDICATE &&
-                              query->type != PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE &&
                               !is_so_overflow_query(query)) {
          copy_results_to_buffer(ctx, query, res, offset, 1, size_flags);
          return;