From b054a233dfd20bffb27934cb6eda19d6db2cabb9 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 3 Feb 2022 17:18:58 -0500
Subject: [PATCH] zink: activate conditional render for compute dispatch when
 necessary

fixes:
KHR-GL46.compute_shader.conditional-dispatching

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15018>
---
 src/gallium/drivers/zink/zink_draw.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_draw.cpp b/src/gallium/drivers/zink/zink_draw.cpp
index 5d606154a03..d1eb37ac37f 100644
--- a/src/gallium/drivers/zink/zink_draw.cpp
+++ b/src/gallium/drivers/zink/zink_draw.cpp
@@ -942,6 +942,9 @@ zink_launch_grid(struct pipe_context *pctx, const struct pipe_grid_info *info)
    struct zink_screen *screen = zink_screen(pctx->screen);
    struct zink_batch *batch = &ctx->batch;
 
+   if (ctx->render_condition_active)
+      zink_start_conditional_render(ctx);
+
    update_barriers(ctx, true);
    if (ctx->memory_barrier)
       zink_flush_memory_barrier(ctx, true);