mewin/vulkan-headers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for Vulkan-Docs 1.2.201

Browse Source
This commit is contained in:
Jon Leech 2021-11-30 18:40:09 -08:00
parent a152371654
commit ea61f32f24
17 changed files with 6021 additions and 850 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/vulkan/vk_platform.h
View File

@ -42,7 +42,7 @@ extern "C"
#define VKAPI_CALL __stdcall #define VKAPI_CALL __stdcall
#define VKAPI_PTR VKAPI_CALL #define VKAPI_PTR VKAPI_CALL
#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7 #elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7
#error "Vulkan isn't supported for the 'armeabi' NDK ABI" #error "Vulkan is not supported for the 'armeabi' NDK ABI"
#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE) #elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE)
// On Android 32-bit ARM targets, Vulkan functions use the "hardfloat" // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat"
// calling convention, i.e. float parameters are passed in registers. This // calling convention, i.e. float parameters are passed in registers. This

60
include/vulkan/vulkan.hpp
View File

@ -119,7 +119,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h
# include <span> # include <span>
#endif #endif
static_assert( VK_HEADER_VERSION == 200, "Wrong VK_HEADER_VERSION!" ); static_assert( VK_HEADER_VERSION == 201, "Wrong VK_HEADER_VERSION!" );
// 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default. // 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default.
// To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION
@ -7667,6 +7667,22 @@ namespace VULKAN_HPP_NAMESPACE
value = true value = true
}; };
}; };
template <>
struct StructExtends<VideoEncodeH264RateControlInfoEXT, VideoEncodeRateControlInfoKHR>
{
enum
{
value = true
};
};
template <>
struct StructExtends<VideoEncodeH264RateControlLayerInfoEXT, VideoEncodeRateControlLayerInfoKHR>
{
enum
{
value = true
};
};
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
#if defined( VK_ENABLE_BETA_EXTENSIONS ) #if defined( VK_ENABLE_BETA_EXTENSIONS )
@ -7767,6 +7783,22 @@ namespace VULKAN_HPP_NAMESPACE
value = true value = true
}; };
}; };
template <>
struct StructExtends<VideoEncodeH265RateControlInfoEXT, VideoEncodeRateControlInfoKHR>
{
enum
{
value = true
};
};
template <>
struct StructExtends<VideoEncodeH265RateControlLayerInfoEXT, VideoEncodeRateControlLayerInfoKHR>
{
enum
{
value = true
};
};
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
#if defined( VK_ENABLE_BETA_EXTENSIONS ) #if defined( VK_ENABLE_BETA_EXTENSIONS )
@ -10191,6 +10223,14 @@ namespace VULKAN_HPP_NAMESPACE
value = true value = true
}; };
}; };
template <>
struct StructExtends<VideoEncodeRateControlLayerInfoKHR, VideoCodingControlInfoKHR>
{
enum
{
value = true
};
};
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
//=== VK_NV_device_diagnostics_config === //=== VK_NV_device_diagnostics_config ===
@ -10474,6 +10514,24 @@ namespace VULKAN_HPP_NAMESPACE
}; };
}; };
//=== VK_ARM_rasterization_order_attachment_access ===
template <>
struct StructExtends<PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM, PhysicalDeviceFeatures2>
{
enum
{
value = true
};
};
template <>
struct StructExtends<PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM, DeviceCreateInfo>
{
enum
{
value = true
};
};
//=== VK_EXT_rgba10x6_formats === //=== VK_EXT_rgba10x6_formats ===
template <> template <>
struct StructExtends<PhysicalDeviceRGBA10X6FormatsFeaturesEXT, PhysicalDeviceFeatures2> struct StructExtends<PhysicalDeviceRGBA10X6FormatsFeaturesEXT, PhysicalDeviceFeatures2>

119
include/vulkan/vulkan_beta.h
View File

