AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: stop swizzling conditional render during batch flush

Browse Source 
conditional render is only supposed to be enabled during renderpasses,
and this ends up doing mismatched start/stop in and out of renderpasses

affects:
GTF-GL46.gtf30.GL3Tests.conditional_render*

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23511>
This commit is contained in:
Mike Blumenkrantz
2023-05-11 10:29:00 -04:00
committed by Marge Bot
parent 43a6f8b9f8
commit 6aa9e95021
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_context.c
-4
View File
@@ -3178,8 +3178,6 @@ flush_batch(struct zink_context *ctx, bool sync)
if (ctx->clears_enabled)
/* start rp to do all the clears */
zink_batch_rp(ctx);
bool conditional_render_active = ctx->render_condition.active;
zink_stop_conditional_render(ctx);
zink_batch_no_rp_safe(ctx);
zink_end_batch(ctx, batch);
ctx->deferred_fence = NULL;
@@ -3209,8 +3207,6 @@ flush_batch(struct zink_context *ctx, bool sync)
VKCTX(CmdSetPatchControlPointsEXT)(ctx->batch.state->barrier_cmdbuf, 1);
}
update_feedback_loop_dynamic_state(ctx);
if (conditional_render_active)
zink_start_conditional_render(ctx);
reapply_color_write(ctx);
update_layered_rendering_state(ctx);
tc_renderpass_info_reset(&ctx->dynamic_fb.tc_info);