Skip to content

Commit 7d65e28

Browse files
mikes-lunargcharles-lunarg
authored andcommitted
build: Update to header 1.4.347
1 parent 3208d4b commit 7d65e28

6 files changed

Lines changed: 59 additions & 4 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.346 LANGUAGES C)
21+
project(VULKAN_LOADER VERSION 1.4.347 LANGUAGES C)
2222

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

loader/generated/vk_layer_dispatch_table.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,10 @@ typedef struct VkLayerDispatchTable_ {
788788
PFN_vkCmdCopyMemoryIndirectKHR CmdCopyMemoryIndirectKHR;
789789
PFN_vkCmdCopyMemoryToImageIndirectKHR CmdCopyMemoryToImageIndirectKHR;
790790

791+
// ---- VK_KHR_device_fault extension commands
792+
PFN_vkGetDeviceFaultReportsKHR GetDeviceFaultReportsKHR;
793+
PFN_vkGetDeviceFaultDebugInfoKHR GetDeviceFaultDebugInfoKHR;
794+
791795
// ---- VK_KHR_maintenance10 extension commands
792796
PFN_vkCmdEndRendering2KHR CmdEndRendering2KHR;
793797

loader/generated/vk_loader_extensions.c

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,10 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo
829829
table->CmdCopyMemoryIndirectKHR = (PFN_vkCmdCopyMemoryIndirectKHR)gdpa(dev, "vkCmdCopyMemoryIndirectKHR");
830830
table->CmdCopyMemoryToImageIndirectKHR = (PFN_vkCmdCopyMemoryToImageIndirectKHR)gdpa(dev, "vkCmdCopyMemoryToImageIndirectKHR");
831831

832+
// ---- VK_KHR_device_fault extension commands
833+
table->GetDeviceFaultReportsKHR = (PFN_vkGetDeviceFaultReportsKHR)gdpa(dev, "vkGetDeviceFaultReportsKHR");
834+
table->GetDeviceFaultDebugInfoKHR = (PFN_vkGetDeviceFaultDebugInfoKHR)gdpa(dev, "vkGetDeviceFaultDebugInfoKHR");
835+
832836
// ---- VK_KHR_maintenance10 extension commands
833837
table->CmdEndRendering2KHR = (PFN_vkCmdEndRendering2KHR)gdpa(dev, "vkCmdEndRendering2KHR");
834838

@@ -2883,6 +2887,10 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis
28832887
if (!strcmp(name, "CmdCopyMemoryIndirectKHR")) return (void *)table->CmdCopyMemoryIndirectKHR;
28842888
if (!strcmp(name, "CmdCopyMemoryToImageIndirectKHR")) return (void *)table->CmdCopyMemoryToImageIndirectKHR;
28852889

2890+
// ---- VK_KHR_device_fault extension commands
2891+
if (!strcmp(name, "GetDeviceFaultReportsKHR")) return (void *)table->GetDeviceFaultReportsKHR;
2892+
if (!strcmp(name, "GetDeviceFaultDebugInfoKHR")) return (void *)table->GetDeviceFaultDebugInfoKHR;
2893+
28862894
// ---- VK_KHR_maintenance10 extension commands
28872895
if (!strcmp(name, "CmdEndRendering2KHR")) return (void *)table->CmdEndRendering2KHR;
28882896

@@ -6036,6 +6044,37 @@ VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryToImageIndirectKHR(
60366044
}
60376045

60386046

6047+
// ---- VK_KHR_device_fault extension trampoline/terminators
6048+
6049+
VKAPI_ATTR VkResult VKAPI_CALL GetDeviceFaultReportsKHR(
6050+
VkDevice device,
6051+
uint64_t timeout,
6052+
uint32_t* pFaultCounts,
6053+
VkDeviceFaultInfoKHR* pFaultInfo) {
6054+
const VkLayerDispatchTable *disp = loader_get_dispatch(device);
6055+
if (NULL == disp) {
6056+
loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0,
6057+
"vkGetDeviceFaultReportsKHR: Invalid device "
6058+
"[VUID-vkGetDeviceFaultReportsKHR-device-parameter]");
6059+
abort(); /* Intentionally fail so user can correct issue. */
6060+
}
6061+
return disp->GetDeviceFaultReportsKHR(device, timeout, pFaultCounts, pFaultInfo);
6062+
}
6063+
6064+
VKAPI_ATTR VkResult VKAPI_CALL GetDeviceFaultDebugInfoKHR(
6065+
VkDevice device,
6066+
VkDeviceFaultDebugInfoKHR* pDebugInfo) {
6067+
const VkLayerDispatchTable *disp = loader_get_dispatch(device);
6068+
if (NULL == disp) {
6069+
loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0,
6070+
"vkGetDeviceFaultDebugInfoKHR: Invalid device "
6071+
"[VUID-vkGetDeviceFaultDebugInfoKHR-device-parameter]");
6072+
abort(); /* Intentionally fail so user can correct issue. */
6073+
}
6074+
return disp->GetDeviceFaultDebugInfoKHR(device, pDebugInfo);
6075+
}
6076+
6077+
60396078
// ---- VK_KHR_maintenance10 extension trampoline/terminators
60406079

