diff options
| author | Samuel Pitoiset <[email protected]> | 2019-10-21 13:32:05 +0200 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-10-25 09:06:25 -0700 |
| commit | e2b416e8aef488545c14b6130a575ec83d4ef134 (patch) | |
| tree | 945381e9b26b217d7952703550868cec2d45bf94 | |
| parent | a352e1d2f74458de114acc85ad4e15c4837f91ec (diff) | |
radv: fix vkUpdateDescriptorSets with inline uniform blocks
descriptorCount is the number of bytes into the descriptor, so
it shouldn't be used as an index. srcArrayElement/dstArrayElement
specify the starting byte offset within the binding to copy from/to.
This fixes new CTS tests:
dEQP-VK.binding_model.descriptor_copy.*.inline_uniform_block_*
dEQP-VK.binding_model.descriptor_copy.*.mix_3
dEQP-VK.binding_model.descriptor_copy.*.mix_array1
Fixes: 8d2654a4197 ("radv: Support VK_EXT_inline_uniform_block.")
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
(cherry picked from commit 7562a2cbe3e963247f32d6bd9d434036ad1a93dc)
| -rw-r--r-- | src/amd/vulkan/radv_descriptor_set.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 6f999a4595b..57dfd2232b9 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -1076,6 +1076,14 @@ void radv_update_descriptor_sets( src_ptr += src_binding_layout->offset / 4; dst_ptr += dst_binding_layout->offset / 4; + if (src_binding_layout->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { + src_ptr += copyset->srcArrayElement / 4; + dst_ptr += copyset->dstArrayElement / 4; + + memcpy(dst_ptr, src_ptr, copyset->descriptorCount); + continue; + } + src_ptr += src_binding_layout->size * copyset->srcArrayElement / 4; dst_ptr += dst_binding_layout->size * copyset->dstArrayElement / 4; |