KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: always use VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL for sampler bindings 

if a resource is used multiple times with different samplers then this can result
in conflicting layouts, so it's better to just use the general case here

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9348>
This commit is contained in:
Mike Blumenkrantz 2020-10-09 09:37:47 -04:00 committed by Marge Bot
parent e4421c4b82
commit 5700cbfa1a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/zink/zink_context.c
View File

@ -96,11 +96,7 @@ calc_descriptor_hash_sampler_view(struct zink_context *ctx, struct zink_sampler_
hash_data = &sampler_view->image_view;
data_size = sizeof(VkImageView);
hash = XXH32(hash_data, data_size, hash);
VkImageLayout layout;
if (util_format_is_depth_and_stencil(sampler_view->base.format))
layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
else
layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
VkImageLayout layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
hash_data = &layout;
data_size = sizeof(VkImageLayout);
sampler_view->hash = XXH32(hash_data, data_size, hash);