From bbfeb6cd874503ccaf90d6b822e059b1ebb3649a Mon Sep 17 00:00:00 2001 From: Hoe Hao Cheng Date: Sat, 7 Jun 2025 00:21:01 +0800 Subject: [PATCH] zink: fix win32 detection in zink_device_info str.find(substr) returns -1 if the substring's not in the string, and bool(-1) returns True in Python, so the _WIN32 ifdef guard was actually inserted everywhere. Also, the win32 functions actually have "Win32" in their name, like vkGetMemoryWin32HandleKHR Part-of: --- src/gallium/drivers/zink/zink_device_info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py index 46fe7f80dcd..92ad9742353 100644 --- a/src/gallium/drivers/zink/zink_device_info.py +++ b/src/gallium/drivers/zink/zink_device_info.py @@ -750,7 +750,7 @@ zink_verify_device_extensions(struct zink_screen *screen) <%helpers:guard ext="${ext}"> if (screen->info.have_${ext.name_with_vendor()}) { %for cmd in registry.get_registry_entry(ext.name).device_commands: -%if cmd.find("win32"): +%if cmd.find("Win32") != -1: #ifdef _WIN32 %endif if (!screen->vk.${cmd.lstrip("vk")}) { @@ -760,7 +760,7 @@ zink_verify_device_extensions(struct zink_screen *screen) screen->vk.${cmd.lstrip("vk")} = (PFN_${cmd})zink_stub_function_not_loaded; #endif } -%if cmd.find("win32"): +%if cmd.find("Win32") != -1: #endif %endif %endfor