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

vulkan/pipeline_cache: move vk_log on failed deserialization to vk_pipeline_cache_load()

Browse source 
Partially evicted or corrupted disk cache entries should not create
application cache log entries.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21967>
This commit is contained in:
Daniel Schürmann 2023-03-31 16:35:59 +02:00 • committed by Marge Bot
parent 53eb3ad375
commit 719a0e269e
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -288,11 +288,8 @@ vk_pipeline_cache_object_deserialize(struct vk_pipeline_cache *cache,
struct vk_pipeline_cache_object *object =
ops->deserialize(cache, key_data, key_size, &reader);
if (object == NULL) {
vk_logw(VK_LOG_OBJS(cache),
"Deserializing pipeline cache object failed");
if (object == NULL)
return NULL;
}
assert(reader.current == reader.end && !reader.overrun);
assert(object->ops == ops);
@ -406,6 +403,9 @@ vk_pipeline_cache_lookup_object(struct vk_pipeline_cache *cache,
data_obj->data,
data_obj->data_size, ops);
if (real_object == NULL) {
vk_logw(VK_LOG_OBJS(cache),
"Deserializing pipeline cache object failed");
vk_pipeline_cache_remove_object(cache, hash, object);
return NULL;
}
@ -597,8 +597,11 @@ vk_pipeline_cache_load(struct vk_pipeline_cache *cache,
vk_pipeline_cache_create_and_insert_object(cache, key_data, key_size,
data, data_size, ops);
if (object == NULL)
if (object == NULL) {
vk_logw(VK_LOG_OBJS(cache),
"Failed to load pipeline cache object");
continue;
}
vk_pipeline_cache_object_unref(cache->base.device, object);
}