ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winevulkan: Update to VK spec version 1.2.155. 

Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>
Signed-off-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Liam Middlebrook 2020-09-29 15:45:33 -07:00 committed by Alexandre Julliard
parent 844dbbffb3
commit a8ddba3576
4 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/winevulkan/make_vulkan
View File

@ -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.2.154" VK_XML_VERSION = "1.2.155"
WINE_VK_VERSION = (1, 2) WINE_VK_VERSION = (1, 2)
# Filenames to create. # Filenames to create.

18
dlls/winevulkan/vulkan_thunks.c
View File

@ -2960,6 +2960,23 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break; break;
} }
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT:
{
const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *in = (const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *)in_header;
VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
out->sType = in->sType;
out->pNext = NULL;
out->shaderImageInt64Atomics = in->shaderImageInt64Atomics;
out->sparseImageInt64Atomics = in->sparseImageInt64Atomics;
out_header->pNext = (VkBaseOutStructure *)out;
out_header = out_header->pNext;
break;
}
default: default:
FIXME("Application requested a linked structure of type %u.\n", in_header->sType); FIXME("Application requested a linked structure of type %u.\n", in_header->sType);
} }
@ -6105,6 +6122,7 @@ static const char * const vk_device_extensions[] =
"VK_EXT_separate_stencil_usage", "VK_EXT_separate_stencil_usage",
"VK_EXT_shader_atomic_float", "VK_EXT_shader_atomic_float",
"VK_EXT_shader_demote_to_helper_invocation", "VK_EXT_shader_demote_to_helper_invocation",
"VK_EXT_shader_image_atomic_int64",
"VK_EXT_shader_stencil_export", "VK_EXT_shader_stencil_export",
"VK_EXT_shader_subgroup_ballot", "VK_EXT_shader_subgroup_ballot",
"VK_EXT_shader_subgroup_vote", "VK_EXT_shader_subgroup_vote",

2
dlls/winevulkan/winevulkan.json
View File

@ -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.2.154" "api_version": "1.2.155"
} }
} }

63
include/wine/vulkan.h
View File

