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
17d9841d
Commit
17d9841d
authored
Oct 06, 2023
by
Georg Lehmann
Committed by
Alexandre Julliard
Oct 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Update to VK spec version 1.3.267.
parent
5ce02389
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
116 additions
and
2 deletions
+116
-2
loader_thunks.c
dlls/winevulkan/loader_thunks.c
+62
-0
loader_thunks.h
dlls/winevulkan/loader_thunks.h
+42
-0
make_vulkan
dlls/winevulkan/make_vulkan
+1
-1
vulkan_thunks.c
dlls/winevulkan/vulkan_thunks.c
+0
-0
vulkan_thunks.h
dlls/winevulkan/vulkan_thunks.h
+10
-0
winevulkan.json
dlls/winevulkan/winevulkan.json
+1
-1
vulkan.h
include/wine/vulkan.h
+0
-0
No files found.
dlls/winevulkan/loader_thunks.c
View file @
17d9841d
...
...
@@ -4446,6 +4446,18 @@ VkResult WINAPI vkGetImageViewOpaqueCaptureDescriptorDataEXT(VkDevice device, co
return
params
.
result
;
}
void
WINAPI
vkGetLatencyTimingsNV
(
VkDevice
device
,
VkSwapchainKHR
swapchain
,
uint32_t
*
pTimingCount
,
VkGetLatencyMarkerInfoNV
*
pLatencyMarkerInfo
)
{
struct
vkGetLatencyTimingsNV_params
params
;
NTSTATUS
status
;
params
.
device
=
device
;
params
.
swapchain
=
swapchain
;
params
.
pTimingCount
=
pTimingCount
;
params
.
pLatencyMarkerInfo
=
pLatencyMarkerInfo
;
status
=
UNIX_CALL
(
vkGetLatencyTimingsNV
,
&
params
);
assert
(
!
status
&&
"vkGetLatencyTimingsNV"
);
}
VkResult
WINAPI
vkGetMemoryHostPointerPropertiesEXT
(
VkDevice
device
,
VkExternalMemoryHandleTypeFlagBits
handleType
,
const
void
*
pHostPointer
,
VkMemoryHostPointerPropertiesEXT
*
pMemoryHostPointerProperties
)
{
struct
vkGetMemoryHostPointerPropertiesEXT_params
params
;
...
...
@@ -5350,6 +5362,18 @@ VkResult WINAPI vkInvalidateMappedMemoryRanges(VkDevice device, uint32_t memoryR
return
params
.
result
;
}
VkResult
WINAPI
vkLatencySleepNV
(
VkDevice
device
,
VkSwapchainKHR
swapchain
,
const
VkLatencySleepInfoNV
*
pSleepInfo
)
{
struct
vkLatencySleepNV_params
params
;
NTSTATUS
status
;
params
.
device
=
device
;
params
.
swapchain
=
swapchain
;
params
.
pSleepInfo
=
pSleepInfo
;
status
=
UNIX_CALL
(
vkLatencySleepNV
,
&
params
);
assert
(
!
status
&&
"vkLatencySleepNV"
);
return
params
.
result
;
}
VkResult
WINAPI
vkMapMemory
(
VkDevice
device
,
VkDeviceMemory
memory
,
VkDeviceSize
offset
,
VkDeviceSize
size
,
VkMemoryMapFlags
flags
,
void
**
ppData
)
{
struct
vkMapMemory_params
params
;
...
...
@@ -5445,6 +5469,16 @@ void WINAPI vkQueueInsertDebugUtilsLabelEXT(VkQueue queue, const VkDebugUtilsLab
assert
(
!
status
&&
"vkQueueInsertDebugUtilsLabelEXT"
);
}
void
WINAPI
vkQueueNotifyOutOfBandNV
(
VkQueue
queue
,
const
VkOutOfBandQueueTypeInfoNV
*
pQueueTypeInfo
)
{
struct
vkQueueNotifyOutOfBandNV_params
params
;
NTSTATUS
status
;
params
.
queue
=
queue
;
params
.
pQueueTypeInfo
=
pQueueTypeInfo
;
status
=
UNIX_CALL
(
vkQueueNotifyOutOfBandNV
,
&
params
);
assert
(
!
status
&&
"vkQueueNotifyOutOfBandNV"
);
}
VkResult
WINAPI
vkQueuePresentKHR
(
VkQueue
queue
,
const
VkPresentInfoKHR
*
pPresentInfo
)
{
struct
vkQueuePresentKHR_params
params
;
...
...
@@ -5685,6 +5719,29 @@ void WINAPI vkSetHdrMetadataEXT(VkDevice device, uint32_t swapchainCount, const
assert
(
!
status
&&
"vkSetHdrMetadataEXT"
);
}
void
WINAPI
vkSetLatencyMarkerNV
(
VkDevice
device
,
VkSwapchainKHR
swapchain
,
const
VkSetLatencyMarkerInfoNV
*
pLatencyMarkerInfo
)
{
struct
vkSetLatencyMarkerNV_params
params
;
NTSTATUS
status
;
params
.
device
=
device
;
params
.
swapchain
=
swapchain
;
params
.
pLatencyMarkerInfo
=
pLatencyMarkerInfo
;
status
=
UNIX_CALL
(
vkSetLatencyMarkerNV
,
&
params
);
assert
(
!
status
&&
"vkSetLatencyMarkerNV"
);
}
VkResult
WINAPI
vkSetLatencySleepModeNV
(
VkDevice
device
,
VkSwapchainKHR
swapchain
,
const
VkLatencySleepModeInfoNV
*
pSleepModeInfo
)
{
struct
vkSetLatencySleepModeNV_params
params
;
NTSTATUS
status
;
params
.
device
=
device
;
params
.
swapchain
=
swapchain
;
params
.
pSleepModeInfo
=
pSleepModeInfo
;
status
=
UNIX_CALL
(
vkSetLatencySleepModeNV
,
&
params
);
assert
(
!
status
&&
"vkSetLatencySleepModeNV"
);
return
params
.
result
;
}
VkResult
WINAPI
vkSetPrivateData
(
VkDevice
device
,
VkObjectType
objectType
,
uint64_t
objectHandle
,
VkPrivateDataSlot
privateDataSlot
,
uint64_t
data
)
{
struct
vkSetPrivateData_params
params
;
...
...
@@ -6339,6 +6396,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{
"vkGetImageViewAddressNVX"
,
vkGetImageViewAddressNVX
},
{
"vkGetImageViewHandleNVX"
,
vkGetImageViewHandleNVX
},
{
"vkGetImageViewOpaqueCaptureDescriptorDataEXT"
,
vkGetImageViewOpaqueCaptureDescriptorDataEXT
},
{
"vkGetLatencyTimingsNV"
,
vkGetLatencyTimingsNV
},
{
"vkGetMemoryHostPointerPropertiesEXT"
,
vkGetMemoryHostPointerPropertiesEXT
},
{
"vkGetMicromapBuildSizesEXT"
,
vkGetMicromapBuildSizesEXT
},
{
"vkGetPerformanceParameterINTEL"
,
vkGetPerformanceParameterINTEL
},
...
...
@@ -6371,6 +6429,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{
"vkGetValidationCacheDataEXT"
,
vkGetValidationCacheDataEXT
},
{
"vkInitializePerformanceApiINTEL"
,
vkInitializePerformanceApiINTEL
},
{
"vkInvalidateMappedMemoryRanges"
,
vkInvalidateMappedMemoryRanges
},
{
"vkLatencySleepNV"
,
vkLatencySleepNV
},
{
"vkMapMemory"
,
vkMapMemory
},
{
"vkMapMemory2KHR"
,
vkMapMemory2KHR
},
{
"vkMergePipelineCaches"
,
vkMergePipelineCaches
},
...
...
@@ -6379,6 +6438,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{
"vkQueueBindSparse"
,
vkQueueBindSparse
},
{
"vkQueueEndDebugUtilsLabelEXT"
,
vkQueueEndDebugUtilsLabelEXT
},
{
"vkQueueInsertDebugUtilsLabelEXT"
,
vkQueueInsertDebugUtilsLabelEXT
},
{
"vkQueueNotifyOutOfBandNV"
,
vkQueueNotifyOutOfBandNV
},
{
"vkQueuePresentKHR"
,
vkQueuePresentKHR
},
{
"vkQueueSetPerformanceConfigurationINTEL"
,
vkQueueSetPerformanceConfigurationINTEL
},
{
"vkQueueSubmit"
,
vkQueueSubmit
},
...
...
@@ -6400,6 +6460,8 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{
"vkSetDeviceMemoryPriorityEXT"
,
vkSetDeviceMemoryPriorityEXT
},
{
"vkSetEvent"
,
vkSetEvent
},
{
"vkSetHdrMetadataEXT"
,
vkSetHdrMetadataEXT
},
{
"vkSetLatencyMarkerNV"
,
vkSetLatencyMarkerNV
},
{
"vkSetLatencySleepModeNV"
,
vkSetLatencySleepModeNV
},
{
"vkSetPrivateData"
,
vkSetPrivateData
},
{
"vkSetPrivateDataEXT"
,
vkSetPrivateDataEXT
},
{
"vkSignalSemaphore"
,
vkSignalSemaphore
},
...
...
dlls/winevulkan/loader_thunks.h
View file @
17d9841d
...
...
@@ -444,6 +444,7 @@ enum unix_call
unix_vkGetImageViewAddressNVX
,
unix_vkGetImageViewHandleNVX
,
unix_vkGetImageViewOpaqueCaptureDescriptorDataEXT
,
unix_vkGetLatencyTimingsNV
,
unix_vkGetMemoryHostPointerPropertiesEXT
,
unix_vkGetMicromapBuildSizesEXT
,
unix_vkGetPerformanceParameterINTEL
,
...
...
@@ -521,6 +522,7 @@ enum unix_call
unix_vkGetValidationCacheDataEXT
,
unix_vkInitializePerformanceApiINTEL
,
unix_vkInvalidateMappedMemoryRanges
,
unix_vkLatencySleepNV
,
unix_vkMapMemory
,
unix_vkMapMemory2KHR
,
unix_vkMergePipelineCaches
,
...
...
@@ -529,6 +531,7 @@ enum unix_call
unix_vkQueueBindSparse
,
unix_vkQueueEndDebugUtilsLabelEXT
,
unix_vkQueueInsertDebugUtilsLabelEXT
,
unix_vkQueueNotifyOutOfBandNV
,
unix_vkQueuePresentKHR
,
unix_vkQueueSetPerformanceConfigurationINTEL
,
unix_vkQueueSubmit
,
...
...
@@ -550,6 +553,8 @@ enum unix_call
unix_vkSetDeviceMemoryPriorityEXT
,
unix_vkSetEvent
,
unix_vkSetHdrMetadataEXT
,
unix_vkSetLatencyMarkerNV
,
unix_vkSetLatencySleepModeNV
,
unix_vkSetPrivateData
,
unix_vkSetPrivateDataEXT
,
unix_vkSignalSemaphore
,
...
...
@@ -3880,6 +3885,14 @@ struct vkGetImageViewOpaqueCaptureDescriptorDataEXT_params
VkResult
result
;
};
struct
vkGetLatencyTimingsNV_params
{
VkDevice
device
;
VkSwapchainKHR
DECLSPEC_ALIGN
(
8
)
swapchain
;
uint32_t
*
pTimingCount
;
VkGetLatencyMarkerInfoNV
*
pLatencyMarkerInfo
;
};
struct
vkGetMemoryHostPointerPropertiesEXT_params
{
VkDevice
device
;
...
...
@@ -4496,6 +4509,14 @@ struct vkInvalidateMappedMemoryRanges_params
VkResult
result
;
};
struct
vkLatencySleepNV_params
{
VkDevice
device
;
VkSwapchainKHR
DECLSPEC_ALIGN
(
8
)
swapchain
;
const
VkLatencySleepInfoNV
*
pSleepInfo
;
VkResult
result
;
};
struct
vkMapMemory_params
{
VkDevice
device
;
...
...
@@ -4559,6 +4580,12 @@ struct vkQueueInsertDebugUtilsLabelEXT_params
const
VkDebugUtilsLabelEXT
*
pLabelInfo
;
};
struct
vkQueueNotifyOutOfBandNV_params
{
VkQueue
queue
;
const
VkOutOfBandQueueTypeInfoNV
*
pQueueTypeInfo
;
};
struct
vkQueuePresentKHR_params
{
VkQueue
queue
;
...
...
@@ -4715,6 +4742,21 @@ struct vkSetHdrMetadataEXT_params
const
VkHdrMetadataEXT
*
pMetadata
;
};
struct
vkSetLatencyMarkerNV_params
{
VkDevice
device
;
VkSwapchainKHR
DECLSPEC_ALIGN
(
8
)
swapchain
;
const
VkSetLatencyMarkerInfoNV
*
pLatencyMarkerInfo
;
};
struct
vkSetLatencySleepModeNV_params
{
VkDevice
device
;
VkSwapchainKHR
DECLSPEC_ALIGN
(
8
)
swapchain
;
const
VkLatencySleepModeInfoNV
*
pSleepModeInfo
;
VkResult
result
;
};
struct
vkSetPrivateData_params
{
VkDevice
device
;
...
...
dlls/winevulkan/make_vulkan
View file @
17d9841d
...
...
@@ -65,7 +65,7 @@ from enum import Enum
LOGGER
=
logging
.
Logger
(
"vulkan"
)
LOGGER
.
addHandler
(
logging
.
StreamHandler
())
VK_XML_VERSION
=
"1.3.26
0
"
VK_XML_VERSION
=
"1.3.26
7
"
WINE_VK_VERSION
=
(
1
,
3
)
# Filenames to create.
...
...
dlls/winevulkan/vulkan_thunks.c
View file @
17d9841d
This diff is collapsed.
Click to expand it.
dlls/winevulkan/vulkan_thunks.h
View file @
17d9841d
...
...
@@ -473,6 +473,7 @@ struct vulkan_device_funcs
VkResult
(
*
p_vkGetImageViewAddressNVX
)(
VkDevice
,
VkImageView
,
VkImageViewAddressPropertiesNVX
*
);
uint32_t
(
*
p_vkGetImageViewHandleNVX
)(
VkDevice
,
const
VkImageViewHandleInfoNVX
*
);
VkResult
(
*
p_vkGetImageViewOpaqueCaptureDescriptorDataEXT
)(
VkDevice
,
const
VkImageViewCaptureDescriptorDataInfoEXT
*
,
void
*
);
void
(
*
p_vkGetLatencyTimingsNV
)(
VkDevice
,
VkSwapchainKHR
,
uint32_t
*
,
VkGetLatencyMarkerInfoNV
*
);
VkResult
(
*
p_vkGetMemoryHostPointerPropertiesEXT
)(
VkDevice
,
VkExternalMemoryHandleTypeFlagBits
,
const
void
*
,
VkMemoryHostPointerPropertiesEXT
*
);
void
(
*
p_vkGetMicromapBuildSizesEXT
)(
VkDevice
,
VkAccelerationStructureBuildTypeKHR
,
const
VkMicromapBuildInfoEXT
*
,
VkMicromapBuildSizesInfoEXT
*
);
VkResult
(
*
p_vkGetPerformanceParameterINTEL
)(
VkDevice
,
VkPerformanceParameterTypeINTEL
,
VkPerformanceValueINTEL
*
);
...
...
@@ -505,6 +506,7 @@ struct vulkan_device_funcs
VkResult
(
*
p_vkGetValidationCacheDataEXT
)(
VkDevice
,
VkValidationCacheEXT
,
size_t
*
,
void
*
);
VkResult
(
*
p_vkInitializePerformanceApiINTEL
)(
VkDevice
,
const
VkInitializePerformanceApiInfoINTEL
*
);
VkResult
(
*
p_vkInvalidateMappedMemoryRanges
)(
VkDevice
,
uint32_t
,
const
VkMappedMemoryRange
*
);
VkResult
(
*
p_vkLatencySleepNV
)(
VkDevice
,
VkSwapchainKHR
,
const
VkLatencySleepInfoNV
*
);
VkResult
(
*
p_vkMapMemory
)(
VkDevice
,
VkDeviceMemory
,
VkDeviceSize
,
VkDeviceSize
,
VkMemoryMapFlags
,
void
**
);
VkResult
(
*
p_vkMapMemory2KHR
)(
VkDevice
,
const
VkMemoryMapInfoKHR
*
,
void
**
);
VkResult
(
*
p_vkMergePipelineCaches
)(
VkDevice
,
VkPipelineCache
,
uint32_t
,
const
VkPipelineCache
*
);
...
...
@@ -513,6 +515,7 @@ struct vulkan_device_funcs
VkResult
(
*
p_vkQueueBindSparse
)(
VkQueue
,
uint32_t
,
const
VkBindSparseInfo
*
,
VkFence
);
void
(
*
p_vkQueueEndDebugUtilsLabelEXT
)(
VkQueue
);
void
(
*
p_vkQueueInsertDebugUtilsLabelEXT
)(
VkQueue
,
const
VkDebugUtilsLabelEXT
*
);
void
(
*
p_vkQueueNotifyOutOfBandNV
)(
VkQueue
,
const
VkOutOfBandQueueTypeInfoNV
*
);
VkResult
(
*
p_vkQueuePresentKHR
)(
VkQueue
,
const
VkPresentInfoKHR
*
);
VkResult
(
*
p_vkQueueSetPerformanceConfigurationINTEL
)(
VkQueue
,
VkPerformanceConfigurationINTEL
);
VkResult
(
*
p_vkQueueSubmit
)(
VkQueue
,
uint32_t
,
const
VkSubmitInfo
*
,
VkFence
);
...
...
@@ -534,6 +537,8 @@ struct vulkan_device_funcs
void
(
*
p_vkSetDeviceMemoryPriorityEXT
)(
VkDevice
,
VkDeviceMemory
,
float
);
VkResult
(
*
p_vkSetEvent
)(
VkDevice
,
VkEvent
);
void
(
*
p_vkSetHdrMetadataEXT
)(
VkDevice
,
uint32_t
,
const
VkSwapchainKHR
*
,
const
VkHdrMetadataEXT
*
);
void
(
*
p_vkSetLatencyMarkerNV
)(
VkDevice
,
VkSwapchainKHR
,
const
VkSetLatencyMarkerInfoNV
*
);
VkResult
(
*
p_vkSetLatencySleepModeNV
)(
VkDevice
,
VkSwapchainKHR
,
const
VkLatencySleepModeInfoNV
*
);
VkResult
(
*
p_vkSetPrivateData
)(
VkDevice
,
VkObjectType
,
uint64_t
,
VkPrivateDataSlot
,
uint64_t
);
VkResult
(
*
p_vkSetPrivateDataEXT
)(
VkDevice
,
VkObjectType
,
uint64_t
,
VkPrivateDataSlot
,
uint64_t
);
VkResult
(
*
p_vkSignalSemaphore
)(
VkDevice
,
const
VkSemaphoreSignalInfo
*
);
...
...
@@ -1024,6 +1029,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkGetImageViewAddressNVX) \
USE_VK_FUNC(vkGetImageViewHandleNVX) \
USE_VK_FUNC(vkGetImageViewOpaqueCaptureDescriptorDataEXT) \
USE_VK_FUNC(vkGetLatencyTimingsNV) \
USE_VK_FUNC(vkGetMemoryHostPointerPropertiesEXT) \
USE_VK_FUNC(vkGetMicromapBuildSizesEXT) \
USE_VK_FUNC(vkGetPerformanceParameterINTEL) \
...
...
@@ -1056,6 +1062,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkGetValidationCacheDataEXT) \
USE_VK_FUNC(vkInitializePerformanceApiINTEL) \
USE_VK_FUNC(vkInvalidateMappedMemoryRanges) \
USE_VK_FUNC(vkLatencySleepNV) \
USE_VK_FUNC(vkMapMemory) \
USE_VK_FUNC(vkMapMemory2KHR) \
USE_VK_FUNC(vkMergePipelineCaches) \
...
...
@@ -1064,6 +1071,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkQueueBindSparse) \
USE_VK_FUNC(vkQueueEndDebugUtilsLabelEXT) \
USE_VK_FUNC(vkQueueInsertDebugUtilsLabelEXT) \
USE_VK_FUNC(vkQueueNotifyOutOfBandNV) \
USE_VK_FUNC(vkQueuePresentKHR) \
USE_VK_FUNC(vkQueueSetPerformanceConfigurationINTEL) \
USE_VK_FUNC(vkQueueSubmit) \
...
...
@@ -1085,6 +1093,8 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkSetDeviceMemoryPriorityEXT) \
USE_VK_FUNC(vkSetEvent) \
USE_VK_FUNC(vkSetHdrMetadataEXT) \
USE_VK_FUNC(vkSetLatencyMarkerNV) \
USE_VK_FUNC(vkSetLatencySleepModeNV) \
USE_VK_FUNC(vkSetPrivateData) \
USE_VK_FUNC(vkSetPrivateDataEXT) \
USE_VK_FUNC(vkSignalSemaphore) \
...
...
dlls/winevulkan/winevulkan.json
View file @
17d9841d
...
...
@@ -2,6 +2,6 @@
"file_format_version"
:
"1.0.0"
,
"ICD"
:
{
"library_path"
:
".
\\
winevulkan.dll"
,
"api_version"
:
"1.3.26
0
"
"api_version"
:
"1.3.26
7
"
}
}
include/wine/vulkan.h
View file @
17d9841d
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