diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2019-07-02 11:32:44 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2019-07-03 10:43:35 +0000 |
| commit | 8a053254b81497cb6b0708fe86986e461ee43771 (patch) | |
| tree | 5aa0a8236827f98c750237a1f18c01149c85bfc4 | |
| parent | 11a3679e3aba3524cf987f1f808d92c25f16e080 (diff) | |
radv: Fix interactions between variable descriptor count and inline uniform blocks.
Fixes: d7e6541cc72 "radv: Only allocate supplied number of descriptors when variable."
Reviewed-by: Samuel Pitoiset <[email protected]>
| -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 2891808e418..9a6e9cead9c 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -506,8 +506,12 @@ radv_descriptor_set_create(struct radv_device *device, uint32_t layout_size = layout->size; if (variable_count) { assert(layout->has_variable_descriptors); + uint32_t stride = layout->binding[layout->binding_count - 1].size; + if (layout->binding[layout->binding_count - 1].type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + stride = 1; + layout_size = layout->binding[layout->binding_count - 1].offset + - *variable_count * layout->binding[layout->binding_count - 1].size; + *variable_count * stride; } layout_size = align_u32(layout_size, 32); if (layout_size) { |