@ -311,6 +311,8 @@
#define VK_AMD_SHADER_CORE_PROPERTIES_2_EXTENSION_NAME "VK_AMD_shader_core_properties2" #define VK_AMD_SHADER_CORE_PROPERTIES_2_EXTENSION_NAME "VK_AMD_shader_core_properties2"
#define VK_AMD_DEVICE_COHERENT_MEMORY_SPEC_VERSION 1 #define VK_AMD_DEVICE_COHERENT_MEMORY_SPEC_VERSION 1
#define VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME "VK_AMD_device_coherent_memory" #define VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME "VK_AMD_device_coherent_memory"
#define VK_EXT_SHADER_IMAGE_ATOMIC_INT64_SPEC_VERSION 1
#define VK_EXT_SHADER_IMAGE_ATOMIC_INT64_EXTENSION_NAME "VK_EXT_shader_image_atomic_int64"
#define VK_KHR_SPIRV_1_4_SPEC_VERSION 1 #define VK_KHR_SPIRV_1_4_SPEC_VERSION 1
#define VK_KHR_SPIRV_1_4_EXTENSION_NAME "VK_KHR_spirv_1_4" #define VK_KHR_SPIRV_1_4_EXTENSION_NAME "VK_KHR_spirv_1_4"
#define VK_EXT_MEMORY_BUDGET_SPEC_VERSION 1 #define VK_EXT_MEMORY_BUDGET_SPEC_VERSION 1
@ -394,7 +396,7 @@
#define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0)
#define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0)
#define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0)
#define VK_HEADER_VERSION 154 #define VK_HEADER_VERSION 155
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, 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_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;
@ -2823,6 +2825,7 @@ typedef enum VkStructureType
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = 1000225002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = 1000225002,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD = 1000227000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD = 1000227000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD = 1000229000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD = 1000229000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT = 1000234000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000,
VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001,
@ -4460,20 +4463,35 @@ typedef struct VkPhysicalDeviceShaderDrawParametersFeatures
} VkPhysicalDeviceShaderDrawParametersFeatures; } VkPhysicalDeviceShaderDrawParametersFeatures;
typedef VkPhysicalDeviceShaderDrawParametersFeatures VkPhysicalDeviceShaderDrawParameterFeatures; typedef VkPhysicalDeviceShaderDrawParametersFeatures VkPhysicalDeviceShaderDrawParameterFeatures;
typedef struct VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL typedef struct VkPhysicalDeviceShaderImageFootprintFeaturesNV
{ {
VkStructureType sType; VkStructureType sType;
void *pNext; void *pNext;
VkBool32 shaderIntegerFunctions2; VkBool32 imageFootprint;
} VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL; } VkPhysicalDeviceShaderImageFootprintFeaturesNV;
typedef struct VkPhysicalDeviceShaderSMBuiltinsPropertiesNV typedef struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV
{ {
VkStructureType sType; VkStructureType sType;
void *pNext; void *pNext;
uint32_t shaderSMCount; VkBool32 shaderSMBuiltins;
uint32_t shaderWarpsPerSM; } VkPhysicalDeviceShaderSMBuiltinsFeaturesNV;
} VkPhysicalDeviceShaderSMBuiltinsPropertiesNV;
typedef struct VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures
{
VkStructureType sType;
void *pNext;
VkBool32 shaderSubgroupExtendedTypes;
} VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures;
typedef VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR;
typedef struct VkPhysicalDeviceShadingRateImageFeaturesNV
{
VkStructureType sType;
void *pNext;
VkBool32 shadingRateImage;
VkBool32 shadingRateCoarseSampleOrder;
} VkPhysicalDeviceShadingRateImageFeaturesNV;
typedef struct VkPhysicalDeviceSparseImageFormatInfo2 typedef struct VkPhysicalDeviceSparseImageFormatInfo2
{ {
@ -5578,20 +5596,12 @@ typedef struct VkPhysicalDeviceShaderFloat16Int8Features
typedef VkPhysicalDeviceShaderFloat16Int8Features VkPhysicalDeviceShaderFloat16Int8FeaturesKHR; typedef VkPhysicalDeviceShaderFloat16Int8Features VkPhysicalDeviceShaderFloat16Int8FeaturesKHR;
typedef VkPhysicalDeviceShaderFloat16Int8Features VkPhysicalDeviceFloat16Int8FeaturesKHR; typedef VkPhysicalDeviceShaderFloat16Int8Features VkPhysicalDeviceFloat16Int8FeaturesKHR;
typedef struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV typedef struct VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL
{ {
VkStructureType sType; VkStructureType sType;
void *pNext; void *pNext;
VkBool32 shaderSMBuiltins; VkBool32 shaderIntegerFunctions2;
} VkPhysicalDeviceShaderSMBuiltinsFeaturesNV; } VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
typedef struct VkPhysicalDeviceShadingRateImageFeaturesNV
{
VkStructureType sType;
void *pNext;
VkBool32 shadingRateImage;
VkBool32 shadingRateCoarseSampleOrder;
} VkPhysicalDeviceShadingRateImageFeaturesNV;
typedef struct VkPhysicalDeviceSubgroupSizeControlPropertiesEXT typedef struct VkPhysicalDeviceSubgroupSizeControlPropertiesEXT
{ {
@ -6305,13 +6315,13 @@ typedef struct VkPhysicalDeviceSampleLocationsPropertiesEXT
VkBool32 variableSampleLocations; VkBool32 variableSampleLocations;
} VkPhysicalDeviceSampleLocationsPropertiesEXT; } VkPhysicalDeviceSampleLocationsPropertiesEXT;
typedef struct VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures typedef struct VkPhysicalDeviceShaderSMBuiltinsPropertiesNV
{ {
VkStructureType sType; VkStructureType sType;
void *pNext; void *pNext;
VkBool32 shaderSubgroupExtendedTypes; uint32_t shaderSMCount;
} VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures; uint32_t shaderWarpsPerSM;
typedef VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR; } VkPhysicalDeviceShaderSMBuiltinsPropertiesNV;
typedef struct VkPhysicalDeviceSubgroupProperties typedef struct VkPhysicalDeviceSubgroupProperties
{ {
@ -6755,12 +6765,13 @@ typedef struct VkPhysicalDeviceProperties2
} VkPhysicalDeviceProperties2; } VkPhysicalDeviceProperties2;
typedef VkPhysicalDeviceProperties2 VkPhysicalDeviceProperties2KHR; typedef VkPhysicalDeviceProperties2 VkPhysicalDeviceProperties2KHR;
typedef struct VkPhysicalDeviceShaderImageFootprintFeaturesNV typedef struct VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT
{ {
VkStructureType sType; VkStructureType sType;
void *pNext; void *pNext;
VkBool32 imageFootprint; VkBool32 shaderImageInt64Atomics;
} VkPhysicalDeviceShaderImageFootprintFeaturesNV; VkBool32 sparseImageInt64Atomics;
} VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT;
typedef struct VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT typedef struct VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT
{ {