[PATCH] winevulkan: Override VK_USE_64_BIT_PTR_DEFINES instead of handle definition.
Georg Lehmann
dadschoorse at gmail.com
Sun Apr 25 06:22:14 CDT 2021
A bit simpler and more consistent because currently VK_USE_64_BIT_PTR_DEFINES
can be 1 but non dipatchable handles are always unit64_t.
Signed-off-by: Georg Lehmann <dadschoorse at gmail.com>
---
dlls/winevulkan/make_vulkan | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 66b28bf13df..fc6aa4de7db 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -319,15 +319,11 @@ class VkDefine(object):
# <type category="define" name="some_name">some_value</type>
name = define.attrib.get("name")
- # We override behavior of VK_DEFINE_NON_DISPATCHABLE handle as the default
+ # We override behavior of VK_USE_64_BIT_PTR_DEFINES as the default non-dispatchable handle
# definition various between 64-bit (uses pointers) and 32-bit (uses uint64_t).
# This complicates TRACEs in the thunks, so just use uint64_t.
- if name == "VK_DEFINE_NON_DISPATCHABLE_HANDLE":
- value = "#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;"
- # As VK_DEFINE_NON_DISPATCHABLE handle is overriden above, we must also override
- # VK_NULL_HANDLE so that its type will match.
- elif name == "VK_NULL_HANDLE":
- value = "#define VK_NULL_HANDLE 0ULL"
+ if name == "VK_USE_64_BIT_PTR_DEFINES":
+ value = "#define VK_USE_64_BIT_PTR_DEFINES 0"
else:
value = define.text
return VkDefine(name, value)
--
2.31.1
More information about the wine-devel
mailing list