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
a37b4832
Commit
a37b4832
authored
Sep 15, 2022
by
Georg Lehmann
Committed by
Alexandre Julliard
Sep 15, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winevulkan: Update to VK spec version 1.3.228.
parent
90ff3c5b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
18 deletions
+58
-18
make_vulkan
dlls/winevulkan/make_vulkan
+1
-1
vulkan_thunks.c
dlls/winevulkan/vulkan_thunks.c
+21
-3
winevulkan.json
dlls/winevulkan/winevulkan.json
+1
-1
vulkan.h
include/wine/vulkan.h
+35
-13
No files found.
dlls/winevulkan/make_vulkan
View file @
a37b4832
...
...
@@ -64,7 +64,7 @@ from enum import Enum
LOGGER
=
logging
.
Logger
(
"vulkan"
)
LOGGER
.
addHandler
(
logging
.
StreamHandler
())
VK_XML_VERSION
=
"1.3.22
6
"
VK_XML_VERSION
=
"1.3.22
8
"
WINE_VK_VERSION
=
(
1
,
3
)
# Filenames to create.
...
...
dlls/winevulkan/vulkan_thunks.c
View file @
a37b4832
...
...
@@ -4584,10 +4584,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break
;
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_
VALVE
:
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_
EXT
:
{
const
VkPhysicalDeviceMutableDescriptorTypeFeatures
VALVE
*
in
=
(
const
VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE
*
)
in_header
;
VkPhysicalDeviceMutableDescriptorTypeFeatures
VALVE
*
out
;
const
VkPhysicalDeviceMutableDescriptorTypeFeatures
EXT
*
in
=
(
const
VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT
*
)
in_header
;
VkPhysicalDeviceMutableDescriptorTypeFeatures
EXT
*
out
;
if
(
!
(
out
=
malloc
(
sizeof
(
*
out
))))
goto
out_of_memory
;
...
...
@@ -4682,6 +4682,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break
;
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT
:
{
const
VkPhysicalDeviceLegacyDitheringFeaturesEXT
*
in
=
(
const
VkPhysicalDeviceLegacyDitheringFeaturesEXT
*
)
in_header
;
VkPhysicalDeviceLegacyDitheringFeaturesEXT
*
out
;
if
(
!
(
out
=
malloc
(
sizeof
(
*
out
))))
goto
out_of_memory
;
out
->
sType
=
in
->
sType
;
out
->
pNext
=
NULL
;
out
->
legacyDithering
=
in
->
legacyDithering
;
out_header
->
pNext
=
(
VkBaseOutStructure
*
)
out
;
out_header
=
out_header
->
pNext
;
break
;
}
case
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTISAMPLED_RENDER_TO_SINGLE_SAMPLED_FEATURES_EXT
:
{
const
VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT
*
in
=
(
const
VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT
*
)
in_header
;
...
...
@@ -10103,6 +10119,7 @@ static const char * const vk_device_extensions[] =
"VK_EXT_image_view_min_lod"
,
"VK_EXT_index_type_uint8"
,
"VK_EXT_inline_uniform_block"
,
"VK_EXT_legacy_dithering"
,
"VK_EXT_line_rasterization"
,
"VK_EXT_load_store_op_none"
,
"VK_EXT_memory_budget"
,
...
...
@@ -10110,6 +10127,7 @@ static const char * const vk_device_extensions[] =
"VK_EXT_mesh_shader"
,
"VK_EXT_multi_draw"
,
"VK_EXT_multisampled_render_to_single_sampled"
,
"VK_EXT_mutable_descriptor_type"
,
"VK_EXT_non_seamless_cube_map"
,
"VK_EXT_pageable_device_local_memory"
,
"VK_EXT_pci_bus_info"
,
...
...
dlls/winevulkan/winevulkan.json
View file @
a37b4832
...
...
@@ -2,6 +2,6 @@
"file_format_version"
:
"1.0.0"
,
"ICD"
:
{
"library_path"
:
".
\\
winevulkan.dll"
,
"api_version"
:
"1.3.22
6
"
"api_version"
:
"1.3.22
8
"
}
}
include/wine/vulkan.h
View file @
a37b4832
...
...
@@ -536,8 +536,12 @@
#define VK_EXT_SHADER_MODULE_IDENTIFIER_EXTENSION_NAME "VK_EXT_shader_module_identifier"
#define VK_EXT_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_SPEC_VERSION 1
#define VK_EXT_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_EXTENSION_NAME "VK_EXT_rasterization_order_attachment_access"
#define VK_EXT_LEGACY_DITHERING_SPEC_VERSION 1
#define VK_EXT_LEGACY_DITHERING_EXTENSION_NAME "VK_EXT_legacy_dithering"
#define VK_QCOM_TILE_PROPERTIES_SPEC_VERSION 1
#define VK_QCOM_TILE_PROPERTIES_EXTENSION_NAME "VK_QCOM_tile_properties"
#define VK_EXT_MUTABLE_DESCRIPTOR_TYPE_SPEC_VERSION 1
#define VK_EXT_MUTABLE_DESCRIPTOR_TYPE_EXTENSION_NAME "VK_EXT_mutable_descriptor_type"
#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13
#define VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_KHR_acceleration_structure"
#define VK_KHR_RAY_TRACING_PIPELINE_SPEC_VERSION 1
...
...
@@ -562,7 +566,7 @@
#define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 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_HEADER_VERSION 22
6
#define VK_HEADER_VERSION 22
8
#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_USE_64_BIT_PTR_DEFINES 0
...
...
@@ -1476,8 +1480,9 @@ typedef enum VkDescriptorPoolCreateFlagBits
{
VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT
=
0x00000001
,
VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT
=
0x00000002
,
VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_
VALVE
=
0x00000004
,
VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_
EXT
=
0x00000004
,
VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT
=
VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT
,
VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_VALVE
=
VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT
,
VK_DESCRIPTOR_POOL_CREATE_FLAG_BITS_MAX_ENUM
=
0x7fffffff
,
}
VkDescriptorPoolCreateFlagBits
;
...
...
@@ -1485,8 +1490,9 @@ typedef enum VkDescriptorSetLayoutCreateFlagBits
{
VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR
=
0x00000001
,
VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT
=
0x00000002
,
VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_
VALVE
=
0x00000004
,
VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_
EXT
=
0x00000004
,
VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT
=
VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT
,
VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_VALVE
=
VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT
,
VK_DESCRIPTOR_SET_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM
=
0x7fffffff
,
}
VkDescriptorSetLayoutCreateFlagBits
;
...
...
@@ -1506,10 +1512,11 @@ typedef enum VkDescriptorType
VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK
=
1000138000
,
VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR
=
1000150000
,
VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV
=
1000165000
,
VK_DESCRIPTOR_TYPE_MUTABLE_
VALVE
=
1000351000
,
VK_DESCRIPTOR_TYPE_MUTABLE_
EXT
=
1000351000
,
VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM
=
1000440000
,
VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM
=
1000440001
,
VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT
=
VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK
,
VK_DESCRIPTOR_TYPE_MUTABLE_VALVE
=
VK_DESCRIPTOR_TYPE_MUTABLE_EXT
,
VK_DESCRIPTOR_TYPE_MAX_ENUM
=
0x7fffffff
,
}
VkDescriptorType
;
...
...
@@ -3128,6 +3135,7 @@ typedef enum VkRenderingFlagBits
VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT
=
0x00000001
,
VK_RENDERING_SUSPENDING_BIT
=
0x00000002
,
VK_RENDERING_RESUMING_BIT
=
0x00000004
,
VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT
=
0x00000008
,
VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR
=
VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT
,
VK_RENDERING_SUSPENDING_BIT_KHR
=
VK_RENDERING_SUSPENDING_BIT
,
VK_RENDERING_RESUMING_BIT_KHR
=
VK_RENDERING_RESUMING_BIT
,
...
...
@@ -3896,8 +3904,8 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR
=
1000347000
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR
=
1000347001
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR
=
1000348013
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_
VALVE
=
1000351000
,
VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_
VALVE
=
1000351002
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_
EXT
=
1000351000
,
VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_
EXT
=
1000351002
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_INPUT_DYNAMIC_STATE_FEATURES_EXT
=
1000352000
,
VK_STRUCTURE_TYPE_VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT
=
1000352001
,
VK_STRUCTURE_TYPE_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION_2_EXT
=
1000352002
,
...
...
@@ -3954,6 +3962,7 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MODULE_IDENTIFIER_PROPERTIES_EXT
=
1000462001
,
VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_MODULE_IDENTIFIER_CREATE_INFO_EXT
=
1000462002
,
VK_STRUCTURE_TYPE_SHADER_MODULE_IDENTIFIER_EXT
=
1000462003
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_DITHERING_FEATURES_EXT
=
1000465000
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM
=
1000484000
,
VK_STRUCTURE_TYPE_TILE_PROPERTIES_QCOM
=
1000484001
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES
,
...
...
@@ -4118,6 +4127,8 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR
=
VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2
,
VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR
=
VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_EXT
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT
,
VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE
=
VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT
,
VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR
=
VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3
,
VK_STRUCTURE_TYPE_PIPELINE_INFO_EXT
=
VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR
,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT
=
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR
,
...
...
@@ -4165,6 +4176,7 @@ typedef enum VkSubpassDescriptionFlagBits
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT
=
0x00000010
,
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT
=
0x00000020
,
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT
=
0x00000040
,
VK_SUBPASS_DESCRIPTION_ENABLE_LEGACY_DITHERING_BIT_EXT
=
0x00000080
,
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_ARM
=
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_EXT
,
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM
=
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT
,
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM
=
VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT
,
...
...
@@ -6024,11 +6036,12 @@ typedef struct VkMultiviewPerViewAttributesInfoNVX
VkBool32
perViewAttributesPositionXOnly
;
}
VkMultiviewPerViewAttributesInfoNVX
;
typedef
struct
VkMutableDescriptorTypeList
VALVE
typedef
struct
VkMutableDescriptorTypeList
EXT
{
uint32_t
descriptorTypeCount
;
const
VkDescriptorType
*
pDescriptorTypes
;
}
VkMutableDescriptorTypeListVALVE
;
}
VkMutableDescriptorTypeListEXT
;
typedef
VkMutableDescriptorTypeListEXT
VkMutableDescriptorTypeListVALVE
;
typedef
struct
VkOffset2D
{
...
...
@@ -6949,6 +6962,13 @@ typedef struct VkPhysicalDeviceInvocationMaskFeaturesHUAWEI
VkBool32
invocationMask
;
}
VkPhysicalDeviceInvocationMaskFeaturesHUAWEI
;
typedef
struct
VkPhysicalDeviceLegacyDitheringFeaturesEXT
{
VkStructureType
sType
;
void
*
pNext
;
VkBool32
legacyDithering
;
}
VkPhysicalDeviceLegacyDitheringFeaturesEXT
;
typedef
struct
VkPhysicalDeviceLimits
{
uint32_t
maxImageDimension1D
;
...
...
@@ -7253,12 +7273,13 @@ typedef struct VkPhysicalDeviceMultiviewProperties
}
VkPhysicalDeviceMultiviewProperties
;
typedef
VkPhysicalDeviceMultiviewProperties
VkPhysicalDeviceMultiviewPropertiesKHR
;
typedef
struct
VkPhysicalDeviceMutableDescriptorTypeFeatures
VALVE
typedef
struct
VkPhysicalDeviceMutableDescriptorTypeFeatures
EXT
{
VkStructureType
sType
;
void
*
pNext
;
VkBool32
mutableDescriptorType
;
}
VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE
;
}
VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT
;
typedef
VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT
VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE
;
typedef
struct
VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT
{
...
...
@@ -10055,13 +10076,14 @@ typedef struct VkIndirectCommandsLayoutCreateInfoNV
const
uint32_t
*
pStreamStrides
;
}
VkIndirectCommandsLayoutCreateInfoNV
;
typedef
struct
VkMutableDescriptorTypeCreateInfo
VALVE
typedef
struct
VkMutableDescriptorTypeCreateInfo
EXT
{
VkStructureType
sType
;
const
void
*
pNext
;
uint32_t
mutableDescriptorTypeListCount
;
const
VkMutableDescriptorTypeListVALVE
*
pMutableDescriptorTypeLists
;
}
VkMutableDescriptorTypeCreateInfoVALVE
;
const
VkMutableDescriptorTypeListEXT
*
pMutableDescriptorTypeLists
;
}
VkMutableDescriptorTypeCreateInfoEXT
;
typedef
VkMutableDescriptorTypeCreateInfoEXT
VkMutableDescriptorTypeCreateInfoVALVE
;
typedef
struct
VkPhysicalDeviceProperties
{
...
...
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