Skip to content

Commit b1288c1

Browse files
bkaradzicMichael Pekar
authored and
Michael Pekar
committed
Updated vulkan headers.
1 parent 813cc3b commit b1288c1

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

3rdparty/khronos/vulkan-local/vulkan_beta.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -626,21 +626,21 @@ typedef struct VkVideoEncodeH264RateControlLayerInfoEXT {
626626
#define VK_EXT_video_encode_h265 1
627627
#include "vk_video/vulkan_video_codec_h265std.h"
628628
#include "vk_video/vulkan_video_codec_h265std_encode.h"
629-
#define VK_EXT_VIDEO_ENCODE_H265_SPEC_VERSION 3
629+
#define VK_EXT_VIDEO_ENCODE_H265_SPEC_VERSION 4
630630
#define VK_EXT_VIDEO_ENCODE_H265_EXTENSION_NAME "VK_EXT_video_encode_h265"
631631
typedef VkFlags VkVideoEncodeH265CapabilityFlagsEXT;
632632

633633
typedef enum VkVideoEncodeH265InputModeFlagBitsEXT {
634634
VK_VIDEO_ENCODE_H265_INPUT_MODE_FRAME_BIT_EXT = 0x00000001,
635-
VK_VIDEO_ENCODE_H265_INPUT_MODE_SLICE_BIT_EXT = 0x00000002,
635+
VK_VIDEO_ENCODE_H265_INPUT_MODE_SLICE_SEGMENT_BIT_EXT = 0x00000002,
636636
VK_VIDEO_ENCODE_H265_INPUT_MODE_NON_VCL_BIT_EXT = 0x00000004,
637637
VK_VIDEO_ENCODE_H265_INPUT_MODE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
638638
} VkVideoEncodeH265InputModeFlagBitsEXT;
639639
typedef VkFlags VkVideoEncodeH265InputModeFlagsEXT;
640640

641641
typedef enum VkVideoEncodeH265OutputModeFlagBitsEXT {
642642
VK_VIDEO_ENCODE_H265_OUTPUT_MODE_FRAME_BIT_EXT = 0x00000001,
643-
VK_VIDEO_ENCODE_H265_OUTPUT_MODE_SLICE_BIT_EXT = 0x00000002,
643+
VK_VIDEO_ENCODE_H265_OUTPUT_MODE_SLICE_SEGMENT_BIT_EXT = 0x00000002,
644644
VK_VIDEO_ENCODE_H265_OUTPUT_MODE_NON_VCL_BIT_EXT = 0x00000004,
645645
VK_VIDEO_ENCODE_H265_OUTPUT_MODE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
646646
} VkVideoEncodeH265OutputModeFlagBitsEXT;
@@ -723,21 +723,21 @@ typedef struct VkVideoEncodeH265ReferenceListsEXT {
723723
const StdVideoEncodeH265ReferenceModifications* pReferenceModifications;
724724
} VkVideoEncodeH265ReferenceListsEXT;
725725

726-
typedef struct VkVideoEncodeH265NaluSliceEXT {
727-
VkStructureType sType;
728-
const void* pNext;
729-
uint32_t ctbCount;
730-
const VkVideoEncodeH265ReferenceListsEXT* pReferenceFinalLists;
731-
const StdVideoEncodeH265SliceHeader* pSliceHeaderStd;
732-
} VkVideoEncodeH265NaluSliceEXT;
726+
typedef struct VkVideoEncodeH265NaluSliceSegmentEXT {
727+
VkStructureType sType;
728+
const void* pNext;
729+
uint32_t ctbCount;
730+
const VkVideoEncodeH265ReferenceListsEXT* pReferenceFinalLists;
731+
const StdVideoEncodeH265SliceSegmentHeader* pSliceSegmentHeaderStd;
732+
} VkVideoEncodeH265NaluSliceSegmentEXT;
733733

734734
typedef struct VkVideoEncodeH265VclFrameInfoEXT {
735-
VkStructureType sType;
736-
const void* pNext;
737-
const VkVideoEncodeH265ReferenceListsEXT* pReferenceFinalLists;
738-
uint32_t naluSliceEntryCount;
739-
const VkVideoEncodeH265NaluSliceEXT* pNaluSliceEntries;
740-
const StdVideoEncodeH265PictureInfo* pCurrentPictureInfo;
735+
VkStructureType sType;
736+
const void* pNext;
737+
const VkVideoEncodeH265ReferenceListsEXT* pReferenceFinalLists;
738+
uint32_t naluSliceSegmentEntryCount;
739+
const VkVideoEncodeH265NaluSliceSegmentEXT* pNaluSliceSegmentEntries;
740+
const StdVideoEncodeH265PictureInfo* pCurrentPictureInfo;
741741
} VkVideoEncodeH265VclFrameInfoEXT;
742742

743743
typedef struct VkVideoEncodeH265EmitPictureParametersEXT {

3rdparty/khronos/vulkan-local/vulkan_core.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ extern "C" {
7272
#define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0
7373

7474
// Version of this file
75-
#define VK_HEADER_VERSION 204
75+
#define VK_HEADER_VERSION 205
7676

7777
// Complete version of this file
7878
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION)
@@ -541,7 +541,7 @@ typedef enum VkStructureType {
541541
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT = 1000039005,
542542
#endif
543543
#ifdef VK_ENABLE_BETA_EXTENSIONS
544-
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_EXT = 1000039006,
544+
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_EXT = 1000039006,
545545
#endif
546546
#ifdef VK_ENABLE_BETA_EXTENSIONS
547547
VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_EMIT_PICTURE_PARAMETERS_EXT = 1000039007,
@@ -1984,14 +1984,15 @@ typedef enum VkImageAspectFlagBits {
19841984
VK_IMAGE_ASPECT_PLANE_0_BIT = 0x00000010,
19851985
VK_IMAGE_ASPECT_PLANE_1_BIT = 0x00000020,
19861986
VK_IMAGE_ASPECT_PLANE_2_BIT = 0x00000040,
1987+
VK_IMAGE_ASPECT_NONE = 0,
19871988
VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT = 0x00000080,
19881989
VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT = 0x00000100,
19891990
VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT = 0x00000200,
19901991
VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT = 0x00000400,
1991-
VK_IMAGE_ASPECT_NONE_KHR = 0,
19921992
VK_IMAGE_ASPECT_PLANE_0_BIT_KHR = VK_IMAGE_ASPECT_PLANE_0_BIT,
19931993
VK_IMAGE_ASPECT_PLANE_1_BIT_KHR = VK_IMAGE_ASPECT_PLANE_1_BIT,
19941994
VK_IMAGE_ASPECT_PLANE_2_BIT_KHR = VK_IMAGE_ASPECT_PLANE_2_BIT,
1995+
VK_IMAGE_ASPECT_NONE_KHR = VK_IMAGE_ASPECT_NONE,
19951996
VK_IMAGE_ASPECT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
19961997
} VkImageAspectFlagBits;
19971998
typedef VkFlags VkImageAspectFlags;
@@ -13418,7 +13419,7 @@ typedef struct VkPhysicalDevice4444FormatsFeaturesEXT {
1341813419
#define VK_ARM_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_EXTENSION_NAME "VK_ARM_rasterization_order_attachment_access"
1341913420
typedef struct VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM {
1342013421
VkStructureType sType;
13421-
const void* pNext;
13422+
void* pNext;
1342213423
VkBool32 rasterizationOrderColorAttachmentAccess;
1342313424
VkBool32 rasterizationOrderDepthAttachmentAccess;
1342413425
VkBool32 rasterizationOrderStencilAttachmentAccess;

0 commit comments

Comments
 (0)