AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 14:10:30 +00:00
Code Issues Projects Releases Wiki Activity

vulkan: Fix leaks with pipeline cache

Browse Source 
In particular, we were leaking the actual cache and then created a new
one.
This commit is contained in:
Benjamin Otte 2023-07-17 21:02:33 +02:00
parent 92038d6b7f
commit 0f289fddf7
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gdk/gdkvulkancontext.c
View File

@ -1050,6 +1050,7 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
{ {
g_warning_once ("Failed to create pipeline cache directory"); g_warning_once ("Failed to create pipeline cache directory");
g_free (path); g_free (path);
g_free (data);
return FALSE; return FALSE;
} }
g_free (path); g_free (path);
@ -1085,6 +1086,7 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
} }
g_clear_error (&error); g_clear_error (&error);
g_object_unref (file); g_object_unref (file);
g_free (data);
/* try again */ /* try again */
return gdk_vulkan_save_pipeline_cache (display); return gdk_vulkan_save_pipeline_cache (display);
@ -1093,10 +1095,12 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
g_warning ("Failed to save pipeline cache: %s", error->message); g_warning ("Failed to save pipeline cache: %s", error->message);
g_clear_error (&error); g_clear_error (&error);
g_object_unref (file); g_object_unref (file);
g_free (data);
return FALSE; return FALSE;
} }
g_object_unref (file); g_object_unref (file);
g_free (data);
g_free (display->vk_pipeline_cache_etag); g_free (display->vk_pipeline_cache_etag);
display->vk_pipeline_cache_etag = etag; display->vk_pipeline_cache_etag = etag;
@ -1132,12 +1136,15 @@ gdk_display_create_pipeline_cache (GdkDisplay *display)
{ {
display->vk_pipeline_cache = gdk_display_load_pipeline_cache (display); display->vk_pipeline_cache = gdk_display_load_pipeline_cache (display);
GDK_VK_CHECK (vkCreatePipelineCache, display->vk_device, if (display->vk_pipeline_cache == VK_NULL_HANDLE)
&(VkPipelineCacheCreateInfo) { {
.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO, GDK_VK_CHECK (vkCreatePipelineCache, display->vk_device,
}, &(VkPipelineCacheCreateInfo) {
NULL, .sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
&display->vk_pipeline_cache); },
NULL,
&display->vk_pipeline_cache);
}
} }
VkPipelineCache VkPipelineCache
@ -1649,7 +1656,7 @@ gdk_display_unref_vulkan (GdkDisplay *display)
g_assert (display->vk_save_pipeline_cache_source == 0); g_assert (display->vk_save_pipeline_cache_source == 0);
} }
vkDestroyPipelineCache (display->vk_device, display->vk_pipeline_cache, NULL); vkDestroyPipelineCache (display->vk_device, display->vk_pipeline_cache, NULL);
display->vk_device = VK_NULL_HANDLE; display->vk_pipeline_cache = VK_NULL_HANDLE;
g_clear_pointer (&display->vk_pipeline_cache_etag, g_free); g_clear_pointer (&display->vk_pipeline_cache_etag, g_free);
display->vk_pipeline_cache_size = 0; display->vk_pipeline_cache_size = 0;