fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

v3dv: fix sampler array addressing in v3dv_descriptor_set_layout

Browse source 
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15634>
This commit is contained in:
Iago Toral Quiroga 2022-03-29 11:47:54 +02:00 • committed by Marge Bot
parent 00cc52b282
commit 591eed30b2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/broadcom/vulkan/v3dv_descriptor_set.c
View file

@ -578,8 +578,13 @@ v3dv_CreateDescriptorSetLayout(VkDevice _device,
}
}
uint32_t samplers_offset = sizeof(struct v3dv_descriptor_set_layout) +
num_bindings * sizeof(set_layout->binding[0]);
/* We place immutable samplers after the binding data. We want to use
* offsetof instead of any sizeof(struct v3dv_descriptor_set_layout)
* because the latter may include padding at the end of the struct.
*/
uint32_t samplers_offset =
offsetof(struct v3dv_descriptor_set_layout, binding[num_bindings]);
uint32_t size = samplers_offset +
immutable_sampler_count * sizeof(struct v3dv_sampler);
@ -589,7 +594,6 @@ v3dv_CreateDescriptorSetLayout(VkDevice _device,
if (!set_layout)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
/* We just allocate all the immutable samplers at the end of the struct */
struct v3dv_sampler *samplers = (void*) &set_layout->binding[num_bindings];
assert(pCreateInfo->bindingCount == 0 || num_bindings > 0);