Skip to content

Commit 865aba3

Browse files
committed
build: Update to header 1.4.311
1 parent 54cbefd commit 865aba3

File tree

6 files changed

+36
-4
lines changed

6 files changed

+36
-4
lines changed

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.310 LANGUAGES C)
21+
project(VULKAN_LOADER VERSION 1.4.311 LANGUAGES C)
2222

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

loader/generated/vk_layer_dispatch_table.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,9 @@ typedef struct VkLayerDispatchTable_ {
12181218
PFN_vkGetMemoryMetalHandlePropertiesEXT GetMemoryMetalHandlePropertiesEXT;
12191219
#endif // VK_USE_PLATFORM_METAL_EXT
12201220

1221+
// ---- VK_EXT_fragment_density_map_offset extension commands
1222+
PFN_vkCmdEndRendering2EXT CmdEndRendering2EXT;
1223+
12211224
// ---- VK_KHR_acceleration_structure extension commands
12221225
PFN_vkCreateAccelerationStructureKHR CreateAccelerationStructureKHR;
12231226
PFN_vkDestroyAccelerationStructureKHR DestroyAccelerationStructureKHR;

loader/generated/vk_loader_extensions.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,9 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo
12561256
table->GetMemoryMetalHandlePropertiesEXT = (PFN_vkGetMemoryMetalHandlePropertiesEXT)gdpa(dev, "vkGetMemoryMetalHandlePropertiesEXT");
12571257
#endif // VK_USE_PLATFORM_METAL_EXT
12581258

1259+
// ---- VK_EXT_fragment_density_map_offset extension commands
1260+
table->CmdEndRendering2EXT = (PFN_vkCmdEndRendering2EXT)gdpa(dev, "vkCmdEndRendering2EXT");
1261+
12591262
// ---- VK_KHR_acceleration_structure extension commands
12601263
table->CreateAccelerationStructureKHR = (PFN_vkCreateAccelerationStructureKHR)gdpa(dev, "vkCreateAccelerationStructureKHR");
12611264
table->DestroyAccelerationStructureKHR = (PFN_vkDestroyAccelerationStructureKHR)gdpa(dev, "vkDestroyAccelerationStructureKHR");
@@ -3161,6 +3164,9 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis
31613164
if (!strcmp(name, "GetMemoryMetalHandlePropertiesEXT")) return (void *)table->GetMemoryMetalHandlePropertiesEXT;
31623165
#endif // VK_USE_PLATFORM_METAL_EXT
31633166

3167+
// ---- VK_EXT_fragment_density_map_offset extension commands
3168+
if (!strcmp(name, "CmdEndRendering2EXT")) return (void *)table->CmdEndRendering2EXT;
3169+
31643170
// ---- VK_KHR_acceleration_structure extension commands
31653171
if (!strcmp(name, "CreateAccelerationStructureKHR")) return (void *)table->CreateAccelerationStructureKHR;
31663172
if (!strcmp(name, "DestroyAccelerationStructureKHR")) return (void *)table->DestroyAccelerationStructureKHR;
@@ -10097,6 +10103,22 @@ VKAPI_ATTR VkResult VKAPI_CALL GetMemoryMetalHandlePropertiesEXT(
1009710103

1009810104
#endif // VK_USE_PLATFORM_METAL_EXT
1009910105

10106+
// ---- VK_EXT_fragment_density_map_offset extension trampoline/terminators
10107+
10108+
VKAPI_ATTR void VKAPI_CALL CmdEndRendering2EXT(
10109+
VkCommandBuffer commandBuffer,
10110+
const VkRenderingEndInfoEXT* pRenderingEndInfo) {
10111+
const VkLayerDispatchTable *disp = loader_get_dispatch(commandBuffer);
10112+
if (NULL == disp) {
10113+
loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0,
10114+
"vkCmdEndRendering2EXT: Invalid commandBuffer "
10115+
"[VUID-vkCmdEndRendering2EXT-commandBuffer-parameter]");
10116+
abort(); /* Intentionally fail so user can correct issue. */
10117+
}
10118+
disp->CmdEndRendering2EXT(commandBuffer, pRenderingEndInfo);
10119+
}
10120+
10121+
1010010122
// ---- VK_KHR_acceleration_structure extension trampoline/terminators
1010110123

1010210124
VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
@@ -12550,6 +12572,12 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na
1255012572
}
1255112573
#endif // VK_USE_PLATFORM_METAL_EXT
1255212574

12575+
// ---- VK_EXT_fragment_density_map_offset extension commands
12576+
if (!strcmp("vkCmdEndRendering2EXT", name)) {
12577+
*addr = (void *)CmdEndRendering2EXT;
12578+
return true;
12579+
}
12580+
1255312581
// ---- VK_KHR_acceleration_structure extension commands
1255412582
if (!strcmp("vkCreateAccelerationStructureKHR", name)) {
1255512583
*addr = (void *)CreateAccelerationStructureKHR;

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, 310, 0
26-
#define VER_FILE_DESCRIPTION_STR "1.4.310.Dev Build"
25+
#define VER_FILE_VERSION 1, 4, 311, 0
26+
#define VER_FILE_DESCRIPTION_STR "1.4.311.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

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

tests/framework/layer/vk_dispatch_table_helper.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,7 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
832832
table->GetMemoryMetalHandlePropertiesEXT =
833833
(PFN_vkGetMemoryMetalHandlePropertiesEXT)gpa(device, "vkGetMemoryMetalHandlePropertiesEXT");
834834
#endif // VK_USE_PLATFORM_METAL_EXT
835+
table->CmdEndRendering2EXT = (PFN_vkCmdEndRendering2EXT)gpa(device, "vkCmdEndRendering2EXT");
835836
table->CreateAccelerationStructureKHR = (PFN_vkCreateAccelerationStructureKHR)gpa(device, "vkCreateAccelerationStructureKHR");
836837
table->DestroyAccelerationStructureKHR =
837838
(PFN_vkDestroyAccelerationStructureKHR)gpa(device, "vkDestroyAccelerationStructureKHR");

0 commit comments

Comments
 (0)