Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
0bfad658
Commit
0bfad658
authored
Nov 03, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Drop "static_array" from conversion function names.
Static arrays need only output conversion and output conversion is the same for static and dynamic arrays.
parent
d44aadc5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
make_vulkan
dlls/winevulkan/make_vulkan
+2
-4
vulkan_thunks.c
dlls/winevulkan/vulkan_thunks.c
+2
-2
No files found.
dlls/winevulkan/make_vulkan
View file @
0bfad658
...
...
@@ -1323,7 +1323,7 @@ class VkMember(VkVariable):
count
=
self
.
array_len
if
direction
==
Direction
.
OUTPUT
:
# Needed by VkMemoryHeap.memoryHeaps
return
"convert_{0}_
static_
array_host_to_{5}({2}{1}, {3}{1}, {4});
\n
"
.
format
(
self
.
type
,
self
.
name
,
input
,
output
,
count
,
win_type
)
return
"convert_{0}_array_host_to_{5}({2}{1}, {3}{1}, {4});
\n
"
.
format
(
self
.
type
,
self
.
name
,
input
,
output
,
count
,
win_type
)
else
:
# Nothing needed this yet.
LOGGER
.
warn
(
"TODO: implement copying of static array for {0}.{1}"
.
format
(
self
.
type
,
self
.
name
))
...
...
@@ -2148,9 +2148,7 @@ class ConversionFunction(object):
def
_set_name
(
self
):
name
=
"convert_{0}_"
.
format
(
self
.
type
)
if
self
.
array
:
name
+=
"static_array_"
elif
self
.
dyn_array
:
if
self
.
array
or
self
.
dyn_array
:
name
+=
"array_"
win_type
=
"win32"
if
self
.
conv
else
"win64"
...
...
dlls/winevulkan/vulkan_thunks.c
View file @
0bfad658
...
...
@@ -2024,7 +2024,7 @@ static inline void convert_VkImageFormatProperties2_host_to_win32(const VkImageF
#endif
/* USE_STRUCT_CONVERSION */
#if defined(USE_STRUCT_CONVERSION)
static
inline
void
convert_VkMemoryHeap_
static_
array_host_to_win32
(
const
VkMemoryHeap_host
*
in
,
VkMemoryHeap
*
out
,
uint32_t
count
)
static
inline
void
convert_VkMemoryHeap_array_host_to_win32
(
const
VkMemoryHeap_host
*
in
,
VkMemoryHeap
*
out
,
uint32_t
count
)
{
unsigned
int
i
;
...
...
@@ -2046,7 +2046,7 @@ static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const
out
->
memoryTypeCount
=
in
->
memoryTypeCount
;
memcpy
(
out
->
memoryTypes
,
in
->
memoryTypes
,
VK_MAX_MEMORY_TYPES
*
sizeof
(
VkMemoryType
));
out
->
memoryHeapCount
=
in
->
memoryHeapCount
;
convert_VkMemoryHeap_
static_
array_host_to_win32
(
in
->
memoryHeaps
,
out
->
memoryHeaps
,
VK_MAX_MEMORY_HEAPS
);
convert_VkMemoryHeap_array_host_to_win32
(
in
->
memoryHeaps
,
out
->
memoryHeaps
,
VK_MAX_MEMORY_HEAPS
);
}
#endif
/* USE_STRUCT_CONVERSION */
...
...
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