Skip to content

Commit 8900685

Browse files
mikes-lunargmikes-lunarg
committed
build: Update to header 1.3.299
1 parent 56eca74 commit 8900685

5 files changed

+89
-89
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.3.298"
5+
"api_version": "1.3.299"
66
}
77
}

‎icd/generated/function_declarations.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -2421,18 +2421,6 @@ static VKAPI_ATTR VkResult VKAPI_CALL QueueSubmit2KHR(
24212421
const VkSubmitInfo2* pSubmits,
24222422
VkFence fence);
24232423

2424-
static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarker2AMD(
2425-
VkCommandBuffer commandBuffer,
2426-
VkPipelineStageFlags2 stage,
2427-
VkBuffer dstBuffer,
2428-
VkDeviceSize dstOffset,
2429-
uint32_t marker);
2430-
2431-
static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV(
2432-
VkQueue queue,
2433-
uint32_t* pCheckpointDataCount,
2434-
VkCheckpointData2NV* pCheckpointData);
2435-
24362424

24372425

24382426

@@ -3242,6 +3230,13 @@ static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarkerAMD(
32423230
VkDeviceSize dstOffset,
32433231
uint32_t marker);
32443232

3233+
static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarker2AMD(
3234+
VkCommandBuffer commandBuffer,
3235+
VkPipelineStageFlags2 stage,
3236+
VkBuffer dstBuffer,
3237+
VkDeviceSize dstOffset,
3238+
uint32_t marker);
3239+
32453240

32463241

