Skip to content

Commit b96b34f

Browse files
oddhackoddhack
committed
Update for Vulkan-Docs 1.4.335
1 parent 65586d1 commit b96b34f

18 files changed

+3786
-384
lines changed

‎include/vulkan/vulkan.cppm‎

Lines changed: 61 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ module;
1313

1414
#if !defined( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
1515
# define VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING \
16-
"The Vulkan-Hpp C++ named module is experimental. " \
17-
"It is subject to change without prior notice.\n" \
18-
"To silence this warning, define the VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING macro.\n\n" \
19-
"For feedback, go to: https://github.com/KhronosGroup/Vulkan-Hpp/issues"
16+
"\n\tThe Vulkan-Hpp C++ named module is experimental. It is subject to change without prior notice.\n" \
17+
"\tTo silence this warning, define the VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING macro.\n" \
18+
"\tFor feedback, go to: https://github.com/KhronosGroup/Vulkan-Hpp/issues"
2019

2120
VULKAN_HPP_COMPILE_WARNING( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
2221
#endif
@@ -28,7 +27,8 @@ VULKAN_HPP_COMPILE_WARNING( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
2827
#include <vulkan/vulkan_raii.hpp>
2928
#include <vulkan/vulkan_shared.hpp>
3029

31-
export module vulkan_hpp;
30+
export module vulkan;
31+
export import :video;
3232
export import std;
3333

3434
export namespace VULKAN_HPP_NAMESPACE
@@ -687,6 +687,14 @@ export namespace VULKAN_HPP_NAMESPACE
687687
//=== VK_AMD_memory_overallocation_behavior ===
688688
using VULKAN_HPP_NAMESPACE::MemoryOverallocationBehaviorAMD;
689689

690+
//=== VK_EXT_present_timing ===
691+
using VULKAN_HPP_NAMESPACE::PastPresentationTimingFlagBitsEXT;
692+
using VULKAN_HPP_NAMESPACE::PastPresentationTimingFlagsEXT;
693+
using VULKAN_HPP_NAMESPACE::PresentStageFlagBitsEXT;
694+
using VULKAN_HPP_NAMESPACE::PresentStageFlagsEXT;
695+
using VULKAN_HPP_NAMESPACE::PresentTimingInfoFlagBitsEXT;
696+
using VULKAN_HPP_NAMESPACE::PresentTimingInfoFlagsEXT;
697+
690698
//=== VK_INTEL_performance_query ===
691699
using VULKAN_HPP_NAMESPACE::PerformanceConfigurationTypeINTEL;
692700
using VULKAN_HPP_NAMESPACE::PerformanceOverrideTypeINTEL;
@@ -1104,6 +1112,7 @@ export namespace VULKAN_HPP_NAMESPACE
11041112
using VULKAN_HPP_NAMESPACE::OutOfDeviceMemoryError;
11051113
using VULKAN_HPP_NAMESPACE::OutOfHostMemoryError;
11061114
using VULKAN_HPP_NAMESPACE::OutOfPoolMemoryError;
1115+
using VULKAN_HPP_NAMESPACE::PresentTimingQueueFullEXTError;
11071116
using VULKAN_HPP_NAMESPACE::SurfaceLostKHRError;
11081117
using VULKAN_HPP_NAMESPACE::SystemError;
11091118
using VULKAN_HPP_NAMESPACE::TooManyObjectsError;
@@ -1894,6 +1903,10 @@ export namespace VULKAN_HPP_NAMESPACE
18941903
using VULKAN_HPP_NAMESPACE::KHRTimelineSemaphoreExtensionName;
18951904
using VULKAN_HPP_NAMESPACE::KHRTimelineSemaphoreSpecVersion;
18961905

1906+
//=== VK_EXT_present_timing ===
1907+
using VULKAN_HPP_NAMESPACE::EXTPresentTimingExtensionName;
1908+
using VULKAN_HPP_NAMESPACE::EXTPresentTimingSpecVersion;
1909+
18971910
//=== VK_INTEL_shader_integer_functions2 ===
18981911
using VULKAN_HPP_NAMESPACE::INTELShaderIntegerFunctions2ExtensionName;
18991912
using VULKAN_HPP_NAMESPACE::INTELShaderIntegerFunctions2SpecVersion;
@@ -4163,6 +4176,19 @@ export namespace VULKAN_HPP_NAMESPACE
41634176
using VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointProperties2NV;
41644177
using VULKAN_HPP_NAMESPACE::QueueFamilyCheckpointPropertiesNV;
41654178

4179+
//=== VK_EXT_present_timing ===
4180+
using VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT;
4181+
using VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT;
4182+
using VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT;
4183+
using VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT;
4184+
using VULKAN_HPP_NAMESPACE::PresentStageTimeEXT;
4185+
using VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT;
4186+
using VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT;
4187+
using VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT;
4188+
using VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT;
4189+
using VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT;
4190+
using VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT;
4191+
41664192
//=== VK_INTEL_shader_integer_functions2 ===
41674193
using VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL;
41684194

@@ -7606,6 +7632,30 @@ export namespace std
76067632
template <>
76077633
struct hash<VULKAN_HPP_NAMESPACE::CheckpointData2NV>;
76087634

7635+
//=== VK_EXT_present_timing ===
7636+
template <>
7637+
struct hash<VULKAN_HPP_NAMESPACE::PhysicalDevicePresentTimingFeaturesEXT>;
7638+
template <>
7639+
struct hash<VULKAN_HPP_NAMESPACE::PresentTimingSurfaceCapabilitiesEXT>;
7640+
template <>
7641+
struct hash<VULKAN_HPP_NAMESPACE::SwapchainCalibratedTimestampInfoEXT>;
7642+
template <>
7643+
struct hash<VULKAN_HPP_NAMESPACE::SwapchainTimingPropertiesEXT>;
7644+
template <>
7645+
struct hash<VULKAN_HPP_NAMESPACE::SwapchainTimeDomainPropertiesEXT>;
7646+
template <>
7647+
struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingInfoEXT>;
7648+
template <>
7649+
struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingPropertiesEXT>;
7650+
template <>
7651+
struct hash<VULKAN_HPP_NAMESPACE::PastPresentationTimingEXT>;
7652+
template <>
7653+
struct hash<VULKAN_HPP_NAMESPACE::PresentTimingsInfoEXT>;
7654+
template <>
7655+
struct hash<VULKAN_HPP_NAMESPACE::PresentTimingInfoEXT>;
7656+
template <>
7657+
struct hash<VULKAN_HPP_NAMESPACE::PresentStageTimeEXT>;
7658+
76097659
//=== VK_INTEL_shader_integer_functions2 ===
76107660
template <>
76117661
struct hash<VULKAN_HPP_NAMESPACE::PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL>;
@@ -10090,6 +10140,12 @@ export
1009010140
using ::PFN_vkSignalSemaphoreKHR;
1009110141
using ::PFN_vkWaitSemaphoresKHR;
1009210142

10143+
//=== VK_EXT_present_timing ===
10144+
using ::PFN_vkGetPastPresentationTimingEXT;
10145+
using ::PFN_vkGetSwapchainTimeDomainPropertiesEXT;
10146+
using ::PFN_vkGetSwapchainTimingPropertiesEXT;
10147+
using ::PFN_vkSetSwapchainPresentTimingQueueSizeEXT;
10148+
1009310149
//=== VK_INTEL_performance_query ===
1009410150
using ::PFN_vkAcquirePerformanceConfigurationINTEL;
1009510151
using ::PFN_vkCmdSetPerformanceMarkerINTEL;

‎include/vulkan/vulkan.hpp‎

Lines changed: 112 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h
5757
# endif
5858
#endif
5959

60-
VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 334, "Wrong VK_HEADER_VERSION!" );
60+
VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 335, "Wrong VK_HEADER_VERSION!" );
6161

