From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 18 Dec 2020 23:07:00 +0000 (-0500)
Subject: zink: remove special casing for occlusion qbos
X-Git-Tag: upstream/21.2.3~5801
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=313407672c1135f30d26166f3a93fe53385773ae;p=platform%2Fupstream%2Fmesa.git

zink: remove special casing for occlusion qbos

this seems fine now

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

diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c
index 66ef9db..4644846 100644
--- a/src/gallium/drivers/zink/zink_query.c
+++ b/src/gallium/drivers/zink/zink_query.c
@@ -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;