From 679657cc0f4a6080969ddd2ecc80e7d78bf57cce Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 20 Mar 2023 15:47:10 +0200 Subject: [PATCH 1/2] ci: Use Fedora 38 as the base --- .gitlab-ci.yml | 2 +- .gitlab-ci/fedora.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f70a56014f..890a2c4bc4 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 -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v41" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v42" workflow: rules: diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index fd8930443a..4cafd15306 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:37 +FROM fedora:38 RUN dnf -y install \ adwaita-icon-theme \ From f9b2d3104a681b3e2bb2c32c98e1d992fdd29034 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 20 Mar 2023 16:15:05 +0200 Subject: [PATCH 2/2] vulkan: Update error codes enum --- gdk/gdkvulkancontext.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c index c28327fbd2..74f2a0e08d 100644 --- a/gdk/gdkvulkancontext.c +++ b/gdk/gdkvulkancontext.c @@ -221,6 +221,20 @@ gdk_vulkan_strerror (VkResult result) #endif #if VK_HEADER_VERSION < 140 case VK_RESULT_RANGE_SIZE: +#endif +#if VK_HEADER_VERSION >= 218 + case VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR: + return "The requested VkImageUsageFlags are not supported. (VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR)"; + case VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR: + return "The requested video picture layout is not supported. (VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR)"; + case VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR: + return "A video profile operation specified via VkVideoProfileInfoKHR::videoCodecOperation is not supported. (VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR)"; + case VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR: + return "Format parameters in a requested VkVideoProfileInfoKHR chain are not supported. (VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR)"; + case VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR: + return "Codec-specific parameters in a requested (VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR)"; + case VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR: + return "The specified video Std header version is not supported. (VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR)"; #endif case VK_RESULT_MAX_ENUM: default: