diff options
| author | Samuel Pitoiset <[email protected]> | 2019-02-25 15:28:25 +0100 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-02-26 10:41:09 -0800 |
| commit | e32fb87fd08f71d0eab4c06937adcba10d42e5b9 (patch) | |
| tree | eb3db6f82b3639db11f9b05c1e6e6e2507d27aa6 /src/amd | |
| parent | b2b148eb324b69eedb10d0172eadcb905e2d2bed (diff) | |
radv: don't copy buffer descriptors list for samplers
Sampler descriptors don't have a buffer list.
This fixes some crashes with new CTS
dEQP-VK.binding_model.descriptor_copy.*.sampler_*.
Cc: 18.3 19.0 <[email protected]>
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
(cherry picked from commit 4924dfc851e52c383380ae56be4d8606684ead7c)
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/vulkan/radv_descriptor_set.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index e6649305961..68171b5d244 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -969,7 +969,11 @@ void radv_update_descriptor_sets( } src_ptr += src_binding_layout->size / 4; dst_ptr += dst_binding_layout->size / 4; - dst_buffer_list[j] = src_buffer_list[j]; + + if (src_binding_layout->type != VK_DESCRIPTOR_TYPE_SAMPLER) { + /* Sampler descriptors don't have a buffer list. */ + dst_buffer_list[j] = src_buffer_list[j]; + } } } } |