Skip to content

Commit d4a196d

Browse files
committed
Update for Vulkan-Docs 1.4.304
1 parent 6a74a7d commit d4a196d

File tree

12 files changed

+1693
-1256
lines changed

12 files changed

+1693
-1256
lines changed

include/vulkan/vulkan.cppm

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module;
2222
#include <vulkan/vulkan_hash.hpp>
2323
#include <vulkan/vulkan_raii.hpp>
2424
#include <vulkan/vulkan_shared.hpp>
25+
#include <vulkan/vulkan_to_string.hpp>
2526

2627
export module vulkan_hpp;
2728

@@ -41,6 +42,7 @@ export namespace VULKAN_HPP_NAMESPACE
4142
using VULKAN_HPP_NAMESPACE::detail::DispatchLoaderDynamic;
4243
#if !defined( VK_NO_PROTOTYPES )
4344
using VULKAN_HPP_NAMESPACE::detail::DispatchLoaderStatic;
45+
using VULKAN_HPP_NAMESPACE::detail::getDispatchLoaderStatic;
4446
#endif /*VK_NO_PROTOTYPES*/
4547
} // namespace detail
4648

@@ -2686,6 +2688,30 @@ export namespace VULKAN_HPP_NAMESPACE
26862688
using VULKAN_HPP_NAMESPACE::ApiVersion14;
26872689
using VULKAN_HPP_NAMESPACE::HeaderVersionComplete;
26882690

2691+
//====================
2692+
//=== FUNCPOINTERs ===
2693+
//====================
2694+
2695+
//=== VK_VERSION_1_0 ===
2696+
using VULKAN_HPP_NAMESPACE::PFN_AllocationFunction;
2697+
using VULKAN_HPP_NAMESPACE::PFN_FreeFunction;
2698+
using VULKAN_HPP_NAMESPACE::PFN_InternalAllocationNotification;
2699+
using VULKAN_HPP_NAMESPACE::PFN_InternalFreeNotification;
2700+
using VULKAN_HPP_NAMESPACE::PFN_ReallocationFunction;
2701+
using VULKAN_HPP_NAMESPACE::PFN_VoidFunction;
2702+
2703+
//=== VK_EXT_debug_report ===
2704+
using VULKAN_HPP_NAMESPACE::PFN_DebugReportCallbackEXT;
2705+
2706+
//=== VK_EXT_debug_utils ===
2707+
using VULKAN_HPP_NAMESPACE::PFN_DebugUtilsMessengerCallbackEXT;
2708+
2709+
//=== VK_EXT_device_memory_report ===
2710+
using VULKAN_HPP_NAMESPACE::PFN_DeviceMemoryReportCallbackEXT;
2711+
2712+
//=== VK_LUNARG_direct_driver_loading ===
2713+
using VULKAN_HPP_NAMESPACE::PFN_GetInstanceProcAddrLUNARG;
2714+
26892715
//===============
26902716
//=== STRUCTs ===
26912717
//===============

include/vulkan/vulkan.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h
6363
# include <span>
6464
#endif
6565

66-
static_assert( VK_HEADER_VERSION == 303, "Wrong VK_HEADER_VERSION!" );
66+
static_assert( VK_HEADER_VERSION == 304, "Wrong VK_HEADER_VERSION!" );
6767

6868
// <tuple> includes <sys/sysmacros.h> through some other header
6969
// this results in major(x) being resolved to gnu_dev_major(x)

