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

v3dv: fix crash on 32-bit builds

Browse source 
Command buffer private object destroy callbacks receive a 64-integer so their
signature should respect that to avoid alignment issues when passing pointers.
This is the same we were already doing for color pipelines, but now for D/S
pipelines too.

Fixes crash on 32-bit build with:
dEQP-VK.synchronization2.op.single_queue.fence.write_clear_attachments_read_copy_image_to_buffer.image_128x128_d16_unorm

Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>
cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33463>
(cherry picked from commit daa48cbaef)
This commit is contained in:
Iago Toral Quiroga 2025-02-10 09:10:12 +01:00 • committed by Eric Engestrom
parent 33065515bc
commit 93d004ab64
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -714,7 +714,7 @@
"description": "v3dv: fix crash on 32-bit builds",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

6
src/broadcom/vulkan/v3dv_meta_clear.c
View file

@ -220,9 +220,11 @@ destroy_color_clear_pipeline(VkDevice _device,
static void
destroy_depth_clear_pipeline(VkDevice _device,
struct v3dv_meta_depth_clear_pipeline *p,
uint64_t pipeline,
VkAllocationCallbacks *alloc)
{
struct v3dv_meta_depth_clear_pipeline *p =
(struct v3dv_meta_depth_clear_pipeline *)(uintptr_t)pipeline;
v3dv_DestroyPipeline(_device, p->pipeline, alloc);
vk_free(alloc, p);
}
@ -306,7 +308,7 @@ v3dv_meta_clear_finish(struct v3dv_device *device)
hash_table_foreach(device->meta.depth_clear.cache, entry) {
struct v3dv_meta_depth_clear_pipeline *item = entry->data;
destroy_depth_clear_pipeline(_device, item, &device->vk.alloc);
destroy_depth_clear_pipeline(_device, (uintptr_t)item, &device->vk.alloc);
}
_mesa_hash_table_destroy(device->meta.depth_clear.cache, NULL);
}