From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 19 Aug 2020 18:50:05 +0000 (-0400)
Subject: zink: assert batch is not in a renderpass when emitting pipeline barrier
X-Git-Tag: upstream/21.2.3~7590
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d664166c85f6294f3e92eb34cb876e63ae6e99a;p=platform%2Fupstream%2Fmesa.git

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>
---

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 73570e9..8bc0429 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -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))