diff options
| author | Fredrik Höglund <[email protected]> | 2017-03-29 18:11:56 +0200 |
|---|---|---|
| committer | Fredrik Höglund <[email protected]> | 2017-04-07 00:54:46 +0200 |
| commit | 3b33f03913d6c41aedf01a63c8b847c058a73f2f (patch) | |
| tree | ee0b291ae1458754a3069669e76215d03971c017 /src/amd/vulkan | |
| parent | a6e94a87cb0d0fd61f70a0eb5e33b3520a50d3c1 (diff) | |
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 <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_descriptor_set.c | 6 |
1 files changed, 3 insertions, 3 deletions
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"); |