diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-04-13 09:14:15 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-21 00:05:38 +0000 |
| commit | 7c2c0813c56baf522f39584150046c613a18931f (patch) | |
| tree | abf7b215d35cfbb0bb6d937d1d6d268c2fef5417 | |
| parent | 5357d331fb221d80a3c2ca7f2a06f91f540d3578 (diff) | |
zink: use undefined layout for first scanout obj transition
doesn't really matter, but technically an error
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10213>
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_resource.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 0c694038799..d45f749cf71 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1789,7 +1789,7 @@ copy_scanout(struct zink_context *ctx, struct zink_resource *res) NULL, 0, VK_ACCESS_TRANSFER_WRITE_BIT, - VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, + res->scanout_obj_init ? VK_IMAGE_LAYOUT_PRESENT_SRC_KHR : VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, @@ -1822,6 +1822,8 @@ copy_scanout(struct zink_context *ctx, struct zink_resource *res) 0, NULL, 1, &imb ); + /* separate flag to avoid annoying validation errors for new scanout objs */ + res->scanout_obj_init = true; } static void diff --git a/src/gallium/drivers/zink/zink_resource.h b/src/gallium/drivers/zink/zink_resource.h index 1bf959916ef..c298c8fe3d2 100644 --- a/src/gallium/drivers/zink/zink_resource.h +++ b/src/gallium/drivers/zink/zink_resource.h @@ -89,6 +89,7 @@ struct zink_resource { struct zink_resource_object *obj; struct zink_resource_object *scanout_obj; //TODO: remove for wsi + bool scanout_obj_init; union { struct util_range valid_buffer_range; struct { |