fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: use more accurate generation for buffer barrier pipeline stages

Browse source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12822>
This commit is contained in:
Mike Blumenkrantz 2021-09-03 10:45:09 -04:00 • committed by Marge Bot
parent 793e5dba98
commit c5a090aa3a
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/zink/zink_draw.cpp
View file

@ -336,6 +336,17 @@ draw(struct zink_context *ctx,
}
}
ALWAYS_INLINE static VkPipelineStageFlags
find_pipeline_bits(uint32_t *mask)
{
for (unsigned i = 0; i < ZINK_SHADER_COUNT; i++) {
if (mask[i]) {
return zink_pipeline_flags_from_pipe_stage((enum pipe_shader_type)i);
}
}
return 0;
}
static void
update_barriers(struct zink_context *ctx, bool is_compute)
{
@ -371,9 +382,14 @@ update_barriers(struct zink_context *ctx, bool is_compute)
if (is_compute)
pipeline = VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT;
else if (!pipeline) {
u_foreach_bit(stage, res->bind_stages) {
pipeline |= zink_pipeline_flags_from_pipe_stage((enum pipe_shader_type)stage);
}
if (res->ubo_bind_count[0])
pipeline |= find_pipeline_bits(res->ubo_bind_mask);
if (!pipeline)
pipeline |= find_pipeline_bits(res->ssbo_bind_mask);
if (!pipeline)
pipeline |= find_pipeline_bits(res->sampler_binds);
if (!pipeline) //must be a shader image
pipeline = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
}
if (res->base.b.target == PIPE_BUFFER)
zink_resource_buffer_barrier(ctx, res, access, pipeline);