include/vulkan/vulkan_core.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ extern "C" {
6969
#define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0
7070

7171
// Version of this file
72-
#define VK_HEADER_VERSION 303
72+
#define VK_HEADER_VERSION 304
7373

7474
// Complete version of this file
7575
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 4, VK_HEADER_VERSION)
@@ -5954,7 +5954,7 @@ typedef enum VkDriverId {
59545954
VK_DRIVER_ID_MESA_NVK = 24,
59555955
VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA = 25,
59565956
VK_DRIVER_ID_MESA_HONEYKRISP = 26,
5957-
VK_DRIVER_ID_RESERVED_27 = 27,
5957+
VK_DRIVER_ID_VULKAN_SC_EMULATION_ON_VULKAN = 27,
59585958
VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY,
59595959
VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE,
59605960
VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV,

include/vulkan/vulkan_enums.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ namespace VULKAN_HPP_NAMESPACE
256256
eErrorInvalidDeviceAddressEXT = VK_ERROR_INVALID_DEVICE_ADDRESS_EXT,
257257
eErrorInvalidOpaqueCaptureAddressKHR = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR,
258258
ePipelineCompileRequired = VK_PIPELINE_COMPILE_REQUIRED,
259-
eErrorPipelineCompileRequiredEXT = VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT,
260259
ePipelineCompileRequiredEXT = VK_PIPELINE_COMPILE_REQUIRED_EXT,
260+
eErrorPipelineCompileRequiredEXT = VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT,
261261
eErrorNotPermitted = VK_ERROR_NOT_PERMITTED,
262262
eErrorNotPermittedEXT = VK_ERROR_NOT_PERMITTED_EXT,
263263
eErrorNotPermittedKHR = VK_ERROR_NOT_PERMITTED_KHR,
@@ -413,8 +413,8 @@ namespace VULKAN_HPP_NAMESPACE
413413
ePhysicalDeviceMultiviewProperties = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES,
414414
ePhysicalDeviceMultiviewPropertiesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR,
415415
ePhysicalDeviceVariablePointersFeatures = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES,
416-
ePhysicalDeviceVariablePointersFeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES_KHR,
417416
ePhysicalDeviceVariablePointerFeatures = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES,
417+
ePhysicalDeviceVariablePointersFeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES_KHR,
418418
ePhysicalDeviceVariablePointerFeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR,
419419
eProtectedSubmitInfo = VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO,
420420
ePhysicalDeviceProtectedMemoryFeatures = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES,
@@ -495,8 +495,8 @@ namespace VULKAN_HPP_NAMESPACE
495495
ePhysicalDeviceShaderAtomicInt64Features = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES,
496496
ePhysicalDeviceShaderAtomicInt64FeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR,
497497
ePhysicalDeviceShaderFloat16Int8Features = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES,
498-
ePhysicalDeviceFloat16Int8FeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR,
499498
ePhysicalDeviceShaderFloat16Int8FeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR,
499+
ePhysicalDeviceFloat16Int8FeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR,
500500
ePhysicalDeviceFloatControlsProperties = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES,
501501
ePhysicalDeviceFloatControlsPropertiesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR,
502502
eDescriptorSetLayoutBindingFlagsCreateInfo = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO,
@@ -675,11 +675,11 @@ namespace VULKAN_HPP_NAMESPACE
675675
eDeviceQueueGlobalPriorityCreateInfoEXT = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT,
676676
eDeviceQueueGlobalPriorityCreateInfoKHR = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR,
677677
ePhysicalDeviceGlobalPriorityQueryFeatures = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES,
678-
ePhysicalDeviceGlobalPriorityQueryFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT,
679678
ePhysicalDeviceGlobalPriorityQueryFeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR,
679+
ePhysicalDeviceGlobalPriorityQueryFeaturesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT,
680680
eQueueFamilyGlobalPriorityProperties = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES,
681-
eQueueFamilyGlobalPriorityPropertiesEXT = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT,
682681
eQueueFamilyGlobalPriorityPropertiesKHR = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR,
682+
eQueueFamilyGlobalPriorityPropertiesEXT = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT,
683683
ePhysicalDeviceShaderSubgroupRotateFeatures = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES,
684684
ePhysicalDeviceShaderSubgroupRotateFeaturesKHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR,
685685
ePhysicalDeviceShaderFloatControls2Features = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES,
@@ -3532,9 +3532,9 @@ namespace VULKAN_HPP_NAMESPACE
35323532
eStore = VK_ATTACHMENT_STORE_OP_STORE,
35333533
eDontCare = VK_ATTACHMENT_STORE_OP_DONT_CARE,
35343534
eNone = VK_ATTACHMENT_STORE_OP_NONE,
3535-
eNoneEXT = VK_ATTACHMENT_STORE_OP_NONE_EXT,
35363535
eNoneKHR = VK_ATTACHMENT_STORE_OP_NONE_KHR,
3537-
eNoneQCOM = VK_ATTACHMENT_STORE_OP_NONE_QCOM
3536+
eNoneQCOM = VK_ATTACHMENT_STORE_OP_NONE_QCOM,
3537+
eNoneEXT = VK_ATTACHMENT_STORE_OP_NONE_EXT
35383538
};
35393539

