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

winevulkan: Pull in required types into Vulkan header. 

Not all types are referenced by commands.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-07-12 11:39:40 +02:00 committed by Alexandre Julliard
parent 6a2b92a15a
commit 3a2c576fd3
2 changed files with 885 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/winevulkan/make_vulkan
View File

@ -188,7 +188,7 @@ class Direction(Enum):
class VkBaseType(object): class VkBaseType(object):
def __init__(self, name, _type, alias=False, requires=None): def __init__(self, name, _type, alias=None, requires=None):
""" Vulkan base type class. """ Vulkan base type class.
VkBaseType is mostly used by Vulkan to define its own VkBaseType is mostly used by Vulkan to define its own
@ -213,7 +213,7 @@ class VkBaseType(object):
return "typedef {0} {1};\n".format(self.type, self.name) return "typedef {0} {1};\n".format(self.type, self.name)
def is_alias(self): def is_alias(self):
return self.alias return bool(self.alias)
class VkConstant(object): class VkConstant(object):
@ -291,7 +291,7 @@ class VkDefine(object):
class VkEnum(object): class VkEnum(object):
def __init__(self, name, values, alias=False): def __init__(self, name, values, alias=None):
self.name = name self.name = name
self.values = values self.values = values
self.required = False self.required = False
@ -300,7 +300,7 @@ class VkEnum(object):
@staticmethod @staticmethod
def from_alias(enum, alias): def from_alias(enum, alias):
name = enum.attrib.get("name") name = enum.attrib.get("name")
return VkEnum(name, alias.values) return VkEnum(name, alias.values, alias=alias)
@staticmethod @staticmethod
def from_xml(enum): def from_xml(enum):
@ -353,7 +353,7 @@ class VkEnum(object):
return text return text
def is_alias(self): def is_alias(self):
return self.alias return bool(self.alias)
class VkEnumValue(object): class VkEnumValue(object):
@ -1477,7 +1477,7 @@ class VkParam(object):
class VkStruct(Sequence): class VkStruct(Sequence):
""" Class which represents the type union and struct. """ """ Class which represents the type union and struct. """
def __init__(self, name, members, returnedonly, alias=False, union=False): def __init__(self, name, members, returnedonly, alias=None, union=False):
self.name = name self.name = name
self.members = members self.members = members
self.returnedonly = returnedonly self.returnedonly = returnedonly
@ -1495,7 +1495,7 @@ class VkStruct(Sequence):
@staticmethod @staticmethod
def from_alias(struct, alias): def from_alias(struct, alias):
name = struct.attrib.get("name") name = struct.attrib.get("name")
return VkStruct(name, alias.members, alias.returnedonly, alias=True) return VkStruct(name, alias.members, alias.returnedonly, alias=alias)
@staticmethod @staticmethod
def from_xml(struct): def from_xml(struct):
@ -1602,7 +1602,7 @@ class VkStruct(Sequence):
return text return text
def is_alias(self): def is_alias(self):
return self.alias return bool(self.alias)
def needs_alignment(self): def needs_alignment(self):
""" Check if structure needs alignment for 64-bit data. """ Check if structure needs alignment for 64-bit data.
@ -2527,6 +2527,12 @@ class VkRegistry(object):
# This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX # This seems to be used to pull in constants e.g. VK_MAX_DEVICE_GROUP_KHX
continue continue
for t in require.findall("type"):
type_info = self.types[t.attrib["name"]]["data"]
if type_info.is_alias():
type_info = type_info.alias
type_info.required = True
# Pull in any commands we need. We infer types to pull in from the command # Pull in any commands we need. We infer types to pull in from the command
# as well. # as well.
for command in require.findall("command"): for command in require.findall("command"):
@ -2678,7 +2684,7 @@ class VkRegistry(object):
alias = t.attrib.get("alias") alias = t.attrib.get("alias")
if type_info["category"] == "bitmask": if type_info["category"] == "bitmask":
bitmask = VkBaseType(type_info["name"], alias, alias=True) bitmask = VkBaseType(type_info["name"], alias, alias=self.types[alias]["data"])
bitmasks.append(bitmask) bitmasks.append(bitmask)
type_info["data"] = bitmask type_info["data"] = bitmask

1099
include/wine/vulkan.h
View File

File diff suppressed because it is too large Load Diff