60416080
VKAPI_ATTR void VKAPI_CALL CmdEndRendering2KHR(
@@ -13031,6 +13070,16 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na
1303113070
return true;
1303213071
}
1303313072

13073+
// ---- VK_KHR_device_fault extension commands
13074+
if (!strcmp("vkGetDeviceFaultReportsKHR", name)) {
13075+
*addr = (void *)GetDeviceFaultReportsKHR;
13076+
return true;
13077+
}
13078+
if (!strcmp("vkGetDeviceFaultDebugInfoKHR", name)) {
13079+
*addr = (void *)GetDeviceFaultDebugInfoKHR;
13080+
return true;
13081+
}
13082+
1303413083
// ---- VK_KHR_maintenance10 extension commands
1303513084
if (!strcmp("vkCmdEndRendering2KHR", name)) {
1303613085
*addr = (void *)CmdEndRendering2KHR;

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, 346, 0
26-
#define VER_FILE_DESCRIPTION_STR "1.4.346.Dev Build"
25+
#define VER_FILE_VERSION 1, 4, 347, 0
26+
#define VER_FILE_DESCRIPTION_STR "1.4.347.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.346"
10+
"commit": "v1.4.347"
1111
},
1212
{
1313
"name": "googletest",

tests/framework/layer/generated/vk_dispatch_table_helper.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,8 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
394394
table->CmdBindDescriptorBufferEmbeddedSamplers2EXT = (PFN_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT)gpa(device, "vkCmdBindDescriptorBufferEmbeddedSamplers2EXT");
395395
table->CmdCopyMemoryIndirectKHR = (PFN_vkCmdCopyMemoryIndirectKHR)gpa(device, "vkCmdCopyMemoryIndirectKHR");
396396
table->CmdCopyMemoryToImageIndirectKHR = (PFN_vkCmdCopyMemoryToImageIndirectKHR)gpa(device, "vkCmdCopyMemoryToImageIndirectKHR");
397+
table->GetDeviceFaultReportsKHR = (PFN_vkGetDeviceFaultReportsKHR)gpa(device, "vkGetDeviceFaultReportsKHR");
398+
table->GetDeviceFaultDebugInfoKHR = (PFN_vkGetDeviceFaultDebugInfoKHR)gpa(device, "vkGetDeviceFaultDebugInfoKHR");
397399
table->CmdEndRendering2KHR = (PFN_vkCmdEndRendering2KHR)gpa(device, "vkCmdEndRendering2KHR");
398400
table->DebugMarkerSetObjectTagEXT = (PFN_vkDebugMarkerSetObjectTagEXT)gpa(device, "vkDebugMarkerSetObjectTagEXT");
399401
table->DebugMarkerSetObjectNameEXT = (PFN_vkDebugMarkerSetObjectNameEXT)gpa(device, "vkDebugMarkerSetObjectNameEXT");

0 commit comments

Comments
 (0)