6262
// <tuple> includes <sys/sysmacros.h> through some other header
6363
// this results in major(x) being resolved to gnu_dev_major(x)
@@ -4443,6 +4443,36 @@ namespace VULKAN_HPP_NAMESPACE
44434443
return ::vkSignalSemaphoreKHR( device, pSignalInfo );
44444444
}
44454445

4446+
//=== VK_EXT_present_timing ===
4447+
4448+
VkResult vkSetSwapchainPresentTimingQueueSizeEXT( VkDevice device, VkSwapchainKHR swapchain, uint32_t size ) const VULKAN_HPP_NOEXCEPT
4449+
{
4450+
return ::vkSetSwapchainPresentTimingQueueSizeEXT( device, swapchain, size );
4451+
}
4452+
4453+
VkResult vkGetSwapchainTimingPropertiesEXT( VkDevice device,
4454+
VkSwapchainKHR swapchain,
4455+
VkSwapchainTimingPropertiesEXT * pSwapchainTimingProperties,
4456+
uint64_t * pSwapchainTimingPropertiesCounter ) const VULKAN_HPP_NOEXCEPT
4457+
{
4458+
return ::vkGetSwapchainTimingPropertiesEXT( device, swapchain, pSwapchainTimingProperties, pSwapchainTimingPropertiesCounter );
4459+
}
4460+
4461+
VkResult vkGetSwapchainTimeDomainPropertiesEXT( VkDevice device,
4462+
VkSwapchainKHR swapchain,
4463+
VkSwapchainTimeDomainPropertiesEXT * pSwapchainTimeDomainProperties,
4464+
uint64_t * pTimeDomainsCounter ) const VULKAN_HPP_NOEXCEPT
4465+
{
4466+
return ::vkGetSwapchainTimeDomainPropertiesEXT( device, swapchain, pSwapchainTimeDomainProperties, pTimeDomainsCounter );
4467+
}
4468+
4469+
VkResult vkGetPastPresentationTimingEXT( VkDevice device,
4470+
const VkPastPresentationTimingInfoEXT * pPastPresentationTimingInfo,
4471+
VkPastPresentationTimingPropertiesEXT * pPastPresentationTimingProperties ) const VULKAN_HPP_NOEXCEPT
4472+
{
4473+
return ::vkGetPastPresentationTimingEXT( device, pPastPresentationTimingInfo, pPastPresentationTimingProperties );
4474+
}
4475+
44464476
//=== VK_INTEL_performance_query ===
44474477

