Skip to content

Commit 17e6fb5

Browse files
mikes-lunargmikes-lunarg
committed
build: Update to header 1.4.333
1 parent 8e9daf5 commit 17e6fb5

File tree

7 files changed

+124
-9
lines changed

7 files changed

+124
-9
lines changed

‎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.332)
21+
project(Vulkan-Tools VERSION 1.4.333)
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.332"
5+
"api_version": "1.4.333"
66
}
77
}

‎icd/generated/function_declarations.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
515515
{"VK_NV_partitioned_acceleration_structure", VK_NV_PARTITIONED_ACCELERATION_STRUCTURE_SPEC_VERSION},
516516
{"VK_EXT_device_generated_commands", VK_EXT_DEVICE_GENERATED_COMMANDS_SPEC_VERSION},
517517
{"VK_MESA_image_alignment_control", VK_MESA_IMAGE_ALIGNMENT_CONTROL_SPEC_VERSION},
518+
{"VK_EXT_ray_tracing_invocation_reorder", VK_EXT_RAY_TRACING_INVOCATION_REORDER_SPEC_VERSION},
518519
{"VK_EXT_depth_clamp_control", VK_EXT_DEPTH_CLAMP_CONTROL_SPEC_VERSION},
519520
#ifdef VK_USE_PLATFORM_OHOS
520521
{"VK_OHOS_native_buffer", VK_OHOS_NATIVE_BUFFER_SPEC_VERSION},
@@ -535,6 +536,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
535536
{"VK_EXT_fragment_density_map_offset", VK_EXT_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION},
536537
{"VK_EXT_zero_initialize_device_memory", VK_EXT_ZERO_INITIALIZE_DEVICE_MEMORY_SPEC_VERSION},
537538
{"VK_EXT_shader_64bit_indexing", VK_EXT_SHADER_64BIT_INDEXING_SPEC_VERSION},
539+
{"VK_EXT_custom_resolve", VK_EXT_CUSTOM_RESOLVE_SPEC_VERSION},
538540
{"VK_QCOM_data_graph_model", VK_QCOM_DATA_GRAPH_MODEL_SPEC_VERSION},
539541
{"VK_SEC_pipeline_cache_incremental_mode", VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_SPEC_VERSION},
540542
{"VK_EXT_shader_uniform_buffer_unsized_array", VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_SPEC_VERSION},
@@ -4562,6 +4564,10 @@ static VKAPI_ATTR void VKAPI_CALL CmdEndRendering2EXT(
45624564
VkCommandBuffer commandBuffer,
45634565
const VkRenderingEndInfoKHR* pRenderingEndInfo);
45644566

