gnu: vkmark: Fix compatibility with vulkan-headers 1.4.333.

* gnu/packages/patches/vkmark-2025.1-fix-vulkan-headers-1.4.333.patch:
  New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/benchmark.scm (vkmark)[source]<patches>: Add it.

Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>

3 files changed, 61 insertions, 1 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index 8d795b82458..a71dc5b68c1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2629,6 +2629,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/vcmi-disable-privacy-breach.patch        \
   %D%/packages/patches/vinagre-newer-freerdp.patch             \
   %D%/packages/patches/vinagre-newer-rdp-parameters.patch      \
+  %D%/packages/patches/vkmark-2025.1-fix-vulkan-headers-1.4.333.patch   \
   %D%/packages/patches/vsearch-unbundle-cityhash.patch          \
   %D%/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch    \
   %D%/packages/patches/vte-CVE-2012-2738-pt1.patch                      \
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 906021e314f..926daca2a87 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -899,7 +899,8 @@ user-provided Lua scripts.
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0mpxyfwln1627zzi11fb6lgv7x1jz1p2w16w1mhhkdz1xsln6fj6"))))
+        (base32 "0mpxyfwln1627zzi11fb6lgv7x1jz1p2w16w1mhhkdz1xsln6fj6"))
+       (patches (search-patches "vkmark-2025.1-fix-vulkan-headers-1.4.333.patch"))))
     (build-system meson-build-system)
     (arguments
      (list
diff --git a/gnu/packages/patches/vkmark-2025.1-fix-vulkan-headers-1.4.333.patch b/gnu/packages/patches/vkmark-2025.1-fix-vulkan-headers-1.4.333.patch
new file mode 100644
index 00000000000..7779954290f
--- /dev/null
+++ b/gnu/packages/patches/vkmark-2025.1-fix-vulkan-headers-1.4.333.patch
@@ -0,0 +1,58 @@
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Wed, 10 Dec 2025 10:59:49 +0100
+Subject: Register custom dispatcher with isDispatchLoader
+Upstream-status: https://github.com/vkmark/vkmark/pull/80
+
+Since Vulkan 1.4.333, custom dispatch loaders must be registered
+with isDispatchLoader to be recognized.
+
+diff --git a/src/vulkan_state.cpp b/src/vulkan_state.cpp
+index a36b299..3dbb48b 100644
+--- a/src/vulkan_state.cpp
++++ b/src/vulkan_state.cpp
+@@ -65,6 +65,18 @@ class DebugUtilsDispatcher
+ 
+ }
+ 
++#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/src/ws/kms_window_system.cpp b/src/ws/kms_window_system.cpp
+index 4bf7838..d378778 100644
+--- a/src/ws/kms_window_system.cpp
++++ b/src/ws/kms_window_system.cpp
+@@ -474,6 +474,22 @@ class GetFormatProperties2Dispatcher
+     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)
+ {