Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-16 00:28:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

vrclient: Use the all_records dict to lookup structs.

Browse Source 
CW-Bug-Id: #22729
This commit is contained in:
Rémi Bernon 2023-09-21 20:02:34 +02:00 committed by Arkadiusz Hiler
parent 18e3344745
commit 6a59c1377a
1 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vrclient_x64/gen_wrapper.py
View File

@ -818,26 +818,17 @@ def canonical_typename(cursor):
return name.removeprefix("const ") return name.removeprefix("const ")
windows_structs32 = {} def find_struct(struct, abi):
def find_windows_struct(struct):
name = canonical_typename(struct) name = canonical_typename(struct)
return windows_structs32.get(name, None) ret = all_records[sdkver][abi][1].get(name, None)
return ret
windows_structs64 = {}
def find_windows64_struct(struct):
name = canonical_typename(struct)
return windows_structs64.get(name, None)
linux_structs64 = {}
def find_linux64_struct(struct):
name = canonical_typename(struct)
return linux_structs64.get(name, None)
def struct_needs_conversion_nocache(struct): def struct_needs_conversion_nocache(struct):
needs_size_adjustment = False needs_size_adjustment = False
#check 32-bit compat #check 32-bit compat
windows_struct = find_windows_struct(struct) windows_struct = find_struct(struct, 'w32')
assert(not windows_struct is None) #must find windows_struct assert(not windows_struct is None) #must find windows_struct
for field in struct.get_fields(): for field in struct.get_fields():
if struct.get_offset(field.spelling) != windows_struct.get_offset(field.spelling): if struct.get_offset(field.spelling) != windows_struct.get_offset(field.spelling):
@ -851,9 +842,9 @@ def struct_needs_conversion_nocache(struct):
needs_size_adjustment = True needs_size_adjustment = True
#check 64-bit compat #check 64-bit compat
windows_struct = find_windows64_struct(struct) windows_struct = find_struct(struct, 'w64')
assert(not windows_struct is None) #must find windows_struct assert(not windows_struct is None) #must find windows_struct
lin64_struct = find_linux64_struct(struct) lin64_struct = find_struct(struct, 'u64')
assert(not lin64_struct is None) #must find lin64_struct assert(not lin64_struct is None) #must find lin64_struct
for field in lin64_struct.get_fields(): for field in lin64_struct.get_fields():
if lin64_struct.get_offset(field.spelling) != windows_struct.get_offset(field.spelling): if lin64_struct.get_offset(field.spelling) != windows_struct.get_offset(field.spelling):
@ -890,7 +881,7 @@ def get_field_attribute_str(field):
ftype = field.type.get_canonical() ftype = field.type.get_canonical()
if ftype.kind != TypeKind.RECORD: if ftype.kind != TypeKind.RECORD:
return "" return ""
win_struct = find_windows_struct(ftype) win_struct = find_struct(ftype, 'w32')
align = win_struct.get_align() align = win_struct.get_align()
return " __attribute__((aligned(" + str(align) + ")))" return " __attribute__((aligned(" + str(align) + ")))"
@ -1390,18 +1381,8 @@ def load(sdkver):
def generate(sdkver, records): def generate(sdkver, records):
global linux_structs32
global linux_structs64
global windows_structs32
global windows_structs64
print(f'generating SDK version {sdkver}...') print(f'generating SDK version {sdkver}...')
linux_build32, linux_structs32 = records['u32'] for child in enumerate_structs(records['u32'][0].cursor, vr_only=True):
linux_build64, linux_structs64 = records['u64']
windows_build32, windows_structs32 = records['w32']
windows_build64, windows_structs64 = records['w64']
for child in enumerate_structs(linux_build32.cursor, vr_only=True):
if child.kind in [CursorKind.STRUCT_DECL, CursorKind.CLASS_DECL]: if child.kind in [CursorKind.STRUCT_DECL, CursorKind.CLASS_DECL]:
handle_struct(sdkver, child) handle_struct(sdkver, child)
@ -1446,12 +1427,6 @@ print('enumerating classes... 100%')
for version, tuple in sorted(all_classes.items()): for version, tuple in sorted(all_classes.items()):
sdkver, klass = tuple sdkver, klass = tuple
linux_build32, linux_structs32 = all_records[sdkver]['u32']
linux_build64, linux_structs64 = all_records[sdkver]['u64']
windows_build32, windows_structs32 = all_records[sdkver]['w32']
windows_build64, windows_structs64 = all_records[sdkver]['w64']
handle_class(sdkver, klass, version) handle_class(sdkver, klass, version)