fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: collect gfx stages for all bindings during barrier generation

Browse source 
it's important to get the full mask in order to accurately provide
dependency info

Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-By: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17111>
This commit is contained in:
Mike Blumenkrantz 2022-06-18 09:47:13 -04:00 • committed by Marge Bot
parent 9e3ed65324
commit 1fa3f03442
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -367,16 +367,14 @@ update_barriers(struct zink_context *ctx, bool is_compute,
if (!is_compute && res->vbo_bind_mask) { if (!is_compute && res->vbo_bind_mask) {
access |= VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT; access |= VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
pipeline |= VK_PIPELINE_STAGE_VERTEX_INPUT_BIT; pipeline |= VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
if (res->write_bind_count[is_compute])
pipeline |= VK_PIPELINE_STAGE_VERTEX_SHADER_BIT;
bind_count -= res->vbo_bind_count; bind_count -= res->vbo_bind_count;
} }
if (bind_count) if (bind_count)
access |= VK_ACCESS_SHADER_READ_BIT; access |= VK_ACCESS_SHADER_READ_BIT;
if (!res->write_bind_count[is_compute]) { if (!is_compute) {
pipeline |= find_pipeline_bits(res->ssbo_bind_mask); pipeline |= find_pipeline_bits(res->ssbo_bind_mask);
if (res->ubo_bind_count[0]) if (res->ubo_bind_count[0] && (pipeline & GFX_SHADER_BITS) != GFX_SHADER_BITS)
pipeline |= find_pipeline_bits(res->ubo_bind_mask); pipeline |= find_pipeline_bits(res->ubo_bind_mask);
} }
} else { } else {
@ -391,10 +389,10 @@ update_barriers(struct zink_context *ctx, bool is_compute,
VkPipelineStageFlags gfx_stages = pipeline & ~(VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT); VkPipelineStageFlags gfx_stages = pipeline & ~(VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT);
/* images always need gfx stages, and buffers need gfx stages if non-vbo binds exist */ /* images always need gfx stages, and buffers need gfx stages if non-vbo binds exist */
bool needs_stages = !is_buffer || (res->bind_count[0] - res->vbo_bind_count > 0); bool needs_stages = !is_buffer || (res->bind_count[0] - res->vbo_bind_count > 0);
if (!gfx_stages && needs_stages) { if (gfx_stages != GFX_SHADER_BITS && needs_stages) {
gfx_stages = find_pipeline_bits(res->sampler_binds); gfx_stages |= find_pipeline_bits(res->sampler_binds);
if (!gfx_stages) //must be a shader image if (gfx_stages != GFX_SHADER_BITS) //must be a shader image
gfx_stages = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; gfx_stages |= find_pipeline_bits(res->image_binds);
pipeline |= gfx_stages; pipeline |= gfx_stages;
} }
} }