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

vulkan: Don't use set_foreach_remove when destroying pipeline caches

Browse source 
set_foreach_remove assumes no entries have been removed. That assumption
only holds if no errors occur, since pipeline cache objects can get
removed if an error occurs during deserialization.

This fixes
dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic
crashing on RADV.

Cc: mesa-stable
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26164>
(cherry picked from commit 8ffdad731c)
This commit is contained in:
Friedrich Vock 2023-11-12 21:00:04 +01:00 • committed by Eric Engestrom
parent 16ed2f180c
commit 7cf359fb57
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -5364,7 +5364,7 @@
"description": "vulkan: Don't use set_foreach_remove when destroying pipeline caches",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

2
src/vulkan/runtime/vk_pipeline_cache.c
View file

@ -659,7 +659,7 @@ vk_pipeline_cache_destroy(struct vk_pipeline_cache *cache,
{
if (cache->object_cache) {
if (!cache->weak_ref) {
set_foreach_remove(cache->object_cache, entry) {
set_foreach(cache->object_cache, entry) {
vk_pipeline_cache_object_unref(cache->base.device, (void *)entry->key);
}
} else {