Skip to content

Commit 32ee3e6

Browse files
committed
build: Update to header 1.4.311
1 parent 072c812 commit 32ee3e6

File tree

6 files changed

+101
-20
lines changed

6 files changed

+101
-20
lines changed

icd/VkICD_mock_icd.json.in

+1-1
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.310"
5+
"api_version": "1.4.311"
66
}
77
}

icd/generated/function_declarations.h

+10-1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
164164
{"VK_AMD_shader_fragment_mask", 1},
165165
{"VK_EXT_inline_uniform_block", 1},
166166
{"VK_EXT_shader_stencil_export", 1},
167+
{"VK_KHR_shader_bfloat16", 1},
167168
{"VK_EXT_sample_locations", 1},
168169
{"VK_KHR_relaxed_block_layout", 1},
169170
{"VK_KHR_get_memory_requirements2", 1},
@@ -350,7 +351,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
350351
{"VK_EXT_depth_clamp_zero_one", 1},
351352
{"VK_EXT_non_seamless_cube_map", 1},
352353
{"VK_ARM_render_pass_striped", 1},
353-
{"VK_QCOM_fragment_density_map_offset", 2},
354+
{"VK_QCOM_fragment_density_map_offset", 3},
354355
{"VK_NV_copy_memory_indirect", 1},
355356
{"VK_NV_memory_decompression", 1},
356357
{"VK_NV_device_generated_commands_compute", 2},
@@ -431,6 +432,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
431432
{"VK_KHR_depth_clamp_zero_one", 1},
432433
{"VK_EXT_vertex_attribute_robustness", 1},
433434
{"VK_NV_present_metering", 1},
435+
{"VK_EXT_fragment_density_map_offset", 1},
434436
};
435437

436438