@ -384,7 +384,7 @@ typedef VkFlags VkVideoEncodeFlagsKHR;
typedef enum VkVideoEncodeRateControlFlagBitsKHR { typedef enum VkVideoEncodeRateControlFlagBitsKHR {
VK_VIDEO_ENCODE_RATE_CONTROL_DEFAULT_KHR = 0, VK_VIDEO_ENCODE_RATE_CONTROL_DEFAULT_KHR = 0,
VK_VIDEO_ENCODE_RATE_CONTROL_RESET_BIT_KHR = 0x00000001, VK_VIDEO_ENCODE_RATE_CONTROL_RESERVED_0_BIT_KHR = 0x00000001,
VK_VIDEO_ENCODE_RATE_CONTROL_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF VK_VIDEO_ENCODE_RATE_CONTROL_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF
} VkVideoEncodeRateControlFlagBitsKHR; } VkVideoEncodeRateControlFlagBitsKHR;
typedef VkFlags VkVideoEncodeRateControlFlagsKHR; typedef VkFlags VkVideoEncodeRateControlFlagsKHR;
@ -409,18 +409,27 @@ typedef struct VkVideoEncodeInfoKHR {
const VkVideoReferenceSlotKHR* pSetupReferenceSlot; const VkVideoReferenceSlotKHR* pSetupReferenceSlot;
uint32_t referenceSlotCount; uint32_t referenceSlotCount;
const VkVideoReferenceSlotKHR* pReferenceSlots; const VkVideoReferenceSlotKHR* pReferenceSlots;
uint32_t precedingExternallyEncodedBytes;
} VkVideoEncodeInfoKHR; } VkVideoEncodeInfoKHR;
typedef struct VkVideoEncodeRateControlLayerInfoKHR {
VkStructureType sType;
const void* pNext;
uint32_t averageBitrate;
uint32_t maxBitrate;
uint32_t frameRateNumerator;
uint32_t frameRateDenominator;
uint32_t virtualBufferSizeInMs;
uint32_t initialVirtualBufferSizeInMs;
} VkVideoEncodeRateControlLayerInfoKHR;
typedef struct VkVideoEncodeRateControlInfoKHR { typedef struct VkVideoEncodeRateControlInfoKHR {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
VkVideoEncodeRateControlFlagsKHR flags; VkVideoEncodeRateControlFlagsKHR flags;
VkVideoEncodeRateControlModeFlagBitsKHR rateControlMode; VkVideoEncodeRateControlModeFlagBitsKHR rateControlMode;
uint32_t averageBitrate; uint8_t layerCount;
uint16_t peakToAverageBitrateRatio; const VkVideoEncodeRateControlLayerInfoKHR* pLayerConfigs;
uint16_t frameRateNumerator;
uint16_t frameRateDenominator;
uint32_t virtualBufferSizeInMs;
} VkVideoEncodeRateControlInfoKHR; } VkVideoEncodeRateControlInfoKHR;
typedef void (VKAPI_PTR *PFN_vkCmdEncodeVideoKHR)(VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR* pEncodeInfo); typedef void (VKAPI_PTR *PFN_vkCmdEncodeVideoKHR)(VkCommandBuffer commandBuffer, const VkVideoEncodeInfoKHR* pEncodeInfo);
@ -450,6 +459,7 @@ typedef enum VkVideoEncodeH264CapabilityFlagBitsEXT {
VK_VIDEO_ENCODE_H264_CAPABILITY_DEBLOCKING_FILTER_PARTIAL_BIT_EXT = 0x00000100, VK_VIDEO_ENCODE_H264_CAPABILITY_DEBLOCKING_FILTER_PARTIAL_BIT_EXT = 0x00000100,
VK_VIDEO_ENCODE_H264_CAPABILITY_MULTIPLE_SLICE_PER_FRAME_BIT_EXT = 0x00000200, VK_VIDEO_ENCODE_H264_CAPABILITY_MULTIPLE_SLICE_PER_FRAME_BIT_EXT = 0x00000200,
VK_VIDEO_ENCODE_H264_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT = 0x00000400, VK_VIDEO_ENCODE_H264_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT = 0x00000400,
VK_VIDEO_ENCODE_H264_CAPABILITY_OPTIONAL_RC_EXTENSION_STRUCT_BIT_EXT = 0x00000800,
VK_VIDEO_ENCODE_H264_CAPABILITY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF VK_VIDEO_ENCODE_H264_CAPABILITY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH264CapabilityFlagBitsEXT; } VkVideoEncodeH264CapabilityFlagBitsEXT;
typedef VkFlags VkVideoEncodeH264CapabilityFlagsEXT; typedef VkFlags VkVideoEncodeH264CapabilityFlagsEXT;
@ -476,6 +486,14 @@ typedef enum VkVideoEncodeH264CreateFlagBitsEXT {
VK_VIDEO_ENCODE_H264_CREATE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF VK_VIDEO_ENCODE_H264_CREATE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH264CreateFlagBitsEXT; } VkVideoEncodeH264CreateFlagBitsEXT;
typedef VkFlags VkVideoEncodeH264CreateFlagsEXT; typedef VkFlags VkVideoEncodeH264CreateFlagsEXT;
typedef enum VkVideoEncodeH264RateControlStructureFlagBitsEXT {
VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_UNKNOWN_EXT = 0,
VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_FLAT_BIT_EXT = 0x00000001,
VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_DYADIC_BIT_EXT = 0x00000002,
VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH264RateControlStructureFlagBitsEXT;
typedef VkFlags VkVideoEncodeH264RateControlStructureFlagsEXT;
typedef struct VkVideoEncodeH264CapabilitiesEXT { typedef struct VkVideoEncodeH264CapabilitiesEXT {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
@ -533,9 +551,6 @@ typedef struct VkVideoEncodeH264NaluSliceEXT {
const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList0Entries; const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList0Entries;
uint8_t refFinalList1EntryCount; uint8_t refFinalList1EntryCount;
const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList1Entries; const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList1Entries;
uint32_t precedingNaluBytes;
uint8_t minQp;
uint8_t maxQp;
} VkVideoEncodeH264NaluSliceEXT; } VkVideoEncodeH264NaluSliceEXT;
typedef struct VkVideoEncodeH264VclFrameInfoEXT { typedef struct VkVideoEncodeH264VclFrameInfoEXT {
@ -565,6 +580,41 @@ typedef struct VkVideoEncodeH264ProfileEXT {
StdVideoH264ProfileIdc stdProfileIdc; StdVideoH264ProfileIdc stdProfileIdc;
} VkVideoEncodeH264ProfileEXT; } VkVideoEncodeH264ProfileEXT;
typedef struct VkVideoEncodeH264RateControlInfoEXT {
VkStructureType sType;
const void* pNext;
uint32_t gopFrameCount;
uint32_t idrPeriod;
uint32_t consecutiveBFrameCount;
VkVideoEncodeH264RateControlStructureFlagBitsEXT rateControlStructure;
} VkVideoEncodeH264RateControlInfoEXT;
typedef struct VkVideoEncodeH264QpEXT {
int32_t qpI;
int32_t qpP;
int32_t qpB;
} VkVideoEncodeH264QpEXT;
typedef struct VkVideoEncodeH264FrameSizeEXT {
uint32_t frameISize;
uint32_t framePSize;
uint32_t frameBSize;
} VkVideoEncodeH264FrameSizeEXT;
typedef struct VkVideoEncodeH264RateControlLayerInfoEXT {
VkStructureType sType;
const void* pNext;
uint8_t temporalLayerId;
VkBool32 useInitialRcQp;
VkVideoEncodeH264QpEXT initialRcQp;
VkBool32 useMinQp;
VkVideoEncodeH264QpEXT minQp;
VkBool32 useMaxQp;
VkVideoEncodeH264QpEXT maxQp;
VkBool32 useMaxFrameSize;
VkVideoEncodeH264FrameSizeEXT maxFrameSize;
} VkVideoEncodeH264RateControlLayerInfoEXT;
#define VK_EXT_video_encode_h265 1 #define VK_EXT_video_encode_h265 1
@ -599,6 +649,14 @@ typedef enum VkVideoEncodeH265CtbSizeFlagBitsEXT {
VK_VIDEO_ENCODE_H265_CTB_SIZE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF VK_VIDEO_ENCODE_H265_CTB_SIZE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH265CtbSizeFlagBitsEXT; } VkVideoEncodeH265CtbSizeFlagBitsEXT;
typedef VkFlags VkVideoEncodeH265CtbSizeFlagsEXT; typedef VkFlags VkVideoEncodeH265CtbSizeFlagsEXT;
typedef enum VkVideoEncodeH265RateControlStructureFlagBitsEXT {
VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_UNKNOWN_EXT = 0,
VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_FLAT_BIT_EXT = 0x00000001,
VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_DYADIC_BIT_EXT = 0x00000002,
VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
} VkVideoEncodeH265RateControlStructureFlagBitsEXT;
typedef VkFlags VkVideoEncodeH265RateControlStructureFlagsEXT;
typedef struct VkVideoEncodeH265CapabilitiesEXT { typedef struct VkVideoEncodeH265CapabilitiesEXT {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
@ -693,6 +751,41 @@ typedef struct VkVideoEncodeH265ProfileEXT {
StdVideoH265ProfileIdc stdProfileIdc; StdVideoH265ProfileIdc stdProfileIdc;
} VkVideoEncodeH265ProfileEXT; } VkVideoEncodeH265ProfileEXT;
typedef struct VkVideoEncodeH265RateControlInfoEXT {
VkStructureType sType;
const void* pNext;
uint32_t gopFrameCount;
uint32_t idrPeriod;
uint32_t consecutiveBFrameCount;
VkVideoEncodeH265RateControlStructureFlagBitsEXT rateControlStructure;
} VkVideoEncodeH265RateControlInfoEXT;
typedef struct VkVideoEncodeH265QpEXT {
int32_t qpI;
int32_t qpP;
int32_t qpB;
} VkVideoEncodeH265QpEXT;
typedef struct VkVideoEncodeH265FrameSizeEXT {
uint32_t frameISize;
uint32_t framePSize;
uint32_t frameBSize;
} VkVideoEncodeH265FrameSizeEXT;
typedef struct VkVideoEncodeH265RateControlLayerInfoEXT {
VkStructureType sType;
const void* pNext;
uint8_t temporalId;
VkBool32 useInitialRcQp;
VkVideoEncodeH265QpEXT initialRcQp;
VkBool32 useMinQp;
VkVideoEncodeH265QpEXT minQp;
VkBool32 useMaxQp;
VkVideoEncodeH265QpEXT maxQp;
VkBool32 useMaxFrameSize;
VkVideoEncodeH265FrameSizeEXT maxFrameSize;
} VkVideoEncodeH265RateControlLayerInfoEXT;
#define VK_EXT_video_decode_h264 1 #define VK_EXT_video_decode_h264 1

17
include/vulkan/vulkan_core.h
View File

@ -72,7 +72,7 @@ extern "C" {
#define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0 #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0
// Version of this file // Version of this file
#define VK_HEADER_VERSION 200 #define VK_HEADER_VERSION 201
// Complete version of this file // Complete version of this file
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION) #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION)
@ -459,6 +459,12 @@ typedef enum VkStructureType {
#ifdef VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_EXT = 1000038008, VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_EXT = 1000038008,
#endif #endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_EXT = 1000038009,
#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_EXT = 1000038010,
#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT = 1000039000, VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT = 1000039000,
#endif #endif
@ -489,6 +495,12 @@ typedef enum VkStructureType {
#ifdef VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_EXT = 1000039009, VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_EXT = 1000039009,
#endif #endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_EXT = 1000039010,
#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_EXT = 1000039011,
#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_EXT = 1000040000, VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_EXT = 1000040000,
#endif #endif
@ -821,6 +833,9 @@ typedef enum VkStructureType {
#endif #endif
#ifdef VK_ENABLE_BETA_EXTENSIONS #ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR = 1000299001, VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR = 1000299001,
#endif
#ifdef VK_ENABLE_BETA_EXTENSIONS
VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR = 1000299002,
#endif #endif
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000,
VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001,

3477
include/vulkan/vulkan_enums.hpp
View File

File diff suppressed because it is too large Load Diff

9
include/vulkan/vulkan_handles.hpp
View File

@ -480,6 +480,10 @@ namespace VULKAN_HPP_NAMESPACE
struct VideoEncodeH264DpbSlotInfoEXT; struct VideoEncodeH264DpbSlotInfoEXT;
struct VideoEncodeH264NaluSliceEXT; struct VideoEncodeH264NaluSliceEXT;
struct VideoEncodeH264ProfileEXT; struct VideoEncodeH264ProfileEXT;
struct VideoEncodeH264RateControlInfoEXT;
struct VideoEncodeH264RateControlLayerInfoEXT;
struct VideoEncodeH264QpEXT;
struct VideoEncodeH264FrameSizeEXT;
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
#if defined( VK_ENABLE_BETA_EXTENSIONS ) #if defined( VK_ENABLE_BETA_EXTENSIONS )
@ -494,6 +498,10 @@ namespace VULKAN_HPP_NAMESPACE
struct VideoEncodeH265NaluSliceEXT; struct VideoEncodeH265NaluSliceEXT;
struct VideoEncodeH265ProfileEXT; struct VideoEncodeH265ProfileEXT;
struct VideoEncodeH265ReferenceListsEXT; struct VideoEncodeH265ReferenceListsEXT;
struct VideoEncodeH265RateControlInfoEXT;
struct VideoEncodeH265RateControlLayerInfoEXT;
struct VideoEncodeH265QpEXT;
struct VideoEncodeH265FrameSizeEXT;
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
#if defined( VK_ENABLE_BETA_EXTENSIONS ) #if defined( VK_ENABLE_BETA_EXTENSIONS )
@ -1108,6 +1116,7 @@ namespace VULKAN_HPP_NAMESPACE
//=== VK_KHR_video_encode_queue === //=== VK_KHR_video_encode_queue ===
struct VideoEncodeInfoKHR; struct VideoEncodeInfoKHR;
struct VideoEncodeRateControlInfoKHR; struct VideoEncodeRateControlInfoKHR;
struct VideoEncodeRateControlLayerInfoKHR;
#endif /*VK_ENABLE_BETA_EXTENSIONS*/ #endif /*VK_ENABLE_BETA_EXTENSIONS*/
//=== VK_NV_device_diagnostics_config === //=== VK_NV_device_diagnostics_config ===

3
include/vulkan/vulkan_raii.hpp
View File

@ -82,8 +82,7 @@ namespace VULKAN_HPP_NAMESPACE
vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties" ) ); vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceQueueFamilyProperties" ) );
vkGetPhysicalDeviceMemoryProperties = PFN_vkGetPhysicalDeviceMemoryProperties( vkGetPhysicalDeviceMemoryProperties = PFN_vkGetPhysicalDeviceMemoryProperties(
vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties" ) ); vkGetInstanceProcAddr( instance, "vkGetPhysicalDeviceMemoryProperties" ) );
vkGetInstanceProcAddr = PFN_vkGetInstanceProcAddr( vkGetInstanceProcAddr( instance, "vkGetInstanceProcAddr" ) ); vkCreateDevice = PFN_vkCreateDevice( vkGetInstanceProcAddr( instance, "vkCreateDevice" ) );
vkCreateDevice = PFN_vkCreateDevice( vkGetInstanceProcAddr( instance, "vkCreateDevice" ) );
vkEnumerateDeviceExtensionProperties = PFN_vkEnumerateDeviceExtensionProperties( vkEnumerateDeviceExtensionProperties = PFN_vkEnumerateDeviceExtensionProperties(
vkGetInstanceProcAddr( instance, "vkEnumerateDeviceExtensionProperties" ) ); vkGetInstanceProcAddr( instance, "vkEnumerateDeviceExtensionProperties" ) );
vkEnumerateDeviceLayerProperties = vkEnumerateDeviceLayerProperties =

1307
include/vulkan/vulkan_structs.hpp
View File

File diff suppressed because it is too large Load Diff

11
registry/apiconventions.py Normal file
View File

@ -0,0 +1,11 @@
#!/usr/bin/python3 -i
#
# Copyright 2021 The Khronos Group Inc.
# SPDX-License-Identifier: Apache-2.0
# Generic alias for working group-specific API conventions interface.
# This import should be changed at the repository / working group level to
# specify the correct API's conventions.
from vkconventions import VulkanConventions as APIConventions

8
registry/cgenerator.py
View File

@ -188,7 +188,7 @@ class COutputGenerator(OutputGenerator):
OutputGenerator.beginFeature(self, interface, emit) OutputGenerator.beginFeature(self, interface, emit)
# C-specific # C-specific
# Accumulate includes, defines, types, enums, function pointer typedefs, # Accumulate includes, defines, types, enums, function pointer typedefs,
# end function prototypes separately for this feature. They're only # end function prototypes separately for this feature. They are only
# printed in endFeature(). # printed in endFeature().
self.sections = {section: [] for section in self.ALL_SECTIONS} self.sections = {section: [] for section in self.ALL_SECTIONS}
self.feature_not_empty = False self.feature_not_empty = False
@ -267,7 +267,7 @@ class COutputGenerator(OutputGenerator):
else: else:
# Replace <apientry /> tags with an APIENTRY-style string # Replace <apientry /> tags with an APIENTRY-style string
# (from self.genOpts). Copy other text through unchanged. # (from self.genOpts). Copy other text through unchanged.
# If the resulting text is an empty string, don't emit it. # If the resulting text is an empty string, do not emit it.
body = noneStr(typeElem.text) body = noneStr(typeElem.text)
for elem in typeElem: for elem in typeElem:
if elem.tag == 'apientry': if elem.tag == 'apientry':
@ -306,8 +306,8 @@ class COutputGenerator(OutputGenerator):
def typeMayAlias(self, typeName): def typeMayAlias(self, typeName):
if not self.may_alias: if not self.may_alias:
# First time we've asked if a type may alias. # First time we have asked if a type may alias.
# So, let's populate the set of all names of types that may. # So, populate the set of all names of types that may.
# Everyone with an explicit mayalias="true" # Everyone with an explicit mayalias="true"
self.may_alias = set(typeName self.may_alias = set(typeName

4
registry/conventions.py
View File

@ -139,9 +139,9 @@ class ConventionsBase:
Optionally adds a quantifier (like 'any') before a list of 2 or more, Optionally adds a quantifier (like 'any') before a list of 2 or more,
if specified by fmt. if specified by fmt.
Don't edit these defaults, override self.makeProseList(). Do not edit these defaults, override self.makeProseList().
""" """
assert(serial_comma) # didn't implement what we didn't need assert(serial_comma) # did not implement what we did not need
if isinstance(fmt, str): if isinstance(fmt, str):
fmt = ProseListFormats.from_string(fmt) fmt = ProseListFormats.from_string(fmt)

24
registry/generator.py
View File

@ -364,7 +364,7 @@ class OutputGenerator:
# print('About to translate value =', value, 'type =', type(value)) # print('About to translate value =', value, 'type =', type(value))
if needsNum: if needsNum:
numVal = int(value, 0) numVal = int(value, 0)
# If there's a non-integer, numeric 'type' attribute (e.g. 'u' or # If there is a non-integer, numeric 'type' attribute (e.g. 'u' or
# 'ull'), append it to the string value. # 'ull'), append it to the string value.
# t = enuminfo.elem.get('type') # t = enuminfo.elem.get('type')
# if t is not None and t != '' and t != 'i' and t != 's': # if t is not None and t != '' and t != 'i' and t != 's':
@ -445,7 +445,7 @@ class OutputGenerator:
+ ') found with different values:' + strVal + ') found with different values:' + strVal
+ ' and ' + strVal2) + ' and ' + strVal2)
# Don't add the duplicate to the returned list # Do not add the duplicate to the returned list
continue continue
elif numVal in valueMap: elif numVal in valueMap:
# Duplicate value found (such as an alias); report it, but # Duplicate value found (such as an alias); report it, but
@ -546,7 +546,7 @@ class OutputGenerator:
# Accumulate non-numeric enumerant values separately and append # Accumulate non-numeric enumerant values separately and append
# them following the numeric values, to allow for aliases. # them following the numeric values, to allow for aliases.
# NOTE: this doesn't do a topological sort yet, so aliases of # NOTE: this does not do a topological sort yet, so aliases of
# aliases can still get in the wrong order. # aliases can still get in the wrong order.
aliasText = '' aliasText = ''
@ -639,7 +639,7 @@ class OutputGenerator:
# Accumulate non-numeric enumerant values separately and append # Accumulate non-numeric enumerant values separately and append
# them following the numeric values, to allow for aliases. # them following the numeric values, to allow for aliases.
# NOTE: this doesn't do a topological sort yet, so aliases of # NOTE: this does not do a topological sort yet, so aliases of
# aliases can still get in the wrong order. # aliases can still get in the wrong order.
aliasText = [] aliasText = []
@ -678,7 +678,7 @@ class OutputGenerator:
self.logMsg('error', 'Allowable range for C enum types is [', minValidValue, ',', maxValidValue, '], but', name, 'has a value outside of this (', strVal, ')\n') self.logMsg('error', 'Allowable range for C enum types is [', minValidValue, ',', maxValidValue, '], but', name, 'has a value outside of this (', strVal, ')\n')
exit(1) exit(1)
# Don't track min/max for non-numbers (numVal is None) # Do not track min/max for non-numbers (numVal is None)
if isEnum and numVal is not None and elem.get('extends') is None: if isEnum and numVal is not None and elem.get('extends') is None:
if minName is None: if minName is None:
minName = maxName = name minName = maxName = name
@ -701,7 +701,7 @@ class OutputGenerator:
" {}_RANGE_SIZE{} = ({} - {} + 1),".format(expandPrefix, expandSuffix, maxName, minName))) " {}_RANGE_SIZE{} = ({} - {} + 1),".format(expandPrefix, expandSuffix, maxName, minName)))
# Generate a range-padding value to ensure the enum is 32 bits, but # Generate a range-padding value to ensure the enum is 32 bits, but
# only in code generators, so it doesn't appear in documentation # only in code generators, so it does not appear in documentation
if (self.genOpts.codeGenerator or if (self.genOpts.codeGenerator or
self.conventions.generate_max_enum_in_docs): self.conventions.generate_max_enum_in_docs):
body.append(" {}_MAX_ENUM{} = 0x7FFFFFFF".format( body.append(" {}_MAX_ENUM{} = 0x7FFFFFFF".format(
@ -774,7 +774,7 @@ class OutputGenerator:
def beginFile(self, genOpts): def beginFile(self, genOpts):
"""Start a new interface file """Start a new interface file
- genOpts - GeneratorOptions controlling what's generated and how""" - genOpts - GeneratorOptions controlling what is generated and how"""
self.genOpts = genOpts self.genOpts = genOpts
self.should_insert_may_alias_macro = \ self.should_insert_may_alias_macro = \
self.genOpts.conventions.should_insert_may_alias_macro(self.genOpts) self.genOpts.conventions.should_insert_may_alias_macro(self.genOpts)
@ -826,7 +826,7 @@ class OutputGenerator:
- emit - actually write to the header only when True""" - emit - actually write to the header only when True"""
self.emit = emit self.emit = emit
self.featureName = interface.get('name') self.featureName = interface.get('name')
# If there's an additional 'protect' attribute in the feature, save it # If there is an additional 'protect' attribute in the feature, save it
self.featureExtraProtect = interface.get('protect') self.featureExtraProtect = interface.get('protect')
def endFeature(self): def endFeature(self):
@ -838,7 +838,7 @@ class OutputGenerator:
def genRequirements(self, name, mustBeFound = True): def genRequirements(self, name, mustBeFound = True):
"""Generate text showing what core versions and extensions introduce """Generate text showing what core versions and extensions introduce
an API. This exists in the base Generator class because it's used by an API. This exists in the base Generator class because it is used by
the shared enumerant-generating interfaces (buildEnumCDecl, etc.). the shared enumerant-generating interfaces (buildEnumCDecl, etc.).
Here it returns an empty string for most generators, but can be Here it returns an empty string for most generators, but can be
overridden by e.g. DocGenerator. overridden by e.g. DocGenerator.
@ -851,7 +851,7 @@ class OutputGenerator:
return '' return ''
def validateFeature(self, featureType, featureName): def validateFeature(self, featureType, featureName):
"""Validate we're generating something only inside a `<feature>` tag""" """Validate we are generating something only inside a `<feature>` tag"""
if self.featureName is None: if self.featureName is None:
raise UserWarning('Attempt to generate', featureType, raise UserWarning('Attempt to generate', featureType,
featureName, 'when not in feature') featureName, 'when not in feature')
@ -1050,7 +1050,7 @@ class OutputGenerator:
return None return None
def isStructAlwaysValid(self, structname): def isStructAlwaysValid(self, structname):
"""Try to do check if a structure is always considered valid (i.e. there's no rules to its acceptance).""" """Try to do check if a structure is always considered valid (i.e. there is no rules to its acceptance)."""
# A conventions object is required for this call. # A conventions object is required for this call.
if not self.conventions: if not self.conventions:
raise RuntimeError("To use isStructAlwaysValid, be sure your options include a Conventions object.") raise RuntimeError("To use isStructAlwaysValid, be sure your options include a Conventions object.")
@ -1146,7 +1146,7 @@ class OutputGenerator:
# Leading text # Leading text
pdecl += noneStr(proto.text) pdecl += noneStr(proto.text)
tdecl += noneStr(proto.text) tdecl += noneStr(proto.text)
# For each child element, if it's a <name> wrap in appropriate # For each child element, if it is a <name> wrap in appropriate
# declaration. Otherwise append its contents and tail contents. # declaration. Otherwise append its contents and tail contents.
for elem in proto: for elem in proto:
text = noneStr(elem.text) text = noneStr(elem.text)

61
registry/genvk.py
View File

@ -19,12 +19,13 @@ from interfacedocgenerator import InterfaceDocGenerator
from generator import write from generator import write
from spirvcapgenerator import SpirvCapabilityOutputGenerator from spirvcapgenerator import SpirvCapabilityOutputGenerator
from hostsyncgenerator import HostSynchronizationOutputGenerator from hostsyncgenerator import HostSynchronizationOutputGenerator
from formatsgenerator import FormatsOutputGenerator
from pygenerator import PyOutputGenerator from pygenerator import PyOutputGenerator
from rubygenerator import RubyOutputGenerator from rubygenerator import RubyOutputGenerator
from reflib import logDiag, logWarn, setLogFile from reflib import logDiag, logWarn, setLogFile
from reg import Registry from reg import Registry
from validitygenerator import ValidityOutputGenerator from validitygenerator import ValidityOutputGenerator
from vkconventions import VulkanConventions from apiconventions import APIConventions
# Simple timer functions # Simple timer functions
@ -135,7 +136,9 @@ def makeGenOpts(args):
protectFile = protect protectFile = protect
# An API style conventions object # An API style conventions object
conventions = VulkanConventions() conventions = APIConventions()
defaultAPIName = conventions.xml_api_name
# API include files for spec and ref pages # API include files for spec and ref pages
# Overwrites include subdirectories in spec source tree # Overwrites include subdirectories in spec source tree
@ -151,7 +154,7 @@ def makeGenOpts(args):
filename = 'timeMarker', filename = 'timeMarker',
directory = directory, directory = directory,
genpath = genpath, genpath = genpath,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -167,8 +170,8 @@ def makeGenOpts(args):
expandEnumerants = False) expandEnumerants = False)
] ]
# Python representation of API information, used by scripts that # Python and Ruby representations of API information, used by scripts
# don't need to load the full XML. # that do not need to load the full XML.
genOpts['api.py'] = [ genOpts['api.py'] = [
PyOutputGenerator, PyOutputGenerator,
DocGeneratorOptions( DocGeneratorOptions(
@ -176,7 +179,7 @@ def makeGenOpts(args):
filename = 'api.py', filename = 'api.py',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -187,8 +190,6 @@ def makeGenOpts(args):
reparentEnums = False) reparentEnums = False)
] ]
# Ruby representation of API information, used by scripts that
# don't need to load the full XML.
genOpts['api.rb'] = [ genOpts['api.rb'] = [
RubyOutputGenerator, RubyOutputGenerator,
DocGeneratorOptions( DocGeneratorOptions(
@ -196,7 +197,7 @@ def makeGenOpts(args):
filename = 'api.rb', filename = 'api.rb',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -220,7 +221,7 @@ def makeGenOpts(args):
filename = 'timeMarker', filename = 'timeMarker',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -240,7 +241,7 @@ def makeGenOpts(args):
filename = 'timeMarker', filename = 'timeMarker',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -262,7 +263,7 @@ def makeGenOpts(args):
filename = 'timeMarker', filename = 'timeMarker',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = None, emitversions = None,
@ -281,7 +282,7 @@ def makeGenOpts(args):
filename = 'timeMarker', filename = 'timeMarker',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -299,7 +300,7 @@ def makeGenOpts(args):
filename = 'timeMarker', filename = 'timeMarker',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -311,6 +312,26 @@ def makeGenOpts(args):
reparentEnums = False) reparentEnums = False)
] ]
# Used to generate various format chapter tables
genOpts['formatsinc'] = [
FormatsOutputGenerator,
DocGeneratorOptions(
conventions = conventions,
filename = 'timeMarker',
directory = directory,
genpath = None,
apiname = defaultAPIName,
profile = None,
versions = featuresPat,
emitversions = featuresPat,
defaultExtensions = None,
addExtensions = addExtensionsPat,
removeExtensions = removeExtensionsPat,
emitExtensions = emitExtensionsPat,
emitFormats = emitFormatsPat,
reparentEnums = False)
]
# Platform extensions, in their own header files # Platform extensions, in their own header files
# Each element of the platforms[] array defines information for # Each element of the platforms[] array defines information for
# generating a single platform: # generating a single platform:
@ -393,7 +414,7 @@ def makeGenOpts(args):
filename = headername, filename = headername,
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = None, emitversions = None,
@ -434,7 +455,7 @@ def makeGenOpts(args):
filename = 'vulkan_core.h', filename = 'vulkan_core.h',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -468,7 +489,7 @@ def makeGenOpts(args):
filename = 'vulkan10.h', filename = 'vulkan10.h',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = 'VK_VERSION_1_0', versions = 'VK_VERSION_1_0',
emitversions = 'VK_VERSION_1_0', emitversions = 'VK_VERSION_1_0',
@ -502,7 +523,7 @@ def makeGenOpts(args):
filename = 'vulkan11.h', filename = 'vulkan11.h',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = '^VK_VERSION_1_[01]$', versions = '^VK_VERSION_1_[01]$',
emitversions = '^VK_VERSION_1_[01]$', emitversions = '^VK_VERSION_1_[01]$',
@ -531,7 +552,7 @@ def makeGenOpts(args):
filename = 'alias.h', filename = 'alias.h',
directory = directory, directory = directory,
genpath = None, genpath = None,
apiname = 'vulkan', apiname = defaultAPIName,
profile = None, profile = None,
versions = featuresPat, versions = featuresPat,
emitversions = featuresPat, emitversions = featuresPat,
@ -602,7 +623,7 @@ if __name__ == '__main__':
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-defaultExtensions', action='store', parser.add_argument('-defaultExtensions', action='store',
default='vulkan', default=APIConventions().xml_api_name,
help='Specify a single class of extensions to add to targets') help='Specify a single class of extensions to add to targets')
parser.add_argument('-extension', action='append', parser.add_argument('-extension', action='append',
default=[], default=[],

130
registry/reg.py
View File

@ -10,19 +10,24 @@ import copy
import re import re
import sys import sys
import xml.etree.ElementTree as etree import xml.etree.ElementTree as etree
from collections import defaultdict, namedtuple from collections import defaultdict, deque, namedtuple
from generator import OutputGenerator, GeneratorOptions, write from generator import OutputGenerator, GeneratorOptions, write
import pdb from apiconventions import APIConventions
def apiNameMatch(str, supported): def apiNameMatch(str, supported):
"""Return whether a required api name matches a pattern specified for an """Return whether a required api name matches a pattern specified for an
XML <feature> 'api' attribute or <extension> 'supported' attribute. XML <feature> 'api' attribute or <extension> 'supported' attribute.
- str - api name such as 'vulkan' or 'openxr' - str - API name such as 'vulkan' or 'openxr'. May be None, in which
- supported - comma-separated list of XML API names""" case it never matches (this should not happen).
- supported - comma-separated list of XML API names. May be None, in
which case str always matches (this is the usual case)."""
return (str is not None and str in supported.split(',')) if str is not None:
return supported is None or str in supported.split(',')
# Fallthrough case - either str is None or the test failed
return False
def matchAPIProfile(api, profile, elem): def matchAPIProfile(api, profile, elem):
"""Return whether an API and profile """Return whether an API and profile
@ -52,7 +57,7 @@ def matchAPIProfile(api, profile, elem):
--------- -------- --------- --------
None None Always matches None None Always matches
'string' None Always matches 'string' None Always matches
None 'string' Does not match. Can't generate multiple APIs None 'string' Does not match. Cannot generate multiple APIs
or profiles, so if an API/profile constraint or profiles, so if an API/profile constraint
is present, it must be asked for explicitly. is present, it must be asked for explicitly.
'string' 'string' Strings must match 'string' 'string' Strings must match
@ -60,7 +65,7 @@ def matchAPIProfile(api, profile, elem):
** In the future, we will allow regexes for the attributes, ** In the future, we will allow regexes for the attributes,
not just strings, so that `api="^(gl|gles2)"` will match. Even not just strings, so that `api="^(gl|gles2)"` will match. Even
this isn't really quite enough, we might prefer something this is not really quite enough, we might prefer something
like `"gl(core)|gles1(common-lite)"`.""" like `"gl(core)|gles1(common-lite)"`."""
# Match 'api', if present # Match 'api', if present
elem_api = elem.get('api') elem_api = elem.get('api')
@ -69,7 +74,7 @@ def matchAPIProfile(api, profile, elem):
raise UserWarning("No API requested, but 'api' attribute is present with value '" raise UserWarning("No API requested, but 'api' attribute is present with value '"
+ elem_api + "'") + elem_api + "'")
elif api != elem_api: elif api != elem_api:
# Requested API doesn't match attribute # Requested API does not match attribute
return False return False
elem_profile = elem.get('profile') elem_profile = elem.get('profile')
if elem_profile: if elem_profile:
@ -77,11 +82,37 @@ def matchAPIProfile(api, profile, elem):
raise UserWarning("No profile requested, but 'profile' attribute is present with value '" raise UserWarning("No profile requested, but 'profile' attribute is present with value '"
+ elem_profile + "'") + elem_profile + "'")
elif profile != elem_profile: elif profile != elem_profile:
# Requested profile doesn't match attribute # Requested profile does not match attribute
return False return False
return True return True
def stripNonmatchingAPIs(tree, apiName, actuallyDelete = True):
"""Remove tree Elements with 'api' attributes matching apiName.
tree - Element at the root of the hierarchy to strip. Only its
children can actually be removed, not the tree itself.
apiName - string which much match a command-separated component of
the 'api' attribute.
actuallyDelete - only delete matching elements if True."""
stack = deque()
stack.append(tree)
while len(stack) > 0:
parent = stack.pop()
for child in parent.findall('*'):
api = child.get('api')
if api:
if not apiNameMatch(apiName, api):
if actuallyDelete:
parent.remove(child)
else:
# Add child to the queue
stack.append(child)
class BaseInfo: class BaseInfo:
"""Base class for information about a registry feature """Base class for information about a registry feature
(type/group/enum/command/API/extension). (type/group/enum/command/API/extension).
@ -128,12 +159,12 @@ class BaseInfo:
if (self.compareKeys(info, 'value', required = True) or if (self.compareKeys(info, 'value', required = True) or
self.compareKeys(info, 'bitpos', required = True)): self.compareKeys(info, 'bitpos', required = True)):
# If both specify the same value or bit position, # If both specify the same value or bit position,
# they're equal # they are equal
return True return True
elif (self.compareKeys(info, 'extnumber') and elif (self.compareKeys(info, 'extnumber') and
self.compareKeys(info, 'offset') and self.compareKeys(info, 'offset') and
self.compareKeys(info, 'dir')): self.compareKeys(info, 'dir')):
# If both specify the same relative offset, they're equal # If both specify the same relative offset, they are equal
return True return True
elif (self.compareKeys(info, 'alias')): elif (self.compareKeys(info, 'alias')):
# If both are aliases of the same value # If both are aliases of the same value
@ -141,7 +172,7 @@ class BaseInfo:
else: else:
return False return False
else: else:
# The same enum can't extend two different types # The same enum cannot extend two different types
return False return False
else: else:
# Non-<enum>s should never be redefined # Non-<enum>s should never be redefined
@ -248,7 +279,7 @@ class FeatureInfo(BaseInfo):
enumerant offsets. <feature> features do not have extension enumerant offsets. <feature> features do not have extension
numbers and are assigned number 0.""" numbers and are assigned number 0."""
# If there's no 'number' attribute, use 0, so sorting works # If there is no 'number' attribute, use 0, so sorting works
if self.number is None: if self.number is None:
self.number = 0 self.number = 0
self.supported = elem.get('supported') self.supported = elem.get('supported')
@ -278,7 +309,9 @@ class Registry:
"Output generator used to write headers / messages" "Output generator used to write headers / messages"
if genOpts is None: if genOpts is None:
self.genOpts = GeneratorOptions() # If no generator is provided, we may still need the XML API name
# (for example, in genRef.py).
self.genOpts = GeneratorOptions(apiname = APIConventions().xml_api_name)
else: else:
self.genOpts = genOpts self.genOpts = genOpts
"Options controlling features to write and how to format them" "Options controlling features to write and how to format them"
@ -417,15 +450,26 @@ class Registry:
# This must be the Element for the root <registry> # This must be the Element for the root <registry>
self.reg = self.tree.getroot() self.reg = self.tree.getroot()
# Preprocess the tree by removing all elements with non-matching
# 'api' attributes by breadth-first tree traversal.
# This is a blunt hammer, but eliminates the need to track and test
# the apis deeper in processing to select the correct elements and
# avoid duplicates.
# Schema validation should prevent duplicate elements with
# overlapping api attributes, or where one element has an api
# attribute and the other does not.
stripNonmatchingAPIs(self.reg, self.genOpts.apiname)
# Create dictionary of registry types from toplevel <types> tags # Create dictionary of registry types from toplevel <types> tags
# and add 'name' attribute to each <type> tag (where missing) # and add 'name' attribute to each <type> tag (where missing)
# based on its <name> element. # based on its <name> element.
# #
# There's usually one <types> block; more are OK # There is usually one <types> block; more are OK
# Required <type> attributes: 'name' or nested <name> tag contents # Required <type> attributes: 'name' or nested <name> tag contents
self.typedict = {} self.typedict = {}
for type_elem in self.reg.findall('types/type'): for type_elem in self.reg.findall('types/type'):
# If the <type> doesn't already have a 'name' attribute, set # If the <type> does not already have a 'name' attribute, set
# it from contents of its <name> tag. # it from contents of its <name> tag.
if type_elem.get('name') is None: if type_elem.get('name') is None:
type_elem.set('name', type_elem.find('name').text) type_elem.set('name', type_elem.find('name').text)
@ -434,8 +478,8 @@ class Registry:
# Create dictionary of registry enum groups from <enums> tags. # Create dictionary of registry enum groups from <enums> tags.
# #
# Required <enums> attributes: 'name'. If no name is given, one is # Required <enums> attributes: 'name'. If no name is given, one is
# generated, but that group can't be identified and turned into an # generated, but that group cannot be identified and turned into an
# enum type definition - it's just a container for <enum> tags. # enum type definition - it is just a container for <enum> tags.
self.groupdict = {} self.groupdict = {}
for group in self.reg.findall('enums'): for group in self.reg.findall('enums'):
self.addElementInfo(group, GroupInfo(group), 'group', self.groupdict) self.addElementInfo(group, GroupInfo(group), 'group', self.groupdict)
@ -461,7 +505,7 @@ class Registry:
# and add 'name' attribute to each <command> tag (where missing) # and add 'name' attribute to each <command> tag (where missing)
# based on its <proto><name> element. # based on its <proto><name> element.
# #
# There's usually only one <commands> block; more are OK. # There is usually only one <commands> block; more are OK.
# Required <command> attributes: 'name' or <proto><name> tag contents # Required <command> attributes: 'name' or <proto><name> tag contents
self.cmddict = {} self.cmddict = {}
# List of commands which alias others. Contains # List of commands which alias others. Contains
@ -469,7 +513,7 @@ class Registry:
# for each alias # for each alias
cmdAlias = [] cmdAlias = []
for cmd in self.reg.findall('commands/command'): for cmd in self.reg.findall('commands/command'):
# If the <command> doesn't already have a 'name' attribute, set # If the <command> does not already have a 'name' attribute, set
# it from contents of its <proto><name> tag. # it from contents of its <proto><name> tag.
name = cmd.get('name') name = cmd.get('name')
if name is None: if name is None:
@ -516,11 +560,11 @@ class Registry:
# Instead, generateRequiredInterface ignores <enum> elements # Instead, generateRequiredInterface ignores <enum> elements
# that extend enumerated types. # that extend enumerated types.
# #
# For <enum> tags which are actually just constants, if there's # For <enum> tags which are actually just constants, if there is
# no 'extends' tag but there is a 'value' or 'bitpos' tag, just # no 'extends' tag but there is a 'value' or 'bitpos' tag, just
# add an EnumInfo record to the dictionary. That works because # add an EnumInfo record to the dictionary. That works because
# output generation of constants is purely dependency-based, and # output generation of constants is purely dependency-based, and
# doesn't need to iterate through the XML tags. # does not need to iterate through the XML tags.
for elem in feature.findall('require'): for elem in feature.findall('require'):
for enum in elem.findall('enum'): for enum in elem.findall('enum'):
addEnumInfo = False addEnumInfo = False
@ -608,7 +652,7 @@ class Registry:
for parent in parentStructs.split(','): for parent in parentStructs.split(','):
# self.gen.logMsg('diag', type.get('name'), 'extends', parent) # self.gen.logMsg('diag', type.get('name'), 'extends', parent)
self.validextensionstructs[parent].append(type_elem.get('name')) self.validextensionstructs[parent].append(type_elem.get('name'))
# Sort the lists so they don't depend on the XML order # Sort the lists so they do not depend on the XML order
for parent in self.validextensionstructs: for parent in self.validextensionstructs:
self.validextensionstructs[parent].sort() self.validextensionstructs[parent].sort()
@ -688,7 +732,7 @@ class Registry:
if depname: if depname:
self.gen.logMsg('diag', 'Generating dependent type', self.gen.logMsg('diag', 'Generating dependent type',
depname, 'for', attrib_name, 'type', typename) depname, 'for', attrib_name, 'type', typename)
# Don't recurse on self-referential structures. # Do not recurse on self-referential structures.
if typename != depname: if typename != depname:
self.markTypeRequired(depname, required) self.markTypeRequired(depname, required)
else: else:
@ -735,10 +779,10 @@ class Registry:
if enum is not None: if enum is not None:
# If the enum is part of a group, and is being removed, then # If the enum is part of a group, and is being removed, then
# look it up in that <group> tag and remove it there, so that it # look it up in that <group> tag and remove it there, so that it
# isn't visible to generators (which traverse the <group> tag # is not visible to generators (which traverse the <group> tag
# elements themselves). # elements themselves).
# This isn't the most robust way of doing this, since a removed # This is not the most robust way of doing this, since a removed
# enum that's later required again will no longer have a group # enum that is later required again will no longer have a group
# element, but it makes the change non-intrusive on generator # element, but it makes the change non-intrusive on generator
# code. # code.
if required is False: if required is False:
@ -820,7 +864,7 @@ class Registry:
# Loop over types, enums, and commands in the tag # Loop over types, enums, and commands in the tag
# @@ It would be possible to respect 'api' and 'profile' attributes # @@ It would be possible to respect 'api' and 'profile' attributes
# in individual features, but that's not done yet. # in individual features, but that is not done yet.
for typeElem in feature.findall('type'): for typeElem in feature.findall('type'):
self.markTypeRequired(typeElem.get('name'), required) self.markTypeRequired(typeElem.get('name'), required)
for enumElem in feature.findall('enum'): for enumElem in feature.findall('enum'):
@ -920,7 +964,7 @@ class Registry:
typeinfo = self.lookupElementInfo(typename, self.typedict) typeinfo = self.lookupElementInfo(typename, self.typedict)
if typeinfo: if typeinfo:
# Remove aliases in the same extension/feature; these are always added as a correction. Don't need the original to be visible. # Remove aliases in the same extension/feature; these are always added as a correction. Do not need the original to be visible.
alias = self.getAlias(typeElem, self.typedict) alias = self.getAlias(typeElem, self.typedict)
if not self.checkForCorrectionAliases(alias, require, 'type'): if not self.checkForCorrectionAliases(alias, require, 'type'):
# Resolve the type info to the actual type, so we get an accurate read for 'structextends' # Resolve the type info to the actual type, so we get an accurate read for 'structextends'
@ -943,7 +987,7 @@ class Registry:
enumname = enumElem.get('name') enumname = enumElem.get('name')
typeinfo = self.lookupElementInfo(enumname, self.enumdict) typeinfo = self.lookupElementInfo(enumname, self.enumdict)
# Remove aliases in the same extension/feature; these are always added as a correction. Don't need the original to be visible. # Remove aliases in the same extension/feature; these are always added as a correction. Do not need the original to be visible.
alias = self.getAlias(enumElem, self.enumdict) alias = self.getAlias(enumElem, self.enumdict)
if not self.checkForCorrectionAliases(alias, require, 'enum'): if not self.checkForCorrectionAliases(alias, require, 'enum'):
enumextends = enumElem.get('extends') enumextends = enumElem.get('extends')
@ -956,7 +1000,7 @@ class Registry:
self.gen.logMsg('warn', 'fillFeatureDictionary: NOT filling for {}'.format(typename)) self.gen.logMsg('warn', 'fillFeatureDictionary: NOT filling for {}'.format(typename))
for cmdElem in require.findall('command'): for cmdElem in require.findall('command'):
# Remove aliases in the same extension/feature; these are always added as a correction. Don't need the original to be visible. # Remove aliases in the same extension/feature; these are always added as a correction. Do not need the original to be visible.
alias = self.getAlias(cmdElem, self.cmddict) alias = self.getAlias(cmdElem, self.cmddict)
if not self.checkForCorrectionAliases(alias, require, 'command'): if not self.checkForCorrectionAliases(alias, require, 'command'):
if not required_key in self.gen.featureDictionary[featurename]['command']: if not required_key in self.gen.featureDictionary[featurename]['command']:
@ -1019,7 +1063,7 @@ class Registry:
'returning!') 'returning!')
return return
# If feature isn't required, or has already been declared, return # If feature is not required, or has already been declared, return
if not f.required: if not f.required:
self.gen.logMsg('diag', 'Skipping', ftype, fname, '(not required)') self.gen.logMsg('diag', 'Skipping', ftype, fname, '(not required)')
return return
@ -1096,7 +1140,7 @@ class Registry:
# @ The enum group is not ready for generation. At this # @ The enum group is not ready for generation. At this
# @ point, it contains all <enum> tags injected by # @ point, it contains all <enum> tags injected by
# @ <extension> tags without any verification of whether # @ <extension> tags without any verification of whether
# @ they're required or not. It may also contain # @ they are required or not. It may also contain
# @ duplicates injected by multiple consistent # @ duplicates injected by multiple consistent
# @ definitions of an <enum>. # @ definitions of an <enum>.
@ -1134,7 +1178,7 @@ class Registry:
if required: if required:
# Mark this element as required (in the element, not the EnumInfo) # Mark this element as required (in the element, not the EnumInfo)
elem.set('required', 'true') elem.set('required', 'true')
# If it's an alias, track that for later use # If it is an alias, track that for later use
enumAlias = elem.get('alias') enumAlias = elem.get('alias')
if enumAlias: if enumAlias:
enumAliases.append(enumAlias) enumAliases.append(enumAlias)
@ -1185,7 +1229,7 @@ class Registry:
for t in features.findall('type'): for t in features.findall('type'):
self.generateFeature(t.get('name'), 'type', self.typedict) self.generateFeature(t.get('name'), 'type', self.typedict)
for e in features.findall('enum'): for e in features.findall('enum'):
# If this is an enum extending an enumerated type, don't # If this is an enum extending an enumerated type, do not
# generate it - this has already been done in reg.parseTree, # generate it - this has already been done in reg.parseTree,
# by copying this element into the enumerated type. # by copying this element into the enumerated type.
enumextends = e.get('extends') enumextends = e.get('extends')
@ -1229,7 +1273,7 @@ class Registry:
##print('\t**STRIPPING API {} from {}'.format(api, key)) ##print('\t**STRIPPING API {} from {}'.format(api, key))
# Update the attribute after stripping stuff. # Update the attribute after stripping stuff.
# Could sort apis before joining, but it's not a clear win # Could sort apis before joining, but it is not a clear win
if stripped: if stripped:
eleminfo.elem.set(attribute, ','.join(apis)) eleminfo.elem.set(attribute, ','.join(apis))
@ -1262,7 +1306,7 @@ class Registry:
# this has never been done. The 20% or so build-time speedup that # this has never been done. The 20% or so build-time speedup that
# might result is not worth the effort to make it actually work. # might result is not worth the effort to make it actually work.
# #
#@@ self.apiReset() # self.apiReset()
# Compile regexps used to select versions & extensions # Compile regexps used to select versions & extensions
regVersions = re.compile(self.genOpts.versions) regVersions = re.compile(self.genOpts.versions)
@ -1327,7 +1371,7 @@ class Registry:
# Include additional extensions if the extension name matches # Include additional extensions if the extension name matches
# the regexp specified in the generator options. This allows # the regexp specified in the generator options. This allows
# forcing extensions into an interface even if they're not # forcing extensions into an interface even if they are not
# tagged appropriately in the registry. # tagged appropriately in the registry.
# However we still respect the 'supported' attribute. # However we still respect the 'supported' attribute.
if regAddExtensions.match(extName) is not None: if regAddExtensions.match(extName) is not None:
@ -1341,7 +1385,7 @@ class Registry:
include = True include = True
# Remove extensions if the name matches the regexp specified # Remove extensions if the name matches the regexp specified
# in generator options. This allows forcing removal of # in generator options. This allows forcing removal of
# extensions from an interface even if they're tagged that # extensions from an interface even if they are tagged that
# way in the registry. # way in the registry.
if regRemoveExtensions.match(extName) is not None: if regRemoveExtensions.match(extName) is not None:
self.gen.logMsg('diag', 'Removing extension', self.gen.logMsg('diag', 'Removing extension',
@ -1359,8 +1403,8 @@ class Registry:
'for emission (does not match emitextensions pattern)') 'for emission (does not match emitextensions pattern)')
# Hack - can be removed when validity generator goes away # Hack - can be removed when validity generator goes away
# (Jon) I'm not sure what this does, or if it should respect # (Jon) I am not sure what this does, or if it should
# the ei.emit flag above. # respect the ei.emit flag above.
self.requiredextensions.append(extName) self.requiredextensions.append(extName)
else: else:
self.gen.logMsg('diag', 'NOT including extension', self.gen.logMsg('diag', 'NOT including extension',
@ -1423,7 +1467,7 @@ class Registry:
# <enable property="VkPhysicalDeviceVulkan12Properties" member="shaderDenormPreserveFloat16" value="VK_TRUE" requires="VK_VERSION_1_2,VK_KHR_shader_float_controls"/> # <enable property="VkPhysicalDeviceVulkan12Properties" member="shaderDenormPreserveFloat16" value="VK_TRUE" requires="VK_VERSION_1_2,VK_KHR_shader_float_controls"/>
# Pass 2: loop over specified API versions and extensions printing # Pass 2: loop over specified API versions and extensions printing
# declarations for required things which haven't already been # declarations for required things which have not already been
# generated. # generated.
self.gen.logMsg('diag', 'PASS 2: GENERATE INTERFACES FOR FEATURES') self.gen.logMsg('diag', 'PASS 2: GENERATE INTERFACES FOR FEATURES')
self.gen.beginFile(self.genOpts) self.gen.beginFile(self.genOpts)
@ -1435,7 +1479,7 @@ class Registry:
self.gen.logMsg('diag', 'PASS 2: NOT declaring feature', self.gen.logMsg('diag', 'PASS 2: NOT declaring feature',
f.elem.get('name'), 'because it is not tagged for emission') f.elem.get('name'), 'because it is not tagged for emission')
# Generate the interface (or just tag its elements as having been # Generate the interface (or just tag its elements as having been
# emitted, if they haven't been). # emitted, if they have not been).
self.gen.beginFeature(f.elem, emit) self.gen.beginFeature(f.elem, emit)
self.generateRequiredInterface(f.elem) self.generateRequiredInterface(f.elem)
self.gen.endFeature() self.gen.endFeature()

1496
registry/validusage.json
View File

File diff suppressed because one or more lines are too long

136
registry/vk.xml
View File

@ -155,7 +155,7 @@ branch of the member gitlab server.
<type category="define" requires="VK_MAKE_API_VERSION">// Vulkan 1.2 version number <type category="define" requires="VK_MAKE_API_VERSION">// Vulkan 1.2 version number
#define <name>VK_API_VERSION_1_2</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 2, 0)// Patch version should always be set to 0</type> #define <name>VK_API_VERSION_1_2</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 2, 0)// Patch version should always be set to 0</type>
<type category="define">// Version of this file <type category="define">// Version of this file
#define <name>VK_HEADER_VERSION</name> 200</type> #define <name>VK_HEADER_VERSION</name> 201</type>
<type category="define" requires="VK_HEADER_VERSION">// Complete version of this file <type category="define" requires="VK_HEADER_VERSION">// Complete version of this file
#define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 2, VK_HEADER_VERSION)</type> #define <name>VK_HEADER_VERSION_COMPLETE</name> <type>VK_MAKE_API_VERSION</type>(0, 1, 2, VK_HEADER_VERSION)</type>
@ -418,6 +418,7 @@ typedef void <name>CAMetalLayer</name>;
<type requires="VkVideoEncodeH264InputModeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264InputModeFlagsEXT</name>;</type> <type requires="VkVideoEncodeH264InputModeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264InputModeFlagsEXT</name>;</type>
<type requires="VkVideoEncodeH264OutputModeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264OutputModeFlagsEXT</name>;</type> <type requires="VkVideoEncodeH264OutputModeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264OutputModeFlagsEXT</name>;</type>
<type requires="VkVideoEncodeH264CreateFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264CreateFlagsEXT</name>;</type> <type requires="VkVideoEncodeH264CreateFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264CreateFlagsEXT</name>;</type>
<type requires="VkVideoEncodeH264RateControlStructureFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH264RateControlStructureFlagsEXT</name>;</type>
<comment>Video Encode H.265 extension</comment> <comment>Video Encode H.265 extension</comment>
<type category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CapabilityFlagsEXT</name>;</type> <type category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CapabilityFlagsEXT</name>;</type>
@ -425,6 +426,7 @@ typedef void <name>CAMetalLayer</name>;
<type requires="VkVideoEncodeH265OutputModeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265OutputModeFlagsEXT</name>;</type> <type requires="VkVideoEncodeH265OutputModeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265OutputModeFlagsEXT</name>;</type>
<type category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CreateFlagsEXT</name>;</type> <type category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CreateFlagsEXT</name>;</type>
<type requires="VkVideoEncodeH265CtbSizeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CtbSizeFlagsEXT</name>;</type> <type requires="VkVideoEncodeH265CtbSizeFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265CtbSizeFlagsEXT</name>;</type>
<type requires="VkVideoEncodeH265RateControlStructureFlagBitsEXT" category="bitmask">typedef <type>VkFlags</type> <name>VkVideoEncodeH265RateControlStructureFlagsEXT</name>;</type>
<comment>Types which can be void pointers or class pointers, selected at compile time</comment> <comment>Types which can be void pointers or class pointers, selected at compile time</comment>
<type category="handle" objtypeenum="VK_OBJECT_TYPE_INSTANCE"><type>VK_DEFINE_HANDLE</type>(<name>VkInstance</name>)</type> <type category="handle" objtypeenum="VK_OBJECT_TYPE_INSTANCE"><type>VK_DEFINE_HANDLE</type>(<name>VkInstance</name>)</type>
@ -739,11 +741,13 @@ typedef void <name>CAMetalLayer</name>;
<type name="VkVideoEncodeH264InputModeFlagBitsEXT" category="enum"/> <type name="VkVideoEncodeH264InputModeFlagBitsEXT" category="enum"/>
<type name="VkVideoEncodeH264OutputModeFlagBitsEXT" category="enum"/> <type name="VkVideoEncodeH264OutputModeFlagBitsEXT" category="enum"/>
<type name="VkVideoEncodeH264CreateFlagBitsEXT" category="enum"/> <type name="VkVideoEncodeH264CreateFlagBitsEXT" category="enum"/>
<type name="VkVideoEncodeH264RateControlStructureFlagBitsEXT" category="enum"/>
<comment>Video H.265 Encode extensions</comment> <comment>Video H.265 Encode extensions</comment>
<type name="VkVideoEncodeH265InputModeFlagBitsEXT" category="enum"/> <type name="VkVideoEncodeH265InputModeFlagBitsEXT" category="enum"/>
<type name="VkVideoEncodeH265OutputModeFlagBitsEXT" category="enum"/> <type name="VkVideoEncodeH265OutputModeFlagBitsEXT" category="enum"/>
<type name="VkVideoEncodeH265CtbSizeFlagBitsEXT" category="enum"/> <type name="VkVideoEncodeH265CtbSizeFlagBitsEXT" category="enum"/>
<type name="VkVideoEncodeH265RateControlStructureFlagBitsEXT" category="enum"/>
<comment>The PFN_vk*Function types are used by VkAllocationCallbacks below</comment> <comment>The PFN_vk*Function types are used by VkAllocationCallbacks below</comment>
<type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkInternalAllocationNotification</name>)( <type category="funcpointer">typedef void (VKAPI_PTR *<name>PFN_vkInternalAllocationNotification</name>)(
@ -5896,17 +5900,25 @@ typedef void <name>CAMetalLayer</name>;
<member>const <type>VkVideoReferenceSlotKHR</type>* <name>pSetupReferenceSlot</name></member> <member>const <type>VkVideoReferenceSlotKHR</type>* <name>pSetupReferenceSlot</name></member>
<member optional="true"><type>uint32_t</type> <name>referenceSlotCount</name></member> <member optional="true"><type>uint32_t</type> <name>referenceSlotCount</name></member>
<member len="referenceSlotCount">const <type>VkVideoReferenceSlotKHR</type>* <name>pReferenceSlots</name></member> <member len="referenceSlotCount">const <type>VkVideoReferenceSlotKHR</type>* <name>pReferenceSlots</name></member>
<member><type>uint32_t</type> <name>precedingExternallyEncodedBytes</name></member>
</type> </type>
<type category="struct" name="VkVideoEncodeRateControlInfoKHR" structextends="VkVideoCodingControlInfoKHR"> <type category="struct" name="VkVideoEncodeRateControlInfoKHR" structextends="VkVideoCodingControlInfoKHR">
<member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR"><type>VkStructureType</type><name>sType</name></member> <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR"><type>VkStructureType</type><name>sType</name></member>
<member optional="true">const <type>void</type>* <name>pNext</name></member> <member optional="true">const <type>void</type>* <name>pNext</name></member>
<member><type>VkVideoEncodeRateControlFlagsKHR</type> <name>flags</name></member> <member noautovalidity="true"><type>VkVideoEncodeRateControlFlagsKHR</type> <name>flags</name></member>
<member><type>VkVideoEncodeRateControlModeFlagBitsKHR</type> <name>rateControlMode</name></member> <member><type>VkVideoEncodeRateControlModeFlagBitsKHR</type> <name>rateControlMode</name></member>
<member><type>uint8_t</type> <name>layerCount</name></member>
<member len="layerCount">const <type>VkVideoEncodeRateControlLayerInfoKHR</type>* <name>pLayerConfigs</name></member>
</type>
<type category="struct" name="VkVideoEncodeRateControlLayerInfoKHR" structextends="VkVideoCodingControlInfoKHR">
<member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR"><type>VkStructureType</type><name>sType</name></member>
<member>const <type>void</type>* <name>pNext</name></member>
<member><type>uint32_t</type> <name>averageBitrate</name></member> <member><type>uint32_t</type> <name>averageBitrate</name></member>
<member><type>uint16_t</type> <name>peakToAverageBitrateRatio</name></member> <member><type>uint32_t</type> <name>maxBitrate</name></member>
<member><type>uint16_t</type> <name>frameRateNumerator</name></member> <member><type>uint32_t</type> <name>frameRateNumerator</name></member>
<member><type>uint16_t</type> <name>frameRateDenominator</name></member> <member><type>uint32_t</type> <name>frameRateDenominator</name></member>
<member><type>uint32_t</type> <name>virtualBufferSizeInMs</name></member> <member><type>uint32_t</type> <name>virtualBufferSizeInMs</name></member>
<member><type>uint32_t</type> <name>initialVirtualBufferSizeInMs</name></member>
</type> </type>
<type category="struct" name="VkVideoEncodeH264CapabilitiesEXT" structextends="VkVideoCapabilitiesKHR"> <type category="struct" name="VkVideoEncodeH264CapabilitiesEXT" structextends="VkVideoCapabilitiesKHR">
<member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_EXT"><type>VkStructureType</type><name>sType</name></member> <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_EXT"><type>VkStructureType</type><name>sType</name></member>
@ -5993,9 +6005,37 @@ typedef void <name>CAMetalLayer</name>;
<member len="refFinalList0EntryCount">const <type>VkVideoEncodeH264DpbSlotInfoEXT</type>* <name>pRefFinalList0Entries</name></member> <member len="refFinalList0EntryCount">const <type>VkVideoEncodeH264DpbSlotInfoEXT</type>* <name>pRefFinalList0Entries</name></member>
<member><type>uint8_t</type> <name>refFinalList1EntryCount</name></member> <member><type>uint8_t</type> <name>refFinalList1EntryCount</name></member>
<member len="refFinalList1EntryCount">const <type>VkVideoEncodeH264DpbSlotInfoEXT</type>* <name>pRefFinalList1Entries</name></member> <member len="refFinalList1EntryCount">const <type>VkVideoEncodeH264DpbSlotInfoEXT</type>* <name>pRefFinalList1Entries</name></member>
<member><type>uint32_t</type> <name>precedingNaluBytes</name></member> </type>
<member><type>uint8_t</type> <name>minQp</name></member> <type category="struct" name="VkVideoEncodeH264RateControlInfoEXT" structextends="VkVideoEncodeRateControlInfoKHR">
<member><type>uint8_t</type> <name>maxQp</name></member> <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_EXT"><type>VkStructureType</type><name>sType</name></member>
<member optional="true">const <type>void</type>* <name>pNext</name></member>
<member><type>uint32_t</type> <name>gopFrameCount</name></member>
<member><type>uint32_t</type> <name>idrPeriod</name></member>
<member><type>uint32_t</type> <name>consecutiveBFrameCount</name></member>
<member><type>VkVideoEncodeH264RateControlStructureFlagBitsEXT</type> <name>rateControlStructure</name></member>
</type>
<type category="struct" name="VkVideoEncodeH264QpEXT">
<member noautovalidity="true"><type>int32_t</type> <name>qpI</name></member>
<member noautovalidity="true"><type>int32_t</type> <name>qpP</name></member>
<member noautovalidity="true"><type>int32_t</type> <name>qpB</name></member>
</type>
<type category="struct" name="VkVideoEncodeH264FrameSizeEXT">
<member noautovalidity="true"><type>uint32_t</type> <name>frameISize</name></member>
<member noautovalidity="true"><type>uint32_t</type> <name>framePSize</name></member>
<member noautovalidity="true"><type>uint32_t</type> <name>frameBSize</name></member>
</type>
<type category="struct" name="VkVideoEncodeH264RateControlLayerInfoEXT" structextends="VkVideoEncodeRateControlLayerInfoKHR">
<member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_EXT"><type>VkStructureType</type><name>sType</name></member>
<member optional="true">const <type>void</type>* <name>pNext</name></member>
<member><type>uint8_t</type> <name>temporalLayerId</name></member>
<member><type>VkBool32</type> <name>useInitialRcQp</name></member>
<member><type>VkVideoEncodeH264QpEXT</type> <name>initialRcQp</name></member>
<member><type>VkBool32</type> <name>useMinQp</name></member>
<member><type>VkVideoEncodeH264QpEXT</type> <name>minQp</name></member>
<member><type>VkBool32</type> <name>useMaxQp</name></member>
<member><type>VkVideoEncodeH264QpEXT</type> <name>maxQp</name></member>
<member><type>VkBool32</type> <name>useMaxFrameSize</name></member>
<member><type>VkVideoEncodeH264FrameSizeEXT</type> <name>maxFrameSize</name></member>
</type> </type>
<type category="struct" name="VkVideoEncodeH265CapabilitiesEXT" structextends="VkVideoCapabilitiesKHR"> <type category="struct" name="VkVideoEncodeH265CapabilitiesEXT" structextends="VkVideoCapabilitiesKHR">
<member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT"><type>VkStructureType</type><name>sType</name></member> <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT"><type>VkStructureType</type><name>sType</name></member>
@ -6070,6 +6110,37 @@ typedef void <name>CAMetalLayer</name>;
<member optional="true">const <type>VkVideoEncodeH265ReferenceListsEXT</type>* <name>pReferenceFinalLists</name></member> <member optional="true">const <type>VkVideoEncodeH265ReferenceListsEXT</type>* <name>pReferenceFinalLists</name></member>
<member>const <type>StdVideoEncodeH265SliceHeader</type>* <name>pSliceHeaderStd</name></member> <member>const <type>StdVideoEncodeH265SliceHeader</type>* <name>pSliceHeaderStd</name></member>
</type> </type>
<type category="struct" name="VkVideoEncodeH265RateControlInfoEXT" structextends="VkVideoEncodeRateControlInfoKHR">
<member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_EXT"><type>VkStructureType</type><name>sType</name></member>
<member optional="true">const <type>void</type>* <name>pNext</name></member>
<member><type>uint32_t</type> <name>gopFrameCount</name></member>
<member><type>uint32_t</type> <name>idrPeriod</name></member>
<member><type>uint32_t</type> <name>consecutiveBFrameCount</name></member>
<member><type>VkVideoEncodeH265RateControlStructureFlagBitsEXT</type> <name>rateControlStructure</name></member>
</type>
<type category="struct" name="VkVideoEncodeH265QpEXT">
<member noautovalidity="true"><type>int32_t</type> <name>qpI</name></member>
<member noautovalidity="true"><type>int32_t</type> <name>qpP</name></member>
<member noautovalidity="true"><type>int32_t</type> <name>qpB</name></member>
</type>
<type category="struct" name="VkVideoEncodeH265FrameSizeEXT">
<member noautovalidity="true"><type>uint32_t</type> <name>frameISize</name></member>
<member noautovalidity="true"><type>uint32_t</type> <name>framePSize</name></member>
<member noautovalidity="true"><type>uint32_t</type> <name>frameBSize</name></member>
</type>
<type category="struct" name="VkVideoEncodeH265RateControlLayerInfoEXT" structextends="VkVideoEncodeRateControlLayerInfoKHR">
<member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_EXT"><type>VkStructureType</type><name>sType</name></member>
<member optional="true">const <type>void</type>* <name>pNext</name></member>
<member><type>uint8_t</type> <name>temporalId</name></member>
<member><type>VkBool32</type> <name>useInitialRcQp</name></member>
<member><type>VkVideoEncodeH265QpEXT</type> <name>initialRcQp</name></member>
<member><type>VkBool32</type> <name>useMinQp</name></member>
<member><type>VkVideoEncodeH265QpEXT</type> <name>minQp</name></member>
<member><type>VkBool32</type> <name>useMaxQp</name></member>
<member><type>VkVideoEncodeH265QpEXT</type> <name>maxQp</name></member>
<member><type>VkBool32</type> <name>useMaxFrameSize</name></member>
<member><type>VkVideoEncodeH265FrameSizeEXT</type> <name>maxFrameSize</name></member>
</type>
<type category="struct" name="VkVideoEncodeH265ProfileEXT" structextends="VkVideoProfileKHR,VkQueryPoolCreateInfo,VkFormatProperties2,VkImageCreateInfo,VkImageViewCreateInfo,VkBufferCreateInfo"> <type category="struct" name="VkVideoEncodeH265ProfileEXT" structextends="VkVideoProfileKHR,VkQueryPoolCreateInfo,VkFormatProperties2,VkImageCreateInfo,VkImageViewCreateInfo,VkBufferCreateInfo">
<member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_EXT"><type>VkStructureType</type><name>sType</name></member> <member values="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_EXT"><type>VkStructureType</type><name>sType</name></member>
<member optional="true">const <type>void</type>* <name>pNext</name></member> <member optional="true">const <type>void</type>* <name>pNext</name></member>
@ -6472,7 +6543,7 @@ typedef void <name>CAMetalLayer</name>;
<member optional="true">const <type>void</type>* <name>pNext</name></member> <member optional="true">const <type>void</type>* <name>pNext</name></member>
<member><type>float</type> <name>minLod</name></member> <member><type>float</type> <name>minLod</name></member>
</type> </type>
<type category="struct" name="VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM" returnedonly="true"> <type category="struct" name="VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
<member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM"><type>VkStructureType</type> <name>sType</name></member> <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM"><type>VkStructureType</type> <name>sType</name></member>
<member optional="true">const <type>void</type>* <name>pNext</name></member> <member optional="true">const <type>void</type>* <name>pNext</name></member>
<member><type>VkBool32</type> <name>rasterizationOrderColorAttachmentAccess</name></member> <member><type>VkBool32</type> <name>rasterizationOrderColorAttachmentAccess</name></member>
@ -8030,7 +8101,7 @@ typedef void <name>CAMetalLayer</name>;
</enums> </enums>
<enums name="VkVideoEncodeRateControlFlagBitsKHR" type="bitmask"> <enums name="VkVideoEncodeRateControlFlagBitsKHR" type="bitmask">
<enum value="0" name="VK_VIDEO_ENCODE_RATE_CONTROL_DEFAULT_KHR"/> <enum value="0" name="VK_VIDEO_ENCODE_RATE_CONTROL_DEFAULT_KHR"/>
<enum bitpos="0" name="VK_VIDEO_ENCODE_RATE_CONTROL_RESET_BIT_KHR"/> <enum bitpos="0" name="VK_VIDEO_ENCODE_RATE_CONTROL_RESERVED_0_BIT_KHR"/>
</enums> </enums>
<enums name="VkVideoEncodeRateControlModeFlagBitsKHR" type="bitmask"> <enums name="VkVideoEncodeRateControlModeFlagBitsKHR" type="bitmask">
<enum value="0" name="VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR"/> <enum value="0" name="VK_VIDEO_ENCODE_RATE_CONTROL_MODE_NONE_BIT_KHR"/>
@ -8048,7 +8119,8 @@ typedef void <name>CAMetalLayer</name>;
<enum bitpos="7" name="VK_VIDEO_ENCODE_H264_CAPABILITY_DEBLOCKING_FILTER_ENABLED_BIT_EXT"/> <enum bitpos="7" name="VK_VIDEO_ENCODE_H264_CAPABILITY_DEBLOCKING_FILTER_ENABLED_BIT_EXT"/>
<enum bitpos="8" name="VK_VIDEO_ENCODE_H264_CAPABILITY_DEBLOCKING_FILTER_PARTIAL_BIT_EXT"/> <enum bitpos="8" name="VK_VIDEO_ENCODE_H264_CAPABILITY_DEBLOCKING_FILTER_PARTIAL_BIT_EXT"/>
<enum bitpos="9" name="VK_VIDEO_ENCODE_H264_CAPABILITY_MULTIPLE_SLICE_PER_FRAME_BIT_EXT"/> <enum bitpos="9" name="VK_VIDEO_ENCODE_H264_CAPABILITY_MULTIPLE_SLICE_PER_FRAME_BIT_EXT"/>
<enum bitpos="10" name="VK_VIDEO_ENCODE_H264_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT"/> <enum bitpos="10" name="VK_VIDEO_ENCODE_H264_CAPABILITY_EVENLY_DISTRIBUTED_SLICE_SIZE_BIT_EXT"/>
<enum bitpos="11" name="VK_VIDEO_ENCODE_H264_CAPABILITY_OPTIONAL_RC_EXTENSION_STRUCT_BIT_EXT"/>
</enums> </enums>
<enums name="VkVideoEncodeH264InputModeFlagBitsEXT" type="bitmask"> <enums name="VkVideoEncodeH264InputModeFlagBitsEXT" type="bitmask">
<enum bitpos="0" name="VK_VIDEO_ENCODE_H264_INPUT_MODE_FRAME_BIT_EXT"/> <enum bitpos="0" name="VK_VIDEO_ENCODE_H264_INPUT_MODE_FRAME_BIT_EXT"/>
@ -8064,6 +8136,11 @@ typedef void <name>CAMetalLayer</name>;
<enum value="0" name="VK_VIDEO_ENCODE_H264_CREATE_DEFAULT_EXT"/> <enum value="0" name="VK_VIDEO_ENCODE_H264_CREATE_DEFAULT_EXT"/>
<enum bitpos="0" name="VK_VIDEO_ENCODE_H264_CREATE_RESERVED_0_BIT_EXT"/> <enum bitpos="0" name="VK_VIDEO_ENCODE_H264_CREATE_RESERVED_0_BIT_EXT"/>
</enums> </enums>
<enums name="VkVideoEncodeH264RateControlStructureFlagBitsEXT" type="bitmask">
<enum value="0" name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_UNKNOWN_EXT"/>
<enum bitpos="0" name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_FLAT_BIT_EXT"/>
<enum bitpos="1" name="VK_VIDEO_ENCODE_H264_RATE_CONTROL_STRUCTURE_DYADIC_BIT_EXT"/>
</enums>
<enums name="VkImageFormatConstraintsFlagBitsFUCHSIA" type="bitmask"> <enums name="VkImageFormatConstraintsFlagBitsFUCHSIA" type="bitmask">
</enums> </enums>
<enums name="VkImageConstraintsInfoFlagBitsFUCHSIA" type="bitmask"> <enums name="VkImageConstraintsInfoFlagBitsFUCHSIA" type="bitmask">
@ -8123,6 +8200,11 @@ typedef void <name>CAMetalLayer</name>;
<enum bitpos="1" name="VK_RENDERING_SUSPENDING_BIT_KHR"/> <enum bitpos="1" name="VK_RENDERING_SUSPENDING_BIT_KHR"/>
<enum bitpos="2" name="VK_RENDERING_RESUMING_BIT_KHR"/> <enum bitpos="2" name="VK_RENDERING_RESUMING_BIT_KHR"/>
</enums> </enums>
<enums name="VkVideoEncodeH265RateControlStructureFlagBitsEXT" type="bitmask">
<enum value="0" name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_UNKNOWN_EXT"/>
<enum bitpos="0" name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_FLAT_BIT_EXT"/>
<enum bitpos="1" name="VK_VIDEO_ENCODE_H265_RATE_CONTROL_STRUCTURE_DYADIC_BIT_EXT"/>
</enums>
<commands comment="Vulkan command definitions"> <commands comment="Vulkan command definitions">
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_LAYER_NOT_PRESENT,VK_ERROR_EXTENSION_NOT_PRESENT,VK_ERROR_INCOMPATIBLE_DRIVER"> <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY,VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_LAYER_NOT_PRESENT,VK_ERROR_EXTENSION_NOT_PRESENT,VK_ERROR_INCOMPATIBLE_DRIVER">
@ -11909,7 +11991,7 @@ typedef void <name>CAMetalLayer</name>;
<type name="VkPhysicalDeviceVariablePointerFeatures"/> <type name="VkPhysicalDeviceVariablePointerFeatures"/>
<type name="VkPhysicalDeviceVariablePointersFeatures"/> <type name="VkPhysicalDeviceVariablePointersFeatures"/>
</require> </require>
<require comment="Originally based on VK_KHR_protected_memory (extension 146), which was never published; thus the mystifying large value= numbers below. These are not aliased since they weren't actually promoted from an extension."> <require comment="Originally based on VK_KHR_protected_memory (extension 146), which was never published; thus the mystifying large value= numbers below. These are not aliased since they were not actually promoted from an extension.">
<enum extends="VkStructureType" extnumber="146" offset="0" name="VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO"/> <enum extends="VkStructureType" extnumber="146" offset="0" name="VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO"/>
<enum extends="VkStructureType" extnumber="146" offset="1" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES"/> <enum extends="VkStructureType" extnumber="146" offset="1" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES"/>
<enum extends="VkStructureType" extnumber="146" offset="2" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES"/> <enum extends="VkStructureType" extnumber="146" offset="2" name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES"/>
@ -12451,7 +12533,7 @@ typedef void <name>CAMetalLayer</name>;
</extension> </extension>
<extension name="VK_ANDROID_native_buffer" number="11" type="device" author="ANDROID" platform="android" contact="Jesse Hall @critsec" supported="disabled"> <extension name="VK_ANDROID_native_buffer" number="11" type="device" author="ANDROID" platform="android" contact="Jesse Hall @critsec" supported="disabled">
<require> <require>
<comment>VK_ANDROID_native_buffer is used between the Android Vulkan loader and drivers to implement the WSI extensions. It isn't exposed to applications and uses types that aren't part of Android's stable public API, so it is left disabled to keep it out of the standard Vulkan headers.</comment> <comment>VK_ANDROID_native_buffer is used between the Android Vulkan loader and drivers to implement the WSI extensions. It is not exposed to applications and uses types that are not part of Android's stable public API, so it is left disabled to keep it out of the standard Vulkan headers.</comment>
<enum value="8" name="VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION"/> <enum value="8" name="VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION"/>
<enum value="11" name="VK_ANDROID_NATIVE_BUFFER_NUMBER"/> <enum value="11" name="VK_ANDROID_NATIVE_BUFFER_NUMBER"/>
<enum value="&quot;VK_ANDROID_native_buffer&quot;" name="VK_ANDROID_NATIVE_BUFFER_EXTENSION_NAME"/> <enum value="&quot;VK_ANDROID_native_buffer&quot;" name="VK_ANDROID_NATIVE_BUFFER_EXTENSION_NAME"/>
@ -12842,6 +12924,8 @@ typedef void <name>CAMetalLayer</name>;
<enum offset="6" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum offset="6" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="9" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="10" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum bitpos="16" extends="VkVideoCodecOperationFlagBitsKHR" name="VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum bitpos="16" extends="VkVideoCodecOperationFlagBitsKHR" name="VK_VIDEO_CODEC_OPERATION_ENCODE_H264_BIT_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<type name="VkVideoEncodeH264CapabilityFlagBitsEXT"/> <type name="VkVideoEncodeH264CapabilityFlagBitsEXT"/>
@ -12861,6 +12945,12 @@ typedef void <name>CAMetalLayer</name>;
<type name="VkVideoEncodeH264DpbSlotInfoEXT"/> <type name="VkVideoEncodeH264DpbSlotInfoEXT"/>
<type name="VkVideoEncodeH264NaluSliceEXT"/> <type name="VkVideoEncodeH264NaluSliceEXT"/>
<type name="VkVideoEncodeH264ProfileEXT"/> <type name="VkVideoEncodeH264ProfileEXT"/>
<type name="VkVideoEncodeH264RateControlInfoEXT"/>
<type name="VkVideoEncodeH264RateControlStructureFlagBitsEXT"/>
<type name="VkVideoEncodeH264RateControlStructureFlagsEXT"/>
<type name="VkVideoEncodeH264RateControlLayerInfoEXT"/>
<type name="VkVideoEncodeH264QpEXT"/>
<type name="VkVideoEncodeH264FrameSizeEXT"/>
</require> </require>
</extension> </extension>
<extension name="VK_EXT_video_encode_h265" number="40" type="device" requires="VK_KHR_video_encode_queue" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" provisional="true" platform="provisional" supported="vulkan"> <extension name="VK_EXT_video_encode_h265" number="40" type="device" requires="VK_KHR_video_encode_queue" author="KHR" contact="Ahmed Abdelkhalek @aabdelkh" provisional="true" platform="provisional" supported="vulkan">
@ -12877,6 +12967,8 @@ typedef void <name>CAMetalLayer</name>;
<enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_EMIT_PICTURE_PARAMETERS_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum offset="7" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_EMIT_PICTURE_PARAMETERS_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum offset="8" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="9" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum offset="9" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="10" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="11" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum bitpos="17" extends="VkVideoCodecOperationFlagBitsKHR" name="VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum bitpos="17" extends="VkVideoCodecOperationFlagBitsKHR" name="VK_VIDEO_CODEC_OPERATION_ENCODE_H265_BIT_EXT" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<type name="VkVideoEncodeH265CapabilityFlagsEXT"/> <type name="VkVideoEncodeH265CapabilityFlagsEXT"/>
@ -12898,6 +12990,12 @@ typedef void <name>CAMetalLayer</name>;
<type name="VkVideoEncodeH265NaluSliceEXT"/> <type name="VkVideoEncodeH265NaluSliceEXT"/>
<type name="VkVideoEncodeH265ProfileEXT"/> <type name="VkVideoEncodeH265ProfileEXT"/>
<type name="VkVideoEncodeH265ReferenceListsEXT"/> <type name="VkVideoEncodeH265ReferenceListsEXT"/>
<type name="VkVideoEncodeH265RateControlInfoEXT"/>
<type name="VkVideoEncodeH265RateControlStructureFlagBitsEXT"/>
<type name="VkVideoEncodeH265RateControlStructureFlagsEXT"/>
<type name="VkVideoEncodeH265RateControlLayerInfoEXT"/>
<type name="VkVideoEncodeH265QpEXT"/>
<type name="VkVideoEncodeH265FrameSizeEXT"/>
</require> </require>
</extension> </extension>
<extension name="VK_EXT_video_decode_h264" number="41" type="device" requires="VK_KHR_video_decode_queue" author="KHR" contact="peter.fang@amd.com" provisional="true" platform="provisional" supported="vulkan"> <extension name="VK_EXT_video_decode_h264" number="41" type="device" requires="VK_KHR_video_decode_queue" author="KHR" contact="peter.fang@amd.com" provisional="true" platform="provisional" supported="vulkan">
@ -16304,6 +16402,7 @@ typedef void <name>CAMetalLayer</name>;
<enum bitpos="38" extends="VkAccessFlagBits2KHR" name="VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum bitpos="38" extends="VkAccessFlagBits2KHR" name="VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum bitpos="6" extends="VkQueueFlagBits" name="VK_QUEUE_VIDEO_ENCODE_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum bitpos="6" extends="VkQueueFlagBits" name="VK_QUEUE_VIDEO_ENCODE_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum bitpos="15" extends="VkBufferUsageFlagBits" name="VK_BUFFER_USAGE_VIDEO_ENCODE_DST_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum bitpos="15" extends="VkBufferUsageFlagBits" name="VK_BUFFER_USAGE_VIDEO_ENCODE_DST_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
<enum bitpos="16" extends="VkBufferUsageFlagBits" name="VK_BUFFER_USAGE_VIDEO_ENCODE_SRC_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/> <enum bitpos="16" extends="VkBufferUsageFlagBits" name="VK_BUFFER_USAGE_VIDEO_ENCODE_SRC_BIT_KHR" protect="VK_ENABLE_BETA_EXTENSIONS"/>
@ -16327,6 +16426,7 @@ typedef void <name>CAMetalLayer</name>;
<type name="VkVideoEncodeRateControlModeFlagsKHR"/> <type name="VkVideoEncodeRateControlModeFlagsKHR"/>
<type name="VkVideoEncodeRateControlInfoKHR"/> <type name="VkVideoEncodeRateControlInfoKHR"/>
<type name="VkVideoEncodeRateControlLayerInfoKHR"/>
<command name="vkCmdEncodeVideoKHR"/> <command name="vkCmdEncodeVideoKHR"/>
</require> </require>
<require extension="VK_KHR_format_feature_flags2"> <require extension="VK_KHR_format_feature_flags2">
@ -17528,6 +17628,12 @@ typedef void <name>CAMetalLayer</name>;
<enum value="&quot;VK_EXT_extension_437&quot;" name="VK_EXT_EXTENSION_437_EXTENSION_NAME"/> <enum value="&quot;VK_EXT_extension_437&quot;" name="VK_EXT_EXTENSION_437_EXTENSION_NAME"/>
</require> </require>
</extension> </extension>
<extension name="VK_EXT_extension_438" number="438" author="EXT" contact="Jan-Harald Fredriksen @janharaldfredriksen-arm" supported="disabled">
<require>
<enum value="0" name="VK_EXT_EXTENSION_438_SPEC_VERSION"/>
<enum value="&quot;VK_EXT_extension_438&quot;" name="VK_EXT_EXTENSION_438_EXTENSION_NAME"/>
</require>
</extension>
</extensions> </extensions>
<formats> <formats>
<format name="VK_FORMAT_R4G4_UNORM_PACK8" class="8-bit" blockSize="1" texelsPerBlock="1" packed="8"> <format name="VK_FORMAT_R4G4_UNORM_PACK8" class="8-bit" blockSize="1" texelsPerBlock="1" packed="8">
@ -18599,7 +18705,7 @@ typedef void <name>CAMetalLayer</name>;
<format name="VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16" class="10-bit 2-plane 422" blockSize="6" texelsPerBlock="1" packed="16" chroma="422"> <format name="VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16" class="10-bit 2-plane 422" blockSize="6" texelsPerBlock="1" packed="16" chroma="422">
<component name="G" bits="10" numericFormat="UNORM" planeIndex="0"/> <component name="G" bits="10" numericFormat="UNORM" planeIndex="0"/>
<component name="B" bits="10" numericFormat="UNORM" planeIndex="1"/> <component name="B" bits="10" numericFormat="UNORM" planeIndex="1"/>
<component name="R" bits="10" numericFormat="UNORM" planeIndex="2"/> <component name="R" bits="10" numericFormat="UNORM" planeIndex="1"/>
<plane index="0" widthDivisor="1" heightDivisor="1" compatible="VK_FORMAT_R10X6_UNORM_PACK16"/> <plane index="0" widthDivisor="1" heightDivisor="1" compatible="VK_FORMAT_R10X6_UNORM_PACK16"/>
<plane index="1" widthDivisor="2" heightDivisor="1" compatible="VK_FORMAT_R10X6G10X6_UNORM_2PACK16"/> <plane index="1" widthDivisor="2" heightDivisor="1" compatible="VK_FORMAT_R10X6G10X6_UNORM_2PACK16"/>
</format> </format>

7
registry/vkconventions.py
View File

@ -169,7 +169,7 @@ class VulkanConventions(ConventionsBase):
def specURL(self, spectype='api'): def specURL(self, spectype='api'):
"""Return public registry URL which ref pages should link to for the """Return public registry URL which ref pages should link to for the
current all-extensions HTML specification, so xrefs in the current all-extensions HTML specification, so xrefs in the
asciidoc source that aren't to ref pages can link into it asciidoc source that are not to ref pages can link into it
instead. N.b. this may need to change on a per-refpage basis if instead. N.b. this may need to change on a per-refpage basis if
there are multiple documents involved. there are multiple documents involved.
""" """
@ -209,7 +209,7 @@ class VulkanConventions(ConventionsBase):
@property @property
def unified_flag_refpages(self): def unified_flag_refpages(self):
"""Return True if Flags/FlagBits refpages are unified, False if """Return True if Flags/FlagBits refpages are unified, False if
they're separate. they are separate.
""" """
return False return False
@ -232,7 +232,8 @@ class VulkanConventions(ConventionsBase):
def category_requires_validation(self, category): def category_requires_validation(self, category):
"""Return True if the given type 'category' always requires validation. """Return True if the given type 'category' always requires validation.
Overridden because Vulkan doesn't require "valid" text for basetype in the spec right now.""" Overridden because Vulkan does not require "valid" text for basetype
in the spec right now."""
return category in CATEGORIES_REQUIRING_VALIDATION return category in CATEGORIES_REQUIRING_VALIDATION
@property @property