zink: assert batch is not in a renderpass when emitting pipeline barrier

this is only valid for subpasses which have self-dependencies set, and we
don't currently do that

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8945>
This commit is contained in:
Mike Blumenkrantz 2020-08-19 14:50:05 -04:00 committed by Marge Bot
parent 9df8c4ba96
commit 5d664166c8
1 changed files with 2 additions and 0 deletions

View File

@ -1089,6 +1089,7 @@ void
zink_resource_barrier(struct zink_batch *batch, struct zink_resource *res,
VkImageLayout new_layout, VkPipelineStageFlags pipeline)
{
assert(!batch->in_rp);
if (!pipeline)
pipeline = pipeline_dst_stage(new_layout);
if (!zink_resource_image_needs_barrier(res, new_layout, pipeline))
@ -1177,6 +1178,7 @@ zink_resource_buffer_needs_barrier(struct zink_resource *res, VkAccessFlags flag
void
zink_resource_buffer_barrier(struct zink_batch *batch, struct zink_resource *res, VkAccessFlags flags, VkPipelineStageFlags pipeline)
{
assert(!batch->in_rp);
if (!pipeline)
pipeline = pipeline_access_stage(flags);
if (!zink_resource_buffer_needs_barrier(res, flags, pipeline))