Module: Mesa Branch: main Commit: 71fd9c2be06c4ecd03c63d8da451526606d40947 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=71fd9c2be06c4ecd03c63d8da451526606d40947
Author: Luigi Santivetti <[email protected]> Date: Thu Mar 9 15:54:35 2023 +0000 pvr: fix segfault in dEQP-VK.ycbcr.query.* Signed-off-by: Luigi Santivetti <[email protected]> Reviewed-by: Frank Binns <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22061> --- src/imagination/vulkan/pvr_descriptor_set.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/imagination/vulkan/pvr_descriptor_set.c b/src/imagination/vulkan/pvr_descriptor_set.c index 2c0737be86b..2c32d286b08 100644 --- a/src/imagination/vulkan/pvr_descriptor_set.c +++ b/src/imagination/vulkan/pvr_descriptor_set.c @@ -1191,7 +1191,6 @@ pvr_descriptor_set_create(struct pvr_device *device, struct pvr_descriptor_set *set; VkResult result; size_t size; - void *map; size = sizeof(*set) + sizeof(set->descriptors[0]) * layout->descriptor_count; @@ -1231,7 +1230,6 @@ pvr_descriptor_set_create(struct pvr_device *device, set->layout = layout; set->pool = pool; - map = set->pvr_bo->bo->map; for (uint32_t i = 0; i < layout->binding_count; i++) { const struct pvr_descriptor_set_layout_binding *binding = &layout->bindings[i]; @@ -1254,6 +1252,7 @@ pvr_descriptor_set_create(struct pvr_device *device, binding, stage, j); + void *map = set->pvr_bo->bo->map; if (binding->type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) offset_in_dwords += 4;
