aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Schuchardt <mikes@lunarg.com>2023-10-20 15:50:04 -0700
committerMike Schuchardt <mikes@lunarg.com>2023-10-20 16:23:35 -0700
commit9fae21009c8e42bb5abc5218aa2bec264fb5f0f6 (patch)
tree4befcde72a1785f4e249c792eb83a0e8a10d3ad7
parentf7017f23337b90a2b2ceb65a4e1050e8ad89e065 (diff)
downloadusermoji-9fae21009c8e42bb5abc5218aa2bec264fb5f0f6.tar.xz
build: Update to header 1.3.269
- Update known-good - Generate source
-rw-r--r--cube/android/vulkan_wrapper.cpp6
-rw-r--r--icd/VkICD_mock_icd.json.in2
-rw-r--r--icd/generated/function_declarations.h42
-rw-r--r--icd/generated/function_definitions.h57
-rw-r--r--icd/generated/vk_typemap_helper.h72
-rwxr-xr-xscripts/generate_vulkan_wrapper.py14
-rw-r--r--scripts/known_good.json4
7 files changed, 194 insertions, 3 deletions
diff --git a/cube/android/vulkan_wrapper.cpp b/cube/android/vulkan_wrapper.cpp
index c663f9ee..be95673e 100644
--- a/cube/android/vulkan_wrapper.cpp
+++ b/cube/android/vulkan_wrapper.cpp
@@ -1078,6 +1078,12 @@ PFN_vkCreatePrivateDataSlotEXT vkCreatePrivateDataSlotEXT;
PFN_vkDestroyPrivateDataSlotEXT vkDestroyPrivateDataSlotEXT;
PFN_vkSetPrivateDataEXT vkSetPrivateDataEXT;
PFN_vkGetPrivateDataEXT vkGetPrivateDataEXT;
+PFN_vkCreateCudaModuleNV vkCreateCudaModuleNV;
+PFN_vkGetCudaModuleCacheNV vkGetCudaModuleCacheNV;
+PFN_vkCreateCudaFunctionNV vkCreateCudaFunctionNV;
+PFN_vkDestroyCudaModuleNV vkDestroyCudaModuleNV;
+PFN_vkDestroyCudaFunctionNV vkDestroyCudaFunctionNV;
+PFN_vkCmdCudaLaunchKernelNV vkCmdCudaLaunchKernelNV;
PFN_vkGetDescriptorSetLayoutSizeEXT vkGetDescriptorSetLayoutSizeEXT;
PFN_vkGetDescriptorSetLayoutBindingOffsetEXT vkGetDescriptorSetLayoutBindingOffsetEXT;
PFN_vkGetDescriptorEXT vkGetDescriptorEXT;
diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in
index 2ff43409..e9beacd9 100644
--- a/icd/VkICD_mock_icd.json.in
+++ b/icd/VkICD_mock_icd.json.in
@@ -2,6 +2,6 @@
"file_format_version": "1.0.1",
"ICD": {
"library_path": "@JSON_LIBRARY_PATH@",
- "api_version": "1.3.268"
+ "api_version": "1.3.269"
}
} \ No newline at end of file
diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h
index 9c7a65d7..e996d7fa 100644
--- a/icd/generated/function_declarations.h
+++ b/icd/generated/function_declarations.h
@@ -277,6 +277,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_KHR_video_encode_queue", 10},
{"VK_NV_device_diagnostics_config", 2},
{"VK_QCOM_render_pass_store_ops", 2},
+ {"VK_NV_cuda_kernel_launch", 2},
{"VK_NV_low_latency", 1},
{"VK_EXT_metal_objects", 1},
{"VK_KHR_synchronization2", 1},
@@ -335,6 +336,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
{"VK_EXT_pageable_device_local_memory", 1},
{"VK_KHR_maintenance4", 2},
{"VK_ARM_shader_core_properties", 1},
+ {"VK_ARM_scheduling_controls", 1},
{"VK_EXT_image_sliced_view_of_3d", 1},
{"VK_VALVE_descriptor_set_host_mapping", 1},
{"VK_EXT_depth_clamp_zero_one", 1},
@@ -3507,6 +3509,39 @@ static VKAPI_ATTR void VKAPI_CALL GetPrivateDataEXT(
+static VKAPI_ATTR VkResult VKAPI_CALL CreateCudaModuleNV(
+ VkDevice device,
+ const VkCudaModuleCreateInfoNV* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkCudaModuleNV* pModule);
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetCudaModuleCacheNV(
+ VkDevice device,
+ VkCudaModuleNV module,
+ size_t* pCacheSize,
+ void* pCacheData);
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateCudaFunctionNV(
+ VkDevice device,
+ const VkCudaFunctionCreateInfoNV* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkCudaFunctionNV* pFunction);
+
+static VKAPI_ATTR void VKAPI_CALL DestroyCudaModuleNV(
+ VkDevice device,
+ VkCudaModuleNV module,
+ const VkAllocationCallbacks* pAllocator);
+
+static VKAPI_ATTR void VKAPI_CALL DestroyCudaFunctionNV(
+ VkDevice device,
+ VkCudaFunctionNV function,
+ const VkAllocationCallbacks* pAllocator);
+
+static VKAPI_ATTR void VKAPI_CALL CmdCudaLaunchKernelNV(
+ VkCommandBuffer commandBuffer,
+ const VkCudaLaunchInfoNV* pLaunchInfo);
+
+
#ifdef VK_USE_PLATFORM_METAL_EXT
static VKAPI_ATTR void VKAPI_CALL ExportMetalObjectsEXT(
@@ -3892,6 +3927,7 @@ static VKAPI_ATTR void VKAPI_CALL SetDeviceMemoryPriorityEXT(
+
static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutHostMappingInfoVALVE(
VkDevice device,
const VkDescriptorSetBindingReferenceVALVE* pBindingReference,
@@ -4994,6 +5030,12 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
{"vkDestroyPrivateDataSlotEXT", (void*)DestroyPrivateDataSlotEXT},
{"vkSetPrivateDataEXT", (void*)SetPrivateDataEXT},
{"vkGetPrivateDataEXT", (void*)GetPrivateDataEXT},
+ {"vkCreateCudaModuleNV", (void*)CreateCudaModuleNV},
+ {"vkGetCudaModuleCacheNV", (void*)GetCudaModuleCacheNV},
+ {"vkCreateCudaFunctionNV", (void*)CreateCudaFunctionNV},
+ {"vkDestroyCudaModuleNV", (void*)DestroyCudaModuleNV},
+ {"vkDestroyCudaFunctionNV", (void*)DestroyCudaFunctionNV},
+ {"vkCmdCudaLaunchKernelNV", (void*)CmdCudaLaunchKernelNV},
#ifdef VK_USE_PLATFORM_METAL_EXT
{"vkExportMetalObjectsEXT", (void*)ExportMetalObjectsEXT},
#endif
diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h
index 1fb95340..a3b3941e 100644
--- a/icd/generated/function_definitions.h
+++ b/icd/generated/function_definitions.h
@@ -5735,6 +5735,62 @@ static VKAPI_ATTR void VKAPI_CALL GetPrivateDataEXT(
+static VKAPI_ATTR VkResult VKAPI_CALL CreateCudaModuleNV(
+ VkDevice device,
+ const VkCudaModuleCreateInfoNV* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkCudaModuleNV* pModule)
+{
+ unique_lock_t lock(global_lock);
+ *pModule = (VkCudaModuleNV)global_unique_handle++;
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL GetCudaModuleCacheNV(
+ VkDevice device,
+ VkCudaModuleNV module,
+ size_t* pCacheSize,
+ void* pCacheData)
+{
+//Not a CREATE or DESTROY function
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL CreateCudaFunctionNV(
+ VkDevice device,
+ const VkCudaFunctionCreateInfoNV* pCreateInfo,
+ const VkAllocationCallbacks* pAllocator,
+ VkCudaFunctionNV* pFunction)
+{
+ unique_lock_t lock(global_lock);
+ *pFunction = (VkCudaFunctionNV)global_unique_handle++;
+ return VK_SUCCESS;
+}
+
+static VKAPI_ATTR void VKAPI_CALL DestroyCudaModuleNV(
+ VkDevice device,
+ VkCudaModuleNV module,
+ const VkAllocationCallbacks* pAllocator)
+{
+//Destroy object
+}
+
+static VKAPI_ATTR void VKAPI_CALL DestroyCudaFunctionNV(
+ VkDevice device,
+ VkCudaFunctionNV function,
+ const VkAllocationCallbacks* pAllocator)
+{
+//Destroy object
+}
+
+static VKAPI_ATTR void VKAPI_CALL CmdCudaLaunchKernelNV(
+ VkCommandBuffer commandBuffer,
+ const VkCudaLaunchInfoNV* pLaunchInfo)
+{
+//Not a CREATE or DESTROY function
+}
+
+
#ifdef VK_USE_PLATFORM_METAL_EXT
static VKAPI_ATTR void VKAPI_CALL ExportMetalObjectsEXT(
@@ -6334,6 +6390,7 @@ static VKAPI_ATTR void VKAPI_CALL SetDeviceMemoryPriorityEXT(
+
static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutHostMappingInfoVALVE(
VkDevice device,
const VkDescriptorSetBindingReferenceVALVE* pBindingReference,
diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h
index eb406e15..137b5b9c 100644
--- a/icd/generated/vk_typemap_helper.h
+++ b/icd/generated/vk_typemap_helper.h
@@ -5668,6 +5668,51 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREAT
typedef VkDeviceDiagnosticsConfigCreateInfoNV Type;
};
+// Map type VkCudaModuleCreateInfoNV to id VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV
+template <> struct LvlTypeMap<VkCudaModuleCreateInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CUDA_MODULE_CREATE_INFO_NV> {
+ typedef VkCudaModuleCreateInfoNV Type;
+};
+
+// Map type VkCudaFunctionCreateInfoNV to id VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV
+template <> struct LvlTypeMap<VkCudaFunctionCreateInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CUDA_FUNCTION_CREATE_INFO_NV> {
+ typedef VkCudaFunctionCreateInfoNV Type;
+};
+
+// Map type VkCudaLaunchInfoNV to id VK_STRUCTURE_TYPE_CUDA_LAUNCH_INFO_NV
+template <> struct LvlTypeMap<VkCudaLaunchInfoNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_CUDA_LAUNCH_INFO_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CUDA_LAUNCH_INFO_NV> {
+ typedef VkCudaLaunchInfoNV Type;
+};
+
+// Map type VkPhysicalDeviceCudaKernelLaunchFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceCudaKernelLaunchFeaturesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV> {
+ typedef VkPhysicalDeviceCudaKernelLaunchFeaturesNV Type;
+};
+
+// Map type VkPhysicalDeviceCudaKernelLaunchPropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV
+template <> struct LvlTypeMap<VkPhysicalDeviceCudaKernelLaunchPropertiesNV> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_PROPERTIES_NV> {
+ typedef VkPhysicalDeviceCudaKernelLaunchPropertiesNV Type;
+};
+
// Map type VkQueryLowLatencySupportNV to id VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV
template <> struct LvlTypeMap<VkQueryLowLatencySupportNV> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV;
@@ -6821,6 +6866,33 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PRO
typedef VkPhysicalDeviceShaderCorePropertiesARM Type;
};
+// Map type VkDeviceQueueShaderCoreControlCreateInfoARM to id VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM
+template <> struct LvlTypeMap<VkDeviceQueueShaderCoreControlCreateInfoARM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM> {
+ typedef VkDeviceQueueShaderCoreControlCreateInfoARM Type;
+};
+
+// Map type VkPhysicalDeviceSchedulingControlsFeaturesARM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM
+template <> struct LvlTypeMap<VkPhysicalDeviceSchedulingControlsFeaturesARM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM> {
+ typedef VkPhysicalDeviceSchedulingControlsFeaturesARM Type;
+};
+
+// Map type VkPhysicalDeviceSchedulingControlsPropertiesARM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM
+template <> struct LvlTypeMap<VkPhysicalDeviceSchedulingControlsPropertiesARM> {
+ static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM;
+};
+
+template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM> {
+ typedef VkPhysicalDeviceSchedulingControlsPropertiesARM Type;
+};
+
// Map type VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT
template <> struct LvlTypeMap<VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT;
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py
index 35e3e5cc..2e5fa54d 100755
--- a/scripts/generate_vulkan_wrapper.py
+++ b/scripts/generate_vulkan_wrapper.py
@@ -1255,6 +1255,15 @@ VK_NV_device_diagnostics_config = Extension(name='VK_NV_device_diagnostics_confi
VK_QCOM_render_pass_store_ops = Extension(name='VK_QCOM_render_pass_store_ops', version=2, guard=None, commands=[
])
+VK_NV_cuda_kernel_launch = Extension(name='VK_NV_cuda_kernel_launch', version=2, guard=None, commands=[
+ Command(name='vkCreateCudaModuleNV', dispatch='VkDevice'),
+ Command(name='vkGetCudaModuleCacheNV', dispatch='VkDevice'),
+ Command(name='vkCreateCudaFunctionNV', dispatch='VkDevice'),
+ Command(name='vkDestroyCudaModuleNV', dispatch='VkDevice'),
+ Command(name='vkDestroyCudaFunctionNV', dispatch='VkDevice'),
+ Command(name='vkCmdCudaLaunchKernelNV', dispatch='VkCommandBuffer'),
+])
+
VK_NV_low_latency = Extension(name='VK_NV_low_latency', version=1, guard=None, commands=[
])
@@ -1425,6 +1434,9 @@ VK_EXT_pageable_device_local_memory = Extension(name='VK_EXT_pageable_device_loc
VK_ARM_shader_core_properties = Extension(name='VK_ARM_shader_core_properties', version=1, guard=None, commands=[
])
+VK_ARM_scheduling_controls = Extension(name='VK_ARM_scheduling_controls', version=1, guard=None, commands=[
+])
+
VK_EXT_image_sliced_view_of_3d = Extension(name='VK_EXT_image_sliced_view_of_3d', version=1, guard=None, commands=[
])
@@ -2037,6 +2049,7 @@ extensions = [
VK_EXT_pipeline_creation_cache_control,
VK_NV_device_diagnostics_config,
VK_QCOM_render_pass_store_ops,
+ VK_NV_cuda_kernel_launch,
VK_NV_low_latency,
VK_EXT_descriptor_buffer,
VK_EXT_graphics_pipeline_library,
@@ -2079,6 +2092,7 @@ extensions = [
VK_EXT_border_color_swizzle,
VK_EXT_pageable_device_local_memory,
VK_ARM_shader_core_properties,
+ VK_ARM_scheduling_controls,
VK_EXT_image_sliced_view_of_3d,
VK_VALVE_descriptor_set_host_mapping,
VK_EXT_depth_clamp_zero_one,
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 2b865f83..199a970d 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -7,7 +7,7 @@
"sub_dir": "Vulkan-Headers",
"build_dir": "Vulkan-Headers/build",
"install_dir": "Vulkan-Headers/build/install",
- "commit": "v1.3.268"
+ "commit": "v1.3.269"
},
{
"name": "MoltenVK",
@@ -35,7 +35,7 @@
"cmake_options": [
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
],
- "commit": "v1.3.268",
+ "commit": "v1.3.269",
"build_platforms": [
"windows",
"linux",