Skip to content
Snippets Groups Projects
Commit 50c3dcd2 authored by Bas Nieuwenhuizen's avatar Bas Nieuwenhuizen Committed by Juan A. Suárez
Browse files

radv: Fix interactions between variable descriptor count and inline uniform blocks.


Fixes: d7e6541c "radv: Only allocate supplied number of descriptors when variable."
Reviewed-by: default avatarSamuel Pitoiset <samuel.pitoiset@gmail.com>
(cherry picked from commit 8a053254)
parent 202eb29e
No related branches found
No related tags found
Loading
......@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment