Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdkvulkan: Track if we reffed the display's vulkan data

Browse Source 
When reffing the display fails in init, we were still trying to unref
it. Which obviously failed and spewed warnings to stderr.
This commit is contained in:
Benjamin Otte
2017-01-04 18:26:14 +01:00
parent 3887548d55
commit efc5f8dc47
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdk/gdkvulkancontext.c
View File

@@ -45,6 +45,8 @@ struct _GdkVulkanContextPrivate {
#endif
guint32 draw_index;
guint vulkan_ref: 1;
};
enum {
@@ -166,7 +168,7 @@ gdk_vulkan_context_dispose (GObject *gobject)
/* display will be unset in gdk_draw_context_dispose() */
display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
if (display)
if (display && priv->vulkan_ref)
gdk_display_unref_vulkan (display);
G_OBJECT_CLASS (gdk_vulkan_context_parent_class)->dispose (gobject);
@@ -411,7 +413,8 @@ gdk_vulkan_context_real_init (GInitable *initable,
VkBool32 supported;
uint32_t i;
if (!gdk_display_ref_vulkan (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)), error))
priv->vulkan_ref = gdk_display_ref_vulkan (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)), error);
if (!priv->vulkan_ref)
return FALSE;
res = GDK_VULKAN_CONTEXT_GET_CLASS (context)->create_surface (context, &priv->surface);