44484478
VkResult vkInitializePerformanceApiINTEL( VkDevice device, const VkInitializePerformanceApiInfoINTEL * pInitializeInfo ) const VULKAN_HPP_NOEXCEPT
@@ -7240,6 +7270,14 @@ namespace VULKAN_HPP_NAMESPACE
72407270
}
72417271
};
72427272

7273+
class PresentTimingQueueFullEXTError : public SystemError
7274+
{
7275+
public:
7276+
PresentTimingQueueFullEXTError( std::string const & message ) : SystemError( make_error_code( Result::eErrorPresentTimingQueueFullEXT ), message ) {}
7277+
7278+
PresentTimingQueueFullEXTError( char const * message ) : SystemError( make_error_code( Result::eErrorPresentTimingQueueFullEXT ), message ) {}
7279+
};
7280+
72437281
# if defined( VK_USE_PLATFORM_WIN32_KHR )
72447282
class FullScreenExclusiveModeLostEXTError : public SystemError
72457283
{
@@ -7313,6 +7351,7 @@ namespace VULKAN_HPP_NAMESPACE
73137351
case Result::eErrorVideoProfileCodecNotSupportedKHR : throw VideoProfileCodecNotSupportedKHRError( message );
73147352
case Result::eErrorVideoStdVersionNotSupportedKHR : throw VideoStdVersionNotSupportedKHRError( message );
73157353
case Result::eErrorInvalidDrmFormatModifierPlaneLayoutEXT: throw InvalidDrmFormatModifierPlaneLayoutEXTError( message );
7354+
case Result::eErrorPresentTimingQueueFullEXT : throw PresentTimingQueueFullEXTError( message );
73167355
# if defined( VK_USE_PLATFORM_WIN32_KHR )
73177356
case Result::eErrorFullScreenExclusiveModeLostEXT: throw FullScreenExclusiveModeLostEXTError( message );
73187357
# endif /*VK_USE_PLATFORM_WIN32_KHR*/
@@ -8469,6 +8508,10 @@ namespace VULKAN_HPP_NAMESPACE
84698508
VULKAN_HPP_CONSTEXPR_INLINE auto KHRTimelineSemaphoreExtensionName = VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME;
84708509
VULKAN_HPP_CONSTEXPR_INLINE auto KHRTimelineSemaphoreSpecVersion = VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION;
84718510

8511+
//=== VK_EXT_present_timing ===
8512+
VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentTimingExtensionName = VK_EXT_PRESENT_TIMING_EXTENSION_NAME;
8513+
VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentTimingSpecVersion = VK_EXT_PRESENT_TIMING_SPEC_VERSION;
8514+
84728515
//=== VK_INTEL_shader_integer_functions2 ===
84738516
VULKAN_HPP_CONSTEXPR_INLINE auto INTELShaderIntegerFunctions2ExtensionName = VK_INTEL_SHADER_INTEGER_FUNCTIONS_2_EXTENSION_NAME;
84748517
VULKAN_HPP_CONSTEXPR_INLINE auto INTELShaderIntegerFunctions2SpecVersion = VK_INTEL_SHADER_INTEGER_FUNCTIONS_2_SPEC_VERSION;
@@ -13520,6 +13563,52 @@ namespace VULKAN_HPP_NAMESPACE
1352013563
};
1352113564
};
1352213565

