diff options
-rw-r--r-- | .gitlab-ci.yml | 10 | ||||
-rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 3 | ||||
-rw-r--r-- | demos/gtk-demo/meson.build | 2 | ||||
-rw-r--r-- | demos/widget-factory/meson.build | 2 | ||||
-rw-r--r-- | gdk/gdkvulkancontext.c | 20 | ||||
-rw-r--r-- | gtk/meson.build | 2 |
6 files changed, 21 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a78287b8b5..535e4c90bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v39" FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master" .only-default: @@ -85,7 +85,7 @@ fedora-x86_64: EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both" script: - .gitlab-ci/show-info-linux.sh - - meson subprojects update + - meson subprojects download - mkdir _install - meson --prefix=${CI_PROJECT_DIR}/_install ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} @@ -107,7 +107,7 @@ release-build: EXTRA_MESON_FLAGS: "--buildtype=release" script: - .gitlab-ci/show-info-linux.sh - - meson subprojects update + - meson subprojects download - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build - ninja -C _build @@ -131,7 +131,7 @@ fedora-mingw64: # mingw64-graphene (rawhide) script: - .gitlab-ci/show-info-linux.sh - - meson subprojects update + - meson subprojects download - mkdir _build && cd _build - mingw64-meson -Dintrospection=disabled -Dgraphene:introspection=disabled - ninja @@ -145,7 +145,7 @@ installed-tests: G_TEST_ACCESSIBLE: 1 script: - .gitlab-ci/show-info-linux.sh - - meson subprojects update + - meson subprojects download - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build - ninja -C _build diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 6800059bf7..2f76b4f9d3 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:36 +FROM fedora:37 RUN dnf -y install \ adwaita-icon-theme \ @@ -82,7 +82,6 @@ RUN dnf -y install \ python3-markdown \ python3-pip \ python3-pygments \ - python3-toml \ python3-typogrify \ python3-wheel \ redhat-rpm-config \ diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build index ef89fbc7d2..5537cf20a5 100644 --- a/demos/gtk-demo/meson.build +++ b/demos/gtk-demo/meson.build @@ -156,7 +156,7 @@ demos_h = custom_target('gtk4 demo header', objcopy_supports_add_symbol = false objcopy = find_program('objcopy', required : false) if objcopy.found() - objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol') + objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol') endif ld = find_program('ld', required : false) diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build index 550eb09bd9..0513555a3f 100644 --- a/demos/widget-factory/meson.build +++ b/demos/widget-factory/meson.build @@ -3,7 +3,7 @@ objcopy_supports_add_symbol = false objcopy = find_program('objcopy', required : false) if objcopy.found() - objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol') + objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol') endif ld = find_program('ld', required : false) diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c index 70450f2334..c28327fbd2 100644 --- a/gdk/gdkvulkancontext.c +++ b/gdk/gdkvulkancontext.c @@ -94,7 +94,7 @@ gdk_vulkan_strerror (VkResult result) * Because the Vulkan people don't make adding this too easy, here's * the process to manage it: * 1. go to - * https://github.com/KhronosGroup/Vulkan-Headers/blob/master/include/vulkan/vulkan_core.h + * https://github.com/KhronosGroup/Vulkan-Headers/blob/main/include/vulkan/vulkan_core.h * 2. Find the line where this enum value was added. * 3. Click the commit that added this line. * 4. The commit you're looking at now should also change @@ -215,6 +215,10 @@ gdk_vulkan_strerror (VkResult result) case VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT: return "A requested pipeline creation would have required compilation, but the application requested compilation to not be performed. (VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT)"; #endif +#if VK_HEADER_VERSION >= 213 + case VK_ERROR_COMPRESSION_EXHAUSTED_EXT: + return "An image creation failed because internal resources required for compression are exhausted. (VK_ERROR_COMPRESSION_EXHAUSTED_EXT)"; +#endif #if VK_HEADER_VERSION < 140 case VK_RESULT_RANGE_SIZE: #endif @@ -488,7 +492,7 @@ gdk_vulkan_context_end_frame (GdkDrawContext *draw_context, priv->draw_semaphore }, .swapchainCount = 1, - .pSwapchains = (VkSwapchainKHR[]) { + .pSwapchains = (VkSwapchainKHR[]) { priv->swapchain }, .pImageIndices = (uint32_t[]) { @@ -608,7 +612,7 @@ gdk_vulkan_context_real_init (GInitable *initable, { g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE, "No supported image format found."); - goto out_surface; + goto out_surface; } priv->image_format = formats[i]; priv->has_present_region = device_supports_incremental_present (display->vk_physical_device); @@ -1037,8 +1041,8 @@ gdk_display_create_vulkan_instance (GdkDisplay *display, GDK_VK_CHECK (vkEnumerateInstanceExtensionProperties, NULL, &n_extensions, extensions); used_extensions = g_ptr_array_new (); - g_ptr_array_add (used_extensions, (gpointer) VK_KHR_SURFACE_EXTENSION_NAME); - g_ptr_array_add (used_extensions, (gpointer) GDK_DISPLAY_GET_CLASS (display)->vk_extension_name); + g_ptr_array_add (used_extensions, (gpointer) VK_KHR_SURFACE_EXTENSION_NAME); + g_ptr_array_add (used_extensions, (gpointer) GDK_DISPLAY_GET_CLASS (display)->vk_extension_name); for (i = 0; i < n_extensions; i++) { @@ -1118,7 +1122,7 @@ gdk_display_create_vulkan_instance (GdkDisplay *display, if (have_debug_report) { PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT; - + vkCreateDebugReportCallbackEXT = (PFN_vkCreateDebugReportCallbackEXT) vkGetInstanceProcAddr (display->vk_instance, "vkCreateDebugReportCallbackEXT" ); GDK_VK_CHECK (vkCreateDebugReportCallbackEXT, display->vk_instance, &(VkDebugReportCallbackCreateInfoEXT) { @@ -1167,7 +1171,7 @@ gdk_display_ref_vulkan (GdkDisplay *display, } display->vulkan_refcount++; - + return TRUE; } @@ -1180,7 +1184,7 @@ gdk_display_unref_vulkan (GdkDisplay *display) display->vulkan_refcount--; if (display->vulkan_refcount > 0) return; - + vkDestroyDevice (display->vk_device, NULL); display->vk_device = VK_NULL_HANDLE; if (display->vk_debug_callback != VK_NULL_HANDLE) diff --git a/gtk/meson.build b/gtk/meson.build index 2cb16d6710..72e283b71d 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -800,7 +800,7 @@ endif objcopy_supports_add_symbol = false objcopy = find_program('objcopy', required : false) if objcopy.found() - objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol') + objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol') endif ld = find_program('ld', required : false) |