Skip to content

Commit 48b5d24

Browse files
build: Update to header 1.4.335
1 parent 2a3347d commit 48b5d24

File tree

7 files changed

+226
-4
lines changed

7 files changed

+226
-4
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.334)
21+
project(Vulkan-Tools VERSION 1.4.335)
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.334"
5+
"api_version": "1.4.335"
66
}
77
}

icd/generated/function_declarations.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
326326
{"VK_NV_shader_image_footprint", VK_NV_SHADER_IMAGE_FOOTPRINT_SPEC_VERSION},
327327
{"VK_NV_scissor_exclusive", VK_NV_SCISSOR_EXCLUSIVE_SPEC_VERSION},
328328
{"VK_NV_device_diagnostic_checkpoints", VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_SPEC_VERSION},
329+
{"VK_EXT_present_timing", VK_EXT_PRESENT_TIMING_SPEC_VERSION},
329330
{"VK_INTEL_shader_integer_functions2", VK_INTEL_SHADER_INTEGER_FUNCTIONS_2_SPEC_VERSION},
330331
{"VK_INTEL_performance_query", VK_INTEL_PERFORMANCE_QUERY_SPEC_VERSION},
331332
{"VK_EXT_pci_bus_info", VK_EXT_PCI_BUS_INFO_SPEC_VERSION},
@@ -3323,6 +3324,28 @@ static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV(
33233324
uint32_t* pCheckpointDataCount,
33243325
VkCheckpointData2NV* pCheckpointData);
33253326

3327+
static VKAPI_ATTR VkResult VKAPI_CALL SetSwapchainPresentTimingQueueSizeEXT(
3328+
VkDevice device,
3329+
VkSwapchainKHR swapchain,
3330+
uint32_t size);
3331+
3332+
static VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainTimingPropertiesEXT(
3333+
VkDevice device,
3334+
VkSwapchainKHR swapchain,
3335+
VkSwapchainTimingPropertiesEXT* pSwapchainTimingProperties,
3336+
uint64_t* pSwapchainTimingPropertiesCounter);
3337+
3338+
static VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainTimeDomainPropertiesEXT(
3339+
VkDevice device,
3340+
VkSwapchainKHR swapchain,
3341+
VkSwapchainTimeDomainPropertiesEXT* pSwapchainTimeDomainProperties,
3342+
uint64_t* pTimeDomainsCounter);
3343+
3344+
static VKAPI_ATTR VkResult VKAPI_CALL GetPastPresentationTimingEXT(
3345+
VkDevice device,
3346+
const VkPastPresentationTimingInfoEXT* pPastPresentationTimingInfo,
3347+
VkPastPresentationTimingPropertiesEXT* pPastPresentationTimingProperties);
3348+
33263349
static VKAPI_ATTR VkResult VKAPI_CALL InitializePerformanceApiINTEL(
33273350
VkDevice device,
33283351
const VkInitializePerformanceApiInfoINTEL* pInitializeInfo);
@@ -5295,6 +5318,10 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
52955318
{"vkCmdSetCheckpointNV", (void*)CmdSetCheckpointNV},
52965319
{"vkGetQueueCheckpointDataNV", (void*)GetQueueCheckpointDataNV},
52975320
{"vkGetQueueCheckpointData2NV", (void*)GetQueueCheckpointData2NV},
5321+
{"vkSetSwapchainPresentTimingQueueSizeEXT", (void*)SetSwapchainPresentTimingQueueSizeEXT},
5322+
{"vkGetSwapchainTimingPropertiesEXT", (void*)GetSwapchainTimingPropertiesEXT},
5323+
{"vkGetSwapchainTimeDomainPropertiesEXT", (void*)GetSwapchainTimeDomainPropertiesEXT},
5324+
{"vkGetPastPresentationTimingEXT", (void*)GetPastPresentationTimingEXT},
52985325
{"vkInitializePerformanceApiINTEL", (void*)InitializePerformanceApiINTEL},
52995326
{"vkUninitializePerformanceApiINTEL", (void*)UninitializePerformanceApiINTEL},
53005327
{"vkCmdSetPerformanceMarkerINTEL", (void*)CmdSetPerformanceMarkerINTEL},

