From 9d7bfb42fb69f8b3cbe130f9350a234c38ad2487 Mon Sep 17 00:00:00 2001
From: Konstantin Seurer <konstantin.seurer@gmail.com>
Date: Sun, 17 May 2026 11:15:59 +0200
Subject: [PATCH] vulkan: Fixes for a spec update

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41682>
---
 src/vulkan/util/vk_cmd_queue_gen.py                  | 4 ++++
 src/vulkan/util/vk_physical_device_features_gen.py   | 2 ++
 src/vulkan/util/vk_physical_device_properties_gen.py | 1 +
 src/vulkan/util/vk_physical_device_spirv_caps_gen.py | 4 ++++
 4 files changed, 11 insertions(+)

diff --git a/src/vulkan/util/vk_cmd_queue_gen.py b/src/vulkan/util/vk_cmd_queue_gen.py
index 4c74158f11e..6a581c3fb1a 100644
--- a/src/vulkan/util/vk_cmd_queue_gen.py
+++ b/src/vulkan/util/vk_cmd_queue_gen.py
@@ -59,6 +59,10 @@ NO_ENQUEUE_COMMANDS = [
     'CmdSetPerformanceOverrideINTEL',
 
     'CmdBuildAccelerationStructuresIndirectKHR',
+
+    'CmdBeginGpaSessionAMD',
+    'CmdEndGpaSessionAMD',
+    'CmdBeginGpaSampleAMD',
 ]
 
 TEMPLATE_H = Template(COPYRIGHT + """\
diff --git a/src/vulkan/util/vk_physical_device_features_gen.py b/src/vulkan/util/vk_physical_device_features_gen.py
index e4963d595a0..61094b4f4d8 100644
--- a/src/vulkan/util/vk_physical_device_features_gen.py
+++ b/src/vulkan/util/vk_physical_device_features_gen.py
@@ -50,6 +50,8 @@ RENAMED_FEATURES = {
 
     ('FaultFeaturesEXT', 'deviceFault'): 'deviceFaultEXT',
     ('FaultFeaturesEXT', 'deviceFaultVendorBinary'): 'deviceFaultVendorBinaryEXT',
+
+    ('OpacityMicromapFeaturesEXT', 'micromap'): 'micromapEXT',
 }
 
 KNOWN_ALIASES = [
diff --git a/src/vulkan/util/vk_physical_device_properties_gen.py b/src/vulkan/util/vk_physical_device_properties_gen.py
index 8a39fc06526..9befa14977e 100644
--- a/src/vulkan/util/vk_physical_device_properties_gen.py
+++ b/src/vulkan/util/vk_physical_device_properties_gen.py
@@ -65,6 +65,7 @@ OUT_ARRAYS = {
     'pCopySrcLayouts': 'copySrcLayoutCount',
     'pCopyDstLayouts': 'copyDstLayoutCount',
     'pLayeredApis': 'layeredApiCount',
+    'pPerfBlocks': 'perfBlockCount',
 }
 OUT_ARRAY_COUNTS = OUT_ARRAYS.values()
 
diff --git a/src/vulkan/util/vk_physical_device_spirv_caps_gen.py b/src/vulkan/util/vk_physical_device_spirv_caps_gen.py
index c14ef8e570a..b83c445bc05 100644
--- a/src/vulkan/util/vk_physical_device_spirv_caps_gen.py
+++ b/src/vulkan/util/vk_physical_device_spirv_caps_gen.py
@@ -60,6 +60,10 @@ NON_EXISTANT_CAPS = [
 
     # Exclude the one beta cap.
     'ShaderEnqueueAMDX',
+
+    'ImageGatherLinearQCOM',
+    'ImageGatherExtendedModesQCOM',
+    'MultipleWaitQueuesQCOM',
 ]
 
 def process_enable(enab):