mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 13:02:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkan/swapper: destroy the surface in finalize

Browse source 
Fixes a leak of the VkSurface object.
This commit is contained in:
Matthew Waters 2019-08-23 14:19:22 +10:00
parent cac1487479
commit d1f8f7436d
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-libs/gst/vulkan/gstvkswapper.c
View file

@ -61,6 +61,7 @@ struct _GstVulkanSwapperPrivate
PFN_vkGetSwapchainImagesKHR GetSwapchainImagesKHR; PFN_vkGetSwapchainImagesKHR GetSwapchainImagesKHR;
PFN_vkAcquireNextImageKHR AcquireNextImageKHR; PFN_vkAcquireNextImageKHR AcquireNextImageKHR;
PFN_vkQueuePresentKHR QueuePresentKHR; PFN_vkQueuePresentKHR QueuePresentKHR;
PFN_vkDestroySurfaceKHR DestroySurfaceKHR;
/* <private> */ /* <private> */
/* runtime variables */ /* runtime variables */
@ -137,6 +138,7 @@ _get_function_table (GstVulkanSwapper * swapper)
GetPhysicalDeviceSurfaceFormatsKHR); GetPhysicalDeviceSurfaceFormatsKHR);
GET_PROC_ADDRESS_REQUIRED (swapper, instance, GET_PROC_ADDRESS_REQUIRED (swapper, instance,
GetPhysicalDeviceSurfacePresentModesKHR); GetPhysicalDeviceSurfacePresentModesKHR);
GET_PROC_ADDRESS_REQUIRED (swapper, instance, DestroySurfaceKHR);
GET_PROC_ADDRESS_REQUIRED (swapper, device, CreateSwapchainKHR); GET_PROC_ADDRESS_REQUIRED (swapper, device, CreateSwapchainKHR);
GET_PROC_ADDRESS_REQUIRED (swapper, device, DestroySwapchainKHR); GET_PROC_ADDRESS_REQUIRED (swapper, device, DestroySwapchainKHR);
GET_PROC_ADDRESS_REQUIRED (swapper, device, GetSwapchainImagesKHR); GET_PROC_ADDRESS_REQUIRED (swapper, device, GetSwapchainImagesKHR);
@ -478,6 +480,8 @@ static void
gst_vulkan_swapper_finalize (GObject * object) gst_vulkan_swapper_finalize (GObject * object)
{ {
GstVulkanSwapper *swapper = GST_VULKAN_SWAPPER (object); GstVulkanSwapper *swapper = GST_VULKAN_SWAPPER (object);
GstVulkanInstance *instance =
gst_vulkan_device_get_instance (swapper->device);
int i; int i;
g_signal_handler_disconnect (swapper->window, swapper->priv->draw_id); g_signal_handler_disconnect (swapper->window, swapper->priv->draw_id);
@ -509,6 +513,12 @@ gst_vulkan_swapper_finalize (GObject * object)
swapper->priv->swap_chain, NULL); swapper->priv->swap_chain, NULL);
swapper->priv->swap_chain = VK_NULL_HANDLE; swapper->priv->swap_chain = VK_NULL_HANDLE;
if (swapper->priv->surface) {
swapper->priv->DestroySurfaceKHR (instance->instance,
swapper->priv->surface, NULL);
}
swapper->priv->surface = VK_NULL_HANDLE;
g_free (swapper->priv->surf_present_modes); g_free (swapper->priv->surf_present_modes);
swapper->priv->surf_present_modes = NULL; swapper->priv->surf_present_modes = NULL;
@ -536,6 +546,8 @@ gst_vulkan_swapper_finalize (GObject * object)
gst_object_unref (swapper->window); gst_object_unref (swapper->window);
swapper->window = NULL; swapper->window = NULL;
gst_object_unref (instance);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }

3
gst-libs/gst/vulkan/gstvkwindow.c
View file

@ -294,7 +294,8 @@ gst_vulkan_window_get_display (GstVulkanWindow * window)
* @window: a #GstVulkanWindow * @window: a #GstVulkanWindow
* @error: a #GError * @error: a #GError
* *
* Returns: the VkSurface for displaying into * Returns: the VkSurface for displaying into. The caller is responsible for
* calling `VkDestroySurface` on the returned surface.
* *
* Since: 1.18 * Since: 1.18
*/ */