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
c6648a96
Commit
c6648a96
authored
Mar 23, 2018
by
Józef Kucia
Committed by
Alexandre Julliard
Mar 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Simplify wine_vk_instance_convert_create_info() a bit.
Signed-off-by:
Józef Kucia
<
jkucia@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ca2f3bae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
17 deletions
+4
-17
vulkan.c
dlls/winevulkan/vulkan.c
+4
-17
No files found.
dlls/winevulkan/vulkan.c
View file @
c6648a96
...
...
@@ -191,14 +191,12 @@ static BOOL wine_vk_init(void)
* This function takes care of extensions handled at winevulkan layer, a Wine graphics
* driver is responsible for handling e.g. surface extensions.
*/
static
VkResult
wine_vk_instance_convert_create_info
(
const
VkInstanceCreateInfo
*
src
,
static
void
wine_vk_instance_convert_create_info
(
const
VkInstanceCreateInfo
*
src
,
VkInstanceCreateInfo
*
dst
)
{
unsigned
int
i
;
dst
->
sType
=
src
->
sType
;
dst
->
flags
=
src
->
flags
;
dst
->
pApplicationInfo
=
src
->
pApplicationInfo
;
*
dst
=
*
src
;
if
(
dst
->
pApplicationInfo
)
{
...
...
@@ -231,7 +229,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo
break
;
default:
FIXME
(
"Application requested a linked structure of type %
d
\n
"
,
header
->
sType
);
FIXME
(
"Application requested a linked structure of type %
#x.
\n
"
,
header
->
sType
);
}
}
}
...
...
@@ -244,17 +242,11 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo
dst
->
enabledLayerCount
=
0
;
dst
->
ppEnabledLayerNames
=
NULL
;
/* TODO: convert non-WSI win32 extensions here to host specific ones. */
dst
->
ppEnabledExtensionNames
=
src
->
ppEnabledExtensionNames
;
dst
->
enabledExtensionCount
=
src
->
enabledExtensionCount
;
TRACE
(
"Enabled extensions: %u
\n
"
,
dst
->
enabledExtensionCount
);
for
(
i
=
0
;
i
<
dst
->
enabledExtensionCount
;
i
++
)
{
TRACE
(
"Extension %u: %s
\n
"
,
i
,
debugstr_a
(
dst
->
ppEnabledExtensionNames
[
i
]));
}
return
VK_SUCCESS
;
}
/* Helper function which stores wrapped physical devices in the instance object. */
...
...
@@ -633,12 +625,7 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_
}
object
->
base
.
loader_magic
=
VULKAN_ICD_MAGIC_VALUE
;
res
=
wine_vk_instance_convert_create_info
(
create_info
,
&
create_info_host
);
if
(
res
!=
VK_SUCCESS
)
{
ERR
(
"Failed to convert instance create info, res=%d
\n
"
,
res
);
goto
err
;
}
wine_vk_instance_convert_create_info
(
create_info
,
&
create_info_host
);
res
=
vk_funcs
->
p_vkCreateInstance
(
&
create_info_host
,
NULL
/* allocator */
,
&
object
->
instance
);
if
(
res
!=
VK_SUCCESS
)
...
...
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