fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-21 07:30:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: use fake buffer barriers for descriptors

Browse source 
GL requires explicit glMemoryBarrier calls for shader synchronization
and only calls that map/copy buffers get implicit sync, so we don't actually
need barriers for any of these cases, only the state needs to be updated

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11393>
This commit is contained in:
Mike Blumenkrantz 2021-04-07 10:49:39 -04:00 • committed by Marge Bot
parent 3c2f343618
commit 5341b985e4
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/zink/zink_context.c
View file

@ -1017,7 +1017,7 @@ zink_set_constant_buffer(struct pipe_context *pctx,
}
if (!ctx->descriptor_refs_dirty[shader == PIPE_SHADER_COMPUTE])
zink_batch_reference_resource_rw(&ctx->batch, new_res, false);
zink_resource_buffer_barrier(ctx, NULL, new_res, VK_ACCESS_UNIFORM_READ_BIT,
zink_fake_buffer_barrier(new_res, VK_ACCESS_UNIFORM_READ_BIT,
zink_pipeline_flags_from_stage(zink_shader_stage(shader)));
}
update |= ((index || screen->descriptor_mode == ZINK_DESCRIPTOR_MODE_LAZY) && ctx->ubos[shader][index].buffer_offset != offset) ||
@ -1111,7 +1111,7 @@ zink_set_shader_buffers(struct pipe_context *pctx,
ssbo->buffer_size = MIN2(buffers[i].buffer_size, new_res->obj->size - ssbo->buffer_offset);
util_range_add(&new_res->base.b, &new_res->valid_buffer_range, ssbo->buffer_offset,
ssbo->buffer_offset + ssbo->buffer_size);
zink_resource_buffer_barrier(ctx, NULL, new_res, access,
zink_fake_buffer_barrier(new_res, access,
zink_pipeline_flags_from_stage(zink_shader_stage(p_stage)));
update = true;
max_slot = MAX2(max_slot, start_slot + i);
@ -1233,7 +1233,7 @@ zink_set_shader_images(struct pipe_context *pctx,
assert(image_view->buffer_view);
util_range_add(&res->base.b, &res->valid_buffer_range, images[i].u.buf.offset,
images[i].u.buf.offset + images[i].u.buf.size);
zink_resource_buffer_barrier(ctx, NULL, res, access,
zink_fake_buffer_barrier(res, access,
zink_pipeline_flags_from_stage(zink_shader_stage(p_stage)));
} else {
struct pipe_surface tmpl = {0};
@ -1325,7 +1325,7 @@ zink_set_sampler_views(struct pipe_context *pctx,
update = true;
}
}
zink_resource_buffer_barrier(ctx, NULL, res, VK_ACCESS_SHADER_READ_BIT,
zink_fake_buffer_barrier(res, VK_ACCESS_SHADER_READ_BIT,
zink_pipeline_flags_from_stage(zink_shader_stage(shader_type)));
if (!a || a->buffer_view->buffer_view != b->buffer_view->buffer_view)
update = true;
@ -2303,6 +2303,13 @@ zink_resource_buffer_needs_barrier(struct zink_resource *res, VkAccessFlags flag
(res->access & flags) != flags;
}
void
zink_fake_buffer_barrier(struct zink_resource *res, VkAccessFlags flags, VkPipelineStageFlags pipeline)
{
res->access = flags;
res->access_stage = pipeline;
}
void
zink_resource_buffer_barrier(struct zink_context *ctx, struct zink_batch *batch, struct zink_resource *res, VkAccessFlags flags, VkPipelineStageFlags pipeline)
{

3
src/gallium/drivers/zink/zink_context.h
View file

@ -318,7 +318,8 @@ zink_resource_access_is_write(VkAccessFlags flags);
void
zink_resource_buffer_barrier(struct zink_context *ctx, struct zink_batch *batch, struct zink_resource *res, VkAccessFlags flags, VkPipelineStageFlags pipeline);
void
zink_fake_buffer_barrier(struct zink_resource *res, VkAccessFlags flags, VkPipelineStageFlags pipeline);
bool
zink_resource_image_needs_barrier(struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline);
bool