4567+
static VKAPI_ATTR void VKAPI_CALL CmdBeginCustomResolveEXT(
4568+
VkCommandBuffer commandBuffer,
4569+
const VkBeginCustomResolveInfoEXT* pBeginCustomResolveInfo);
4570+
45654571
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
45664572
VkDevice device,
45674573
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
@@ -5603,6 +5609,7 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
56035609
#endif
56045610
{"vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM", (void*)EnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM},
56055611
{"vkCmdEndRendering2EXT", (void*)CmdEndRendering2EXT},
5612+
{"vkCmdBeginCustomResolveEXT", (void*)CmdBeginCustomResolveEXT},
56065613
{"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR},
56075614
{"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR},
56085615
{"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR},

‎icd/generated/function_definitions.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6777,6 +6777,12 @@ static VKAPI_ATTR void VKAPI_CALL CmdEndRendering2EXT(
67776777
{
67786778
//Not a CREATE or DESTROY function
67796779
}
6780+
static VKAPI_ATTR void VKAPI_CALL CmdBeginCustomResolveEXT(
6781+
VkCommandBuffer commandBuffer,
6782+
const VkBeginCustomResolveInfoEXT* pBeginCustomResolveInfo)
6783+
{
6784+
//Not a CREATE or DESTROY function
6785+
}
67806786
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(
67816787
VkDevice device,
67826788
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,

‎icd/generated/vk_typemap_helper.h‎

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8827,13 +8827,13 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INV
88278827
typedef VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV Type;
88288828
};
88298829

8830-
// Map type VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV
8831-
template <> struct LvlTypeMap<VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV> {
8832-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV;
8830+
// Map type VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT
8831+
template <> struct LvlTypeMap<VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT> {
8832+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT;
88338833
};
88348834

8835-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV> {
8836-
typedef VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV Type;
8835+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT> {
8836+
typedef VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT Type;
88378837
};
88388838

88398839
// Map type VkPhysicalDeviceCooperativeVectorPropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_VECTOR_PROPERTIES_NV
@@ -9854,6 +9854,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_
98549854
typedef VkImageAlignmentControlCreateInfoMESA Type;
98559855
};
98569856

9857+
// Map type VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT
9858+
template <> struct LvlTypeMap<VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT> {
9859+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT;
9860+
};
9861+
9862+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT> {
9863+
typedef VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT Type;
9864+
};
9865+
98579866
// Map type VkPhysicalDeviceDepthClampControlFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_CONTROL_FEATURES_EXT
98589867
template <> struct LvlTypeMap<VkPhysicalDeviceDepthClampControlFeaturesEXT> {
98599868
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_CONTROL_FEATURES_EXT;
@@ -10133,6 +10142,33 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_64_BIT_I
1013310142
typedef VkPhysicalDeviceShader64BitIndexingFeaturesEXT Type;
1013410143
};
1013510144

10145+
// Map type VkPhysicalDeviceCustomResolveFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_RESOLVE_FEATURES_EXT
10146+
template <> struct LvlTypeMap<VkPhysicalDeviceCustomResolveFeaturesEXT> {
10147+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_RESOLVE_FEATURES_EXT;
10148+
};
10149+
10150+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_RESOLVE_FEATURES_EXT> {
10151+
typedef VkPhysicalDeviceCustomResolveFeaturesEXT Type;
10152+
};
10153+
10154+
// Map type VkBeginCustomResolveInfoEXT to id VK_STRUCTURE_TYPE_BEGIN_CUSTOM_RESOLVE_INFO_EXT
10155+
template <> struct LvlTypeMap<VkBeginCustomResolveInfoEXT> {
10156+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_BEGIN_CUSTOM_RESOLVE_INFO_EXT;
10157+
};
10158+
10159+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_BEGIN_CUSTOM_RESOLVE_INFO_EXT> {
10160+
typedef VkBeginCustomResolveInfoEXT Type;
10161+
};
10162+
10163+
// Map type VkCustomResolveCreateInfoEXT to id VK_STRUCTURE_TYPE_CUSTOM_RESOLVE_CREATE_INFO_EXT
10164+
template <> struct LvlTypeMap<VkCustomResolveCreateInfoEXT> {
10165+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_CUSTOM_RESOLVE_CREATE_INFO_EXT;
10166+
};
10167+
10168+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CUSTOM_RESOLVE_CREATE_INFO_EXT> {
10169+
typedef VkCustomResolveCreateInfoEXT Type;
10170+
};
10171+
1013610172
// Map type VkDataGraphPipelineBuiltinModelCreateInfoQCOM to id VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_BUILTIN_MODEL_CREATE_INFO_QCOM
1013710173
template <> struct LvlTypeMap<VkDataGraphPipelineBuiltinModelCreateInfoQCOM> {
1013810174
static const VkStructureType kSType = VK_STRUCTURE_TYPE_DATA_GRAPH_PIPELINE_BUILTIN_MODEL_CREATE_INFO_QCOM;

‎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.332"
10+
"commit": "v1.4.333"
1111
},
1212
{
1313
"name": "MoltenVK",
@@ -56,7 +56,7 @@
5656
"cmake_options": [
5757
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
5858
],
59-
"commit": "v1.4.332",
59+
"commit": "v1.4.333",
6060
"build_platforms": [
6161
"windows",
6262
"linux",

0 commit comments

Comments
 (0)