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
04576c15
Commit
04576c15
authored
Nov 04, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Skip unsupported functions in a few more places.
parent
692625a3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
33 deletions
+5
-33
make_vulkan
dlls/winevulkan/make_vulkan
+5
-5
vulkan_thunks.c
dlls/winevulkan/vulkan_thunks.c
+0
-12
vulkan_thunks.h
dlls/winevulkan/vulkan_thunks.h
+0
-16
No files found.
dlls/winevulkan/make_vulkan
View file @
04576c15
...
...
@@ -2292,7 +2292,7 @@ class VkGenerator(object):
self
.
struct_chain_conversions
=
[]
self
.
host_structs
=
[]
for
func
in
self
.
registry
.
funcs
.
values
():
if
not
func
.
is_required
():
if
not
func
.
needs_exposing
():
continue
conversions
=
func
.
get_conversions
()
...
...
@@ -2517,7 +2517,7 @@ class VkGenerator(object):
f
.
write
(
"/* For use by vkDevice and children */
\n
"
)
f
.
write
(
"struct vulkan_device_funcs
\n
{
\n
"
)
for
vk_func
in
self
.
registry
.
device_funcs
:
if
not
vk_func
.
is_required
():
if
not
vk_func
.
needs_exposing
():
continue
if
not
vk_func
.
needs_dispatch
():
...
...
@@ -2530,7 +2530,7 @@ class VkGenerator(object):
f
.
write
(
"/* For use by vkInstance and children */
\n
"
)
f
.
write
(
"struct vulkan_instance_funcs
\n
{
\n
"
)
for
vk_func
in
self
.
registry
.
instance_funcs
+
self
.
registry
.
phys_dev_funcs
:
if
not
vk_func
.
is_required
():
if
not
vk_func
.
needs_exposing
():
continue
if
not
vk_func
.
needs_dispatch
():
...
...
@@ -2543,7 +2543,7 @@ class VkGenerator(object):
f
.
write
(
"#define ALL_VK_DEVICE_FUNCS()
\\\n
"
)
first
=
True
for
vk_func
in
self
.
registry
.
device_funcs
:
if
not
vk_func
.
is_required
():
if
not
vk_func
.
needs_exposing
():
continue
if
not
vk_func
.
needs_dispatch
():
...
...
@@ -2560,7 +2560,7 @@ class VkGenerator(object):
f
.
write
(
"#define ALL_VK_INSTANCE_FUNCS()
\\\n
"
)
first
=
True
for
vk_func
in
self
.
registry
.
instance_funcs
+
self
.
registry
.
phys_dev_funcs
:
if
not
vk_func
.
is_required
():
if
not
vk_func
.
needs_exposing
():
continue
if
not
vk_func
.
needs_dispatch
():
...
...
dlls/winevulkan/vulkan_thunks.c
View file @
04576c15
...
...
@@ -2152,18 +2152,6 @@ static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageV
#endif
/* USE_STRUCT_CONVERSION */
#if defined(USE_STRUCT_CONVERSION)
static
inline
void
convert_VkMemoryGetWin32HandleInfoKHR_win32_to_host
(
const
VkMemoryGetWin32HandleInfoKHR
*
in
,
VkMemoryGetWin32HandleInfoKHR_host
*
out
)
{
if
(
!
in
)
return
;
out
->
sType
=
in
->
sType
;
out
->
pNext
=
in
->
pNext
;
out
->
memory
=
in
->
memory
;
out
->
handleType
=
in
->
handleType
;
}
#endif
/* USE_STRUCT_CONVERSION */
#if defined(USE_STRUCT_CONVERSION)
static
inline
void
convert_VkMicromapBuildSizesInfoEXT_win32_to_host
(
const
VkMicromapBuildSizesInfoEXT
*
in
,
VkMicromapBuildSizesInfoEXT_host
*
out
)
{
if
(
!
in
)
return
;
...
...
dlls/winevulkan/vulkan_thunks.h
View file @
04576c15
...
...
@@ -1410,18 +1410,6 @@ typedef VkImageViewHandleInfoNVX VkImageViewHandleInfoNVX_host;
#endif
#if defined(USE_STRUCT_CONVERSION)
typedef
struct
VkMemoryGetWin32HandleInfoKHR_host
{
VkStructureType
sType
;
const
void
*
pNext
;
VkDeviceMemory
memory
;
VkExternalMemoryHandleTypeFlagBits
handleType
;
}
VkMemoryGetWin32HandleInfoKHR_host
;
#else
typedef
VkMemoryGetWin32HandleInfoKHR
VkMemoryGetWin32HandleInfoKHR_host
;
#endif
#if defined(USE_STRUCT_CONVERSION)
typedef
struct
VkMicromapBuildSizesInfoEXT_host
{
VkStructureType
sType
;
...
...
@@ -2308,8 +2296,6 @@ struct vulkan_device_funcs
VkResult
(
*
p_vkGetImageViewAddressNVX
)(
VkDevice
,
VkImageView
,
VkImageViewAddressPropertiesNVX_host
*
);
uint32_t
(
*
p_vkGetImageViewHandleNVX
)(
VkDevice
,
const
VkImageViewHandleInfoNVX_host
*
);
VkResult
(
*
p_vkGetMemoryHostPointerPropertiesEXT
)(
VkDevice
,
VkExternalMemoryHandleTypeFlagBits
,
const
void
*
,
VkMemoryHostPointerPropertiesEXT
*
);
VkResult
(
*
p_vkGetMemoryWin32HandleKHR
)(
VkDevice
,
const
VkMemoryGetWin32HandleInfoKHR_host
*
,
HANDLE
*
);
VkResult
(
*
p_vkGetMemoryWin32HandlePropertiesKHR
)(
VkDevice
,
VkExternalMemoryHandleTypeFlagBits
,
HANDLE
,
VkMemoryWin32HandlePropertiesKHR
*
);
void
(
*
p_vkGetMicromapBuildSizesEXT
)(
VkDevice
,
VkAccelerationStructureBuildTypeKHR
,
const
VkMicromapBuildInfoEXT_host
*
,
VkMicromapBuildSizesInfoEXT_host
*
);
VkResult
(
*
p_vkGetPerformanceParameterINTEL
)(
VkDevice
,
VkPerformanceParameterTypeINTEL
,
VkPerformanceValueINTEL
*
);
VkResult
(
*
p_vkGetPipelineCacheData
)(
VkDevice
,
VkPipelineCache
,
size_t
*
,
void
*
);
...
...
@@ -2823,8 +2809,6 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkGetImageViewAddressNVX) \
USE_VK_FUNC(vkGetImageViewHandleNVX) \
USE_VK_FUNC(vkGetMemoryHostPointerPropertiesEXT) \
USE_VK_FUNC(vkGetMemoryWin32HandleKHR) \
USE_VK_FUNC(vkGetMemoryWin32HandlePropertiesKHR) \
USE_VK_FUNC(vkGetMicromapBuildSizesEXT) \
USE_VK_FUNC(vkGetPerformanceParameterINTEL) \
USE_VK_FUNC(vkGetPipelineCacheData) \
...
...
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