Thanks, applied as 8c65d55ba075e7f0a27b3424e608719f95a71cee. Michael
[sent from post-receive hook] On Fri, 23 Jan 2026 16:02:12 +0100, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/vkmark-2025.01/0001-core-Register-custom-dispatcher-with-isDispatchLoade.patch > > b/patches/vkmark-2025.01/0001-core-Register-custom-dispatcher-with-isDispatchLoade.patch > new file mode 100644 > index 000000000000..ea02a6da87d3 > --- /dev/null > +++ > b/patches/vkmark-2025.01/0001-core-Register-custom-dispatcher-with-isDispatchLoade.patch > @@ -0,0 +1,35 @@ > +From: Philipp Zabel <[email protected]> > +Date: Wed, 10 Dec 2025 10:59:49 +0100 > +Subject: [PATCH] core: Register custom dispatcher with isDispatchLoader > + > +Since Vulkan 1.4.333, custom dispatch loaders must be registered > +with isDispatchLoader to be recognized. > + > +Upstream-Status: Submitted [https://github.com/vkmark/vkmark/pull/80] > +--- > + src/vulkan_state.cpp | 12 ++++++++++++ > + 1 file changed, 12 insertions(+) > + > +diff --git a/src/vulkan_state.cpp b/src/vulkan_state.cpp > +index a36b2994dbba..847095147bf5 100644 > +--- a/src/vulkan_state.cpp > ++++ b/src/vulkan_state.cpp > +@@ -65,6 +65,18 @@ public: > + > + } > + > ++#if VK_HEADER_VERSION >= 333 > ++namespace vk::detail { > ++ > ++template <> > ++struct isDispatchLoader<::DebugUtilsDispatcher> > ++{ > ++ static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true; > ++}; > ++ > ++} > ++#endif > ++ > + VulkanState::VulkanState(VulkanWSI& vulkan_wsi, > ChoosePhysicalDeviceStrategy const& pd_strategy, bool debug) > + : debug_enabled(debug) > + { > diff --git > a/patches/vkmark-2025.01/0002-kms-Register-custom-dispatcher-with-isDispatchLoader.patch > > b/patches/vkmark-2025.01/0002-kms-Register-custom-dispatcher-with-isDispatchLoader.patch > new file mode 100644 > index 000000000000..f3ad77da9ebf > --- /dev/null > +++ > b/patches/vkmark-2025.01/0002-kms-Register-custom-dispatcher-with-isDispatchLoader.patch > @@ -0,0 +1,39 @@ > +From: Philipp Zabel <[email protected]> > +Date: Wed, 10 Dec 2025 10:59:49 +0100 > +Subject: [PATCH] kms: Register custom dispatcher with isDispatchLoader > + > +Since Vulkan 1.4.333, custom dispatch loaders must be registered > +with isDispatchLoader to be recognized. > + > +Upstream-Status: Submitted [https://github.com/vkmark/vkmark/pull/80] > +--- > + src/ws/kms_window_system.cpp | 16 ++++++++++++++++ > + 1 file changed, 16 insertions(+) > + > +diff --git a/src/ws/kms_window_system.cpp b/src/ws/kms_window_system.cpp > +index fe59c5bc2159..d51e2bbbeac0 100644 > +--- a/src/ws/kms_window_system.cpp > ++++ b/src/ws/kms_window_system.cpp > +@@ -416,6 +416,22 @@ public: > + PFN_vkGetPhysicalDeviceFormatProperties2KHR > vkGetPhysicalDeviceFormatProperties2KHR; > + }; > + > ++} > ++ > ++#if VK_HEADER_VERSION >= 333 > ++namespace vk::detail { > ++ > ++template <> > ++struct isDispatchLoader<::GetFormatProperties2Dispatcher> > ++{ > ++ static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true; > ++}; > ++ > ++} > ++#endif > ++ > ++namespace { > ++ > + std::vector<uint64_t> vk_get_supported_mods_for_format(VulkanState& vulkan, > + vk::Format format) > + { > diff --git > a/patches/vkmark-2025.01/0003-core-Stop-using-deprecated-debug-utils-user-callback.patch > > b/patches/vkmark-2025.01/0003-core-Stop-using-deprecated-debug-utils-user-callback.patch > new file mode 100644 > index 000000000000..7757a3981f98 > --- /dev/null > +++ > b/patches/vkmark-2025.01/0003-core-Stop-using-deprecated-debug-utils-user-callback.patch > @@ -0,0 +1,37 @@ > +From: Philipp Zabel <[email protected]> > +Date: Wed, 10 Dec 2025 11:06:29 +0100 > +Subject: [PATCH] core: Stop using deprecated debug utils user callback setter > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Fix a build warning: > + > + ../src/vulkan_state.cpp:203:32: warning: > ‘vk::DebugUtilsMessengerCreateInfoEXT& > vk::DebugUtilsMessengerCreateInfoEXT::setPfnUserCallback(PFN_vkDebugUtilsMessengerCallbackEXT)’ > is deprecated: This setter is deprecated. Use the one taking a function > pointer type from the vk-namespace instead. [-Wdeprecated-declarations] > + > +by moving the callback function type into the Vulkan namespace. > + > +Upstream-Status: Submitted [https://github.com/vkmark/vkmark/pull/81] > +--- > + src/vulkan_state.cpp | 8 ++++---- > + 1 file changed, 4 insertions(+), 4 deletions(-) > + > +diff --git a/src/vulkan_state.cpp b/src/vulkan_state.cpp > +index 847095147bf5..7e4a05b0d179 100644 > +--- a/src/vulkan_state.cpp > ++++ b/src/vulkan_state.cpp > +@@ -31,10 +31,10 @@ > + namespace > + { > + > +-VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback( > +- VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, > +- VkDebugUtilsMessageTypeFlagsEXT message_type, > +- const VkDebugUtilsMessengerCallbackDataEXT* callback_data, > ++VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_callback( > ++ vk::DebugUtilsMessageSeverityFlagBitsEXT message_severity, > ++ vk::DebugUtilsMessageTypeFlagsEXT message_type, > ++ const vk::DebugUtilsMessengerCallbackDataEXT* callback_data, > + void* user_data) > + { > + Log::debug("%s\n", callback_data->pMessage); > diff --git a/patches/vkmark-2025.01/series b/patches/vkmark-2025.01/series > new file mode 100644 > index 000000000000..a3fd7467d603 > --- /dev/null > +++ b/patches/vkmark-2025.01/series > @@ -0,0 +1,6 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-core-Register-custom-dispatcher-with-isDispatchLoade.patch > +0002-kms-Register-custom-dispatcher-with-isDispatchLoader.patch > +0003-core-Stop-using-deprecated-debug-utils-user-callback.patch > +# be1b1a774085ed37d138497b2a8558e6 - git-ptx-patches magic