13566+
//=== VK_EXT_present_timing ===
13567+
template <>
13568+
struct StructExtends<PhysicalDevicePresentTimingFeaturesEXT, PhysicalDeviceFeatures2>
13569+
{
13570+
enum
13571+
{
13572+
value = true
13573+
};
13574+
};
13575+
13576+
template <>
13577+
struct StructExtends<PhysicalDevicePresentTimingFeaturesEXT, DeviceCreateInfo>
13578+
{
13579+
enum
13580+
{
13581+
value = true
13582+
};
13583+
};
13584+
13585+
template <>
13586+
struct StructExtends<PresentTimingSurfaceCapabilitiesEXT, SurfaceCapabilities2KHR>
13587+
{
13588+
enum
13589+
{
13590+
value = true
13591+
};
13592+
};
13593+
13594+
template <>
13595+
struct StructExtends<SwapchainCalibratedTimestampInfoEXT, CalibratedTimestampInfoKHR>
13596+
{
13597+
enum
13598+
{
13599+
value = true
13600+
};
13601+
};
13602+
13603+
template <>
13604+
struct StructExtends<PresentTimingsInfoEXT, PresentInfoKHR>
13605+
{
13606+
enum
13607+
{
13608+
value = true
13609+
};
13610+
};
13611+
1352313612
//=== VK_INTEL_shader_integer_functions2 ===
1352413613
template <>
1352513614
struct StructExtends<PhysicalDeviceShaderIntegerFunctions2FeaturesINTEL, PhysicalDeviceFeatures2>
@@ -20764,6 +20853,12 @@ namespace VULKAN_HPP_NAMESPACE
2076420853
PFN_vkWaitSemaphoresKHR vkWaitSemaphoresKHR = 0;
2076520854
PFN_vkSignalSemaphoreKHR vkSignalSemaphoreKHR = 0;
2076620855

