Skip to content

Commit 90bf5bc

Browse files
mikes-lunargcharles-lunarg
authored andcommitted
build: Update to header 1.4.347
1 parent 734638e commit 90bf5bc

7 files changed

Lines changed: 199 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
cmake_minimum_required(VERSION 3.22.1)
1919

2020
# The VERSION field is generated with the "--generated-version" flag in the generate_source.py script
21-
project(Vulkan-Tools VERSION 1.4.346)
21+
project(Vulkan-Tools VERSION 1.4.347)
2222

2323
# This variable enables downstream users to customize the target API
2424
# variant (e.g. Vulkan SC)

icd/VkICD_mock_icd.json.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"file_format_version": "1.0.1",
33
"ICD": {
44
"library_path": "@JSON_LIBRARY_PATH@",
5-
"api_version": "1.4.346"
5+
"api_version": "1.4.347"
66
}
77
}

icd/generated/function_declarations.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
173173
{"VK_KHR_vulkan_memory_model", VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION},
174174
{"VK_KHR_shader_terminate_invocation", VK_KHR_SHADER_TERMINATE_INVOCATION_SPEC_VERSION},
175175
{"VK_KHR_fragment_shading_rate", VK_KHR_FRAGMENT_SHADING_RATE_SPEC_VERSION},
176+
{"VK_KHR_shader_constant_data", VK_KHR_SHADER_CONSTANT_DATA_SPEC_VERSION},
176177
{"VK_KHR_dynamic_rendering_local_read", VK_KHR_DYNAMIC_RENDERING_LOCAL_READ_SPEC_VERSION},
178+
{"VK_KHR_shader_abort", VK_KHR_SHADER_ABORT_SPEC_VERSION},
177179
{"VK_KHR_shader_quad_control", VK_KHR_SHADER_QUAD_CONTROL_SPEC_VERSION},
178180
{"VK_KHR_spirv_1_4", VK_KHR_SPIRV_1_4_SPEC_VERSION},
179181
{"VK_KHR_separate_depth_stencil_layouts", VK_KHR_SEPARATE_DEPTH_STENCIL_LAYOUTS_SPEC_VERSION},
@@ -228,6 +230,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
228230
{"VK_KHR_video_encode_quantization_map", VK_KHR_VIDEO_ENCODE_QUANTIZATION_MAP_SPEC_VERSION},
229231
{"VK_KHR_shader_relaxed_extended_instruction", VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_SPEC_VERSION},
230232
{"VK_KHR_maintenance7", VK_KHR_MAINTENANCE_7_SPEC_VERSION},
233+
{"VK_KHR_device_fault", VK_KHR_DEVICE_FAULT_SPEC_VERSION},
231234
{"VK_KHR_maintenance8", VK_KHR_MAINTENANCE_8_SPEC_VERSION},
232235
{"VK_KHR_shader_fma", VK_KHR_SHADER_FMA_SPEC_VERSION},
233236
{"VK_KHR_maintenance9", VK_KHR_MAINTENANCE_9_SPEC_VERSION},
@@ -1862,6 +1865,11 @@ static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryIndirectKHR(VkCommandBuffer comma
18621865
static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryToImageIndirectKHR(
18631866
VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo);
18641867

1868+
static VKAPI_ATTR VkResult VKAPI_CALL GetDeviceFaultReportsKHR(VkDevice device, uint64_t timeout, uint32_t* pFaultCounts,
1869+
VkDeviceFaultInfoKHR* pFaultInfo);
1870+
1871+
static VKAPI_ATTR VkResult VKAPI_CALL GetDeviceFaultDebugInfoKHR(VkDevice device, VkDeviceFaultDebugInfoKHR* pDebugInfo);
1872+
18651873
static VKAPI_ATTR void VKAPI_CALL CmdEndRendering2KHR(VkCommandBuffer commandBuffer,
18661874
const VkRenderingEndInfoKHR* pRenderingEndInfo);
18671875

@@ -3616,6 +3624,8 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
36163624
{"vkCmdBindDescriptorBufferEmbeddedSamplers2EXT", (void*)CmdBindDescriptorBufferEmbeddedSamplers2EXT},
36173625
{"vkCmdCopyMemoryIndirectKHR", (void*)CmdCopyMemoryIndirectKHR},
36183626
{"vkCmdCopyMemoryToImageIndirectKHR", (void*)CmdCopyMemoryToImageIndirectKHR},
3627+
{"vkGetDeviceFaultReportsKHR", (void*)GetDeviceFaultReportsKHR},
3628+
{"vkGetDeviceFaultDebugInfoKHR", (void*)GetDeviceFaultDebugInfoKHR},
36193629
{"vkCmdEndRendering2KHR", (void*)CmdEndRendering2KHR},
36203630
{"vkCreateDebugReportCallbackEXT", (void*)CreateDebugReportCallbackEXT},
36213631
{"vkDestroyDebugReportCallbackEXT", (void*)DestroyDebugReportCallbackEXT},

icd/generated/function_definitions.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2785,6 +2785,15 @@ static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryToImageIndirectKHR(
27852785
VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo) {
27862786
// Not a CREATE or DESTROY function
27872787
}
2788+
static VKAPI_ATTR VkResult VKAPI_CALL GetDeviceFaultReportsKHR(VkDevice device, uint64_t timeout, uint32_t* pFaultCounts,
2789+
VkDeviceFaultInfoKHR* pFaultInfo) {
2790+
// Not a CREATE or DESTROY function
2791+
return VK_SUCCESS;
2792+
}
2793+
static VKAPI_ATTR VkResult VKAPI_CALL GetDeviceFaultDebugInfoKHR(VkDevice device, VkDeviceFaultDebugInfoKHR* pDebugInfo) {
2794+
// Not a CREATE or DESTROY function
2795+
return VK_SUCCESS;
2796+
}
27882797
static VKAPI_ATTR void VKAPI_CALL CmdEndRendering2KHR(VkCommandBuffer commandBuffer,
27892798
const VkRenderingEndInfoKHR* pRenderingEndInfo) {
27902799
// Not a CREATE or DESTROY function

icd/generated/vk_typemap_helper.h

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4351,6 +4351,50 @@ struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_
43514351
typedef VkRenderingFragmentShadingRateAttachmentInfoKHR Type;
43524352
};
43534353

4354+
// Map type VkPhysicalDeviceShaderConstantDataFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CONSTANT_DATA_FEATURES_KHR
4355+
template <>
4356+
struct LvlTypeMap<VkPhysicalDeviceShaderConstantDataFeaturesKHR> {
4357+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CONSTANT_DATA_FEATURES_KHR;
4358+
};
4359+
4360+
template <>
4361+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CONSTANT_DATA_FEATURES_KHR> {
4362+
typedef VkPhysicalDeviceShaderConstantDataFeaturesKHR Type;
4363+
};
4364+
4365+
// Map type VkPhysicalDeviceShaderAbortFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ABORT_FEATURES_KHR
4366+
template <>
4367+
struct LvlTypeMap<VkPhysicalDeviceShaderAbortFeaturesKHR> {
4368+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ABORT_FEATURES_KHR;
4369+
};
4370+
4371+
template <>
4372+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ABORT_FEATURES_KHR> {
4373+
typedef VkPhysicalDeviceShaderAbortFeaturesKHR Type;
4374+
};
4375+
4376+
// Map type VkDeviceFaultShaderAbortMessageInfoKHR to id VK_STRUCTURE_TYPE_DEVICE_FAULT_SHADER_ABORT_MESSAGE_INFO_KHR
4377+
template <>
4378+
struct LvlTypeMap<VkDeviceFaultShaderAbortMessageInfoKHR> {
4379+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_FAULT_SHADER_ABORT_MESSAGE_INFO_KHR;
4380+
};
4381+
4382+
template <>
4383+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_DEVICE_FAULT_SHADER_ABORT_MESSAGE_INFO_KHR> {
4384+
typedef VkDeviceFaultShaderAbortMessageInfoKHR Type;
4385+
};
4386+
4387+
// Map type VkPhysicalDeviceShaderAbortPropertiesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ABORT_PROPERTIES_KHR
4388+
template <>
4389+
struct LvlTypeMap<VkPhysicalDeviceShaderAbortPropertiesKHR> {
4390+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ABORT_PROPERTIES_KHR;
4391+
};
4392+
4393+
template <>
4394+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ABORT_PROPERTIES_KHR> {
4395+
typedef VkPhysicalDeviceShaderAbortPropertiesKHR Type;
4396+
};
4397+
43544398
// Map type VkPhysicalDeviceShaderQuadControlFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR
43554399
template <>
43564400
struct LvlTypeMap<VkPhysicalDeviceShaderQuadControlFeaturesKHR> {
@@ -5807,6 +5851,50 @@ struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_VULKAN_PROPERTI
58075851
typedef VkPhysicalDeviceLayeredApiVulkanPropertiesKHR Type;
58085852
};
58095853

5854+
// Map type VkPhysicalDeviceFaultFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_FEATURES_KHR
5855+
template <>
5856+
struct LvlTypeMap<VkPhysicalDeviceFaultFeaturesKHR> {
5857+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_FEATURES_KHR;
5858+
};
5859+
5860+
template <>
5861+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_FEATURES_KHR> {
5862+
typedef VkPhysicalDeviceFaultFeaturesKHR Type;
5863+
};
5864+
5865+
// Map type VkPhysicalDeviceFaultPropertiesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_PROPERTIES_KHR
5866+
template <>
5867+
struct LvlTypeMap<VkPhysicalDeviceFaultPropertiesKHR> {
5868+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_PROPERTIES_KHR;
5869+
};
5870+
5871+
template <>
5872+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_PROPERTIES_KHR> {
5873+
typedef VkPhysicalDeviceFaultPropertiesKHR Type;
5874+
};
5875+
5876+
// Map type VkDeviceFaultInfoKHR to id VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_KHR
5877+
template <>
5878+
struct LvlTypeMap<VkDeviceFaultInfoKHR> {
5879+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_KHR;
5880+
};
5881+
5882+
template <>
5883+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_DEVICE_FAULT_INFO_KHR> {
5884+
typedef VkDeviceFaultInfoKHR Type;
5885+
};
5886+
5887+
// Map type VkDeviceFaultDebugInfoKHR to id VK_STRUCTURE_TYPE_DEVICE_FAULT_DEBUG_INFO_KHR
5888+
template <>
5889+
struct LvlTypeMap<VkDeviceFaultDebugInfoKHR> {
5890+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_FAULT_DEBUG_INFO_KHR;
5891+
};
5892+
5893+
template <>
5894+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_DEVICE_FAULT_DEBUG_INFO_KHR> {
5895+
typedef VkDeviceFaultDebugInfoKHR Type;
5896+
};
5897+
58105898
// Map type VkMemoryBarrierAccessFlags3KHR to id VK_STRUCTURE_TYPE_MEMORY_BARRIER_ACCESS_FLAGS_3_KHR
58115899
template <>
58125900
struct LvlTypeMap<VkMemoryBarrierAccessFlags3KHR> {

scripts/known_good.json

Lines changed: 2 additions & 2 deletions
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": "MoltenVK",
@@ -56,7 +56,7 @@
5656
"cmake_options": [
5757
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
5858
],
59-
"commit": "v1.4.346",
59+
"commit": "v1.4.347",
6060
"build_platforms": [
6161
"windows",
6262
"linux",

0 commit comments

Comments
 (0)