From: Rémi Bernon rbernon@codeweavers.com
--- dlls/winevulkan/make_vulkan | 86 ++++++------------------------------- include/wine/vulkan.h | 48 ++++----------------- 2 files changed, 20 insertions(+), 114 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7dc64ce72d8..83130b30ad9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1002,82 +1002,29 @@ class VkFunction(object):
class VkFunctionPointer(object): - def __init__(self, _type, name, members, forward_decls): - self.name = name - self.members = members - self.type = _type + def __init__(self, value): + self.value = value self.required = False - self.forward_decls = forward_decls
@staticmethod def from_xml(funcpointer): if not api_is_vulkan(funcpointer): return None
- members = [] - begin = None - - for t in funcpointer.findall("type"): - # General form: - # <type>void</type>* pUserData, - # Parsing of the tail (anything past </type>) is tricky since there - # can be other data on the next line like: const <type>int</type>.. - - const = True if begin and "const" in begin else False - _type = t.text - lines = t.tail.split(",\n") - if lines[0][0] == "*": - pointer = "*" - name = lines[0][1:].strip() - else: - pointer = None - name = lines[0].strip() - - # Filter out ); if it is contained. - name = name.partition(");")[0] - - # If tail encompasses multiple lines, assign the second line to begin - # for the next line. - try: - begin = lines[1].strip() - except IndexError: - begin = None - - members.append(VkMember(const=const, _type=_type, pointer=pointer, name=name)) + value = innertext(funcpointer).replace('\n', '') + value = re.sub(r'\s*//.*$', '', value, flags=re.M) + value = re.sub(r'\s+', ' ', value, flags=re.M) + value = value.strip()
- _type = funcpointer.text - name = funcpointer.find("name").text - if "requires" in funcpointer.attrib: - forward_decls = funcpointer.attrib.get("requires").split(",") - else: - forward_decls = [] - return VkFunctionPointer(_type, name, members, forward_decls) + return VkFunctionPointer(value)
def definition(self): - text = "" - # forward declare required structs - for decl in self.forward_decls: - text += "typedef struct {0} {0};\n".format(decl) - - text += "{0} {1})(\n".format(self.type, self.name) - - first = True - if len(self.members) > 0: - for m in self.members: - if first: - text += " " + m.definition() - first = False - else: - text += ",\n " + m.definition() - else: - # Just make the compiler happy by adding a void parameter. - text += "void" - text += ");\n" - return text + return self.value + '\n'
def is_alias(self): return False
+ class VkHandle(object): def __init__(self, name, _type, parent, alias=None): self.name = name @@ -3064,6 +3011,8 @@ class VkGenerator(object): if enum.required: f.write(enum.definition())
+ f.write("typedef struct VkDebugUtilsMessengerCallbackDataEXT VkDebugUtilsMessengerCallbackDataEXT;\n") + for fp in self.registry.funcpointers: if fp.required: f.write(fp.definition()) @@ -3247,15 +3196,6 @@ class VkRegistry(object): if bitmask.requires is not None: types[bitmask.requires]["data"].required = True
- def mark_funcpointer_dependencies(fp, types): - for m in fp.members: - type_info = types[m.type] - - # Complex types have a matching definition e.g. VkStruct. - # Not needed for base types such as uint32_t. - if "data" in type_info: - types[m.type]["data"].required = True - def mark_struct_dependencies(struct, types): for m in struct: type_info = types[m.type] @@ -3268,8 +3208,6 @@ class VkRegistry(object): if type_info["category"] == "struct" and struct.name != m.type: # Yay, recurse mark_struct_dependencies(type_info["data"], types) - elif type_info["category"] == "funcpointer": - mark_funcpointer_dependencies(type_info["data"], types) elif type_info["category"] == "bitmask": mark_bitmask_dependencies(type_info["data"], types)
@@ -3802,7 +3740,7 @@ class VkRegistry(object): self.bitmasks = sorted(bitmasks, key=lambda bitmask: bitmask.name) self.defines = defines self.enums = OrderedDict(sorted(self.enums.items())) - self.funcpointers = sorted(funcpointers, key=lambda fp: fp.name) + self.funcpointers = sorted(funcpointers, key=lambda fp: fp.value) self.handles = sorted(handles, key=lambda handle: handle.name) self.structs = sorted(structs, key=lambda struct: struct.name)
diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index c0b2d2fa4c2..a6d831786c9 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -6929,47 +6929,15 @@ typedef enum VkViewportCoordinateSwizzleNV VK_VIEWPORT_COORDINATE_SWIZZLE_NV_MAX_ENUM = 0x7fffffff, } VkViewportCoordinateSwizzleNV;
-typedef void* (VKAPI_PTR * PFN_vkAllocationFunction)( - void *pUserData, - size_t size, - size_t alignment, - VkSystemAllocationScope allocationScope); -typedef VkBool32 (VKAPI_PTR * PFN_vkDebugReportCallbackEXT)( - VkDebugReportFlagsEXT flags, - VkDebugReportObjectTypeEXT objectType, - uint64_t object, - size_t location, - int32_t messageCode, - const char *pLayerPrefix, - const char *pMessage, - void *pUserData); typedef struct VkDebugUtilsMessengerCallbackDataEXT VkDebugUtilsMessengerCallbackDataEXT; -typedef VkBool32 (VKAPI_PTR * PFN_vkDebugUtilsMessengerCallbackEXT)( - VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, - VkDebugUtilsMessageTypeFlagsEXT messageTypes, - const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData, - void *pUserData); -typedef void (VKAPI_PTR * PFN_vkFreeFunction)( - void *pUserData, - void *pMemory); -typedef void (VKAPI_PTR * PFN_vkInternalAllocationNotification)( - void *pUserData, - size_t size, - VkInternalAllocationType allocationType, - VkSystemAllocationScope allocationScope); -typedef void (VKAPI_PTR * PFN_vkInternalFreeNotification)( - void *pUserData, - size_t size, - VkInternalAllocationType allocationType, - VkSystemAllocationScope allocationScope); -typedef void* (VKAPI_PTR * PFN_vkReallocationFunction)( - void *pUserData, - void *pOriginal, - size_t size, - size_t alignment, - VkSystemAllocationScope allocationScope); -typedef void (VKAPI_PTR * PFN_vkVoidFunction)( -void); +typedef VkBool32 (VKAPI_PTR *PFN_vkDebugReportCallbackEXT)( VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, size_t location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage, void* pUserData); +typedef VkBool32 (VKAPI_PTR *PFN_vkDebugUtilsMessengerCallbackEXT)( VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData); +typedef void (VKAPI_PTR *PFN_vkFreeFunction)( void* pUserData, void* pMemory); +typedef void (VKAPI_PTR *PFN_vkInternalAllocationNotification)( void* pUserData, size_t size, VkInternalAllocationType allocationType, VkSystemAllocationScope allocationScope); +typedef void (VKAPI_PTR *PFN_vkInternalFreeNotification)( void* pUserData, size_t size, VkInternalAllocationType allocationType, VkSystemAllocationScope allocationScope); +typedef void (VKAPI_PTR *PFN_vkVoidFunction)(void); +typedef void* (VKAPI_PTR *PFN_vkAllocationFunction)( void* pUserData, size_t size, size_t alignment, VkSystemAllocationScope allocationScope); +typedef void* (VKAPI_PTR *PFN_vkReallocationFunction)( void* pUserData, void* pOriginal, size_t size, size_t alignment, VkSystemAllocationScope allocationScope);
typedef struct StdVideoAV1CDEF {