From b889b4846614a6d7ace722a102b2ba3b5035f8fe Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 1 Sep 2022 10:22:51 -0400 Subject: [PATCH] zink: delete more sw conditional render handling I forgot to delete this when I deleted the draw path handling Reviewed-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/zink_blit.c | 4 ---- src/gallium/drivers/zink/zink_clear.c | 3 --- src/gallium/drivers/zink/zink_query.c | 14 -------------- src/gallium/drivers/zink/zink_query.h | 3 --- 4 files changed, 24 deletions(-) diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index be36473eb05..f43a2c38325 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -284,10 +284,6 @@ zink_blit(struct pipe_context *pctx, const struct util_format_description *src_desc = util_format_description(info->src.format); const struct util_format_description *dst_desc = util_format_description(info->dst.format); - if (info->render_condition_enable && - unlikely(!zink_screen(pctx->screen)->info.have_EXT_conditional_rendering && !zink_check_conditional_render(ctx))) - return; - struct zink_resource *src = zink_resource(info->src.resource); struct zink_resource *dst = zink_resource(info->dst.resource); bool needs_present_readback = false; diff --git a/src/gallium/drivers/zink/zink_clear.c b/src/gallium/drivers/zink/zink_clear.c index 2a08e85b9fb..7405e223194 100644 --- a/src/gallium/drivers/zink/zink_clear.c +++ b/src/gallium/drivers/zink/zink_clear.c @@ -149,9 +149,6 @@ zink_clear(struct pipe_context *pctx, struct zink_batch *batch = &ctx->batch; bool needs_rp = false; - if (unlikely(!zink_screen(pctx->screen)->info.have_EXT_conditional_rendering && !zink_check_conditional_render(ctx))) - return; - if (scissor_state) { struct u_rect scissor = {scissor_state->minx, scissor_state->maxx, scissor_state->miny, scissor_state->maxy}; needs_rp = !zink_blit_region_fills(scissor, fb->width, fb->height); diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index 7fc23bd4fc6..67ac1f91550 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -1164,20 +1164,6 @@ zink_stop_conditional_render(struct zink_context *ctx) ctx->render_condition.active = false; } -bool -zink_check_conditional_render(struct zink_context *ctx) -{ - if (!ctx->render_condition_active) - return true; - assert(ctx->render_condition.query); - - union pipe_query_result result; - zink_get_query_result(&ctx->base, (struct pipe_query*)ctx->render_condition.query, true, &result); - return is_bool_query(ctx->render_condition.query) ? - ctx->render_condition.inverted != result.b : - ctx->render_condition.inverted != !!result.u64; -} - static void zink_render_condition(struct pipe_context *pctx, struct pipe_query *pquery, diff --git a/src/gallium/drivers/zink/zink_query.h b/src/gallium/drivers/zink/zink_query.h index 1cd9ce804a6..9ed54d6316a 100644 --- a/src/gallium/drivers/zink/zink_query.h +++ b/src/gallium/drivers/zink/zink_query.h @@ -50,9 +50,6 @@ zink_start_conditional_render(struct zink_context *ctx); void zink_stop_conditional_render(struct zink_context *ctx); -bool -zink_check_conditional_render(struct zink_context *ctx); - void zink_context_destroy_query_pools(struct zink_context *ctx); uint64_t