32473242
static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCalibrateableTimeDomainsEXT(
@@ -3312,6 +3307,11 @@ static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointDataNV(
33123307
uint32_t* pCheckpointDataCount,
33133308
VkCheckpointDataNV* pCheckpointData);
33143309

3310+
static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV(
3311+
VkQueue queue,
3312+
uint32_t* pCheckpointDataCount,
3313+
VkCheckpointData2NV* pCheckpointData);
3314+
33153315

33163316

33173317
static VKAPI_ATTR VkResult VKAPI_CALL InitializePerformanceApiINTEL(
@@ -5011,8 +5011,6 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
50115011
{"vkCmdPipelineBarrier2KHR", (void*)CmdPipelineBarrier2KHR},
50125012
{"vkCmdWriteTimestamp2KHR", (void*)CmdWriteTimestamp2KHR},
50135013
{"vkQueueSubmit2KHR", (void*)QueueSubmit2KHR},
5014-
{"vkCmdWriteBufferMarker2AMD", (void*)CmdWriteBufferMarker2AMD},
5015-
{"vkGetQueueCheckpointData2NV", (void*)GetQueueCheckpointData2NV},
50165014
{"vkCmdCopyBuffer2KHR", (void*)CmdCopyBuffer2KHR},
50175015
{"vkCmdCopyImage2KHR", (void*)CmdCopyImage2KHR},
50185016
{"vkCmdCopyBufferToImage2KHR", (void*)CmdCopyBufferToImage2KHR},
@@ -5166,6 +5164,7 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
51665164
{"vkCompileDeferredNV", (void*)CompileDeferredNV},
51675165
{"vkGetMemoryHostPointerPropertiesEXT", (void*)GetMemoryHostPointerPropertiesEXT},
51685166
{"vkCmdWriteBufferMarkerAMD", (void*)CmdWriteBufferMarkerAMD},
5167+
{"vkCmdWriteBufferMarker2AMD", (void*)CmdWriteBufferMarker2AMD},
51695168
{"vkGetPhysicalDeviceCalibrateableTimeDomainsEXT", (void*)GetPhysicalDeviceCalibrateableTimeDomainsEXT},
51705169
{"vkGetCalibratedTimestampsEXT", (void*)GetCalibratedTimestampsEXT},
51715170
{"vkCmdDrawMeshTasksNV", (void*)CmdDrawMeshTasksNV},
@@ -5175,6 +5174,7 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
51755174
{"vkCmdSetExclusiveScissorNV", (void*)CmdSetExclusiveScissorNV},
51765175
{"vkCmdSetCheckpointNV", (void*)CmdSetCheckpointNV},
51775176
{"vkGetQueueCheckpointDataNV", (void*)GetQueueCheckpointDataNV},
5177+
{"vkGetQueueCheckpointData2NV", (void*)GetQueueCheckpointData2NV},
51785178
{"vkInitializePerformanceApiINTEL", (void*)InitializePerformanceApiINTEL},
51795179
{"vkUninitializePerformanceApiINTEL", (void*)UninitializePerformanceApiINTEL},
51805180
{"vkCmdSetPerformanceMarkerINTEL", (void*)CmdSetPerformanceMarkerINTEL},

‎icd/generated/function_definitions.h

+18-18
Original file line numberDiff line numberDiff line change
@@ -4531,24 +4531,6 @@ static VKAPI_ATTR VkResult VKAPI_CALL QueueSubmit2KHR(
45314531
return VK_SUCCESS;
45324532
}
45334533

4534-
static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarker2AMD(
4535-
VkCommandBuffer commandBuffer,
4536-
VkPipelineStageFlags2 stage,
4537-
VkBuffer dstBuffer,
4538-
VkDeviceSize dstOffset,
4539-
uint32_t marker)
4540-
{
4541-
//Not a CREATE or DESTROY function
4542-
}
4543-
4544-
static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV(
4545-
VkQueue queue,
4546-
uint32_t* pCheckpointDataCount,
4547-
VkCheckpointData2NV* pCheckpointData)
4548-
{
4549-
//Not a CREATE or DESTROY function
4550-
}
4551-
45524534

45534535

45544536

@@ -5832,6 +5814,16 @@ static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarkerAMD(
58325814
//Not a CREATE or DESTROY function
58335815
}
58345816

5817+
static VKAPI_ATTR void VKAPI_CALL CmdWriteBufferMarker2AMD(
5818+
VkCommandBuffer commandBuffer,
5819+
VkPipelineStageFlags2 stage,
5820+
VkBuffer dstBuffer,
5821+
VkDeviceSize dstOffset,
5822+
uint32_t marker)
5823+
{
5824+
//Not a CREATE or DESTROY function
5825+
}
5826+
58355827

58365828

58375829
static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCalibrateableTimeDomainsEXT(
@@ -5936,6 +5928,14 @@ static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointDataNV(
59365928
//Not a CREATE or DESTROY function
59375929
}
59385930

5931+
static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV(
5932+
VkQueue queue,
5933+
uint32_t* pCheckpointDataCount,
5934+
VkCheckpointData2NV* pCheckpointData)
5935+
{
5936+
//Not a CREATE or DESTROY function
5937+
}
5938+
59395939

59405940

59415941
static VKAPI_ATTR VkResult VKAPI_CALL InitializePerformanceApiINTEL(

‎icd/generated/vk_typemap_helper.h

+54-54
Original file line numberDiff line numberDiff line change
@@ -2605,42 +2605,6 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO
26052605
typedef VkVideoDecodeH264DpbSlotInfoKHR Type;
26062606
};
26072607

2608-
// Map type VkRenderingFragmentShadingRateAttachmentInfoKHR to id VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR
2609-
template <> struct LvlTypeMap<VkRenderingFragmentShadingRateAttachmentInfoKHR> {
2610-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR;
2611-
};
2612-
2613-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR> {
2614-
typedef VkRenderingFragmentShadingRateAttachmentInfoKHR Type;
2615-
};
2616-
2617-
// Map type VkRenderingFragmentDensityMapAttachmentInfoEXT to id VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT
2618-
template <> struct LvlTypeMap<VkRenderingFragmentDensityMapAttachmentInfoEXT> {
2619-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT;
2620-
};
2621-
2622-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT> {
2623-
typedef VkRenderingFragmentDensityMapAttachmentInfoEXT Type;
2624-
};
2625-
2626-
// Map type VkAttachmentSampleCountInfoAMD to id VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD
2627-
template <> struct LvlTypeMap<VkAttachmentSampleCountInfoAMD> {
2628-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD;
2629-
};
2630-
2631-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD> {
2632-
typedef VkAttachmentSampleCountInfoAMD Type;
2633-
};
2634-
2635-
// Map type VkMultiviewPerViewAttributesInfoNVX to id VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX
2636-
template <> struct LvlTypeMap<VkMultiviewPerViewAttributesInfoNVX> {
2637-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX;
2638-
};
2639-
2640-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX> {
2641-
typedef VkMultiviewPerViewAttributesInfoNVX Type;
2642-
};
2643-
26442608
#ifdef VK_USE_PLATFORM_WIN32_KHR
26452609
// Map type VkImportMemoryWin32HandleInfoKHR to id VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR
26462610
template <> struct LvlTypeMap<VkImportMemoryWin32HandleInfoKHR> {
@@ -3155,6 +3119,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADIN
31553119
typedef VkPhysicalDeviceFragmentShadingRateKHR Type;
31563120
};
31573121

3122+
// Map type VkRenderingFragmentShadingRateAttachmentInfoKHR to id VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR
3123+
template <> struct LvlTypeMap<VkRenderingFragmentShadingRateAttachmentInfoKHR> {
3124+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR;
3125+
};
3126+
3127+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR> {
3128+
typedef VkRenderingFragmentShadingRateAttachmentInfoKHR Type;
3129+
};
3130+
31583131
// Map type VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR
31593132
template <> struct LvlTypeMap<VkPhysicalDeviceDynamicRenderingLocalReadFeaturesKHR> {
31603133
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR;
@@ -3407,24 +3380,6 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_VIDEO_ENCODE_SESSION_PARAMETERS
34073380
typedef VkVideoEncodeSessionParametersFeedbackInfoKHR Type;
34083381
};
34093382

3410-
// Map type VkQueueFamilyCheckpointProperties2NV to id VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV
3411-
template <> struct LvlTypeMap<VkQueueFamilyCheckpointProperties2NV> {
3412-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV;
3413-
};
3414-
3415-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV> {
3416-
typedef VkQueueFamilyCheckpointProperties2NV Type;
3417-
};
3418-
3419-
// Map type VkCheckpointData2NV to id VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV
3420-
template <> struct LvlTypeMap<VkCheckpointData2NV> {
3421-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV;
3422-
};
3423-
3424-
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV> {
3425-
typedef VkCheckpointData2NV Type;
3426-
};
3427-
34283383
// Map type VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR
34293384
template <> struct LvlTypeMap<VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR> {
34303385
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR;
@@ -4380,6 +4335,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_V
43804335
typedef VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX Type;
43814336
};
43824337

4338+
// Map type VkMultiviewPerViewAttributesInfoNVX to id VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX
4339+
template <> struct LvlTypeMap<VkMultiviewPerViewAttributesInfoNVX> {
4340+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX;
4341+
};
4342+
4343+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX> {
4344+
typedef VkMultiviewPerViewAttributesInfoNVX Type;
4345+
};
4346+
43834347
// Map type VkPipelineViewportSwizzleStateCreateInfoNV to id VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV
43844348
template <> struct LvlTypeMap<VkPipelineViewportSwizzleStateCreateInfoNV> {
43854349
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV;
@@ -4660,6 +4624,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_NODE_CREA
46604624
};
46614625

46624626
#endif // VK_ENABLE_BETA_EXTENSIONS
4627+
// Map type VkAttachmentSampleCountInfoAMD to id VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD
4628+
template <> struct LvlTypeMap<VkAttachmentSampleCountInfoAMD> {
4629+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD;
4630+
};
4631+
4632+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD> {
4633+
typedef VkAttachmentSampleCountInfoAMD Type;
4634+
};
4635+
46634636
// Map type VkSampleLocationsInfoEXT to id VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT
46644637
template <> struct LvlTypeMap<VkSampleLocationsInfoEXT> {
46654638
static const VkStructureType kSType = VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT;
@@ -5148,6 +5121,24 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV> {
51485121
typedef VkCheckpointDataNV Type;
51495122
};
51505123

5124+
// Map type VkQueueFamilyCheckpointProperties2NV to id VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV
5125+
template <> struct LvlTypeMap<VkQueueFamilyCheckpointProperties2NV> {
5126+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV;
5127+
};
5128+
5129+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV> {
5130+
typedef VkQueueFamilyCheckpointProperties2NV Type;
5131+
};
5132+
5133+
// Map type VkCheckpointData2NV to id VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV
5134+
template <> struct LvlTypeMap<VkCheckpointData2NV> {
5135+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV;
5136+
};
5137+
5138+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV> {
5139+
typedef VkCheckpointData2NV Type;
5140+
};
5141+
51515142
// Map type VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL
51525143
template <> struct LvlTypeMap<VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL> {
51535144
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL;
@@ -5287,6 +5278,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MA
52875278
typedef VkRenderPassFragmentDensityMapCreateInfoEXT Type;
52885279
};
52895280

5281+
// Map type VkRenderingFragmentDensityMapAttachmentInfoEXT to id VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT
5282+
template <> struct LvlTypeMap<VkRenderingFragmentDensityMapAttachmentInfoEXT> {
5283+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT;
5284+
};
5285+
5286+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT> {
5287+
typedef VkRenderingFragmentDensityMapAttachmentInfoEXT Type;
5288+
};
5289+
52905290
// Map type VkPhysicalDeviceShaderCoreProperties2AMD to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD
52915291
template <> struct LvlTypeMap<VkPhysicalDeviceShaderCoreProperties2AMD> {
52925292
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD;

‎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.3.298"
10+
"commit": "v1.3.299"
1111
},
1212
{
1313
"name": "MoltenVK",
@@ -74,7 +74,7 @@
7474
"cmake_options": [
7575
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
7676
],
77-
"commit": "v1.3.298",
77+
"commit": "v1.3.299",
7878
"build_platforms": [
7979
"windows",
8080
"linux",

0 commit comments

Comments
 (0)