From: Fredrik Höglund Date: Wed, 29 Mar 2017 16:11:56 +0000 (+0200) Subject: radv: replace an assertion with a conditional X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b33f03913d6c41aedf01a63c8b847c058a73f2f;p=mesa.git radv: replace an assertion with a conditional Replace the !binding_layout->immutable_samplers assertion in radv_update_descriptor_sets with a conditional. The Vulkan specification does not say that it is illegal to update a sampler descriptor when it is immutable; only that pImageInfo is ignored. This change is also needed for push descriptors, because valid descriptors must be pushed for all bindings accessed by shaders, including immutable sampler descriptors. Signed-off-by: Fredrik Höglund Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index aca5effef2e..aefe0c38081 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -693,9 +693,9 @@ void radv_update_descriptor_sets( !binding_layout->immutable_samplers); break; case VK_DESCRIPTOR_TYPE_SAMPLER: - assert(!binding_layout->immutable_samplers); - write_sampler_descriptor(device, ptr, - writeset->pImageInfo + j); + if (!binding_layout->immutable_samplers) + write_sampler_descriptor(device, ptr, + writeset->pImageInfo + j); break; default: unreachable("unimplemented descriptor type");