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

Merge branch 'wip/otte/for-main' into 'main'

Browse Source 
dmabuf: Let the EGL code initialize GL

See merge request GNOME/gtk!6685
This commit is contained in:
Benjamin Otte 2023-12-21 18:03:36 +00:00
commit 4e84312a5a
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdkdisplay.c
View File

@ -1932,8 +1932,6 @@ gdk_display_init_dmabuf (GdkDisplay *self)
#ifdef HAVE_DMABUF #ifdef HAVE_DMABUF
if (!GDK_DISPLAY_DEBUG_CHECK (self, DMABUF_DISABLE)) if (!GDK_DISPLAY_DEBUG_CHECK (self, DMABUF_DISABLE))
{ {
gdk_display_prepare_gl (self, NULL);
#ifdef HAVE_EGL #ifdef HAVE_EGL
gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_egl_downloader (self, builder)); gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_egl_downloader (self, builder));
#endif #endif

2
gdk/gdkvulkancontext.c
View File

@ -1561,7 +1561,7 @@ gdk_display_create_vulkan_instance (GdkDisplay *display,
.applicationVersion = 0, .applicationVersion = 0,
.pEngineName = "GTK", .pEngineName = "GTK",
.engineVersion = VK_MAKE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION, GDK_MICRO_VERSION), .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, .enabledLayerCount = used_layers->len,
.ppEnabledLayerNames = (const char * const *) used_layers->pdata, .ppEnabledLayerNames = (const char * const *) used_layers->pdata,

2
meson.build
View File

@ -25,7 +25,7 @@ epoxy_req = '>= 1.4'
cloudproviders_req = '>= 0.3.1' cloudproviders_req = '>= 0.3.1'
xkbcommon_req = '>= 0.2.0' xkbcommon_req = '>= 0.2.0'
sysprof_req = '>= 3.38.0' sysprof_req = '>= 3.38.0'
vulkan_req = '>= 1.2' vulkan_req = '>= 1.3'
fs = import('fs') fs = import('fs')
gnome = import('gnome') gnome = import('gnome')