icd/generated/function_definitions.h

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4915,6 +4915,40 @@ static VKAPI_ATTR void VKAPI_CALL GetQueueCheckpointData2NV(
49154915
{
49164916
//Not a CREATE or DESTROY function
49174917
}
4918+
static VKAPI_ATTR VkResult VKAPI_CALL SetSwapchainPresentTimingQueueSizeEXT(
4919+
VkDevice device,
4920+
VkSwapchainKHR swapchain,
4921+
uint32_t size)
4922+
{
4923+
//Not a CREATE or DESTROY function
4924+
return VK_SUCCESS;
4925+
}
4926+
static VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainTimingPropertiesEXT(
4927+
VkDevice device,
4928+
VkSwapchainKHR swapchain,
4929+
VkSwapchainTimingPropertiesEXT* pSwapchainTimingProperties,
4930+
uint64_t* pSwapchainTimingPropertiesCounter)
4931+
{
4932+
//Not a CREATE or DESTROY function
4933+
return VK_SUCCESS;
4934+
}
4935+
static VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainTimeDomainPropertiesEXT(
4936+
VkDevice device,
4937+
VkSwapchainKHR swapchain,
4938+
VkSwapchainTimeDomainPropertiesEXT* pSwapchainTimeDomainProperties,
4939+
uint64_t* pTimeDomainsCounter)
4940+
{
4941+
//Not a CREATE or DESTROY function
4942+
return VK_SUCCESS;
4943+
}
4944+
static VKAPI_ATTR VkResult VKAPI_CALL GetPastPresentationTimingEXT(
4945+
VkDevice device,
4946+
const VkPastPresentationTimingInfoEXT* pPastPresentationTimingInfo,
4947+
VkPastPresentationTimingPropertiesEXT* pPastPresentationTimingProperties)
4948+
{
4949+
//Not a CREATE or DESTROY function
4950+
return VK_SUCCESS;
4951+
}
49184952
static VKAPI_ATTR VkResult VKAPI_CALL InitializePerformanceApiINTEL(
49194953
VkDevice device,
49204954
const VkInitializePerformanceApiInfoINTEL* pInitializeInfo)

icd/generated/vk_typemap_helper.h

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5913,6 +5913,96 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV> {
59135913
typedef VkCheckpointData2NV Type;
59145914
};
59155915

5916+
// Map type VkPhysicalDevicePresentTimingFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_TIMING_FEATURES_EXT
5917+
template <> struct LvlTypeMap<VkPhysicalDevicePresentTimingFeaturesEXT> {
5918+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_TIMING_FEATURES_EXT;
5919+
};
5920+
5921+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_TIMING_FEATURES_EXT> {
5922+
typedef VkPhysicalDevicePresentTimingFeaturesEXT Type;
5923+
};
5924+
5925+
// Map type VkPresentTimingSurfaceCapabilitiesEXT to id VK_STRUCTURE_TYPE_PRESENT_TIMING_SURFACE_CAPABILITIES_EXT
5926+
template <> struct LvlTypeMap<VkPresentTimingSurfaceCapabilitiesEXT> {
5927+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PRESENT_TIMING_SURFACE_CAPABILITIES_EXT;
5928+
};
5929+
5930+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PRESENT_TIMING_SURFACE_CAPABILITIES_EXT> {
5931+
typedef VkPresentTimingSurfaceCapabilitiesEXT Type;
5932+
};
5933+
5934+
// Map type VkSwapchainCalibratedTimestampInfoEXT to id VK_STRUCTURE_TYPE_SWAPCHAIN_CALIBRATED_TIMESTAMP_INFO_EXT
5935+
template <> struct LvlTypeMap<VkSwapchainCalibratedTimestampInfoEXT> {
5936+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_CALIBRATED_TIMESTAMP_INFO_EXT;
5937+
};
5938+
5939+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_CALIBRATED_TIMESTAMP_INFO_EXT> {
5940+
typedef VkSwapchainCalibratedTimestampInfoEXT Type;
5941+
};
5942+
5943+
// Map type VkSwapchainTimingPropertiesEXT to id VK_STRUCTURE_TYPE_SWAPCHAIN_TIMING_PROPERTIES_EXT
5944+
template <> struct LvlTypeMap<VkSwapchainTimingPropertiesEXT> {
5945+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_TIMING_PROPERTIES_EXT;
5946+
};
5947+
5948+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_TIMING_PROPERTIES_EXT> {
5949+
typedef VkSwapchainTimingPropertiesEXT Type;
5950+
};
5951+
5952+
// Map type VkSwapchainTimeDomainPropertiesEXT to id VK_STRUCTURE_TYPE_SWAPCHAIN_TIME_DOMAIN_PROPERTIES_EXT
5953+
template <> struct LvlTypeMap<VkSwapchainTimeDomainPropertiesEXT> {
5954+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_TIME_DOMAIN_PROPERTIES_EXT;
5955+
};
5956+
5957+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_TIME_DOMAIN_PROPERTIES_EXT> {
5958+
typedef VkSwapchainTimeDomainPropertiesEXT Type;
5959+
};
5960+
5961+
// Map type VkPastPresentationTimingInfoEXT to id VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_INFO_EXT
5962+
template <> struct LvlTypeMap<VkPastPresentationTimingInfoEXT> {
5963+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_INFO_EXT;
5964+
};
5965+
5966+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_INFO_EXT> {
5967+
typedef VkPastPresentationTimingInfoEXT Type;
5968+
};
5969+
5970+
// Map type VkPastPresentationTimingEXT to id VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_EXT
5971+
template <> struct LvlTypeMap<VkPastPresentationTimingEXT> {
5972+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_EXT;
5973+
};
5974+
5975+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_EXT> {
5976+
typedef VkPastPresentationTimingEXT Type;
5977+
};
5978+
5979+
// Map type VkPastPresentationTimingPropertiesEXT to id VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_PROPERTIES_EXT
5980+
template <> struct LvlTypeMap<VkPastPresentationTimingPropertiesEXT> {
5981+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_PROPERTIES_EXT;
5982+
};
5983+
5984+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PAST_PRESENTATION_TIMING_PROPERTIES_EXT> {
5985+
typedef VkPastPresentationTimingPropertiesEXT Type;
5986+
};
5987+
5988+
// Map type VkPresentTimingInfoEXT to id VK_STRUCTURE_TYPE_PRESENT_TIMING_INFO_EXT
5989+
template <> struct LvlTypeMap<VkPresentTimingInfoEXT> {
5990+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PRESENT_TIMING_INFO_EXT;
5991+
};
5992+
5993+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PRESENT_TIMING_INFO_EXT> {
5994+
typedef VkPresentTimingInfoEXT Type;
5995+
};
5996+
5997+
// Map type VkPresentTimingsInfoEXT to id VK_STRUCTURE_TYPE_PRESENT_TIMINGS_INFO_EXT
5998+
template <> struct LvlTypeMap<VkPresentTimingsInfoEXT> {
5999+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PRESENT_TIMINGS_INFO_EXT;
6000+
};
6001+
6002+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PRESENT_TIMINGS_INFO_EXT> {
6003+
typedef VkPresentTimingsInfoEXT Type;
6004+
};
6005+
59166006
// Map type VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL
59176007
template <> struct LvlTypeMap<VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL> {
59186008
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL;

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

0 commit comments

Comments
 (0)