Needed for VK_KHR_buffer_device_address which uses uint64_t as a return type.
Signed-off-by: Liam Middlebrook lmiddlebrook@nvidia.com Signed-off-by: Piers Daniell pdaniell@nvidia.com --- dlls/winevulkan/make_vulkan | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f9b1e1cf96..6c5753eda5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2845,6 +2845,7 @@ class VkRegistry(object): for t in types: type_info = {} type_info["category"] = t.attrib.get("category", None) + type_info["requires"] = t.attrib.get("requires", None)
# We parse aliases in a second pass when we know more. alias = t.attrib.get("alias") @@ -2863,13 +2864,19 @@ class VkRegistry(object): base_types.append(basetype) type_info["data"] = basetype
+ # Basic C types don't need us to define them, but we do need data for them + if type_info["requires"] == "vk_platform": + requires = type_info["requires"] + basic_c = VkBaseType(name, _type, requires=requires) + type_info["data"] = basic_c + if type_info["category"] == "bitmask": name = t.find("name").text _type = t.find("type").text
# Most bitmasks have a requires attribute used to pull in # required '*FlagBits" enum. - requires = t.attrib.get("requires") + requires = type_info["requires"] bitmask = VkBaseType(name, _type, requires=requires) bitmasks.append(bitmask) type_info["data"] = bitmask
Also update a single define reference in wined3d since VK_EXT_device_address was promoted to KHR and renamed VK_ERROR_INVALID_DEVICE_ADDRESS_EXT to VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR.
Signed-off-by: Liam Middlebrook lmiddlebrook@nvidia.com Signed-off-by: Piers Daniell pdaniell@nvidia.com --- dlls/wined3d/utils.c | 2 +- dlls/winevulkan/make_vulkan | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d5fe1c239b..5581c145ef 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5313,7 +5313,7 @@ const char *wined3d_debug_vkresult(VkResult vr) switch (vr) { #define WINED3D_TO_STR(x) case x: return #x - WINED3D_TO_STR(VK_ERROR_INVALID_DEVICE_ADDRESS_EXT); + WINED3D_TO_STR(VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR); WINED3D_TO_STR(VK_ERROR_NOT_PERMITTED_EXT); WINED3D_TO_STR(VK_ERROR_FRAGMENTATION_EXT); WINED3D_TO_STR(VK_ERROR_INVALID_EXTERNAL_HANDLE); diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6c5753eda5..5eebc0f3b2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler())
-VK_XML_VERSION = "1.1.126" +VK_XML_VERSION = "1.1.130" WINE_VK_VERSION = (1, 1)
# Filenames to create.
-
Liam Middlebrook