@@ -2285,6 +2287,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetDisplayPlaneCapabilities2KHR(
22852287

22862288

22872289

2290+
22882291
static VKAPI_ATTR void VKAPI_CALL GetImageMemoryRequirements2KHR(
22892292
VkDevice device,
22902293
const VkImageMemoryRequirementsInfo2* pInfo,
@@ -4653,6 +4656,11 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryMetalHandlePropertiesEXT(
46534656
#endif /* VK_ENABLE_BETA_EXTENSIONS */
46544657

46554658

4659+
static VKAPI_ATTR void VKAPI_CALL CmdEndRendering2EXT(
4660+
VkCommandBuffer commandBuffer,
4661+
const VkRenderingEndInfoEXT* pRenderingEndInfo);
4662+
4663+
46564664
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
46574665
VkDevice device,
46584666
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
@@ -5642,6 +5650,7 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
56425650
#ifdef VK_USE_PLATFORM_METAL_EXT
56435651
{"vkGetMemoryMetalHandlePropertiesEXT", (void*)GetMemoryMetalHandlePropertiesEXT},
56445652
#endif
5653+
{"vkCmdEndRendering2EXT", (void*)CmdEndRendering2EXT},
56455654
{"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR},
56465655
{"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR},
56475656
{"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR},

icd/generated/function_definitions.h

+9
Original file line numberDiff line numberDiff line change
@@ -4643,6 +4643,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetDisplayPlaneCapabilities2KHR(
46434643

46444644

46454645

4646+
46464647
static VKAPI_ATTR void VKAPI_CALL GetImageMemoryRequirements2KHR(
46474648
VkDevice device,
46484649
const VkImageMemoryRequirementsInfo2* pInfo,
@@ -8385,6 +8386,14 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryMetalHandlePropertiesEXT(
83858386
#endif /* VK_ENABLE_BETA_EXTENSIONS */
83868387

83878388

8389+
static VKAPI_ATTR void VKAPI_CALL CmdEndRendering2EXT(
8390+
VkCommandBuffer commandBuffer,
8391+
const VkRenderingEndInfoEXT* pRenderingEndInfo)
8392+
{
8393+
//Not a CREATE or DESTROY function
8394+
}
8395+
8396+
83888397
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
83898398
VkDevice device,
83908399
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,

icd/generated/vk_typemap_helper.h

+33-15
Original file line numberDiff line numberDiff line change
@@ -3403,6 +3403,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_DISPLAY_PLANE_CAPABILITIES_2_KH
34033403
typedef VkDisplayPlaneCapabilities2KHR Type;
34043404
};
34053405

3406+
// Map type VkPhysicalDeviceShaderBfloat16FeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_BFLOAT16_FEATURES_KHR
3407+
template <> struct LvlTypeMap<VkPhysicalDeviceShaderBfloat16FeaturesKHR> {
3408+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_BFLOAT16_FEATURES_KHR;
3409+
};
3410+
3411+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_BFLOAT16_FEATURES_KHR> {
3412+
typedef VkPhysicalDeviceShaderBfloat16FeaturesKHR Type;
3413+
};
3414+
34063415
#ifdef VK_ENABLE_BETA_EXTENSIONS
34073416
// Map type VkPhysicalDevicePortabilitySubsetFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PORTABILITY_SUBSET_FEATURES_KHR
34083417
template <> struct LvlTypeMap<VkPhysicalDevicePortabilitySubsetFeaturesKHR> {
@@ -7644,31 +7653,31 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_
76447653
typedef VkRenderPassStripeSubmitInfoARM Type;
76457654
};
76467655

7647-
// Map type VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM
7648-
template <> struct LvlTypeMap<VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM> {
7649-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM;
7656+
// Map type VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT
7657+
template <> struct LvlTypeMap<VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT> {
7658+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT;
76507659
};
76517660

7652-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM> {
7653-
typedef VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM Type;
7661+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_EXT> {
7662+
typedef VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT Type;
76547663
};
76557664

7656-
// Map type VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM
7657-
template <> struct LvlTypeMap<VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM> {
7658-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM;
7665+
// Map type VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT
7666+
template <> struct LvlTypeMap<VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT> {
7667+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT;
76597668
};
76607669

7661-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM> {
7662-
typedef VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM Type;
7670+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_EXT> {
7671+
typedef VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT Type;
76637672
};
76647673

7665-
// Map type VkSubpassFragmentDensityMapOffsetEndInfoQCOM to id VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM
7666-
template <> struct LvlTypeMap<VkSubpassFragmentDensityMapOffsetEndInfoQCOM> {
7667-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM;
7674+
// Map type VkRenderPassFragmentDensityMapOffsetEndInfoEXT to id VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT
7675+
template <> struct LvlTypeMap<VkRenderPassFragmentDensityMapOffsetEndInfoEXT> {
7676+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT;
76687677
};
76697678

7670-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM> {
7671-
typedef VkSubpassFragmentDensityMapOffsetEndInfoQCOM Type;
7679+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_EXT> {
7680+
typedef VkRenderPassFragmentDensityMapOffsetEndInfoEXT Type;
76727681
};
76737682

76747683
// Map type VkPhysicalDeviceCopyMemoryIndirectFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COPY_MEMORY_INDIRECT_FEATURES_NV
@@ -9038,6 +9047,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_METERIN
90389047
};
90399048

90409049
#endif // VK_ENABLE_BETA_EXTENSIONS
9050+
// Map type VkRenderingEndInfoEXT to id VK_STRUCTURE_TYPE_RENDERING_END_INFO_EXT
9051+
template <> struct LvlTypeMap<VkRenderingEndInfoEXT> {
9052+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_END_INFO_EXT;
9053+
};
9054+
9055+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDERING_END_INFO_EXT> {
9056+
typedef VkRenderingEndInfoEXT Type;
9057+
};
9058+
90419059
// Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR
90429060
template <> struct LvlTypeMap<VkAccelerationStructureGeometryTrianglesDataKHR> {
90439061
static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR;

scripts/known_good.json

+2-2
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": "MoltenVK",
@@ -74,7 +74,7 @@
7474
"cmake_options": [
7575
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
7676
],
77-
"commit": "v1.4.310",
77+
"commit": "v1.4.311",
7878
"build_platforms": [
7979
"windows",
8080
"linux",

0 commit comments

Comments
 (0)