From 57a5b26d773de65baeae2d3fb4a48981ecdb6481 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 15 Apr 2024 15:54:43 -0700
Subject: [PATCH] Updated to the latest version of the Vulkan SDK
---
.../vk_video/vulkan_video_codec_av1std.h | 392 +++++++++++++++++
.../vulkan_video_codec_av1std_decode.h | 109 +++++
src/video/khronos/vulkan/vk_sdk_platform.h | 69 ---
src/video/khronos/vulkan/vulkan_core.h | 400 +++++++++++++++---
src/video/khronos/vulkan/vulkan_metal.h | 28 +-
5 files changed, 860 insertions(+), 138 deletions(-)
create mode 100644 src/video/khronos/vk_video/vulkan_video_codec_av1std.h
create mode 100644 src/video/khronos/vk_video/vulkan_video_codec_av1std_decode.h
delete mode 100644 src/video/khronos/vulkan/vk_sdk_platform.h
diff --git a/src/video/khronos/vk_video/vulkan_video_codec_av1std.h b/src/video/khronos/vk_video/vulkan_video_codec_av1std.h
new file mode 100644
index 0000000000000..8ce283e8a8a4f
--- /dev/null
+++ b/src/video/khronos/vk_video/vulkan_video_codec_av1std.h
@@ -0,0 +1,392 @@
+#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_
+#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
+
+/*
+** Copyright 2015-2024 The Khronos Group Inc.
+**
+** SPDX-License-Identifier: Apache-2.0
+*/
+
+/*
+** This header is generated from the Khronos Vulkan XML API Registry.
+**
+*/
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+// vulkan_video_codec_av1std is a preprocessor guard. Do not pass it to API calls.
+#define vulkan_video_codec_av1std 1
+#include "vulkan_video_codecs_common.h"
+#define STD_VIDEO_AV1_NUM_REF_FRAMES 8
+#define STD_VIDEO_AV1_REFS_PER_FRAME 7
+#define STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME 8
+#define STD_VIDEO_AV1_MAX_TILE_COLS 64
+#define STD_VIDEO_AV1_MAX_TILE_ROWS 64
+#define STD_VIDEO_AV1_MAX_SEGMENTS 8
+#define STD_VIDEO_AV1_SEG_LVL_MAX 8
+#define STD_VIDEO_AV1_PRIMARY_REF_NONE 7
+#define STD_VIDEO_AV1_SELECT_INTEGER_MV 2
+#define STD_VIDEO_AV1_SELECT_SCREEN_CONTENT_TOOLS 2
+#define STD_VIDEO_AV1_SKIP_MODE_FRAMES 2
+#define STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS 4
+#define STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS 2
+#define STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS 8
+#define STD_VIDEO_AV1_MAX_NUM_PLANES 3
+#define STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS 6
+#define STD_VIDEO_AV1_MAX_NUM_Y_POINTS 14
+#define STD_VIDEO_AV1_MAX_NUM_CB_POINTS 10
+#define STD_VIDEO_AV1_MAX_NUM_CR_POINTS 10
+#define STD_VIDEO_AV1_MAX_NUM_POS_LUMA 24
+#define STD_VIDEO_AV1_MAX_NUM_POS_CHROMA 25
+
+typedef enum StdVideoAV1Profile {
+ STD_VIDEO_AV1_PROFILE_MAIN = 0,
+ STD_VIDEO_AV1_PROFILE_HIGH = 1,
+ STD_VIDEO_AV1_PROFILE_PROFESSIONAL = 2,
+ STD_VIDEO_AV1_PROFILE_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_PROFILE_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1Profile;
+
+typedef enum StdVideoAV1Level {
+ STD_VIDEO_AV1_LEVEL_2_0 = 0,
+ STD_VIDEO_AV1_LEVEL_2_1 = 1,
+ STD_VIDEO_AV1_LEVEL_2_2 = 2,
+ STD_VIDEO_AV1_LEVEL_2_3 = 3,
+ STD_VIDEO_AV1_LEVEL_3_0 = 4,
+ STD_VIDEO_AV1_LEVEL_3_1 = 5,
+ STD_VIDEO_AV1_LEVEL_3_2 = 6,
+ STD_VIDEO_AV1_LEVEL_3_3 = 7,
+ STD_VIDEO_AV1_LEVEL_4_0 = 8,
+ STD_VIDEO_AV1_LEVEL_4_1 = 9,
+ STD_VIDEO_AV1_LEVEL_4_2 = 10,
+ STD_VIDEO_AV1_LEVEL_4_3 = 11,
+ STD_VIDEO_AV1_LEVEL_5_0 = 12,
+ STD_VIDEO_AV1_LEVEL_5_1 = 13,
+ STD_VIDEO_AV1_LEVEL_5_2 = 14,
+ STD_VIDEO_AV1_LEVEL_5_3 = 15,
+ STD_VIDEO_AV1_LEVEL_6_0 = 16,
+ STD_VIDEO_AV1_LEVEL_6_1 = 17,
+ STD_VIDEO_AV1_LEVEL_6_2 = 18,
+ STD_VIDEO_AV1_LEVEL_6_3 = 19,
+ STD_VIDEO_AV1_LEVEL_7_0 = 20,
+ STD_VIDEO_AV1_LEVEL_7_1 = 21,
+ STD_VIDEO_AV1_LEVEL_7_2 = 22,
+ STD_VIDEO_AV1_LEVEL_7_3 = 23,
+ STD_VIDEO_AV1_LEVEL_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_LEVEL_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1Level;
+
+typedef enum StdVideoAV1FrameType {
+ STD_VIDEO_AV1_FRAME_TYPE_KEY = 0,
+ STD_VIDEO_AV1_FRAME_TYPE_INTER = 1,
+ STD_VIDEO_AV1_FRAME_TYPE_INTRA_ONLY = 2,
+ STD_VIDEO_AV1_FRAME_TYPE_SWITCH = 3,
+ STD_VIDEO_AV1_FRAME_TYPE_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_FRAME_TYPE_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1FrameType;
+
+typedef enum StdVideoAV1ReferenceName {
+ STD_VIDEO_AV1_REFERENCE_NAME_INTRA_FRAME = 0,
+ STD_VIDEO_AV1_REFERENCE_NAME_LAST_FRAME = 1,
+ STD_VIDEO_AV1_REFERENCE_NAME_LAST2_FRAME = 2,
+ STD_VIDEO_AV1_REFERENCE_NAME_LAST3_FRAME = 3,
+ STD_VIDEO_AV1_REFERENCE_NAME_GOLDEN_FRAME = 4,
+ STD_VIDEO_AV1_REFERENCE_NAME_BWDREF_FRAME = 5,
+ STD_VIDEO_AV1_REFERENCE_NAME_ALTREF2_FRAME = 6,
+ STD_VIDEO_AV1_REFERENCE_NAME_ALTREF_FRAME = 7,
+ STD_VIDEO_AV1_REFERENCE_NAME_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_REFERENCE_NAME_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1ReferenceName;
+
+typedef enum StdVideoAV1InterpolationFilter {
+ STD_VIDEO_AV1_INTERPOLATION_FILTER_EIGHTTAP = 0,
+ STD_VIDEO_AV1_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH = 1,
+ STD_VIDEO_AV1_INTERPOLATION_FILTER_EIGHTTAP_SHARP = 2,
+ STD_VIDEO_AV1_INTERPOLATION_FILTER_BILINEAR = 3,
+ STD_VIDEO_AV1_INTERPOLATION_FILTER_SWITCHABLE = 4,
+ STD_VIDEO_AV1_INTERPOLATION_FILTER_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_INTERPOLATION_FILTER_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1InterpolationFilter;
+
+typedef enum StdVideoAV1TxMode {
+ STD_VIDEO_AV1_TX_MODE_ONLY_4X4 = 0,
+ STD_VIDEO_AV1_TX_MODE_LARGEST = 1,
+ STD_VIDEO_AV1_TX_MODE_SELECT = 2,
+ STD_VIDEO_AV1_TX_MODE_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_TX_MODE_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1TxMode;
+
+typedef enum StdVideoAV1FrameRestorationType {
+ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_NONE = 0,
+ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_WIENER = 1,
+ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SGRPROJ = 2,
+ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SWITCHABLE = 3,
+ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1FrameRestorationType;
+
+typedef enum StdVideoAV1ColorPrimaries {
+ STD_VIDEO_AV1_COLOR_PRIMARIES_BT_709 = 1,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_BT_UNSPECIFIED = 2,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_M = 4,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_BT_470_B_G = 5,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_BT_601 = 6,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_240 = 7,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_GENERIC_FILM = 8,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_BT_2020 = 9,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_XYZ = 10,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_431 = 11,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_SMPTE_432 = 12,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_EBU_3213 = 22,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_COLOR_PRIMARIES_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1ColorPrimaries;
+
+typedef enum StdVideoAV1TransferCharacteristics {
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_RESERVED_0 = 0,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_709 = 1,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_UNSPECIFIED = 2,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_RESERVED_3 = 3,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_470_M = 4,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_470_B_G = 5,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_601 = 6,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_SMPTE_240 = 7,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_LINEAR = 8,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_LOG_100 = 9,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_LOG_100_SQRT10 = 10,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_IEC_61966 = 11,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_1361 = 12,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_SRGB = 13,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_2020_10_BIT = 14,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_BT_2020_12_BIT = 15,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_SMPTE_2084 = 16,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_SMPTE_428 = 17,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_HLG = 18,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_TRANSFER_CHARACTERISTICS_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1TransferCharacteristics;
+
+typedef enum StdVideoAV1MatrixCoefficients {
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_IDENTITY = 0,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_709 = 1,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_UNSPECIFIED = 2,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_RESERVED_3 = 3,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_FCC = 4,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_470_B_G = 5,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_601 = 6,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_SMPTE_240 = 7,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_SMPTE_YCGCO = 8,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_2020_NCL = 9,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_BT_2020_CL = 10,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_SMPTE_2085 = 11,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_CHROMAT_NCL = 12,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_CHROMAT_CL = 13,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_ICTCP = 14,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_MATRIX_COEFFICIENTS_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1MatrixCoefficients;
+
+typedef enum StdVideoAV1ChromaSamplePosition {
+ STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_UNKNOWN = 0,
+ STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_VERTICAL = 1,
+ STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_COLOCATED = 2,
+ STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_RESERVED = 3,
+ STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_INVALID = 0x7FFFFFFF,
+ STD_VIDEO_AV1_CHROMA_SAMPLE_POSITION_MAX_ENUM = 0x7FFFFFFF
+} StdVideoAV1ChromaSamplePosition;
+typedef struct StdVideoAV1ColorConfigFlags {
+ uint32_t mono_chrome : 1;
+ uint32_t color_range : 1;
+ uint32_t separate_uv_delta_q : 1;
+ uint32_t color_description_present_flag : 1;
+ uint32_t reserved : 28;
+} StdVideoAV1ColorConfigFlags;
+
+typedef struct StdVideoAV1ColorConfig {
+ StdVideoAV1ColorConfigFlags flags;
+ uint8_t BitDepth;
+ uint8_t subsampling_x;
+ uint8_t subsampling_y;
+ uint8_t reserved1;
+ StdVideoAV1ColorPrimaries color_primaries;
+ StdVideoAV1TransferCharacteristics transfer_characteristics;
+ StdVideoAV1MatrixCoefficients matrix_coefficients;
+ StdVideoAV1ChromaSamplePosition chroma_sample_position;
+} StdVideoAV1ColorConfig;
+
+typedef struct StdVideoAV1TimingInfoFlags {
+ uint32_t equal_picture_interval : 1;
+ uint32_t reserved : 31;
+} StdVideoAV1TimingInfoFlags;
+
+typedef struct StdVideoAV1TimingInfo {
+ StdVideoAV1TimingInfoFlags flags;
+ uint32_t num_units_in_display_tick;
+ uint32_t time_scale;
+ uint32_t num_ticks_per_picture_minus_1;
+} StdVideoAV1TimingInfo;
+
+typedef struct StdVideoAV1LoopFilterFlags {
+ uint32_t loop_filter_delta_enabled : 1;
+ uint32_t loop_filter_delta_update : 1;
+ uint32_t reserved : 30;
+} StdVideoAV1LoopFilterFlags;
+
+typedef struct StdVideoAV1LoopFilter {
+ StdVideoAV1LoopFilterFlags flags;
+ uint8_t loop_filter_level[STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS];
+ uint8_t loop_filter_sharpness;
+ uint8_t update_ref_delta;
+ int8_t loop_filter_ref_deltas[STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME];
+ uint8_t update_mode_delta;
+ int8_t loop_filter_mode_deltas[STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS];
+} StdVideoAV1LoopFilter;
+
+typedef struct StdVideoAV1QuantizationFlags {
+ uint32_t using_qmatrix : 1;
+ uint32_t diff_uv_delta : 1;
+ uint32_t reserved : 30;
+} StdVideoAV1QuantizationFlags;
+
+typedef struct StdVideoAV1Quantization {
+ StdVideoAV1QuantizationFlags flags;
+ uint8_t base_q_idx;
+ int8_t DeltaQYDc;
+ int8_t DeltaQUDc;
+ int8_t DeltaQUAc;
+ int8_t DeltaQVDc;
+ int8_t DeltaQVAc;
+ uint8_t qm_y;
+ uint8_t qm_u;
+ uint8_t qm_v;
+} StdVideoAV1Quantization;
+
+typedef struct StdVideoAV1Segmentation {
+ uint8_t FeatureEnabled[STD_VIDEO_AV1_MAX_SEGMENTS];
+ int16_t FeatureData[STD_VIDEO_AV1_MAX_SEGMENTS][STD_VIDEO_AV1_SEG_LVL_MAX];
+} StdVideoAV1Segmentation;
+
+typedef struct StdVideoAV1TileInfoFlags {
+ uint32_t uniform_tile_spacing_flag : 1;
+ uint32_t reserved : 31;
+} StdVideoAV1TileInfoFlags;
+
+typedef struct StdVideoAV1TileInfo {
+ StdVideoAV1TileInfoFlags flags;
+ uint8_t TileCols;
+ uint8_t TileRows;
+ uint16_t context_update_tile_id;
+ uint8_t tile_size_bytes_minus_1;
+ uint8_t reserved1[7];
+ const uint16_t* pMiColStarts;
+ const uint16_t* pMiRowStarts;
+ const uint16_t* pWidthInSbsMinus1;
+ const uint16_t* pHeightInSbsMinus1;
+} StdVideoAV1TileInfo;
+
+typedef struct StdVideoAV1CDEF {
+ uint8_t cdef_damping_minus_3;
+ uint8_t cdef_bits;
+ uint8_t cdef_y_pri_strength[STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS];
+ uint8_t cdef_y_sec_strength[STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS];
+ uint8_t cdef_uv_pri_strength[STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS];
+ uint8_t cdef_uv_sec_strength[STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS];
+} StdVideoAV1CDEF;
+
+typedef struct StdVideoAV1LoopRestoration {
+ StdVideoAV1FrameRestorationType FrameRestorationType[STD_VIDEO_AV1_MAX_NUM_PLANES];
+ uint16_t LoopRestorationSize[STD_VIDEO_AV1_MAX_NUM_PLANES];
+} StdVideoAV1LoopRestoration;
+
+typedef struct StdVideoAV1GlobalMotion {
+ uint8_t GmType[STD_VIDEO_AV1_NUM_REF_FRAMES];
+ int32_t gm_params[STD_VIDEO_AV1_NUM_REF_FRAMES][STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS];
+} StdVideoAV1GlobalMotion;
+
+typedef struct StdVideoAV1FilmGrainFlags {
+ uint32_t chroma_scaling_from_luma : 1;
+ uint32_t overlap_flag : 1;
+ uint32_t clip_to_restricted_range : 1;
+ uint32_t update_grain : 1;
+ uint32_t reserved : 28;
+} StdVideoAV1FilmGrainFlags;
+
+typedef struct StdVideoAV1FilmGrain {
+ StdVideoAV1FilmGrainFlags flags;
+ uint8_t grain_scaling_minus_8;
+ uint8_t ar_coeff_lag;
+ uint8_t ar_coeff_shift_minus_6;
+ uint8_t grain_scale_shift;
+ uint16_t grain_seed;
+ uint8_t film_grain_params_ref_idx;
+ uint8_t num_y_points;
+ uint8_t point_y_value[STD_VIDEO_AV1_MAX_NUM_Y_POINTS];
+ uint8_t point_y_scaling[STD_VIDEO_AV1_MAX_NUM_Y_POINTS];
+ uint8_t num_cb_points;
+ uint8_t point_cb_value[STD_VIDEO_AV1_MAX_NUM_CB_POINTS];
+ uint8_t point_cb_scaling[STD_VIDEO_AV1_MAX_NUM_CB_POINTS];
+ uint8_t num_cr_points;
+ uint8_t point_cr_value[STD_VIDEO_AV1_MAX_NUM_CR_POINTS];
+ uint8_t point_cr_scaling[STD_VIDEO_AV1_MAX_NUM_CR_POINTS];
+ int8_t ar_coeffs_y_plus_128[STD_VIDEO_AV1_MAX_NUM_POS_LUMA];
+ int8_t ar_coeffs_cb_plus_128[STD_VIDEO_AV1_MAX_NUM_POS_CHROMA];
+ int8_t ar_coeffs_cr_plus_128[STD_VIDEO_AV1_MAX_NUM_POS_CHROMA];
+ uint8_t cb_mult;
+ uint8_t cb_luma_mult;
+ uint16_t cb_offset;
+ uint8_t cr_mult;
+ uint8_t cr_luma_mult;
+ uint16_t cr_offset;
+} StdVideoAV1FilmGrain;
+
+typedef struct StdVideoAV1SequenceHeaderFlags {
+ uint32_t still_picture : 1;
+ uint32_t reduced_still_picture_header : 1;
+ uint32_t use_128x128_superblock : 1;
+ uint32_t enable_filter_intra : 1;
+ uint32_t enable_intra_edge_filter : 1;
+ uint32_t enable_interintra_compound : 1;
+ uint32_t enable_masked_compound : 1;
+ uint32_t enable_warped_motion : 1;
+ uint32_t enable_dual_filter : 1;
+ uint32_t enable_order_hint : 1;
+ uint32_t enable_jnt_comp : 1;
+ uint32_t enable_ref_frame_mvs : 1;
+ uint32_t frame_id_numbers_present_flag : 1;
+ uint32_t enable_superres : 1;
+ uint32_t enable_cdef : 1;
+ uint32_t enable_restoration : 1;
+ uint32_t film_grain_params_present : 1;
+ uint32_t timing_info_present_flag : 1;
+ uint32_t initial_display_delay_present_flag : 1;
+ uint32_t reserved : 13;
+} StdVideoAV1SequenceHeaderFlags;
+
+typedef struct StdVideoAV1SequenceHeader {
+ StdVideoAV1SequenceHeaderFlags flags;
+ StdVideoAV1Profile seq_profile;
+ uint8_t frame_width_bits_minus_1;
+ uint8_t frame_height_bits_minus_1;
+ uint16_t max_frame_width_minus_1;
+ uint16_t max_frame_height_minus_1;
+ uint8_t delta_frame_id_length_minus_2;
+ uint8_t additional_frame_id_length_minus_1;
+ uint8_t order_hint_bits_minus_1;
+ uint8_t seq_force_integer_mv;
+ uint8_t seq_force_screen_content_tools;
+ uint8_t reserved1[5];
+ const StdVideoAV1ColorConfig* pColorConfig;
+ const StdVideoAV1TimingInfo* pTimingInfo;
+} StdVideoAV1SequenceHeader;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/video/khronos/vk_video/vulkan_video_codec_av1std_decode.h b/src/video/khronos/vk_video/vulkan_video_codec_av1std_decode.h
new file mode 100644
index 0000000000000..6b8130cd9fcf7
--- /dev/null
+++ b/src/video/khronos/vk_video/vulkan_video_codec_av1std_decode.h
@@ -0,0 +1,109 @@
+#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_
+#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
+
+/*
+** Copyright 2015-2024 The Khronos Group Inc.
+**
+** SPDX-License-Identifier: Apache-2.0
+*/
+
+/*
+** This header is generated from the Khronos Vulkan XML API Registry.
+**
+*/
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+// vulkan_video_codec_av1std_decode is a preprocessor guard. Do not pass it to API calls.
+#define vulkan_video_codec_av1std_decode 1
+#include "vulkan_video_codec_av1std.h"
+
+#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_1_0_0 VK_MAKE_VIDEO_STD_VERSION(1, 0, 0)
+
+#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_1_0_0
+#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_av1_decode"
+typedef struct StdVideoDecodeAV1PictureInfoFlags {
+ uint32_t error_resilient_mode : 1;
+ uint32_t disable_cdf_update : 1;
+ uint32_t use_superres : 1;
+ uint32_t render_and_frame_size_different : 1;
+ uint32_t allow_screen_content_tools : 1;
+ uint32_t is_filter_switchable : 1;
+ uint32_t force_integer_mv : 1;
+ uint32_t frame_size_override_flag : 1;
+ uint32_t buffer_removal_time_present_flag : 1;
+ uint32_t allow_intrabc : 1;
+ uint32_t frame_refs_short_signaling : 1;
+ uint32_t allow_high_precision_mv : 1;
+ uint32_t is_motion_mode_switchable : 1;
+ uint32_t use_ref_frame_mvs : 1;
+ uint32_t disable_frame_end_update_cdf : 1;
+ uint32_t allow_warped_motion : 1;
+ uint32_t reduced_tx_set : 1;
+ uint32_t reference_select : 1;
+ uint32_t skip_mode_present : 1;
+ uint32_t delta_q_present : 1;
+ uint32_t delta_lf_present : 1;
+ uint32_t delta_lf_multi : 1;
+ uint32_t segmentation_enabled : 1;
+ uint32_t segmentation_update_map : 1;
+ uint32_t segmentation_temporal_update : 1;
+ uint32_t segmentation_update_data : 1;
+ uint32_t UsesLr : 1;
+ uint32_t usesChromaLr : 1;
+ uint32_t apply_grain : 1;
+ uint32_t reserved : 3;
+} StdVideoDecodeAV1PictureInfoFlags;
+
+typedef struct StdVideoDecodeAV1PictureInfo {
+ StdVideoDecodeAV1PictureInfoFlags flags;
+ StdVideoAV1FrameType frame_type;
+ uint32_t current_frame_id;
+ uint8_t OrderHint;
+ uint8_t primary_ref_frame;
+ uint8_t refresh_frame_flags;
+ uint8_t reserved1;
+ StdVideoAV1InterpolationFilter interpolation_filter;
+ StdVideoAV1TxMode TxMode;
+ uint8_t delta_q_res;
+ uint8_t delta_lf_res;
+ uint8_t SkipModeFrame[STD_VIDEO_AV1_SKIP_MODE_FRAMES];
+ uint8_t coded_denom;
+ uint8_t reserved2[3];
+ uint8_t OrderHints[STD_VIDEO_AV1_NUM_REF_FRAMES];
+ uint32_t expectedFrameId[STD_VIDEO_AV1_NUM_REF_FRAMES];
+ const StdVideoAV1TileInfo* pTileInfo;
+ const StdVideoAV1Quantization* pQuantization;
+ const StdVideoAV1Segmentation* pSegmentation;
+ const StdVideoAV1LoopFilter* pLoopFilter;
+ const StdVideoAV1CDEF* pCDEF;
+ const StdVideoAV1LoopRestoration* pLoopRestoration;
+ const StdVideoAV1GlobalMotion* pGlobalMotion;
+ const StdVideoAV1FilmGrain* pFilmGrain;
+} StdVideoDecodeAV1PictureInfo;
+
+typedef struct StdVideoDecodeAV1ReferenceInfoFlags {
+ uint32_t disable_frame_end_update_cdf : 1;
+ uint32_t segmentation_enabled : 1;
+ uint32_t reserved : 30;
+} StdVideoDecodeAV1ReferenceInfoFlags;
+
+typedef struct StdVideoDecodeAV1ReferenceInfo {
+ StdVideoDecodeAV1ReferenceInfoFlags flags;
+ uint8_t frame_type;
+ uint8_t RefFrameSignBias;
+ uint8_t OrderHint;
+ uint8_t SavedOrderHints[STD_VIDEO_AV1_NUM_REF_FRAMES];
+} StdVideoDecodeAV1ReferenceInfo;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/video/khronos/vulkan/vk_sdk_platform.h b/src/video/khronos/vulkan/vk_sdk_platform.h
deleted file mode 100644
index 96d8676949e56..0000000000000
--- a/src/video/khronos/vulkan/vk_sdk_platform.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// File: vk_sdk_platform.h
-//
-/*
- * Copyright (c) 2015-2016 The Khronos Group Inc.
- * Copyright (c) 2015-2016 Valve Corporation
- * Copyright (c) 2015-2016 LunarG, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef VK_SDK_PLATFORM_H
-#define VK_SDK_PLATFORM_H
-
-#if defined(_WIN32)
-#define NOMINMAX
-#ifndef __cplusplus
-#undef inline
-#define inline __inline
-#endif // __cplusplus
-
-#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/)
-// C99:
-// Microsoft didn't implement C99 in Visual Studio; but started adding it with
-// VS2013. However, VS2013 still didn't have snprintf(). The following is a
-// work-around (Note: The _CRT_SECURE_NO_WARNINGS macro must be set in the
-// "CMakeLists.txt" file).
-// NOTE: This is fixed in Visual Studio 2015.
-#define snprintf _snprintf
-#endif
-
-#define strdup _strdup
-
-#endif // _WIN32
-
-// Check for noexcept support using clang, with fallback to Windows or GCC version numbers
-#ifndef NOEXCEPT
-#if defined(__clang__)
-#if __has_feature(cxx_noexcept)
-#define HAS_NOEXCEPT
-#endif
-#else
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) && __GNUC__ * 10 + __GNUC_MINOR__ >= 46
-#define HAS_NOEXCEPT
-#else
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026 && defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS
-#define HAS_NOEXCEPT
-#endif
-#endif
-#endif
-
-#ifdef HAS_NOEXCEPT
-#define NOEXCEPT noexcept
-#else
-#define NOEXCEPT
-#endif
-#endif
-
-#endif // VK_SDK_PLATFORM_H
diff --git a/src/video/khronos/vulkan/vulkan_core.h b/src/video/khronos/vulkan/vulkan_core.h
index 5354f61dc9433..dd46027dff33a 100644
--- a/src/video/khronos/vulkan/vulkan_core.h
+++ b/src/video/khronos/vulkan/vulkan_core.h
@@ -69,7 +69,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
// Version of this file
-#define VK_HEADER_VERSION 275
+#define VK_HEADER_VERSION 282
// Complete version of this file
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION)
@@ -184,7 +184,7 @@ typedef enum VkResult {
VK_OPERATION_NOT_DEFERRED_KHR = 1000268003,
VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR = -1000299000,
VK_ERROR_COMPRESSION_EXHAUSTED_EXT = -1000338000,
- VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT = 1000482000,
+ VK_INCOMPATIBLE_SHADER_BINARY_EXT = 1000482000,
VK_ERROR_OUT_OF_POOL_MEMORY_KHR = VK_ERROR_OUT_OF_POOL_MEMORY,
VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR = VK_ERROR_INVALID_EXTERNAL_HANDLE,
VK_ERROR_FRAGMENTATION_EXT = VK_ERROR_FRAGMENTATION,
@@ -193,6 +193,7 @@ typedef enum VkResult {
VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS,
VK_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED,
VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED,
+ VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT = VK_INCOMPATIBLE_SHADER_BINARY_EXT,
VK_RESULT_MAX_ENUM = 0x7FFFFFFF
} VkResult;
@@ -718,7 +719,11 @@ typedef enum VkStructureType {
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR = 1000226004,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD = 1000227000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD = 1000229000,
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_LOCAL_READ_FEATURES_KHR = 1000232000,
+ VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_LOCATION_INFO_KHR = 1000232001,
+ VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR = 1000232002,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT = 1000234000,
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_QUAD_CONTROL_FEATURES_KHR = 1000235000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000,
VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001,
@@ -743,11 +748,7 @@ typedef enum VkStructureType {
VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT = 1000255002,
VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT = 1000255001,
VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000,
- VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = 1000259000,
- VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = 1000259001,
- VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT = 1000259002,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_FEATURES_EXT = 1000260000,
- VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT = 1000265000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT = 1000267000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR = 1000269000,
VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR = 1000269001,
@@ -767,6 +768,9 @@ typedef enum VkStructureType {
VK_STRUCTURE_TYPE_HOST_IMAGE_COPY_DEVICE_PERFORMANCE_QUERY_EXT = 1000270009,
VK_STRUCTURE_TYPE_MEMORY_MAP_INFO_KHR = 1000271000,
VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR = 1000271001,
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_FEATURES_EXT = 1000272000,
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAP_MEMORY_PLACED_PROPERTIES_EXT = 1000272001,
+ VK_STRUCTURE_TYPE_MEMORY_MAP_PLACED_INFO_EXT = 1000272002,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT = 1000273000,
VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT = 1000274000,
VK_STRUCTURE_TYPE_SURFACE_PRESENT_SCALING_CAPABILITIES_EXT = 1000274001,
@@ -959,6 +963,7 @@ typedef enum VkStructureType {
VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT = 1000411001,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM = 1000415000,
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR = 1000416000,
VK_STRUCTURE_TYPE_DEVICE_QUEUE_SHADER_CORE_CONTROL_CREATE_INFO_ARM = 1000417000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM = 1000417001,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_PROPERTIES_ARM = 1000417002,
@@ -985,6 +990,7 @@ typedef enum VkStructureType {
VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_INDIRECT_BUFFER_INFO_NV = 1000428001,
VK_STRUCTURE_TYPE_PIPELINE_INDIRECT_DEVICE_ADDRESS_INFO_NV = 1000428002,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV = 1000430000,
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR = 1000434000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT = 1000437000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_FEATURES_QCOM = 1000440000,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_PROPERTIES_QCOM = 1000440001,
@@ -1059,6 +1065,11 @@ typedef enum VkStructureType {
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_KHR = 1000506002,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM = 1000510000,
VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM = 1000510001,
+ VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR = 1000512000,
+ VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR = 1000512001,
+ VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR = 1000512003,
+ VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000512004,
+ VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR = 1000512005,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VIDEO_MAINTENANCE_1_FEATURES_KHR = 1000515000,
VK_STRUCTURE_TYPE_VIDEO_INLINE_QUERY_INFO_KHR = 1000515001,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PER_STAGE_DESCRIPTOR_SET_FEATURES_NV = 1000516000,
@@ -1075,13 +1086,19 @@ typedef enum VkStructureType {
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR = 1000525000,
VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR = 1000190001,
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_KHR = 1000190002,
+ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES_KHR = 1000528000,
VK_STRUCTURE_TYPE_SCREEN_BUFFER_PROPERTIES_QN
(Patch may be truncated, please check the link at the top of this post.)