From 031109aec3647c35c50aef36c96b95c7050913a8 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 16 May 2024 02:22:17 +0200 Subject: [PATCH 1/2] columnview: Actually check the listview in return_if_fail() This was missed when adding return_if_fail()s in 172cdf8e21aafeb6d705a65406193eee613dd16f. Related: !7240 --- gtk/gtkcolumnview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c index 42b6ff28f1..4cdeceefb7 100644 --- a/gtk/gtkcolumnview.c +++ b/gtk/gtkcolumnview.c @@ -2212,7 +2212,7 @@ gtk_column_view_scroll_to (GtkColumnView *self, GtkScrollInfo *scroll) { g_return_if_fail (GTK_IS_COLUMN_VIEW (self)); - g_return_if_fail (pos < gtk_list_base_get_n_items (GTK_LIST_BASE (self))); + g_return_if_fail (pos < gtk_list_base_get_n_items (GTK_LIST_BASE (self->listview))); g_return_if_fail (column == NULL || GTK_IS_COLUMN_VIEW_COLUMN (column)); if (column) { From b3c6a98132439f67ebfd1d0dc21f8419fbe56459 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 8 May 2024 15:45:35 +0200 Subject: [PATCH 2/2] vulkan: Add a missing extension We need to enable this one, too. Thanks validation layers! --- gdk/gdkvulkancontext.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c index 098f9d3557..729f9e1d36 100644 --- a/gdk/gdkvulkancontext.c +++ b/gdk/gdkvulkancontext.c @@ -607,7 +607,8 @@ physical_device_check_features (VkPhysicalDevice device) features |= GDK_VULKAN_FEATURE_YCBCR; if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME) && - physical_device_supports_extension (device, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) + physical_device_supports_extension (device, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME) && + physical_device_supports_extension (device, VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME)) features |= GDK_VULKAN_FEATURE_DMABUF; if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) @@ -1517,6 +1518,7 @@ gdk_display_create_vulkan_device (GdkDisplay *display, g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME); g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME); + g_ptr_array_add (device_extensions, (gpointer) VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME); g_ptr_array_add (device_extensions, (gpointer) VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME); g_ptr_array_add (device_extensions, (gpointer) VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME);