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
1eaa5976
Commit
1eaa5976
authored
Mar 01, 2019
by
Józef Kucia
Committed by
Alexandre Julliard
Mar 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Use VkBase{In, Out}Structure instead of custom structure.
Signed-off-by:
Józef Kucia
<
jkucia@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e65b9c2e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
13 deletions
+6
-13
vulkan.c
dlls/winevulkan/vulkan.c
+6
-13
No files found.
dlls/winevulkan/vulkan.c
View file @
1eaa5976
...
...
@@ -34,17 +34,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
*/
#define WINE_VULKAN_ICD_VERSION 4
/* All Vulkan structures use this structure for the first elements. */
struct
wine_vk_structure_header
{
VkStructureType
sType
;
void
*
pNext
;
};
#define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t)
static
void
*
wine_vk_find_struct_
(
void
*
s
,
VkStructureType
t
)
{
struct
wine_vk_structure_header
*
header
;
VkBaseOutStructure
*
header
;
for
(
header
=
s
;
header
;
header
=
header
->
pNext
)
{
...
...
@@ -250,7 +243,7 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src
*/
if
(
src
->
pNext
)
{
const
struct
wine_vk_structure_header
*
header
;
const
VkBaseInStructure
*
header
;
dst
->
pNext
=
NULL
;
for
(
header
=
src
->
pNext
;
header
;
header
=
header
->
pNext
)
...
...
@@ -369,7 +362,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo
*/
if
(
src
->
pNext
)
{
const
struct
wine_vk_structure_header
*
header
;
const
VkBaseInStructure
*
header
;
for
(
header
=
src
->
pNext
;
header
;
header
=
header
->
pNext
)
{
...
...
@@ -997,8 +990,8 @@ void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index,
void
WINAPI
wine_vkGetDeviceQueue2
(
VkDevice
device
,
const
VkDeviceQueueInfo2
*
info
,
VkQueue
*
queue
)
{
const
struct
wine_vk_structure_header
*
chain
;
struct
VkQueue_T
*
matching_queue
;
const
VkBaseInStructure
*
chain
;
TRACE
(
"%p, %p, %p
\n
"
,
device
,
info
,
queue
);
...
...
@@ -1111,7 +1104,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count,
{
ERR
(
"Unable to allocate memory for comman buffers!
\n
"
);
res
=
VK_ERROR_OUT_OF_HOST_MEMORY
;
goto
err
;
goto
done
;
}
for
(
j
=
0
;
j
<
num_command_buffers
;
j
++
)
...
...
@@ -1123,7 +1116,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count,
res
=
queue
->
device
->
funcs
.
p_vkQueueSubmit
(
queue
->
queue
,
count
,
submits_host
,
fence
);
err
:
done
:
for
(
i
=
0
;
i
<
count
;
i
++
)
{
heap_free
((
void
*
)
submits_host
[
i
].
pCommandBuffers
);
...
...
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