From 96152303a67c8bea397fcbc20cf485a807a6367c Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 21 Dec 2023 13:25:16 +0100
Subject: [PATCH 1/2] dmabuf: Let the EGL code initialize GL

The EGL downloader initialization already calls prepare_gl(), so no need
to call it in init_dmabuf_formats(), too.
---
 gdk/gdkdisplay.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 5d9432c766..8c18fa51bc 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1932,8 +1932,6 @@ gdk_display_init_dmabuf (GdkDisplay *self)
 #ifdef HAVE_DMABUF
   if (!GDK_DISPLAY_DEBUG_CHECK (self, DMABUF_DISABLE))
     {
-      gdk_display_prepare_gl (self, NULL);
-
 #ifdef HAVE_EGL
       gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_egl_downloader (self, builder));
 #endif

From c21ca4811e0ad53b0e19046a2e715cd5c561e6f0 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 21 Dec 2023 15:01:38 +0100
Subject: [PATCH 2/2] vulkan: Require Vulkan 1.3

Some dmabuf formats were added in Vulkan 1.3.

Note that this does not require the Vulkan drivers to be version 1.3 -
it just means compilation against libvulkan 1.3
---
 gdk/gdkvulkancontext.c | 2 +-
 meson.build            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c
index a463b6516a..6fb18c93d7 100644
--- a/gdk/gdkvulkancontext.c
+++ b/gdk/gdkvulkancontext.c
@@ -1561,7 +1561,7 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
                                                  .applicationVersion = 0,
                                                  .pEngineName = "GTK",
                                                  .engineVersion = VK_MAKE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION, GDK_MICRO_VERSION),
-                                                 .apiVersion = VK_API_VERSION_1_2
+                                                 .apiVersion = VK_API_VERSION_1_3
                                              },
                                              .enabledLayerCount = used_layers->len,
                                              .ppEnabledLayerNames = (const char * const *) used_layers->pdata,
diff --git a/meson.build b/meson.build
index 0f25ec69d0..ac5af50cbc 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,7 @@ epoxy_req          = '>= 1.4'
 cloudproviders_req = '>= 0.3.1'
 xkbcommon_req      = '>= 0.2.0'
 sysprof_req        = '>= 3.38.0'
-vulkan_req         = '>= 1.2'
+vulkan_req         = '>= 1.3'
 
 fs = import('fs')
 gnome = import('gnome')