ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winevulkan: Explicitly define VK_NULL_HANDLE. 

This fixes a mismatch that occurred when the default type of VK_NULL_HANDLE and
VK_DEFINE_NON_DISPATCHABLE_HANDLE had changed in the upstream XML. Because WineVulkan overrides the
definition of VK_DEFINE_NON_DISPATCHABLE_HANDLE we must do the same for VK_NULL_HANDLE so that the
types match.

Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>
Signed-off-by: Daniel Koch <dkoch@nvidia.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Liam Middlebrook 2021-04-19 12:45:38 -07:00 committed by Alexandre Julliard
parent de87cc6d5b
commit 108e093f01
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/winevulkan/make_vulkan
View File

@ -317,8 +317,6 @@ class VkDefine(object):
if name_elem is None: if name_elem is None:
# <type category="define" name="some_name">some_value</type> # <type category="define" name="some_name">some_value</type>
# At the time of writing there is only 1 define of this category
# 'VK_DEFINE_NON_DISPATCHABLE_HANDLE'.
name = define.attrib.get("name") name = define.attrib.get("name")
# We override behavior of VK_DEFINE_NON_DISPATCHABLE handle as the default # We override behavior of VK_DEFINE_NON_DISPATCHABLE handle as the default
@ -326,6 +324,10 @@ class VkDefine(object):
# This complicates TRACEs in the thunks, so just use uint64_t. # This complicates TRACEs in the thunks, so just use uint64_t.
if name == "VK_DEFINE_NON_DISPATCHABLE_HANDLE": if name == "VK_DEFINE_NON_DISPATCHABLE_HANDLE":
value = "#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;" 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"
else: else:
value = define.text value = define.text
return VkDefine(name, value) return VkDefine(name, value)