From f9a15b37ef620f11667a0a5c676208ba2164ca23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Sat, 22 Jun 2024 20:14:58 +0200 Subject: [PATCH] zink: Add VKAPI_PTR specifier to generated stub functions. Same as 8d210ae232bf75fc7c2c8f495e999e20c0543418 but for when NDEBUG isn't defined. Part-of: --- src/gallium/drivers/zink/zink_device_info.py | 4 ++-- src/gallium/drivers/zink/zink_instance.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py index 02649eeb7ce..cfc5832f26a 100644 --- a/src/gallium/drivers/zink/zink_device_info.py +++ b/src/gallium/drivers/zink/zink_device_info.py @@ -438,7 +438,7 @@ zink_verify_device_extensions(struct zink_screen *screen); %for ext in extensions: %if registry.in_registry(ext.name): %for cmd in registry.get_registry_entry(ext.name).device_commands: -void zink_stub_${cmd.lstrip("vk")}(void); +void VKAPI_PTR zink_stub_${cmd.lstrip("vk")}(void); %endfor %endif %endfor @@ -745,7 +745,7 @@ zink_verify_device_extensions(struct zink_screen *screen) %else: <% generated_funcs.add(cmd) %> %endif -void +void VKAPI_PTR zink_stub_${cmd.lstrip("vk")}() { mesa_loge("ZINK: ${cmd} is not loaded properly!"); diff --git a/src/gallium/drivers/zink/zink_instance.py b/src/gallium/drivers/zink/zink_instance.py index e7afff43617..03e8d688dfe 100644 --- a/src/gallium/drivers/zink/zink_instance.py +++ b/src/gallium/drivers/zink/zink_instance.py @@ -111,10 +111,10 @@ zink_verify_instance_extensions(struct zink_screen *screen); %for ext in extensions: %if registry.in_registry(ext.name): %for cmd in registry.get_registry_entry(ext.name).instance_commands: -void zink_stub_${cmd.lstrip("vk")}(void); +void VKAPI_PTR zink_stub_${cmd.lstrip("vk")}(void); %endfor %for cmd in registry.get_registry_entry(ext.name).pdevice_commands: -void zink_stub_${cmd.lstrip("vk")}(void); +void VKAPI_PTR zink_stub_${cmd.lstrip("vk")}(void); %endfor %endif %endfor @@ -329,7 +329,7 @@ zink_verify_instance_extensions(struct zink_screen *screen) %if ext.platform_guard: #ifdef ${ext.platform_guard} %endif -void +void VKAPI_PTR zink_stub_${cmd.lstrip("vk")}() { mesa_loge("ZINK: ${cmd} is not loaded properly!");