From 0d5dc6ef6a6d20e51992ff5517d4d856cf504ddc Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@collabora.com>
Date: Tue, 8 Mar 2022 16:55:50 -0600
Subject: [PATCH] vulkan/cmd_queue: Stop generating enqueue helpers for INTEL
 perf queries

They don't return void and they're not used by anyone except the Intel
drivers so there's no point in supporting them.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15311>
---
 src/vulkan/util/vk_cmd_queue_gen.py | 5 +++++
 src/vulkan/util/vk_commands_gen.py  | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/vulkan/util/vk_cmd_queue_gen.py b/src/vulkan/util/vk_cmd_queue_gen.py
index f3100e2da56..167abfb9231 100644
--- a/src/vulkan/util/vk_cmd_queue_gen.py
+++ b/src/vulkan/util/vk_cmd_queue_gen.py
@@ -53,6 +53,11 @@ MANUAL_COMMANDS = [
     # Lavapipe implements internally
     'CmdBeginRendering',
     'CmdBeginRenderingKHR',
+
+    # These don't return void
+    'CmdSetPerformanceMarkerINTEL',
+    'CmdSetPerformanceStreamMarkerINTEL',
+    'CmdSetPerformanceOverrideINTEL',
 ]
 
 TEMPLATE_H = Template(COPYRIGHT + """\
diff --git a/src/vulkan/util/vk_commands_gen.py b/src/vulkan/util/vk_commands_gen.py
index 784695c4bcf..bc036a9e633 100644
--- a/src/vulkan/util/vk_commands_gen.py
+++ b/src/vulkan/util/vk_commands_gen.py
@@ -47,6 +47,9 @@ MANUAL_COMMANDS = ['CmdPushDescriptorSetKHR',             # This script doesn't
                    'CmdResolveImage',
                    'CmdBeginRendering',
                    'CmdBeginRenderingKHR',
+                   'CmdSetPerformanceMarkerINTEL',
+                   'CmdSetPerformanceStreamMarkerINTEL',
+                   'CmdSetPerformanceOverrideINTEL',
                   ]
 
 TEMPLATE_C = Template(COPYRIGHT + """
@@ -66,7 +69,7 @@ TEMPLATE_C = Template(COPYRIGHT + """
 % if c.guard is not None:
 #ifdef ${c.guard}
 % endif
-VKAPI_ATTR ${c.return_type} VKAPI_CALL lvp_${c.name}(${c.decl_params()})
+VKAPI_ATTR void VKAPI_CALL lvp_${c.name}(${c.decl_params()})
 {
    LVP_FROM_HANDLE(lvp_cmd_buffer, cmd_buffer, commandBuffer);
 
@@ -76,9 +79,6 @@ VKAPI_ATTR ${c.return_type} VKAPI_CALL lvp_${c.name}(${c.decl_params()})
    vk_enqueue_${to_underscore(c.name)}(&cmd_buffer->queue,
                                        ${c.call_params(start=1)});
 % endif
-% if c.return_type == 'VkResult':
-   return VK_SUCCESS;
-% endif
 }
 % if c.guard is not None:
 #endif // ${c.guard}