35403540
enum class DependencyFlagBits : VkDependencyFlags
@@ -4151,7 +4151,7 @@ namespace VULKAN_HPP_NAMESPACE
41514151
eMesaNvk = VK_DRIVER_ID_MESA_NVK,
41524152
eImaginationOpenSourceMESA = VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA,
41534153
eMesaHoneykrisp = VK_DRIVER_ID_MESA_HONEYKRISP,
4154-
eReserved27 = VK_DRIVER_ID_RESERVED_27
4154+
eVulkanScEmulationOnVulkan = VK_DRIVER_ID_VULKAN_SC_EMULATION_ON_VULKAN
41554155
};
41564156
using DriverIdKHR = DriverId;
41574157

include/vulkan/vulkan_extension_inspection.hpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,13 @@ namespace VULKAN_HPP_NAMESPACE
24002400
{ { "VK_VERSION_1_0",
24012401
{ {
24022402
"VK_KHR_cooperative_matrix",
2403-
} } } } }
2403+
} } } } },
2404+
{ "VK_EXT_vertex_attribute_robustness",
2405+
{ { "VK_VERSION_1_0",
2406+
{ {
2407+
"VK_KHR_get_physical_device_properties2",
2408+
} } },
2409+
{ "VK_VERSION_1_1", { {} } } } }
24042410
};
24052411
auto depIt = dependencies.find( extension );
24062412
return ( depIt != dependencies.end() ) ? depIt->second : noDependencies;

include/vulkan/vulkan_handles.hpp

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17706,5 +17706,55 @@ namespace VULKAN_HPP_NAMESPACE
1770617706
VULKAN_HPP_NODISCARD typename ResultValueType<uint32_t>::type enumerateInstanceVersion( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT );
1770717707
#endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */
1770817708

17709+
// operators to compare vk::-handles
17710+
#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR )
17711+
template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
17712+
auto operator<=>( T const & lhs, T const & rhs )
17713+
{
17714+
return static_cast<typename T::NativeType>( lhs ) <=> static_cast<typename T::NativeType>( rhs );
17715+
}
17716+
#else
17717+
template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
17718+
bool operator==( T const & lhs, T const & rhs )
17719+
{
17720+
return static_cast<typename T::NativeType>( lhs ) == static_cast<typename T::NativeType>( rhs );
17721+
}
17722+
17723+
template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
17724+
bool operator!=( T const & lhs, T const & rhs )
17725+
{
17726+
return static_cast<typename T::NativeType>( lhs ) != static_cast<typename T::NativeType>( rhs );
17727+
}
17728+
17729+
template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
17730+
bool operator<( T const & lhs, T const & rhs )
17731+
{
17732+
return static_cast<typename T::NativeType>( lhs ) < static_cast<typename T::NativeType>( rhs );
17733+
}
17734+
#endif
17735+
17736+
template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
17737+
bool operator==( T const & v, std::nullptr_t )
17738+
{
17739+
return !v;
17740+
}
17741+
17742+
template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
17743+
bool operator==( std::nullptr_t, T const & v )
17744+
{
17745+
return !v;
17746+
}
17747+
17748+
template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
17749+
bool operator!=( T const & v, std::nullptr_t )
17750+
{
17751+
return !!v;
17752+
}
17753+
17754+
template <typename T, typename std::enable_if<VULKAN_HPP_NAMESPACE::isVulkanHandleType<T>::value, int>::type = 0>
17755+
bool operator!=( std::nullptr_t, T const & v )
17756+
{
17757+
return !!v;
17758+
}
1770917759
} // namespace VULKAN_HPP_NAMESPACE
1771017760
#endif

0 commit comments

Comments
 (0)