From 5e992e8969de2c405f96759dda10f46c505170f3 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Sun, 10 Aug 2025 18:29:18 -0700
Subject: [PATCH] vulkan/util: add missing vulkan header

Unlike features, property members do need Vulkan header. Currently it
relies on the fact that vk_physical_device.h has included some other
headers that include vulkan.h before this.

Cc: mesa-stable
Reviewed-by: Lucas Fryzek <lfryzek@igalia.com>
Acked-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36702>
(cherry picked from commit 567cff487cdfe9f653152cc01c1e3a856f3f41ed)
---
 .pick_status.json                                    | 2 +-
 src/vulkan/util/vk_physical_device_properties_gen.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 187ad24c7b3..dd94f6b745e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3544,7 +3544,7 @@
         "description": "vulkan/util: add missing vulkan header",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/vulkan/util/vk_physical_device_properties_gen.py b/src/vulkan/util/vk_physical_device_properties_gen.py
index 8cb4693cb4a..16bac42a1b9 100644
--- a/src/vulkan/util/vk_physical_device_properties_gen.py
+++ b/src/vulkan/util/vk_physical_device_properties_gen.py
@@ -156,6 +156,7 @@ TEMPLATE_H = Template(COPYRIGHT + """
 #ifndef VK_PROPERTIES_H
 #define VK_PROPERTIES_H
 
+#include "vulkan/vulkan.h"
 #if DETECT_OS_ANDROID
 #include "vulkan/vk_android_native_buffer.h"
 #endif /* DETECT_OS_ANDROID */