Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
c479ffcd
Commit
c479ffcd
authored
Nov 09, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Fix host aliases declaration.
parent
ab36f7d5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
make_vulkan
dlls/winevulkan/make_vulkan
+12
-6
vulkan_thunks.h
dlls/winevulkan/vulkan_thunks.h
+0
-0
No files found.
dlls/winevulkan/make_vulkan
View file @
c479ffcd
...
...
@@ -1871,17 +1871,19 @@ class VkStruct(Sequence):
postfix (str, optional): text to append to end of struct name, useful for struct renaming.
"""
# Only define alias structs when doing conversions
if
self
.
is_alias
()
and
not
conv
:
if
self
.
is_alias
():
return
""
if
postfix
:
suffix
=
postfix
else
:
suffix
=
""
if
self
.
union
:
text
=
"typedef union {0}"
.
format
(
self
.
name
)
else
:
text
=
"typedef struct {0}"
.
format
(
self
.
name
)
if
postfix
is
not
None
:
text
+=
postfix
text
+=
suffix
text
+=
"
\n
{
\n
"
...
...
@@ -1899,7 +1901,7 @@ class VkStruct(Sequence):
text
+=
"}} {0};
\n
"
.
format
(
self
.
name
)
for
aliasee
in
self
.
aliased_by
:
text
+=
"typedef {0}
{1};
\n
"
.
format
(
self
.
name
,
aliasee
.
name
)
text
+=
"typedef {0}
{2} {1}{2};
\n
"
.
format
(
self
.
name
,
aliasee
.
name
,
suffix
)
return
text
...
...
@@ -2582,10 +2584,14 @@ class VkGenerator(object):
f
.
write
(
"#define WINE_VK_VERSION VK_API_VERSION_{0}_{1}
\n\n
"
.
format
(
WINE_VK_VERSION
[
0
],
WINE_VK_VERSION
[
1
]))
for
struct
in
self
.
host_structs
:
if
struct
.
is_alias
():
continue
f
.
write
(
"#if defined(USE_STRUCT_CONVERSION)
\n
"
)
f
.
write
(
struct
.
definition
(
align
=
False
,
conv
=
True
,
postfix
=
"_host"
))
f
.
write
(
"#else
\n
"
)
f
.
write
(
"typedef {0} {0}_host;
\n
"
.
format
(
struct
.
name
))
for
aliasee
in
struct
.
aliased_by
:
f
.
write
(
"typedef {0}_host {1}_host;
\n
"
.
format
(
struct
.
name
,
aliasee
.
name
))
f
.
write
(
"#endif
\n\n
"
)
f
.
write
(
"
\n
"
)
...
...
dlls/winevulkan/vulkan_thunks.h
View file @
c479ffcd
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment