Drop patches that are unnecessary now that Vulkan headers are newer than 1.4.337.0.
Signed-off-by: Philipp Zabel <[email protected]> --- ...stom-dispatcher-with-isDispatchLoade.patch | 35 ----------------- ...eprecated-debug-utils-user-callback.patch} | 2 +- ...tom-dispatcher-with-isDispatchLoader.patch | 39 ------------------- patches/vkmark-2025.01/series | 6 +-- 4 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 patches/vkmark-2025.01/0001-core-Register-custom-dispatcher-with-isDispatchLoade.patch rename patches/vkmark-2025.01/{0003-core-Stop-using-deprecated-debug-utils-user-callback.patch => 0001-core-Stop-using-deprecated-debug-utils-user-callback.patch} (97%) delete mode 100644 patches/vkmark-2025.01/0002-kms-Register-custom-dispatcher-with-isDispatchLoader.patch 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 deleted file mode 100644 index d2671a7603f2..000000000000 --- a/patches/vkmark-2025.01/0001-core-Register-custom-dispatcher-with-isDispatchLoade.patch +++ /dev/null @@ -1,35 +0,0 @@ -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..3dbb48bfc194 100644 ---- a/src/vulkan_state.cpp -+++ b/src/vulkan_state.cpp -@@ -65,6 +65,18 @@ public: - - } - -+#if VK_HEADER_VERSION >= 333 && VK_HEADER_VERSION <= 337 -+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/0003-core-Stop-using-deprecated-debug-utils-user-callback.patch b/patches/vkmark-2025.01/0001-core-Stop-using-deprecated-debug-utils-user-callback.patch similarity index 97% rename from patches/vkmark-2025.01/0003-core-Stop-using-deprecated-debug-utils-user-callback.patch rename to patches/vkmark-2025.01/0001-core-Stop-using-deprecated-debug-utils-user-callback.patch index 6407c2262713..091b249fc4ca 100644 --- a/patches/vkmark-2025.01/0003-core-Stop-using-deprecated-debug-utils-user-callback.patch +++ b/patches/vkmark-2025.01/0001-core-Stop-using-deprecated-debug-utils-user-callback.patch @@ -17,7 +17,7 @@ Upstream-Status: Submitted [https://github.com/vkmark/vkmark/pull/81] 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vulkan_state.cpp b/src/vulkan_state.cpp -index 3dbb48bfc194..d400a7927583 100644 +index a36b2994dbba..75650161f031 100644 --- a/src/vulkan_state.cpp +++ b/src/vulkan_state.cpp @@ -31,10 +31,10 @@ 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 deleted file mode 100644 index d4d18e415a25..000000000000 --- a/patches/vkmark-2025.01/0002-kms-Register-custom-dispatcher-with-isDispatchLoader.patch +++ /dev/null @@ -1,39 +0,0 @@ -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..dc49a655d4b6 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 && VK_HEADER_VERSION <= 337 -+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/series b/patches/vkmark-2025.01/series index a3fd7467d603..3a632df17028 100644 --- a/patches/vkmark-2025.01/series +++ b/patches/vkmark-2025.01/series @@ -1,6 +1,4 @@ # 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 +0001-core-Stop-using-deprecated-debug-utils-user-callback.patch +# a60b02b9b08f894329a2e79aa8073b4b - git-ptx-patches magic -- 2.47.3
