Skip to content

Commit 5ebf9cb

Browse files
mikes-lunargmikes-lunarg
committed
build: Update to header 1.4.340
1 parent 983f86f commit 5ebf9cb

File tree

7 files changed

+468
-29
lines changed

7 files changed

+468
-29
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
cmake_minimum_required(VERSION 3.22.1)
1919

2020
# The VERSION field is generated with the "--generated-version" flag in the generate_source.py script
21-
project(Vulkan-Tools VERSION 1.4.339)
21+
project(Vulkan-Tools VERSION 1.4.340)
2222

2323
# This variable enables downstream users to customize the target API
2424
# variant (e.g. Vulkan SC)

‎icd/VkICD_mock_icd.json.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"file_format_version": "1.0.1",
33
"ICD": {
44
"library_path": "@JSON_LIBRARY_PATH@",
5-
"api_version": "1.4.339"
5+
"api_version": "1.4.340"
66
}
77
}

‎icd/generated/function_declarations.h‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
203203
{"VK_KHR_ray_tracing_position_fetch", VK_KHR_RAY_TRACING_POSITION_FETCH_SPEC_VERSION},
204204
{"VK_KHR_pipeline_binary", VK_KHR_PIPELINE_BINARY_SPEC_VERSION},
205205
{"VK_KHR_swapchain_maintenance1", VK_KHR_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION},
206+
{"VK_KHR_internally_synchronized_queues", VK_KHR_INTERNALLY_SYNCHRONIZED_QUEUES_SPEC_VERSION},
206207
{"VK_KHR_cooperative_matrix", VK_KHR_COOPERATIVE_MATRIX_SPEC_VERSION},
207208
{"VK_KHR_compute_shader_derivatives", VK_KHR_COMPUTE_SHADER_DERIVATIVES_SPEC_VERSION},
208209
{"VK_KHR_video_decode_av1", VK_KHR_VIDEO_DECODE_AV1_SPEC_VERSION},
@@ -288,6 +289,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
288289
#ifdef VK_ENABLE_BETA_EXTENSIONS
289290
{"VK_AMDX_shader_enqueue", VK_AMDX_SHADER_ENQUEUE_SPEC_VERSION},
290291
#endif
292+
{"VK_EXT_descriptor_heap", VK_EXT_DESCRIPTOR_HEAP_SPEC_VERSION},
291293
{"VK_AMD_mixed_attachment_samples", VK_AMD_MIXED_ATTACHMENT_SAMPLES_SPEC_VERSION},
292294
{"VK_AMD_shader_fragment_mask", VK_AMD_SHADER_FRAGMENT_MASK_SPEC_VERSION},
293295
{"VK_EXT_inline_uniform_block", VK_EXT_INLINE_UNIFORM_BLOCK_SPEC_VERSION},
@@ -517,6 +519,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
517519
{"VK_NV_partitioned_acceleration_structure", VK_NV_PARTITIONED_ACCELERATION_STRUCTURE_SPEC_VERSION},
518520
{"VK_EXT_device_generated_commands", VK_EXT_DEVICE_GENERATED_COMMANDS_SPEC_VERSION},
519521
{"VK_MESA_image_alignment_control", VK_MESA_IMAGE_ALIGNMENT_CONTROL_SPEC_VERSION},
522+
{"VK_NV_push_constant_bank", VK_NV_PUSH_CONSTANT_BANK_SPEC_VERSION},
520523
{"VK_EXT_ray_tracing_invocation_reorder", VK_EXT_RAY_TRACING_INVOCATION_REORDER_SPEC_VERSION},
521524
{"VK_EXT_depth_clamp_control", VK_EXT_DEPTH_CLAMP_CONTROL_SPEC_VERSION},
522525
{"VK_HUAWEI_hdr_vivid", VK_HUAWEI_HDR_VIVID_SPEC_VERSION},
@@ -541,6 +544,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
541544
{"VK_SEC_pipeline_cache_incremental_mode", VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_SPEC_VERSION},
542545
{"VK_EXT_shader_uniform_buffer_unsized_array", VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_SPEC_VERSION},
543546
{"VK_NV_compute_occupancy_priority", VK_NV_COMPUTE_OCCUPANCY_PRIORITY_SPEC_VERSION},
547+
{"VK_EXT_shader_subgroup_partitioned", VK_EXT_SHADER_SUBGROUP_PARTITIONED_SPEC_VERSION},
544548
{"VK_KHR_acceleration_structure", VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION},
545549
{"VK_KHR_ray_tracing_pipeline", VK_KHR_RAY_TRACING_PIPELINE_SPEC_VERSION},
546550
{"VK_KHR_ray_query", VK_KHR_RAY_QUERY_SPEC_VERSION},
@@ -1856,6 +1860,9 @@ static VKAPI_ATTR uint64_t VKAPI_CALL GetImageViewHandle64NVX(VkDevice device, c
18561860
static VKAPI_ATTR VkResult VKAPI_CALL GetImageViewAddressNVX(VkDevice device, VkImageView imageView,
18571861
VkImageViewAddressPropertiesNVX* pProperties);
18581862

1863+
static VKAPI_ATTR uint64_t VKAPI_CALL GetDeviceCombinedImageSamplerIndexNVX(VkDevice device, uint64_t imageViewIndex,
1864+
uint64_t samplerIndex);
1865+
18591866
static VKAPI_ATTR void VKAPI_CALL CmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset,
18601867
VkBuffer countBuffer, VkDeviceSize countBufferOffset,
18611868
uint32_t maxDrawCount, uint32_t stride);
@@ -2012,6 +2019,35 @@ static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectAMDX(VkCommandBuffer c
20122019
static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectCountAMDX(VkCommandBuffer commandBuffer, VkDeviceAddress scratch,
20132020
VkDeviceSize scratchSize, VkDeviceAddress countInfo);
20142021
#endif /* VK_ENABLE_BETA_EXTENSIONS */
2022+
static VKAPI_ATTR VkResult VKAPI_CALL WriteSamplerDescriptorsEXT(VkDevice device, uint32_t samplerCount,
2023+
const VkSamplerCreateInfo* pSamplers,
2024+
const VkHostAddressRangeEXT* pDescriptors);
2025+
2026+
static VKAPI_ATTR VkResult VKAPI_CALL WriteResourceDescriptorsEXT(VkDevice device, uint32_t resourceCount,
2027+
const VkResourceDescriptorInfoEXT* pResources,
2028+
const VkHostAddressRangeEXT* pDescriptors);
2029+
2030+
static VKAPI_ATTR void VKAPI_CALL CmdBindSamplerHeapEXT(VkCommandBuffer commandBuffer, const VkBindHeapInfoEXT* pBindInfo);
2031+
2032+
static VKAPI_ATTR void VKAPI_CALL CmdBindResourceHeapEXT(VkCommandBuffer commandBuffer, const VkBindHeapInfoEXT* pBindInfo);
2033+
2034+
static VKAPI_ATTR void VKAPI_CALL CmdPushDataEXT(VkCommandBuffer commandBuffer, const VkPushDataInfoEXT* pPushDataInfo);
2035+
2036+
static VKAPI_ATTR VkResult VKAPI_CALL GetImageOpaqueCaptureDataEXT(VkDevice device, uint32_t imageCount, const VkImage* pImages,
2037+
VkHostAddressRangeEXT* pDatas);
2038+
2039+
static VKAPI_ATTR VkDeviceSize VKAPI_CALL GetPhysicalDeviceDescriptorSizeEXT(VkPhysicalDevice physicalDevice,
2040+
VkDescriptorType descriptorType);
2041+
2042+
static VKAPI_ATTR VkResult VKAPI_CALL RegisterCustomBorderColorEXT(VkDevice device,
2043+
const VkSamplerCustomBorderColorCreateInfoEXT* pBorderColor,
2044+
VkBool32 requestIndex, uint32_t* pIndex);
2045+
2046+
static VKAPI_ATTR void VKAPI_CALL UnregisterCustomBorderColorEXT(VkDevice device, uint32_t index);
2047+
2048+
static VKAPI_ATTR VkResult VKAPI_CALL GetTensorOpaqueCaptureDataARM(VkDevice device, uint32_t tensorCount,
2049+
const VkTensorARM* pTensors, VkHostAddressRangeEXT* pDatas);
2050+
20152051
static VKAPI_ATTR void VKAPI_CALL CmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer,
20162052
const VkSampleLocationsInfoEXT* pSampleLocationsInfo);
20172053

