From 0e390d2f835c24ebb59b4a3373668ddce6228cdf Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 7 Apr 2021 10:59:41 -0400 Subject: [PATCH] zink: break out image descriptor layout into util function Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_descriptors.c | 14 ++++++++++++++ src/gallium/drivers/zink/zink_descriptors.h | 2 ++ src/gallium/drivers/zink/zink_draw.c | 10 +--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 90e0ceb2900..4d5e901144e 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -488,6 +488,20 @@ zink_descriptor_util_init_null_set(struct zink_context *ctx, VkDescriptorSet des vkUpdateDescriptorSets(screen->dev, 1, &push_wd, 0, NULL); } +VkImageLayout +zink_descriptor_util_image_layout_eval(const struct zink_resource *res, bool is_compute) +{ + return res->image_bind_count[is_compute] ? VK_IMAGE_LAYOUT_GENERAL : + res->aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT) ? + //Vulkan-Docs#1490 + //(res->aspect == VK_IMAGE_ASPECT_DEPTH_BIT ? VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL : + //res->aspect == VK_IMAGE_ASPECT_STENCIL_BIT ? VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL : + (res->aspect == VK_IMAGE_ASPECT_DEPTH_BIT ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : + res->aspect == VK_IMAGE_ASPECT_STENCIL_BIT ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : + VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL) : + VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; +} + static uint32_t hash_descriptor_pool(const void *key) { diff --git a/src/gallium/drivers/zink/zink_descriptors.h b/src/gallium/drivers/zink/zink_descriptors.h index cd5d40a0427..c78876aa317 100644 --- a/src/gallium/drivers/zink/zink_descriptors.h +++ b/src/gallium/drivers/zink/zink_descriptors.h @@ -205,6 +205,8 @@ void zink_descriptor_util_init_null_set(struct zink_context *ctx, VkDescriptorSet desc_set); struct zink_resource * zink_get_resource_for_descriptor(struct zink_context *ctx, enum zink_descriptor_type type, enum pipe_shader_type shader, int idx); +VkImageLayout +zink_descriptor_util_image_layout_eval(const struct zink_resource *res, bool is_compute); /* these two can't be called in lazy mode */ void diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c index cbf478475aa..36bd7329e04 100644 --- a/src/gallium/drivers/zink/zink_draw.c +++ b/src/gallium/drivers/zink/zink_draw.c @@ -376,15 +376,7 @@ update_barriers(struct zink_context *ctx, bool is_compute) if (res->base.b.target == PIPE_BUFFER) zink_resource_buffer_barrier(ctx, NULL, res, access, pipeline); else { - VkImageLayout layout = res->image_bind_count[is_compute] ? VK_IMAGE_LAYOUT_GENERAL : - res->aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT) ? - //Vulkan-Docs#1490 - //(res->aspect == VK_IMAGE_ASPECT_DEPTH_BIT ? VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL : - //res->aspect == VK_IMAGE_ASPECT_STENCIL_BIT ? VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL : - (res->aspect == VK_IMAGE_ASPECT_DEPTH_BIT ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : - res->aspect == VK_IMAGE_ASPECT_STENCIL_BIT ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : - VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL) : - VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + VkImageLayout layout = zink_descriptor_util_image_layout_eval(res, is_compute); zink_resource_image_barrier(ctx, NULL, res, layout, access, pipeline); } /* always barrier on draw if this resource has either multiple image write binds or