From c97e82bab50a2ec2d9d6e73a68c59c544526d01c Mon Sep 17 00:00:00 2001
From: Icecream95 <ixn@disroot.org>
Date: Thu, 15 Oct 2020 00:08:36 +1300
Subject: [PATCH] panfrost: Only enable occlusion queries when active

Fixes piglit tests:
 - occlusion_query_meta_fragments
 - occlusion_query_meta_save

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7074>
---
 src/gallium/drivers/panfrost/pan_context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index 5728ec6fe8a..9d0b6c430b2 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -401,7 +401,7 @@ panfrost_draw_emit_tiler(struct panfrost_batch *batch,
 
                 pan_emit_draw_descs(batch, &cfg, PIPE_SHADER_FRAGMENT);
 
-                if (ctx->occlusion_query) {
+                if (ctx->occlusion_query && ctx->active_queries) {
                         if (ctx->occlusion_query->type == PIPE_QUERY_OCCLUSION_COUNTER)
                                 cfg.occlusion_query = MALI_OCCLUSION_MODE_COUNTER;
                         else