Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-02-05 18:20:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

wineopenxr: Define some structs earlier when generating definitions.

Browse Source 
CW-Bug-Id: #23689
This commit is contained in:
Paul Gofman 2024-04-19 18:58:12 -06:00 committed by Arkadiusz Hiler
parent 98b0d5a4e0
commit 9ff5c9da91
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wineopenxr/make_openxr
View File

@ -217,6 +217,10 @@ STRUCT_CHAIN_CONVERSIONS = [
"XrInstanceCreateInfo", "XrInstanceCreateInfo",
] ]
STRUCTS_PUT_FIRST = [
"XrUuid",
"XrExtent3Df",
]
class Direction(Enum): class Direction(Enum):
""" Parameter direction: input, output, input_output. """ """ Parameter direction: input, output, input_output. """
@ -1561,7 +1565,7 @@ class XrParam(object):
class XrStruct(Sequence): class XrStruct(Sequence):
""" Class which represents the type union and struct. """ """ Class which represents the type union and struct. """
def __init__(self, name, members, returnedonly, structextends, alias=None, union=False): def __init__(self, name, members, returnedonly, structextends, alias=None, union=False, dep_level=1000):
self.name = name self.name = name
self.members = members self.members = members
self.returnedonly = returnedonly self.returnedonly = returnedonly
@ -1572,6 +1576,7 @@ class XrStruct(Sequence):
self.type_info = None # To be set later. self.type_info = None # To be set later.
self.struct_extensions = [] self.struct_extensions = []
self.aliased_by = [] self.aliased_by = []
self.dep_level = dep_level
def __getitem__(self, i): def __getitem__(self, i):
return self.members[i] return self.members[i]
@ -1607,7 +1612,11 @@ class XrStruct(Sequence):
xr_member = XrMember.from_xml(member) xr_member = XrMember.from_xml(member)
members.append(xr_member) members.append(xr_member)
return XrStruct(name, members, returnedonly, structextends, union=union) if name in STRUCTS_PUT_FIRST:
dep_level = 0
else:
dep_level = 1000
return XrStruct(name, members, returnedonly, structextends, union=union, dep_level=dep_level)
@staticmethod @staticmethod
def decouple_structs(structs): def decouple_structs(structs):
@ -2943,7 +2952,7 @@ class XrRegistry(object):
self.enums = OrderedDict(sorted(self.enums.items())) self.enums = OrderedDict(sorted(self.enums.items()))
self.funcpointers = funcpointers self.funcpointers = funcpointers
self.handles = sorted(handles, key=lambda handle: handle.name) self.handles = sorted(handles, key=lambda handle: handle.name)
self.structs = sorted(structs, key=lambda struct: struct.name) self.structs = sorted(structs, key=lambda struct: (struct.dep_level, struct.name))
def collect_element_text(e): def collect_element_text(e):
return "".join(e.itertext()) return "".join(e.itertext())