Skip to content

Commit cb215ed

Browse files
committed
build: Update to header 1.4.333
1 parent 1629b3b commit cb215ed

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.332 LANGUAGES C)
21+
project(VULKAN_LOADER VERSION 1.4.333 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
@@ -1308,6 +1308,9 @@ typedef struct VkLayerDispatchTable_ {
13081308
// ---- VK_EXT_fragment_density_map_offset extension commands
13091309
PFN_vkCmdEndRendering2EXT CmdEndRendering2EXT;
13101310

1311+
// ---- VK_EXT_custom_resolve extension commands
1312+
PFN_vkCmdBeginCustomResolveEXT CmdBeginCustomResolveEXT;
1313+
13111314
// ---- VK_KHR_acceleration_structure extension commands
13121315
PFN_vkCreateAccelerationStructureKHR CreateAccelerationStructureKHR;
13131316
PFN_vkDestroyAccelerationStructureKHR DestroyAccelerationStructureKHR;

loader/generated/vk_loader_extensions.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,6 +1346,9 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo
13461346
// ---- VK_EXT_fragment_density_map_offset extension commands
13471347
table->CmdEndRendering2EXT = (PFN_vkCmdEndRendering2EXT)gdpa(dev, "vkCmdEndRendering2EXT");
13481348

1349+
// ---- VK_EXT_custom_resolve extension commands
1350+
table->CmdBeginCustomResolveEXT = (PFN_vkCmdBeginCustomResolveEXT)gdpa(dev, "vkCmdBeginCustomResolveEXT");
1351+
13491352
// ---- VK_KHR_acceleration_structure extension commands
13501353
table->CreateAccelerationStructureKHR = (PFN_vkCreateAccelerationStructureKHR)gdpa(dev, "vkCreateAccelerationStructureKHR");
13511354
table->DestroyAccelerationStructureKHR = (PFN_vkDestroyAccelerationStructureKHR)gdpa(dev, "vkDestroyAccelerationStructureKHR");
@@ -3341,6 +3344,9 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis
33413344
// ---- VK_EXT_fragment_density_map_offset extension commands
33423345
if (!strcmp(name, "CmdEndRendering2EXT")) return (void *)table->CmdEndRendering2EXT;
33433346

3347+
// ---- VK_EXT_custom_resolve extension commands
3348+
if (!strcmp(name, "CmdBeginCustomResolveEXT")) return (void *)table->CmdBeginCustomResolveEXT;
3349+
33443350
// ---- VK_KHR_acceleration_structure extension commands
33453351
if (!strcmp(name, "CreateAccelerationStructureKHR")) return (void *)table->CreateAccelerationStructureKHR;
33463352
if (!strcmp(name, "DestroyAccelerationStructureKHR")) return (void *)table->DestroyAccelerationStructureKHR;
@@ -11060,6 +11066,22 @@ VKAPI_ATTR void VKAPI_CALL CmdEndRendering2EXT(
1106011066
}
1106111067

1106211068

11069+
// ---- VK_EXT_custom_resolve extension trampoline/terminators
11070+
11071+
VKAPI_ATTR void VKAPI_CALL CmdBeginCustomResolveEXT(
11072+
VkCommandBuffer commandBuffer,
11073+
const VkBeginCustomResolveInfoEXT* pBeginCustomResolveInfo) {
11074+
const VkLayerDispatchTable *disp = loader_get_dispatch(commandBuffer);
11075+
if (NULL == disp) {
11076+
loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0,
11077+
"vkCmdBeginCustomResolveEXT: Invalid commandBuffer "
11078+
"[VUID-vkCmdBeginCustomResolveEXT-commandBuffer-parameter]");
11079+
abort(); /* Intentionally fail so user can correct issue. */
11080+
}
11081+
disp->CmdBeginCustomResolveEXT(commandBuffer, pBeginCustomResolveInfo);
11082+
}
11083+
11084+
1106311085
// ---- VK_KHR_acceleration_structure extension trampoline/terminators
1106411086

1106511087
VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
@@ -13733,6 +13755,12 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na
1373313755
return true;
1373413756
}
1373513757

13758+
// ---- VK_EXT_custom_resolve extension commands
13759+
if (!strcmp("vkCmdBeginCustomResolveEXT", name)) {
13760+
*addr = (void *)CmdBeginCustomResolveEXT;
13761+
return true;
13762+
}
13763+
1373613764
// ---- VK_KHR_acceleration_structure extension commands
1373713765
if (!strcmp("vkCreateAccelerationStructureKHR", name)) {
1373813766
*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, 332, 0
26-
#define VER_FILE_DESCRIPTION_STR "1.4.332.Dev Build"
25+
#define VER_FILE_VERSION 1, 4, 333, 0
26+
#define VER_FILE_DESCRIPTION_STR "1.4.333.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.332"
10+
"commit": "v1.4.333"
1111
},
1212
{
1313
"name": "googletest",

tests/framework/layer/generated/vk_dispatch_table_helper.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,7 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
751751
table->GetMemoryMetalHandlePropertiesEXT = (PFN_vkGetMemoryMetalHandlePropertiesEXT)gpa(device, "vkGetMemoryMetalHandlePropertiesEXT");
752752
#endif // VK_USE_PLATFORM_METAL_EXT
753753
table->CmdEndRendering2EXT = (PFN_vkCmdEndRendering2EXT)gpa(device, "vkCmdEndRendering2EXT");
754+
table->CmdBeginCustomResolveEXT = (PFN_vkCmdBeginCustomResolveEXT)gpa(device, "vkCmdBeginCustomResolveEXT");
754755
table->CreateAccelerationStructureKHR = (PFN_vkCreateAccelerationStructureKHR)gpa(device, "vkCreateAccelerationStructureKHR");
755756
table->DestroyAccelerationStructureKHR = (PFN_vkDestroyAccelerationStructureKHR)gpa(device, "vkDestroyAccelerationStructureKHR");
756757
table->CmdBuildAccelerationStructuresKHR = (PFN_vkCmdBuildAccelerationStructuresKHR)gpa(device, "vkCmdBuildAccelerationStructuresKHR");

0 commit comments

Comments
 (0)