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

vrclient: Add alignment attribute if needed

Browse Source
This commit is contained in:
Andrew Eikum 2019-09-17 10:53:26 -05:00
parent 8de08a1485
commit 2eda0d235b
11 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vrclient_x64/gen_wrapper.py
View File

@ -5,6 +5,8 @@
from __future__ import print_function from __future__ import print_function
CLANG_PATH='/usr/lib/clang/8.0.1'
import pprint import pprint
import sys import sys
import clang.cindex import clang.cindex
@ -699,6 +701,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
generate_c_api_thunk_tests(winclassname, methods, method_names) generate_c_api_thunk_tests(winclassname, methods, method_names)
def strip_const(typename):
return typename.replace("const ", "", 1)
def find_windows_struct(struct):
for child in list(windows_build.cursor.get_children()):
if strip_const(struct.spelling) == child.spelling:
return child.type
return None
def get_field_attribute_str(field):
if field.type.kind != clang.cindex.TypeKind.RECORD:
return ""
win_struct = find_windows_struct(field.type)
if win_struct is None:
align = field.type.get_align()
else:
align = win_struct.get_align()
return " __attribute__((aligned(" + str(align) + ")))"
generated_struct_handlers = [] generated_struct_handlers = []
cpp_files_need_close_brace = [] cpp_files_need_close_brace = []
@ -744,7 +764,7 @@ def handle_struct(sdkver, struct, which):
if m.type.kind == clang.cindex.TypeKind.CONSTANTARRAY: if m.type.kind == clang.cindex.TypeKind.CONSTANTARRAY:
cppfile.write(" %s %s[%u];\n" % (m.type.element_type.spelling, m.displayname, m.type.element_count)) cppfile.write(" %s %s[%u];\n" % (m.type.element_type.spelling, m.displayname, m.type.element_count))
else: else:
cppfile.write(" %s %s;\n" % (m.type.spelling, m.displayname)) cppfile.write(" %s %s%s;\n" % (m.type.spelling, m.displayname, get_field_attribute_str(m)))
if which == WRAPPERS: if which == WRAPPERS:
cppfile.write("\n %s *linux_side;\n" % struct.displayname) cppfile.write("\n %s *linux_side;\n" % struct.displayname)
cppfile.write("} __attribute__ ((ms_struct));\n") cppfile.write("} __attribute__ ((ms_struct));\n")
@ -1105,7 +1125,8 @@ for sdkver in sdk_versions:
if not os.path.isfile(input_name): if not os.path.isfile(input_name):
continue continue
index = clang.cindex.Index.create() index = clang.cindex.Index.create()
tu = index.parse(input_name, args=['-x', 'c++', '-std=c++11', '-DGNUC', '-Iopenvr_%s/' % sdkver, '-I/usr/lib/clang/8.0.1/include/']) windows_build = index.parse(input_name, args=['-x', 'c++', '-m32', '-Iopenvr_%s/' % sdkver, '-I' + CLANG_PATH + '/include/', '-mms-bitfields', '-U__linux__', '-Wno-incompatible-ms-struct'])
tu = index.parse(input_name, args=['-x', 'c++', '-std=c++11', '-DGNUC', '-Iopenvr_%s/' % sdkver, '-I' + CLANG_PATH + '/include/'])
diagnostics = list(tu.diagnostics) diagnostics = list(tu.diagnostics)
if len(diagnostics) > 0: if len(diagnostics) > 0:

2
vrclient_x64/vrclient_x64/struct_converters_090.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_090 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_091.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_091 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_0910.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_0910 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_092.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_092 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_093.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_093 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_094.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_094 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_096.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_096 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_097.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_097 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_098.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_098 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));

2
vrclient_x64/vrclient_x64/struct_converters_099.cpp
View File

@ -41,7 +41,7 @@ struct winRenderModel_t_099 {
uint32_t unVertexCount; uint32_t unVertexCount;
const uint16_t * rIndexData; const uint16_t * rIndexData;
uint32_t unTriangleCount; uint32_t unTriangleCount;
vr::RenderModel_TextureMap_t diffuseTexture; vr::RenderModel_TextureMap_t diffuseTexture __attribute__((aligned(4)));
RenderModel_t *linux_side; RenderModel_t *linux_side;
} __attribute__ ((ms_struct)); } __attribute__ ((ms_struct));