20856+
//=== VK_EXT_present_timing ===
20857+
PFN_vkSetSwapchainPresentTimingQueueSizeEXT vkSetSwapchainPresentTimingQueueSizeEXT = 0;
20858+
PFN_vkGetSwapchainTimingPropertiesEXT vkGetSwapchainTimingPropertiesEXT = 0;
20859+
PFN_vkGetSwapchainTimeDomainPropertiesEXT vkGetSwapchainTimeDomainPropertiesEXT = 0;
20860+
PFN_vkGetPastPresentationTimingEXT vkGetPastPresentationTimingEXT = 0;
20861+
2076720862
//=== VK_INTEL_performance_query ===
2076820863
PFN_vkInitializePerformanceApiINTEL vkInitializePerformanceApiINTEL = 0;
2076920864
PFN_vkUninitializePerformanceApiINTEL vkUninitializePerformanceApiINTEL = 0;
@@ -22251,6 +22346,14 @@ namespace VULKAN_HPP_NAMESPACE
2225122346
if ( !vkSignalSemaphore )
2225222347
vkSignalSemaphore = vkSignalSemaphoreKHR;
2225322348

22349+
//=== VK_EXT_present_timing ===
22350+
vkSetSwapchainPresentTimingQueueSizeEXT =
22351+
PFN_vkSetSwapchainPresentTimingQueueSizeEXT( vkGetInstanceProcAddr( instance, "vkSetSwapchainPresentTimingQueueSizeEXT" ) );
22352+
vkGetSwapchainTimingPropertiesEXT = PFN_vkGetSwapchainTimingPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetSwapchainTimingPropertiesEXT" ) );
22353+
vkGetSwapchainTimeDomainPropertiesEXT =
22354+
PFN_vkGetSwapchainTimeDomainPropertiesEXT( vkGetInstanceProcAddr( instance, "vkGetSwapchainTimeDomainPropertiesEXT" ) );
22355+
vkGetPastPresentationTimingEXT = PFN_vkGetPastPresentationTimingEXT( vkGetInstanceProcAddr( instance, "vkGetPastPresentationTimingEXT" ) );
22356+
2225422357
//=== VK_INTEL_performance_query ===
2225522358
vkInitializePerformanceApiINTEL = PFN_vkInitializePerformanceApiINTEL( vkGetInstanceProcAddr( instance, "vkInitializePerformanceApiINTEL" ) );
2225622359
vkUninitializePerformanceApiINTEL = PFN_vkUninitializePerformanceApiINTEL( vkGetInstanceProcAddr( instance, "vkUninitializePerformanceApiINTEL" ) );
@@ -23599,6 +23702,14 @@ namespace VULKAN_HPP_NAMESPACE
2359923702
if ( !vkSignalSemaphore )
2360023703
vkSignalSemaphore = vkSignalSemaphoreKHR;
2360123704

23705+
//=== VK_EXT_present_timing ===
23706+
vkSetSwapchainPresentTimingQueueSizeEXT =
23707+
PFN_vkSetSwapchainPresentTimingQueueSizeEXT( vkGetDeviceProcAddr( device, "vkSetSwapchainPresentTimingQueueSizeEXT" ) );
23708+
vkGetSwapchainTimingPropertiesEXT = PFN_vkGetSwapchainTimingPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainTimingPropertiesEXT" ) );
23709+
vkGetSwapchainTimeDomainPropertiesEXT =
23710+
PFN_vkGetSwapchainTimeDomainPropertiesEXT( vkGetDeviceProcAddr( device, "vkGetSwapchainTimeDomainPropertiesEXT" ) );
23711+
vkGetPastPresentationTimingEXT = PFN_vkGetPastPresentationTimingEXT( vkGetDeviceProcAddr( device, "vkGetPastPresentationTimingEXT" ) );
23712+
2360223713
//=== VK_INTEL_performance_query ===
2360323714
vkInitializePerformanceApiINTEL = PFN_vkInitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkInitializePerformanceApiINTEL" ) );
2360423715
vkUninitializePerformanceApiINTEL = PFN_vkUninitializePerformanceApiINTEL( vkGetDeviceProcAddr( device, "vkUninitializePerformanceApiINTEL" ) );

0 commit comments

Comments
 (0)