@@ -3478,6 +3514,7 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
34783514
{"vkGetImageViewHandleNVX", (void*)GetImageViewHandleNVX},
34793515
{"vkGetImageViewHandle64NVX", (void*)GetImageViewHandle64NVX},
34803516
{"vkGetImageViewAddressNVX", (void*)GetImageViewAddressNVX},
3517+
{"vkGetDeviceCombinedImageSamplerIndexNVX", (void*)GetDeviceCombinedImageSamplerIndexNVX},
34813518
{"vkCmdDrawIndirectCountAMD", (void*)CmdDrawIndirectCountAMD},
34823519
{"vkCmdDrawIndexedIndirectCountAMD", (void*)CmdDrawIndexedIndirectCountAMD},
34833520
{"vkGetShaderInfoAMD", (void*)GetShaderInfoAMD},
@@ -3556,6 +3593,16 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
35563593
#ifdef VK_ENABLE_BETA_EXTENSIONS
35573594
{"vkCmdDispatchGraphIndirectCountAMDX", (void*)CmdDispatchGraphIndirectCountAMDX},
35583595
#endif
3596+
{"vkWriteSamplerDescriptorsEXT", (void*)WriteSamplerDescriptorsEXT},
3597+
{"vkWriteResourceDescriptorsEXT", (void*)WriteResourceDescriptorsEXT},
3598+
{"vkCmdBindSamplerHeapEXT", (void*)CmdBindSamplerHeapEXT},
3599+
{"vkCmdBindResourceHeapEXT", (void*)CmdBindResourceHeapEXT},
3600+
{"vkCmdPushDataEXT", (void*)CmdPushDataEXT},
3601+
{"vkGetImageOpaqueCaptureDataEXT", (void*)GetImageOpaqueCaptureDataEXT},
3602+
{"vkGetPhysicalDeviceDescriptorSizeEXT", (void*)GetPhysicalDeviceDescriptorSizeEXT},
3603+
{"vkRegisterCustomBorderColorEXT", (void*)RegisterCustomBorderColorEXT},
3604+
{"vkUnregisterCustomBorderColorEXT", (void*)UnregisterCustomBorderColorEXT},
3605+
{"vkGetTensorOpaqueCaptureDataARM", (void*)GetTensorOpaqueCaptureDataARM},
35593606
{"vkCmdSetSampleLocationsEXT", (void*)CmdSetSampleLocationsEXT},
35603607
{"vkGetPhysicalDeviceMultisamplePropertiesEXT", (void*)GetPhysicalDeviceMultisamplePropertiesEXT},
35613608
{"vkGetImageDrmFormatModifierPropertiesEXT", (void*)GetImageDrmFormatModifierPropertiesEXT},

