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
ec6879b7
Commit
ec6879b7
authored
Mar 02, 2024
by
Philip Rebohle
Committed by
Alexandre Julliard
Mar 04, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Update to VK spec version 1.3.279.
Signed-off-by:
Philip Rebohle
<
philip.rebohle@tu-dortmund.de
>
parent
90f31fbd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
85 additions
and
3 deletions
+85
-3
make_vulkan
dlls/winevulkan/make_vulkan
+1
-1
vulkan_thunks.c
dlls/winevulkan/vulkan_thunks.c
+72
-0
winevulkan.json
dlls/winevulkan/winevulkan.json
+1
-1
vulkan.h
include/wine/vulkan.h
+11
-1
No files found.
dlls/winevulkan/make_vulkan
View file @
ec6879b7
...
@@ -64,7 +64,7 @@ from enum import Enum
...
@@ -64,7 +64,7 @@ from enum import Enum
LOGGER
=
logging
.
Logger
(
"vulkan"
)
LOGGER
=
logging
.
Logger
(
"vulkan"
)
LOGGER
.
addHandler
(
logging
.
StreamHandler
())
LOGGER
.
addHandler
(
logging
.
StreamHandler
())
VK_XML_VERSION
=
"1.3.27
8
"
VK_XML_VERSION
=
"1.3.27
9
"
WINE_VK_VERSION
=
(
1
,
3
)
WINE_VK_VERSION
=
(
1
,
3
)
# Filenames to create.
# Filenames to create.
...
...
dlls/winevulkan/vulkan_thunks.c
View file @
ec6879b7
...
@@ -1549,6 +1549,15 @@ typedef struct VkPipelineShaderStageCreateInfo32
...
@@ -1549,6 +1549,15 @@ typedef struct VkPipelineShaderStageCreateInfo32
PTR32
pSpecializationInfo
;
PTR32
pSpecializationInfo
;
}
VkPipelineShaderStageCreateInfo32
;
}
VkPipelineShaderStageCreateInfo32
;
typedef
struct
VkComputePipelineIndirectBufferInfoNV32
{
VkStructureType
sType
;
PTR32
pNext
;
VkDeviceAddress
DECLSPEC_ALIGN
(
8
)
deviceAddress
;
VkDeviceSize
DECLSPEC_ALIGN
(
8
)
size
;
VkDeviceAddress
DECLSPEC_ALIGN
(
8
)
pipelineDeviceAddressCaptureReplay
;
}
VkComputePipelineIndirectBufferInfoNV32
;
typedef
struct
VkPipelineCreateFlags2CreateInfoKHR32
typedef
struct
VkPipelineCreateFlags2CreateInfoKHR32
{
{
VkStructureType
sType
;
VkStructureType
sType
;
...
@@ -3313,6 +3322,13 @@ typedef struct VkPhysicalDeviceMapMemoryPlacedFeaturesEXT32
...
@@ -3313,6 +3322,13 @@ typedef struct VkPhysicalDeviceMapMemoryPlacedFeaturesEXT32
VkBool32
memoryUnmapReserve
;
VkBool32
memoryUnmapReserve
;
}
VkPhysicalDeviceMapMemoryPlacedFeaturesEXT32
;
}
VkPhysicalDeviceMapMemoryPlacedFeaturesEXT32
;
typedef
struct
VkPhysicalDeviceRawAccessChainsFeaturesNV32
{
VkStructureType
sType
;
PTR32
pNext
;
VkBool32
shaderRawAccessChains
;
}
VkPhysicalDeviceRawAccessChainsFeaturesNV32
;
typedef
struct
VkDeviceCreateInfo32
typedef
struct
VkDeviceCreateInfo32
{
{
VkStructureType
sType
;
VkStructureType
sType
;
...
@@ -10862,6 +10878,19 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv
...
@@ -10862,6 +10878,19 @@ static inline void convert_VkComputePipelineCreateInfo_win32_to_host(struct conv
{
{
switch
(
in_header
->
sType
)
switch
(
in_header
->
sType
)
{
{
case
VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV
:
{
VkComputePipelineIndirectBufferInfoNV
*
out_ext
=
conversion_context_alloc
(
ctx
,
sizeof
(
*
out_ext
));
const
VkComputePipelineIndirectBufferInfoNV32
*
in_ext
=
(
const
VkComputePipelineIndirectBufferInfoNV32
*
)
in_header
;
out_ext
->
sType
=
VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV
;
out_ext
->
pNext
=
NULL
;
out_ext
->
deviceAddress
=
in_ext
->
deviceAddress
;
out_ext
->
size
=
in_ext
->
size
;
out_ext
->
pipelineDeviceAddressCaptureReplay
=
in_ext
->
pipelineDeviceAddressCaptureReplay
;
out_header
->
pNext
=
(
void
*
)
out_ext
;
out_header
=
(
void
*
)
out_ext
;
break
;
}
case
VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR
:
case
VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR
:
{
{
VkPipelineCreateFlags2CreateInfoKHR
*
out_ext
=
conversion_context_alloc
(
ctx
,
sizeof
(
*
out_ext
));
VkPipelineCreateFlags2CreateInfoKHR
*
out_ext
=
conversion_context_alloc
(
ctx
,
sizeof
(
*
out_ext
));
...
@@ -13662,6 +13691,17 @@ static inline void convert_VkDeviceCreateInfo_win64_to_host(struct conversion_co
...
@@ -13662,6 +13691,17 @@ static inline void convert_VkDeviceCreateInfo_win64_to_host(struct conversion_co
out_header
=
(
void
*
)
out_ext
;
out_header
=
(
void
*
)
out_ext
;
break
;
break
;
}
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
:
{
VkPhysicalDeviceRawAccessChainsFeaturesNV
*
out_ext
=
conversion_context_alloc
(
ctx
,
sizeof
(
*
out_ext
));
const
VkPhysicalDeviceRawAccessChainsFeaturesNV
*
in_ext
=
(
const
VkPhysicalDeviceRawAccessChainsFeaturesNV
*
)
in_header
;
out_ext
->
sType
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
;
out_ext
->
pNext
=
NULL
;
out_ext
->
shaderRawAccessChains
=
in_ext
->
shaderRawAccessChains
;
out_header
->
pNext
=
(
void
*
)
out_ext
;
out_header
=
(
void
*
)
out_ext
;
break
;
}
default:
default:
FIXME
(
"Unhandled sType %u.
\n
"
,
in_header
->
sType
);
FIXME
(
"Unhandled sType %u.
\n
"
,
in_header
->
sType
);
break
;
break
;
...
@@ -15945,6 +15985,17 @@ static inline void convert_VkDeviceCreateInfo_win32_to_host(struct conversion_co
...
@@ -15945,6 +15985,17 @@ static inline void convert_VkDeviceCreateInfo_win32_to_host(struct conversion_co
out_header
=
(
void
*
)
out_ext
;
out_header
=
(
void
*
)
out_ext
;
break
;
break
;
}
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
:
{
VkPhysicalDeviceRawAccessChainsFeaturesNV
*
out_ext
=
conversion_context_alloc
(
ctx
,
sizeof
(
*
out_ext
));
const
VkPhysicalDeviceRawAccessChainsFeaturesNV32
*
in_ext
=
(
const
VkPhysicalDeviceRawAccessChainsFeaturesNV32
*
)
in_header
;
out_ext
->
sType
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
;
out_ext
->
pNext
=
NULL
;
out_ext
->
shaderRawAccessChains
=
in_ext
->
shaderRawAccessChains
;
out_header
->
pNext
=
(
void
*
)
out_ext
;
out_header
=
(
void
*
)
out_ext
;
break
;
}
default:
default:
FIXME
(
"Unhandled sType %u.
\n
"
,
in_header
->
sType
);
FIXME
(
"Unhandled sType %u.
\n
"
,
in_header
->
sType
);
break
;
break
;
...
@@ -23354,6 +23405,17 @@ static inline void convert_VkPhysicalDeviceFeatures2_win32_to_host(struct conver
...
@@ -23354,6 +23405,17 @@ static inline void convert_VkPhysicalDeviceFeatures2_win32_to_host(struct conver
out_header
=
(
void
*
)
out_ext
;
out_header
=
(
void
*
)
out_ext
;
break
;
break
;
}
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
:
{
VkPhysicalDeviceRawAccessChainsFeaturesNV
*
out_ext
=
conversion_context_alloc
(
ctx
,
sizeof
(
*
out_ext
));
const
VkPhysicalDeviceRawAccessChainsFeaturesNV32
*
in_ext
=
(
const
VkPhysicalDeviceRawAccessChainsFeaturesNV32
*
)
in_header
;
out_ext
->
sType
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
;
out_ext
->
pNext
=
NULL
;
out_ext
->
shaderRawAccessChains
=
in_ext
->
shaderRawAccessChains
;
out_header
->
pNext
=
(
void
*
)
out_ext
;
out_header
=
(
void
*
)
out_ext
;
break
;
}
default:
default:
FIXME
(
"Unhandled sType %u.
\n
"
,
in_header
->
sType
);
FIXME
(
"Unhandled sType %u.
\n
"
,
in_header
->
sType
);
break
;
break
;
...
@@ -25195,6 +25257,15 @@ static inline void convert_VkPhysicalDeviceFeatures2_host_to_win32(const VkPhysi
...
@@ -25195,6 +25257,15 @@ static inline void convert_VkPhysicalDeviceFeatures2_host_to_win32(const VkPhysi
out_header
=
(
void
*
)
out_ext
;
out_header
=
(
void
*
)
out_ext
;
break
;
break
;
}
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
:
{
VkPhysicalDeviceRawAccessChainsFeaturesNV32
*
out_ext
=
find_next_struct32
(
out_header
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
);
const
VkPhysicalDeviceRawAccessChainsFeaturesNV
*
in_ext
=
(
const
VkPhysicalDeviceRawAccessChainsFeaturesNV
*
)
in_header
;
out_ext
->
sType
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
;
out_ext
->
shaderRawAccessChains
=
in_ext
->
shaderRawAccessChains
;
out_header
=
(
void
*
)
out_ext
;
break
;
}
default:
default:
break
;
break
;
}
}
...
@@ -46627,6 +46698,7 @@ static const char * const vk_device_extensions[] =
...
@@ -46627,6 +46698,7 @@ static const char * const vk_device_extensions[] =
"VK_NV_optical_flow"
,
"VK_NV_optical_flow"
,
"VK_NV_per_stage_descriptor_set"
,
"VK_NV_per_stage_descriptor_set"
,
"VK_NV_present_barrier"
,
"VK_NV_present_barrier"
,
"VK_NV_raw_access_chains"
,
"VK_NV_ray_tracing"
,
"VK_NV_ray_tracing"
,
"VK_NV_ray_tracing_invocation_reorder"
,
"VK_NV_ray_tracing_invocation_reorder"
,
"VK_NV_ray_tracing_motion_blur"
,
"VK_NV_ray_tracing_motion_blur"
,
dlls/winevulkan/winevulkan.json
View file @
ec6879b7
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
"file_format_version"
:
"1.0.0"
,
"file_format_version"
:
"1.0.0"
,
"ICD"
:
{
"ICD"
:
{
"library_path"
:
".
\\
winevulkan.dll"
,
"library_path"
:
".
\\
winevulkan.dll"
,
"api_version"
:
"1.3.27
8
"
"api_version"
:
"1.3.27
9
"
}
}
}
}
include/wine/vulkan.h
View file @
ec6879b7
...
@@ -671,6 +671,8 @@
...
@@ -671,6 +671,8 @@
#define VK_KHR_MAINTENANCE_6_EXTENSION_NAME "VK_KHR_maintenance6"
#define VK_KHR_MAINTENANCE_6_EXTENSION_NAME "VK_KHR_maintenance6"
#define VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_SPEC_VERSION 1
#define VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_SPEC_VERSION 1
#define VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_EXTENSION_NAME "VK_NV_descriptor_pool_overallocation"
#define VK_NV_DESCRIPTOR_POOL_OVERALLOCATION_EXTENSION_NAME "VK_NV_descriptor_pool_overallocation"
#define VK_NV_RAW_ACCESS_CHAINS_SPEC_VERSION 1
#define VK_NV_RAW_ACCESS_CHAINS_EXTENSION_NAME "VK_NV_raw_access_chains"
#define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_SPEC_VERSION 1
#define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_SPEC_VERSION 1
#define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_EXTENSION_NAME "VK_NV_shader_atomic_float16_vector"
#define VK_NV_SHADER_ATOMIC_FLOAT16_VECTOR_EXTENSION_NAME "VK_NV_shader_atomic_float16_vector"
#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13
#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13
...
@@ -699,7 +701,7 @@
...
@@ -699,7 +701,7 @@
#define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0)
#define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0)
#define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0)
#define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0)
#define VKSC_API_VERSION_1_0 VK_MAKE_API_VERSION(VKSC_API_VARIANT, 1, 0, 0)
#define VKSC_API_VERSION_1_0 VK_MAKE_API_VERSION(VKSC_API_VARIANT, 1, 0, 0)
#define VK_HEADER_VERSION 27
8
#define VK_HEADER_VERSION 27
9
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION)
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION)
#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;
#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;
#define VK_USE_64_BIT_PTR_DEFINES 0
#define VK_USE_64_BIT_PTR_DEFINES 0
...
@@ -4768,6 +4770,7 @@ typedef enum VkStructureType
...
@@ -4768,6 +4770,7 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT
=
1000545007
,
VK_STRUCTURE_TYPE_SET_DESCRIPTOR_BUFFER_OFFSETS_INFO_EXT
=
1000545007
,
VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT
=
1000545008
,
VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_BUFFER_EMBEDDED_SAMPLERS_INFO_EXT
=
1000545008
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV
=
1000546000
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_POOL_OVERALLOCATION_FEATURES_NV
=
1000546000
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV
=
1000555000
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV
=
1000563000
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV
=
1000563000
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES
,
...
@@ -9278,6 +9281,13 @@ typedef struct VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT
...
@@ -9278,6 +9281,13 @@ typedef struct VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT
}
VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT
;
}
VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT
;
typedef
VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT
VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM
;
typedef
VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesEXT
VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM
;
typedef
struct
VkPhysicalDeviceRawAccessChainsFeaturesNV
{
VkStructureType
sType
;
void
*
pNext
;
VkBool32
shaderRawAccessChains
;
}
VkPhysicalDeviceRawAccessChainsFeaturesNV
;
typedef
struct
VkPhysicalDeviceRayQueryFeaturesKHR
typedef
struct
VkPhysicalDeviceRayQueryFeaturesKHR
{
{
VkStructureType
sType
;
VkStructureType
sType
;
...
...
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