Skip to content

Commit e35946a

Browse files
mikes-lunargmikes-lunarg
committed
build: Update to header 1.4.310
1 parent 9909824 commit e35946a

File tree

6 files changed

+76
-4
lines changed

6 files changed

+76
-4
lines changed

‎CMakeLists.txt

+1-1
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.309 LANGUAGES C)
21+
project(VULKAN_LOADER VERSION 1.4.310 LANGUAGES C)
2222

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

‎loader/generated/vk_layer_dispatch_table.h

+12
Original file line numberDiff line numberDiff line change
@@ -969,12 +969,24 @@ typedef struct VkLayerDispatchTable_ {
969969
PFN_vkGetPrivateDataEXT GetPrivateDataEXT;
970970

971971
// ---- VK_NV_cuda_kernel_launch extension commands
972+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
972973
PFN_vkCreateCudaModuleNV CreateCudaModuleNV;
974+
#endif // VK_ENABLE_BETA_EXTENSIONS
975+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
973976
PFN_vkGetCudaModuleCacheNV GetCudaModuleCacheNV;
977+
#endif // VK_ENABLE_BETA_EXTENSIONS
978+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
974979
PFN_vkCreateCudaFunctionNV CreateCudaFunctionNV;
980+
#endif // VK_ENABLE_BETA_EXTENSIONS
981+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
975982
PFN_vkDestroyCudaModuleNV DestroyCudaModuleNV;
983+
#endif // VK_ENABLE_BETA_EXTENSIONS
984+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
976985
PFN_vkDestroyCudaFunctionNV DestroyCudaFunctionNV;
986+
#endif // VK_ENABLE_BETA_EXTENSIONS
987+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
977988
PFN_vkCmdCudaLaunchKernelNV CmdCudaLaunchKernelNV;
989+
#endif // VK_ENABLE_BETA_EXTENSIONS
978990

979991
// ---- VK_EXT_metal_objects extension commands
980992
#if defined(VK_USE_PLATFORM_METAL_EXT)

‎loader/generated/vk_loader_extensions.c

+48
Original file line numberDiff line numberDiff line change
@@ -1007,12 +1007,24 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo
10071007
table->GetPrivateDataEXT = (PFN_vkGetPrivateDataEXT)gdpa(dev, "vkGetPrivateDataEXT");
10081008

10091009
// ---- VK_NV_cuda_kernel_launch extension commands
1010+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
10101011
table->CreateCudaModuleNV = (PFN_vkCreateCudaModuleNV)gdpa(dev, "vkCreateCudaModuleNV");
1012+
#endif // VK_ENABLE_BETA_EXTENSIONS
1013+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
10111014
table->GetCudaModuleCacheNV = (PFN_vkGetCudaModuleCacheNV)gdpa(dev, "vkGetCudaModuleCacheNV");
1015+
#endif // VK_ENABLE_BETA_EXTENSIONS
1016+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
10121017
table->CreateCudaFunctionNV = (PFN_vkCreateCudaFunctionNV)gdpa(dev, "vkCreateCudaFunctionNV");
1018+
#endif // VK_ENABLE_BETA_EXTENSIONS
1019+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
10131020
table->DestroyCudaModuleNV = (PFN_vkDestroyCudaModuleNV)gdpa(dev, "vkDestroyCudaModuleNV");
1021+
#endif // VK_ENABLE_BETA_EXTENSIONS
1022+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
10141023
table->DestroyCudaFunctionNV = (PFN_vkDestroyCudaFunctionNV)gdpa(dev, "vkDestroyCudaFunctionNV");
1024+
#endif // VK_ENABLE_BETA_EXTENSIONS
1025+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
10151026
table->CmdCudaLaunchKernelNV = (PFN_vkCmdCudaLaunchKernelNV)gdpa(dev, "vkCmdCudaLaunchKernelNV");
1027+
#endif // VK_ENABLE_BETA_EXTENSIONS
10161028

10171029
// ---- VK_EXT_metal_objects extension commands
10181030
#if defined(VK_USE_PLATFORM_METAL_EXT)
@@ -2900,12 +2912,24 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis
29002912
if (!strcmp(name, "GetPrivateDataEXT")) return (void *)table->GetPrivateDataEXT;
29012913

29022914
// ---- VK_NV_cuda_kernel_launch extension commands
2915+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
29032916
if (!strcmp(name, "CreateCudaModuleNV")) return (void *)table->CreateCudaModuleNV;
2917+
#endif // VK_ENABLE_BETA_EXTENSIONS
2918+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
29042919
if (!strcmp(name, "GetCudaModuleCacheNV")) return (void *)table->GetCudaModuleCacheNV;
2920+
#endif // VK_ENABLE_BETA_EXTENSIONS
2921+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
29052922
if (!strcmp(name, "CreateCudaFunctionNV")) return (void *)table->CreateCudaFunctionNV;
2923+
#endif // VK_ENABLE_BETA_EXTENSIONS
2924+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
29062925
if (!strcmp(name, "DestroyCudaModuleNV")) return (void *)table->DestroyCudaModuleNV;
2926+
#endif // VK_ENABLE_BETA_EXTENSIONS
2927+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
29072928
if (!strcmp(name, "DestroyCudaFunctionNV")) return (void *)table->DestroyCudaFunctionNV;
2929+
#endif // VK_ENABLE_BETA_EXTENSIONS
2930+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
29082931
if (!strcmp(name, "CmdCudaLaunchKernelNV")) return (void *)table->CmdCudaLaunchKernelNV;
2932+
#endif // VK_ENABLE_BETA_EXTENSIONS
29092933

29102934
// ---- VK_EXT_metal_objects extension commands
29112935
#if defined(VK_USE_PLATFORM_METAL_EXT)
@@ -7822,6 +7846,7 @@ VKAPI_ATTR void VKAPI_CALL GetPrivateDataEXT(
78227846

78237847
// ---- VK_NV_cuda_kernel_launch extension trampoline/terminators
78247848

7849+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
78257850
VKAPI_ATTR VkResult VKAPI_CALL CreateCudaModuleNV(
78267851
VkDevice device,
78277852
const VkCudaModuleCreateInfoNV* pCreateInfo,
@@ -7837,6 +7862,8 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateCudaModuleNV(
78377862
return disp->CreateCudaModuleNV(device, pCreateInfo, pAllocator, pModule);
78387863
}
78397864

7865+
#endif // VK_ENABLE_BETA_EXTENSIONS
7866+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
78407867
VKAPI_ATTR VkResult VKAPI_CALL GetCudaModuleCacheNV(
78417868
VkDevice device,
78427869
VkCudaModuleNV module,
@@ -7852,6 +7879,8 @@ VKAPI_ATTR VkResult VKAPI_CALL GetCudaModuleCacheNV(
78527879
return disp->GetCudaModuleCacheNV(device, module, pCacheSize, pCacheData);
78537880
}
78547881

7882+
#endif // VK_ENABLE_BETA_EXTENSIONS
7883+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
78557884
VKAPI_ATTR VkResult VKAPI_CALL CreateCudaFunctionNV(
78567885
VkDevice device,
78577886
const VkCudaFunctionCreateInfoNV* pCreateInfo,
@@ -7867,6 +7896,8 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateCudaFunctionNV(
78677896
return disp->CreateCudaFunctionNV(device, pCreateInfo, pAllocator, pFunction);
78687897
}
78697898

7899+
#endif // VK_ENABLE_BETA_EXTENSIONS
7900+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
78707901
VKAPI_ATTR void VKAPI_CALL DestroyCudaModuleNV(
78717902
VkDevice device,
78727903
VkCudaModuleNV module,
@@ -7881,6 +7912,8 @@ VKAPI_ATTR void VKAPI_CALL DestroyCudaModuleNV(
78817912
disp->DestroyCudaModuleNV(device, module, pAllocator);
78827913
}
78837914

7915+
#endif // VK_ENABLE_BETA_EXTENSIONS
7916+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
78847917
VKAPI_ATTR void VKAPI_CALL DestroyCudaFunctionNV(
78857918
VkDevice device,
78867919
VkCudaFunctionNV function,
@@ -7895,6 +7928,8 @@ VKAPI_ATTR void VKAPI_CALL DestroyCudaFunctionNV(
78957928
disp->DestroyCudaFunctionNV(device, function, pAllocator);
78967929
}
78977930

7931+
#endif // VK_ENABLE_BETA_EXTENSIONS
7932+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
78987933
VKAPI_ATTR void VKAPI_CALL CmdCudaLaunchKernelNV(
78997934
VkCommandBuffer commandBuffer,
79007935
const VkCudaLaunchInfoNV* pLaunchInfo) {
@@ -7908,6 +7943,7 @@ VKAPI_ATTR void VKAPI_CALL CmdCudaLaunchKernelNV(
79087943
disp->CmdCudaLaunchKernelNV(commandBuffer, pLaunchInfo);
79097944
}
79107945

7946+
#endif // VK_ENABLE_BETA_EXTENSIONS
79117947

79127948
// ---- VK_EXT_metal_objects extension trampoline/terminators
79137949

@@ -11823,30 +11859,42 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na
1182311859
}
1182411860

1182511861
// ---- VK_NV_cuda_kernel_launch extension commands
11862+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
1182611863
if (!strcmp("vkCreateCudaModuleNV", name)) {
1182711864
*addr = (void *)CreateCudaModuleNV;
1182811865
return true;
1182911866
}
11867+
#endif // VK_ENABLE_BETA_EXTENSIONS
11868+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
1183011869
if (!strcmp("vkGetCudaModuleCacheNV", name)) {
1183111870
*addr = (void *)GetCudaModuleCacheNV;
1183211871
return true;
1183311872
}
11873+
#endif // VK_ENABLE_BETA_EXTENSIONS
11874+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
1183411875
if (!strcmp("vkCreateCudaFunctionNV", name)) {
1183511876
*addr = (void *)CreateCudaFunctionNV;
1183611877
return true;
1183711878
}
11879+
#endif // VK_ENABLE_BETA_EXTENSIONS
11880+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
1183811881
if (!strcmp("vkDestroyCudaModuleNV", name)) {
1183911882
*addr = (void *)DestroyCudaModuleNV;
1184011883
return true;
1184111884
}
11885+
#endif // VK_ENABLE_BETA_EXTENSIONS
11886+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
1184211887
if (!strcmp("vkDestroyCudaFunctionNV", name)) {
1184311888
*addr = (void *)DestroyCudaFunctionNV;
1184411889
return true;
1184511890
}
11891+
#endif // VK_ENABLE_BETA_EXTENSIONS
11892+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
1184611893
if (!strcmp("vkCmdCudaLaunchKernelNV", name)) {
1184711894
*addr = (void *)CmdCudaLaunchKernelNV;
1184811895
return true;
1184911896
}
11897+
#endif // VK_ENABLE_BETA_EXTENSIONS
1185011898

1185111899
// ---- VK_EXT_metal_objects extension commands
1185211900
#if defined(VK_USE_PLATFORM_METAL_EXT)

‎loader/loader.rc

+2-2
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, 309, 0
26-
#define VER_FILE_DESCRIPTION_STR "1.4.309.Dev Build"
25+
#define VER_FILE_VERSION 1, 4, 310, 0
26+
#define VER_FILE_DESCRIPTION_STR "1.4.310.Dev Build"
2727
#define VER_FILE_VERSION_STR "Vulkan Loader - Dev Build"
2828
#define VER_COPYRIGHT_STR "Copyright (C) 2015-2025"
2929

‎scripts/known_good.json

+1-1
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.309"
10+
"commit": "v1.4.310"
1111
},
1212
{
1313
"name": "googletest",

‎tests/framework/layer/vk_dispatch_table_helper.h

+12
Original file line numberDiff line numberDiff line change
@@ -605,12 +605,24 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
605605
table->DestroyPrivateDataSlotEXT = (PFN_vkDestroyPrivateDataSlotEXT)gpa(device, "vkDestroyPrivateDataSlotEXT");
606606
table->SetPrivateDataEXT = (PFN_vkSetPrivateDataEXT)gpa(device, "vkSetPrivateDataEXT");
607607
table->GetPrivateDataEXT = (PFN_vkGetPrivateDataEXT)gpa(device, "vkGetPrivateDataEXT");
608+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
608609
table->CreateCudaModuleNV = (PFN_vkCreateCudaModuleNV)gpa(device, "vkCreateCudaModuleNV");
610+
#endif // VK_ENABLE_BETA_EXTENSIONS
611+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
609612
table->GetCudaModuleCacheNV = (PFN_vkGetCudaModuleCacheNV)gpa(device, "vkGetCudaModuleCacheNV");
613+
#endif // VK_ENABLE_BETA_EXTENSIONS
614+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
610615
table->CreateCudaFunctionNV = (PFN_vkCreateCudaFunctionNV)gpa(device, "vkCreateCudaFunctionNV");
616+
#endif // VK_ENABLE_BETA_EXTENSIONS
617+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
611618
table->DestroyCudaModuleNV = (PFN_vkDestroyCudaModuleNV)gpa(device, "vkDestroyCudaModuleNV");
619+
#endif // VK_ENABLE_BETA_EXTENSIONS
620+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
612621
table->DestroyCudaFunctionNV = (PFN_vkDestroyCudaFunctionNV)gpa(device, "vkDestroyCudaFunctionNV");
622+
#endif // VK_ENABLE_BETA_EXTENSIONS
623+
#if defined(VK_ENABLE_BETA_EXTENSIONS)
613624
table->CmdCudaLaunchKernelNV = (PFN_vkCmdCudaLaunchKernelNV)gpa(device, "vkCmdCudaLaunchKernelNV");
625+
#endif // VK_ENABLE_BETA_EXTENSIONS
614626
#if defined(VK_USE_PLATFORM_METAL_EXT)
615627
table->ExportMetalObjectsEXT = (PFN_vkExportMetalObjectsEXT)gpa(device, "vkExportMetalObjectsEXT");
616628
#endif // VK_USE_PLATFORM_METAL_EXT

0 commit comments

Comments
 (0)