‎icd/generated/function_definitions.h‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2782,6 +2782,11 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetImageViewAddressNVX(VkDevice device, Vk
27822782
// Not a CREATE or DESTROY function
27832783
return VK_SUCCESS;
27842784
}
2785+
static VKAPI_ATTR uint64_t VKAPI_CALL GetDeviceCombinedImageSamplerIndexNVX(VkDevice device, uint64_t imageViewIndex,
2786+
uint64_t samplerIndex) {
2787+
// Not a CREATE or DESTROY function
2788+
return VK_SUCCESS;
2789+
}
27852790
static VKAPI_ATTR void VKAPI_CALL CmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset,
27862791
VkBuffer countBuffer, VkDeviceSize countBufferOffset,
27872792
uint32_t maxDrawCount, uint32_t stride) {
@@ -3040,6 +3045,51 @@ static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectCountAMDX(VkCommandBuf
30403045
// Not a CREATE or DESTROY function
30413046
}
30423047
#endif /* VK_ENABLE_BETA_EXTENSIONS */
3048+
static VKAPI_ATTR VkResult VKAPI_CALL WriteSamplerDescriptorsEXT(VkDevice device, uint32_t samplerCount,
3049+
const VkSamplerCreateInfo* pSamplers,
3050+
const VkHostAddressRangeEXT* pDescriptors) {
3051+
// Not a CREATE or DESTROY function
3052+
return VK_SUCCESS;
3053+
}
3054+
static VKAPI_ATTR VkResult VKAPI_CALL WriteResourceDescriptorsEXT(VkDevice device, uint32_t resourceCount,
3055+
const VkResourceDescriptorInfoEXT* pResources,
3056+
const VkHostAddressRangeEXT* pDescriptors) {
3057+
// Not a CREATE or DESTROY function
3058+
return VK_SUCCESS;
3059+
}
3060+
static VKAPI_ATTR void VKAPI_CALL CmdBindSamplerHeapEXT(VkCommandBuffer commandBuffer, const VkBindHeapInfoEXT* pBindInfo) {
3061+
// Not a CREATE or DESTROY function
3062+
}
3063+
static VKAPI_ATTR void VKAPI_CALL CmdBindResourceHeapEXT(VkCommandBuffer commandBuffer, const VkBindHeapInfoEXT* pBindInfo) {
3064+
// Not a CREATE or DESTROY function
3065+
}
3066+
static VKAPI_ATTR void VKAPI_CALL CmdPushDataEXT(VkCommandBuffer commandBuffer, const VkPushDataInfoEXT* pPushDataInfo) {
3067+
// Not a CREATE or DESTROY function
3068+
}
3069+
static VKAPI_ATTR VkResult VKAPI_CALL GetImageOpaqueCaptureDataEXT(VkDevice device, uint32_t imageCount, const VkImage* pImages,
3070+
VkHostAddressRangeEXT* pDatas) {
3071+
// Not a CREATE or DESTROY function
3072+
return VK_SUCCESS;
3073+
}
3074+
static VKAPI_ATTR VkDeviceSize VKAPI_CALL GetPhysicalDeviceDescriptorSizeEXT(VkPhysicalDevice physicalDevice,
3075+
VkDescriptorType descriptorType) {
3076+
// Not a CREATE or DESTROY function
3077+
return VK_SUCCESS;
3078+
}
3079+
static VKAPI_ATTR VkResult VKAPI_CALL RegisterCustomBorderColorEXT(VkDevice device,
3080+
const VkSamplerCustomBorderColorCreateInfoEXT* pBorderColor,
3081+
VkBool32 requestIndex, uint32_t* pIndex) {
3082+
// Not a CREATE or DESTROY function
3083+
return VK_SUCCESS;
3084+
}
3085+
static VKAPI_ATTR void VKAPI_CALL UnregisterCustomBorderColorEXT(VkDevice device, uint32_t index) {
3086+
// Not a CREATE or DESTROY function
3087+
}
3088+
static VKAPI_ATTR VkResult VKAPI_CALL GetTensorOpaqueCaptureDataARM(VkDevice device, uint32_t tensorCount,
3089+
const VkTensorARM* pTensors, VkHostAddressRangeEXT* pDatas) {
3090+
// Not a CREATE or DESTROY function
3091+
return VK_SUCCESS;
3092+
}
30433093
static VKAPI_ATTR void VKAPI_CALL CmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer,
30443094
const VkSampleLocationsInfoEXT* pSampleLocationsInfo) {
30453095
// Not a CREATE or DESTROY function

0 commit comments

Comments
 (0)