Signed-off-by: Philipp Zabel <[email protected]> --- ...core-Register-custom-dispatcher-with-isDispatchLoade.patch | 4 ++-- ...kms-Register-custom-dispatcher-with-isDispatchLoader.patch | 4 ++-- ...core-Stop-using-deprecated-debug-utils-user-callback.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
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 index ea02a6da87d3..d2671a7603f2 100644 --- 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 @@ -11,14 +11,14 @@ Upstream-Status: Submitted [https://github.com/vkmark/vkmark/pull/80] 1 file changed, 12 insertions(+) diff --git a/src/vulkan_state.cpp b/src/vulkan_state.cpp -index a36b2994dbba..847095147bf5 100644 +index a36b2994dbba..3dbb48bfc194 100644 --- a/src/vulkan_state.cpp +++ b/src/vulkan_state.cpp @@ -65,6 +65,18 @@ public: } -+#if VK_HEADER_VERSION >= 333 ++#if VK_HEADER_VERSION >= 333 && VK_HEADER_VERSION <= 337 +namespace vk::detail { + +template <> 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 index f3ad77da9ebf..d4d18e415a25 100644 --- 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 @@ -11,7 +11,7 @@ Upstream-Status: Submitted [https://github.com/vkmark/vkmark/pull/80] 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 +index fe59c5bc2159..dc49a655d4b6 100644 --- a/src/ws/kms_window_system.cpp +++ b/src/ws/kms_window_system.cpp @@ -416,6 +416,22 @@ public: @@ -20,7 +20,7 @@ index fe59c5bc2159..d51e2bbbeac0 100644 +} + -+#if VK_HEADER_VERSION >= 333 ++#if VK_HEADER_VERSION >= 333 && VK_HEADER_VERSION <= 337 +namespace vk::detail { + +template <> 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 index 7757a3981f98..6407c2262713 100644 --- 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 @@ -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 847095147bf5..7e4a05b0d179 100644 +index 3dbb48bfc194..d400a7927583 100644 --- a/src/vulkan_state.cpp +++ b/src/vulkan_state.cpp @@ -31,10 +31,10 @@ -- 2.47.3
