Skip to content

Commit a354560

Browse files
committed
build: Update to header 1.4.340
1 parent 28a23db commit a354560

8 files changed

Lines changed: 300 additions & 17 deletions

File tree

CMakeLists.txt

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

21-
project(VULKAN_LOADER VERSION 1.4.339 LANGUAGES C)
21+
project(VULKAN_LOADER VERSION 1.4.340 LANGUAGES C)
2222

2323
option(CODE_COVERAGE "Enable Code Coverage" OFF)
2424
if (CODE_COVERAGE)

loader/generated/vk_layer_dispatch_table.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ typedef struct VkLayerInstanceDispatchTable_ {
224224
PFN_vkDestroyDebugUtilsMessengerEXT DestroyDebugUtilsMessengerEXT;
225225
PFN_vkSubmitDebugUtilsMessageEXT SubmitDebugUtilsMessageEXT;
226226

227+
// ---- VK_EXT_descriptor_heap extension commands
228+
PFN_vkGetPhysicalDeviceDescriptorSizeEXT GetPhysicalDeviceDescriptorSizeEXT;
229+
227230
// ---- VK_EXT_sample_locations extension commands
228231
PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT GetPhysicalDeviceMultisamplePropertiesEXT;
229232

@@ -778,6 +781,7 @@ typedef struct VkLayerDispatchTable_ {
778781
PFN_vkGetImageViewHandleNVX GetImageViewHandleNVX;
779782
PFN_vkGetImageViewHandle64NVX GetImageViewHandle64NVX;
780783
PFN_vkGetImageViewAddressNVX GetImageViewAddressNVX;
784+
PFN_vkGetDeviceCombinedImageSamplerIndexNVX GetDeviceCombinedImageSamplerIndexNVX;
781785

782786
// ---- VK_AMD_draw_indirect_count extension commands
783787
PFN_vkCmdDrawIndirectCountAMD CmdDrawIndirectCountAMD;
@@ -857,6 +861,17 @@ typedef struct VkLayerDispatchTable_ {
857861
PFN_vkCmdDispatchGraphIndirectCountAMDX CmdDispatchGraphIndirectCountAMDX;
858862
#endif // VK_ENABLE_BETA_EXTENSIONS
859863

864+
// ---- VK_EXT_descriptor_heap extension commands
865+
PFN_vkWriteSamplerDescriptorsEXT WriteSamplerDescriptorsEXT;
866+
PFN_vkWriteResourceDescriptorsEXT WriteResourceDescriptorsEXT;
867+
PFN_vkCmdBindSamplerHeapEXT CmdBindSamplerHeapEXT;
868+
PFN_vkCmdBindResourceHeapEXT CmdBindResourceHeapEXT;
869+
PFN_vkCmdPushDataEXT CmdPushDataEXT;
870+
PFN_vkGetImageOpaqueCaptureDataEXT GetImageOpaqueCaptureDataEXT;
871+
PFN_vkRegisterCustomBorderColorEXT RegisterCustomBorderColorEXT;
872+
PFN_vkUnregisterCustomBorderColorEXT UnregisterCustomBorderColorEXT;
873+
PFN_vkGetTensorOpaqueCaptureDataARM GetTensorOpaqueCaptureDataARM;
874+
860875
// ---- VK_EXT_sample_locations extension commands
861876
PFN_vkCmdSetSampleLocationsEXT CmdSetSampleLocationsEXT;
862877

loader/generated/vk_loader_extensions.c

Lines changed: 254 additions & 0 deletions
Large diffs are not rendered by default.

loader/generated/vk_loader_extensions.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,9 @@ struct loader_icd_term_dispatch {
416416
PFN_vkDestroyDebugUtilsMessengerEXT DestroyDebugUtilsMessengerEXT;
417417
PFN_vkSubmitDebugUtilsMessageEXT SubmitDebugUtilsMessageEXT;
418418

419+
// ---- VK_EXT_descriptor_heap extension commands
420+
PFN_vkGetPhysicalDeviceDescriptorSizeEXT GetPhysicalDeviceDescriptorSizeEXT;
421+
419422
// ---- VK_EXT_sample_locations extension commands
420423
PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT GetPhysicalDeviceMultisamplePropertiesEXT;
421424

loader/generated/vk_object_types.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ typedef enum VulkanObjectType {
7979
kVulkanObjectTypeCuModuleNVX = 38,
8080
kVulkanObjectTypeCuFunctionNVX = 39,
8181
kVulkanObjectTypeDebugUtilsMessengerEXT = 40,
82-
kVulkanObjectTypeValidationCacheEXT = 41,
83-
kVulkanObjectTypeAccelerationStructureNV = 42,
84-
kVulkanObjectTypePerformanceConfigurationINTEL = 43,
85-
kVulkanObjectTypeIndirectCommandsLayoutNV = 44,
86-
kVulkanObjectTypeCudaModuleNV = 45,
87-
kVulkanObjectTypeCudaFunctionNV = 46,
88-
kVulkanObjectTypeAccelerationStructureKHR = 47,
89-
kVulkanObjectTypeBufferCollectionFUCHSIA = 48,
90-
kVulkanObjectTypeMicromapEXT = 49,
91-
kVulkanObjectTypeTensorARM = 50,
82+
kVulkanObjectTypeTensorARM = 41,
83+
kVulkanObjectTypeValidationCacheEXT = 42,
84+
kVulkanObjectTypeAccelerationStructureNV = 43,
85+
kVulkanObjectTypePerformanceConfigurationINTEL = 44,
86+
kVulkanObjectTypeIndirectCommandsLayoutNV = 45,
87+
kVulkanObjectTypeCudaModuleNV = 46,
88+
kVulkanObjectTypeCudaFunctionNV = 47,
89+
kVulkanObjectTypeAccelerationStructureKHR = 48,
90+
kVulkanObjectTypeBufferCollectionFUCHSIA = 49,
91+
kVulkanObjectTypeMicromapEXT = 50,
9292
kVulkanObjectTypeTensorViewARM = 51,
9393
kVulkanObjectTypeOpticalFlowSessionNV = 52,
9494
kVulkanObjectTypeShaderEXT = 53,
@@ -146,6 +146,7 @@ static const char * const object_string[kVulkanObjectTypeMax] = {
146146
"CuModuleNVX",
147147
"CuFunctionNVX",
148148
"DebugUtilsMessengerEXT",
149+
"TensorARM",
149150
"ValidationCacheEXT",
150151
"AccelerationStructureNV",
151152
"PerformanceConfigurationINTEL",
@@ -155,7 +156,6 @@ static const char * const object_string[kVulkanObjectTypeMax] = {
155156
"AccelerationStructureKHR",
156157
"BufferCollectionFUCHSIA",
157158
"MicromapEXT",
158-
"TensorARM",
159159
"TensorViewARM",
160160
"OpticalFlowSessionNV",
161161
"ShaderEXT",
@@ -208,6 +208,7 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {
208208
VK_DEBUG_REPORT_OBJECT_TYPE_CU_MODULE_NVX_EXT, // kVulkanObjectTypeCuModuleNVX
209209
VK_DEBUG_REPORT_OBJECT_TYPE_CU_FUNCTION_NVX_EXT, // kVulkanObjectTypeCuFunctionNVX
210210
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeDebugUtilsMessengerEXT
211+
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeTensorARM
211212
VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT, // kVulkanObjectTypeValidationCacheEXT
212213
VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT, // kVulkanObjectTypeAccelerationStructureNV
213214
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypePerformanceConfigurationINTEL
@@ -217,7 +218,6 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {
217218
VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR_EXT, // kVulkanObjectTypeAccelerationStructureKHR
218219
VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT, // kVulkanObjectTypeBufferCollectionFUCHSIA
219220
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeMicromapEXT
220-
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeTensorARM
221221
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeTensorViewARM
222222
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeOpticalFlowSessionNV
223223
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeShaderEXT
@@ -270,6 +270,7 @@ const VkObjectType get_object_type_enum[] = {
270270
VK_OBJECT_TYPE_CU_MODULE_NVX, // kVulkanObjectTypeCuModuleNVX
271271
VK_OBJECT_TYPE_CU_FUNCTION_NVX, // kVulkanObjectTypeCuFunctionNVX
272272
VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT, // kVulkanObjectTypeDebugUtilsMessengerEXT
273+
VK_OBJECT_TYPE_TENSOR_ARM, // kVulkanObjectTypeTensorARM
273274
VK_OBJECT_TYPE_VALIDATION_CACHE_EXT, // kVulkanObjectTypeValidationCacheEXT
274275
VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV, // kVulkanObjectTypeAccelerationStructureNV
275276
VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL, // kVulkanObjectTypePerformanceConfigurationINTEL
@@ -279,7 +280,6 @@ const VkObjectType get_object_type_enum[] = {
279280
VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR, // kVulkanObjectTypeAccelerationStructureKHR
280281
VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA, // kVulkanObjectTypeBufferCollectionFUCHSIA
281282
VK_OBJECT_TYPE_MICROMAP_EXT, // kVulkanObjectTypeMicromapEXT
282-
VK_OBJECT_TYPE_TENSOR_ARM, // kVulkanObjectTypeTensorARM
283283
VK_OBJECT_TYPE_TENSOR_VIEW_ARM, // kVulkanObjectTypeTensorViewARM
284284
VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV, // kVulkanObjectTypeOpticalFlowSessionNV
285285
VK_OBJECT_TYPE_SHADER_EXT, // kVulkanObjectTypeShaderEXT

loader/loader.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "winres.h"
2323

2424
// All set through CMake
25-
#define VER_FILE_VERSION 1, 4, 339, 0
26-
#define VER_FILE_DESCRIPTION_STR "1.4.339.Dev Build"
25+
#define VER_FILE_VERSION 1, 4, 340, 0
26+
#define VER_FILE_DESCRIPTION_STR "1.4.340.Dev Build"
2727
#define VER_FILE_VERSION_STR "Vulkan Loader - Dev Build"
2828
#define VER_COPYRIGHT_STR "Copyright (C) 2015-2026"
2929

scripts/known_good.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"sub_dir": "Vulkan-Headers",
88
"build_dir": "Vulkan-Headers/build",
99
"install_dir": "Vulkan-Headers/build/install",
10-
"commit": "v1.4.339"
10+
"commit": "v1.4.340"
1111
},
1212
{
1313
"name": "googletest",

tests/framework/layer/generated/vk_dispatch_table_helper.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
392392
table->GetImageViewHandleNVX = (PFN_vkGetImageViewHandleNVX)gpa(device, "vkGetImageViewHandleNVX");
393393
table->GetImageViewHandle64NVX = (PFN_vkGetImageViewHandle64NVX)gpa(device, "vkGetImageViewHandle64NVX");
394394
table->GetImageViewAddressNVX = (PFN_vkGetImageViewAddressNVX)gpa(device, "vkGetImageViewAddressNVX");
395+
table->GetDeviceCombinedImageSamplerIndexNVX = (PFN_vkGetDeviceCombinedImageSamplerIndexNVX)gpa(device, "vkGetDeviceCombinedImageSamplerIndexNVX");
395396
table->CmdDrawIndirectCountAMD = (PFN_vkCmdDrawIndirectCountAMD)gpa(device, "vkCmdDrawIndirectCountAMD");
396397
table->CmdDrawIndexedIndirectCountAMD = (PFN_vkCmdDrawIndexedIndirectCountAMD)gpa(device, "vkCmdDrawIndexedIndirectCountAMD");
397398
table->GetShaderInfoAMD = (PFN_vkGetShaderInfoAMD)gpa(device, "vkGetShaderInfoAMD");
@@ -446,6 +447,15 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
446447
#if defined(VK_ENABLE_BETA_EXTENSIONS)
447448
table->CmdDispatchGraphIndirectCountAMDX = (PFN_vkCmdDispatchGraphIndirectCountAMDX)gpa(device, "vkCmdDispatchGraphIndirectCountAMDX");
448449
#endif // VK_ENABLE_BETA_EXTENSIONS
450+
table->WriteSamplerDescriptorsEXT = (PFN_vkWriteSamplerDescriptorsEXT)gpa(device, "vkWriteSamplerDescriptorsEXT");
451+
table->WriteResourceDescriptorsEXT = (PFN_vkWriteResourceDescriptorsEXT)gpa(device, "vkWriteResourceDescriptorsEXT");
452+
table->CmdBindSamplerHeapEXT = (PFN_vkCmdBindSamplerHeapEXT)gpa(device, "vkCmdBindSamplerHeapEXT");
453+
table->CmdBindResourceHeapEXT = (PFN_vkCmdBindResourceHeapEXT)gpa(device, "vkCmdBindResourceHeapEXT");
454+
table->CmdPushDataEXT = (PFN_vkCmdPushDataEXT)gpa(device, "vkCmdPushDataEXT");
455+
table->GetImageOpaqueCaptureDataEXT = (PFN_vkGetImageOpaqueCaptureDataEXT)gpa(device, "vkGetImageOpaqueCaptureDataEXT");
456+
table->RegisterCustomBorderColorEXT = (PFN_vkRegisterCustomBorderColorEXT)gpa(device, "vkRegisterCustomBorderColorEXT");
457+
table->UnregisterCustomBorderColorEXT = (PFN_vkUnregisterCustomBorderColorEXT)gpa(device, "vkUnregisterCustomBorderColorEXT");
458+
table->GetTensorOpaqueCaptureDataARM = (PFN_vkGetTensorOpaqueCaptureDataARM)gpa(device, "vkGetTensorOpaqueCaptureDataARM");
449459
table->CmdSetSampleLocationsEXT = (PFN_vkCmdSetSampleLocationsEXT)gpa(device, "vkCmdSetSampleLocationsEXT");
450460
table->GetImageDrmFormatModifierPropertiesEXT = (PFN_vkGetImageDrmFormatModifierPropertiesEXT)gpa(device, "vkGetImageDrmFormatModifierPropertiesEXT");
451461
table->CreateValidationCacheEXT = (PFN_vkCreateValidationCacheEXT)gpa(device, "vkCreateValidationCacheEXT");
@@ -902,6 +912,7 @@ static inline void layer_init_instance_dispatch_table(VkInstance instance, VkLay
902912
table->CreateDebugUtilsMessengerEXT = (PFN_vkCreateDebugUtilsMessengerEXT)gpa(instance, "vkCreateDebugUtilsMessengerEXT");
903913
table->DestroyDebugUtilsMessengerEXT = (PFN_vkDestroyDebugUtilsMessengerEXT)gpa(instance, "vkDestroyDebugUtilsMessengerEXT");
904914
table->SubmitDebugUtilsMessageEXT = (PFN_vkSubmitDebugUtilsMessageEXT)gpa(instance, "vkSubmitDebugUtilsMessageEXT");
915+
table->GetPhysicalDeviceDescriptorSizeEXT = (PFN_vkGetPhysicalDeviceDescriptorSizeEXT)gpa(instance, "vkGetPhysicalDeviceDescriptorSizeEXT");
905916
table->GetPhysicalDeviceMultisamplePropertiesEXT = (PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT)gpa(instance, "vkGetPhysicalDeviceMultisamplePropertiesEXT");
906917
table->GetPhysicalDeviceCalibrateableTimeDomainsEXT = (PFN_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT)gpa(instance, "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT");
907918
#if defined(VK_USE_PLATFORM_FUCHSIA)

0 commit comments

Comments
 (0)