We don't care if blits need to respect render-conditions if there's no
active one. So let's hit the potentially faster native blit-paths
instead.
Fixes:
5743fa6e709 ("zink: enable conditional rendering if available")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3792
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7606>
util_format_get_mask(info->src.format) != info->mask ||
util_format_is_depth_or_stencil(info->dst.format) ||
info->scissor_enable ||
- info->alpha_blend ||
- info->render_condition_enable)
+ info->alpha_blend)
+ return false;
+
+ if (info->render_condition_enable &&
+ ctx->render_condition_active)
return false;
struct zink_resource *src = zink_resource(info->src.resource);
if (util_format_get_mask(info->dst.format) != info->mask ||
util_format_get_mask(info->src.format) != info->mask ||
info->scissor_enable ||
- info->alpha_blend ||
- info->render_condition_enable)
+ info->alpha_blend)
+ return false;
+
+ if (info->render_condition_enable &&
+ ctx->render_condition_active)
return false;
if (util_format_is_depth_or_stencil(info->dst.format) &&
struct list_head suspended_queries;
struct list_head primitives_generated_queries;
- bool queries_disabled;
+ bool queries_disabled, render_condition_active;
struct pipe_resource *dummy_buffer;
struct pipe_resource *null_buffers[5]; /* used to create zink_framebuffer->null_surface, one buffer per samplecount */
if (query == NULL) {
screen->vk_CmdEndConditionalRenderingEXT(batch->cmdbuf);
+ ctx->render_condition_active = false;
return;
}
begin_info.buffer = res->buffer;
begin_info.flags = begin_flags;
screen->vk_CmdBeginConditionalRenderingEXT(batch->cmdbuf, &begin_info);
+ ctx->render_condition_active = true;
zink_batch_reference_resource_rw(batch, res, true);