diff --git a/renderdoc/driver/vulkan/all_exts.txt b/renderdoc/driver/vulkan/all_exts.txt index 89eeba351..9ea99ceb7 100644 --- a/renderdoc/driver/vulkan/all_exts.txt +++ b/renderdoc/driver/vulkan/all_exts.txt @@ -32,6 +32,7 @@ 041 VK_EXT_video_decode_h264 042 VK_AMD_texture_gather_bias_lod 043 VK_AMD_shader_info +045 VK_KHR_dynamic_rendering 047 VK_AMD_shader_image_load_store_lod 050 VK_GGP_stream_descriptor_surface 051 VK_NV_corner_sampled_image @@ -145,6 +146,7 @@ 185 VK_EXT_calibrated_timestamps 186 VK_AMD_shader_core_properties 188 VK_EXT_video_decode_h265 +189 VK_KHR_global_priority 190 VK_AMD_memory_overallocation_behavior 191 VK_EXT_vertex_attribute_divisor 192 VK_GGP_frame_token @@ -237,6 +239,7 @@ 337 VK_KHR_workgroup_memory_explicit_layout 338 VK_KHR_copy_commands2 341 VK_EXT_4444_formats +343 VK_ARM_rasterization_order_attachment_access 345 VK_EXT_rgba10x6_formats 346 VK_NV_acquire_winrt_display 347 VK_EXT_directfb_surface @@ -245,6 +248,7 @@ 352 VK_VALVE_mutable_descriptor_type 353 VK_EXT_vertex_input_dynamic_state 354 VK_EXT_physical_device_drm +356 VK_EXT_depth_clip_control 357 VK_EXT_primitive_topology_list_restart 361 VK_KHR_format_feature_flags2 365 VK_FUCHSIA_external_memory @@ -257,8 +261,12 @@ 379 VK_QNX_screen_surface 382 VK_EXT_color_write_enable 389 VK_EXT_global_priority_query +392 VK_EXT_image_view_min_lod 393 VK_EXT_multi_draw 401 VK_EXT_load_store_op_none 412 VK_EXT_border_color_swizzle 413 VK_EXT_pageable_device_local_memory 414 VK_KHR_maintenance4 +426 VK_QCOM_fragment_density_map_offset +431 VK_NV_linear_color_attachment +434 VK_GOOGLE_surfaceless_query diff --git a/renderdoc/driver/vulkan/extension_support.md b/renderdoc/driver/vulkan/extension_support.md index 5c4d96e3a..105a3af53 100644 --- a/renderdoc/driver/vulkan/extension_support.md +++ b/renderdoc/driver/vulkan/extension_support.md @@ -137,6 +137,7 @@ Maintainers can update this file by updating vk.xml in this folder and running ` * `VK_KHR_get_memory_requirements2` * `VK_KHR_get_physical_device_properties2` * `VK_KHR_get_surface_capabilities2` +* `VK_KHR_global_priority` * `VK_KHR_image_format_list` * `VK_KHR_imageless_framebuffer` * `VK_KHR_incremental_present` @@ -226,9 +227,11 @@ Ray tracing extensions are now standard and will likely be supported at some poi * `VK_EXT_acquire_drm_display` * `VK_EXT_blend_operation_advanced` * `VK_EXT_border_color_swizzle` +* `VK_EXT_depth_clip_control` * `VK_EXT_device_memory_report` * `VK_EXT_external_memory_host` * `VK_EXT_image_drm_format_modifier` +* `VK_EXT_image_view_min_lod` * `VK_EXT_multi_draw` * `VK_EXT_pageable_device_local_memory` * `VK_EXT_physical_device_drm` @@ -237,6 +240,10 @@ Ray tracing extensions are now standard and will likely be supported at some poi ## Platform/IHV Extensions +### ARM + +* `VK_ARM_rasterization_order_attachment_access` + ### AMD * `VK_AMD_memory_overallocation_behavior` @@ -251,6 +258,10 @@ Ray tracing extensions are now standard and will likely be supported at some poi * `VK_FUCHSIA_external_semaphore` * `VK_FUCHSIA_buffer_collection` +### Google + +* `VK_GOOGLE_surfaceless_query` + ### Huawei * `VK_HUAWEI_subpass_shading` @@ -277,6 +288,7 @@ Ray tracing extensions are now standard and will likely be supported at some poi * `VK_NV_fragment_shading_rate_enums` * `VK_NV_framebuffer_mixed_samples` * `VK_NV_inherited_viewport_scissor` +* `VK_NV_linear_color_attachment` * `VK_NV_mesh_shader` * `VK_NV_ray_tracing_motion_blur` * `VK_NV_representative_fragment_test` @@ -287,6 +299,7 @@ Ray tracing extensions are now standard and will likely be supported at some poi ### Qualcomm +* `VK_QCOM_fragment_density_map_offset` * `VK_QCOM_render_pass_shader_resolve` * `VK_QCOM_render_pass_store_ops` * `VK_QCOM_render_pass_transform` diff --git a/renderdoc/driver/vulkan/official/vk_platform.h b/renderdoc/driver/vulkan/official/vk_platform.h index 18b913abc..3ff8c5d14 100644 --- a/renderdoc/driver/vulkan/official/vk_platform.h +++ b/renderdoc/driver/vulkan/official/vk_platform.h @@ -2,7 +2,7 @@ // File: vk_platform.h // /* -** Copyright 2014-2021 The Khronos Group Inc. +** Copyright 2014-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -42,7 +42,7 @@ extern "C" #define VKAPI_CALL __stdcall #define VKAPI_PTR VKAPI_CALL #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) // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat" // calling convention, i.e. float parameters are passed in registers. This diff --git a/renderdoc/driver/vulkan/official/vulkan.h b/renderdoc/driver/vulkan/official/vulkan.h index 3c9ebfc92..2c465b7e8 100644 --- a/renderdoc/driver/vulkan/official/vulkan.h +++ b/renderdoc/driver/vulkan/official/vulkan.h @@ -2,7 +2,7 @@ #define VULKAN_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_android.h b/renderdoc/driver/vulkan/official/vulkan_android.h index a8a830673..de79d382f 100644 --- a/renderdoc/driver/vulkan/official/vulkan_android.h +++ b/renderdoc/driver/vulkan/official/vulkan_android.h @@ -2,7 +2,7 @@ #define VULKAN_ANDROID_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -95,7 +95,7 @@ typedef struct VkAndroidHardwareBufferFormatProperties2ANDROID { void* pNext; VkFormat format; uint64_t externalFormat; - VkFormatFeatureFlags2KHR formatFeatures; + VkFormatFeatureFlags2 formatFeatures; VkComponentMapping samplerYcbcrConversionComponents; VkSamplerYcbcrModelConversion suggestedYcbcrModel; VkSamplerYcbcrRange suggestedYcbcrRange; diff --git a/renderdoc/driver/vulkan/official/vulkan_core.h b/renderdoc/driver/vulkan/official/vulkan_core.h index a2f4e7717..228e4ef6e 100644 --- a/renderdoc/driver/vulkan/official/vulkan_core.h +++ b/renderdoc/driver/vulkan/official/vulkan_core.h @@ -2,7 +2,7 @@ #define VULKAN_CORE_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -72,10 +72,10 @@ 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 197 +#define VK_HEADER_VERSION 204 // 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, 3, VK_HEADER_VERSION) // DEPRECATED: This define is deprecated. VK_API_VERSION_MAJOR should be used instead. #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) @@ -160,6 +160,7 @@ typedef enum VkResult { VK_ERROR_INVALID_EXTERNAL_HANDLE = -1000072003, VK_ERROR_FRAGMENTATION = -1000161000, VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS = -1000257000, + VK_PIPELINE_COMPILE_REQUIRED = 1000297000, VK_ERROR_SURFACE_LOST_KHR = -1000000000, VK_ERROR_NATIVE_WINDOW_IN_USE_KHR = -1000000001, VK_SUBOPTIMAL_KHR = 1000001003, @@ -168,19 +169,20 @@ typedef enum VkResult { VK_ERROR_VALIDATION_FAILED_EXT = -1000011001, VK_ERROR_INVALID_SHADER_NV = -1000012000, VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT = -1000158000, - VK_ERROR_NOT_PERMITTED_EXT = -1000174001, + VK_ERROR_NOT_PERMITTED_KHR = -1000174001, VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT = -1000255000, VK_THREAD_IDLE_KHR = 1000268000, VK_THREAD_DONE_KHR = 1000268001, VK_OPERATION_DEFERRED_KHR = 1000268002, VK_OPERATION_NOT_DEFERRED_KHR = 1000268003, - VK_PIPELINE_COMPILE_REQUIRED_EXT = 1000297000, 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, + VK_ERROR_NOT_PERMITTED_EXT = VK_ERROR_NOT_PERMITTED_KHR, VK_ERROR_INVALID_DEVICE_ADDRESS_EXT = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS, VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS, - VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED_EXT, + VK_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED, + VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED, VK_RESULT_MAX_ENUM = 0x7FFFFFFF } VkResult; @@ -349,6 +351,58 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002, VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO = 1000257003, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO = 1000257004, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES = 53, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES = 54, + VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO = 1000192000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES = 1000215000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES = 1000245000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES = 1000276000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES = 1000295000, + VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO = 1000295001, + VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO = 1000295002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES = 1000297000, + VK_STRUCTURE_TYPE_MEMORY_BARRIER_2 = 1000314000, + VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2 = 1000314001, + VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2 = 1000314002, + VK_STRUCTURE_TYPE_DEPENDENCY_INFO = 1000314003, + VK_STRUCTURE_TYPE_SUBMIT_INFO_2 = 1000314004, + VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO = 1000314005, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO = 1000314006, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES = 1000314007, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES = 1000325000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES = 1000335000, + VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2 = 1000337000, + VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2 = 1000337001, + VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2 = 1000337002, + VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2 = 1000337003, + VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2 = 1000337004, + VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2 = 1000337005, + VK_STRUCTURE_TYPE_BUFFER_COPY_2 = 1000337006, + VK_STRUCTURE_TYPE_IMAGE_COPY_2 = 1000337007, + VK_STRUCTURE_TYPE_IMAGE_BLIT_2 = 1000337008, + VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2 = 1000337009, + VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2 = 1000337010, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES = 1000225000, + VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO = 1000225001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES = 1000225002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES = 1000138000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES = 1000138001, + VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK = 1000138002, + VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO = 1000138003, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES = 1000066000, + VK_STRUCTURE_TYPE_RENDERING_INFO = 1000044000, + VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO = 1000044001, + VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO = 1000044002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES = 1000044003, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO = 1000044004, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES = 1000280000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES = 1000280001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES = 1000281001, + VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3 = 1000360000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES = 1000413000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES = 1000413001, + VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS = 1000413002, + VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS = 1000413003, VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR = 1000001000, VK_STRUCTURE_TYPE_PRESENT_INFO_KHR = 1000001001, VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR = 1000060007, @@ -418,6 +472,9 @@ typedef enum VkStructureType { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_FORMAT_PROPERTIES_KHR = 1000023015, #endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_2_KHR = 1000023016, +#endif #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR = 1000024000, #endif @@ -459,6 +516,12 @@ typedef enum VkStructureType { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_EXT = 1000038008, #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 VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT = 1000039000, #endif @@ -489,6 +552,12 @@ typedef enum VkStructureType { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_EXT = 1000039009, #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 VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_EXT = 1000040000, #endif @@ -514,11 +583,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT = 1000040007, #endif VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 1000041000, - VK_STRUCTURE_TYPE_RENDERING_INFO_KHR = 1000044000, - VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR = 1000044001, - VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR = 1000044002, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR = 1000044003, - VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR = 1000044004, VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000044006, VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT = 1000044007, VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD = 1000044008, @@ -532,7 +596,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000, VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT = 1000061000, VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN = 1000062000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT = 1000066000, VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT = 1000067000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT = 1000067001, VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR = 1000073000, @@ -605,10 +668,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID = 1000129004, VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID = 1000129005, VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_2_ANDROID = 1000129006, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT = 1000138000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT = 1000138001, - VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT = 1000138002, - VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT = 1000138003, VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT = 1000143000, VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT = 1000143001, VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT = 1000143002, @@ -675,7 +734,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV = 1000166001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_IMAGE_FORMAT_INFO_EXT = 1000170000, VK_STRUCTURE_TYPE_FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT = 1000170001, - VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = 1000174000, VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT = 1000178000, VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, @@ -704,12 +762,14 @@ typedef enum VkStructureType { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT = 1000187006, #endif + VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR = 1000174000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR = 1000388000, + VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR = 1000388001, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002, VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP = 1000191000, - VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = 1000192000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = 1000201000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV = 1000202000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV = 1000202001, @@ -730,14 +790,10 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DISPLAY_NATIVE_HDR_SURFACE_CAPABILITIES_AMD = 1000213000, VK_STRUCTURE_TYPE_SWAPCHAIN_DISPLAY_NATIVE_HDR_CREATE_INFO_AMD = 1000213001, VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR = 1000215000, VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT = 1000217000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT = 1000218000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT = 1000218001, VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT = 1000225000, - VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT = 1000225001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = 1000225002, VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000226000, VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR = 1000226001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR = 1000226002, @@ -753,7 +809,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV = 1000240000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT = 1000244000, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT = 1000245000, VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT = 1000247000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR = 1000248000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_NV = 1000249000, @@ -784,7 +839,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR = 1000269004, VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR = 1000269005, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT = 1000273000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = 1000276000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV = 1000277000, VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV = 1000277001, VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV = 1000277002, @@ -795,10 +849,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV = 1000277007, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV = 1000278000, VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV = 1000278001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = 1000280000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = 1000280001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT = 1000281000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = 1000281001, VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM = 1000282000, VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM = 1000282001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT = 1000284000, @@ -812,30 +863,20 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR = 1000290000, VK_STRUCTURE_TYPE_PRESENT_ID_KHR = 1000294000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR = 1000294001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT = 1000295000, - VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT = 1000295001, - VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT = 1000295002, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_INFO_KHR = 1000299000, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS 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 VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, - VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR = 1000314000, - VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR = 1000314001, - VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR = 1000314002, - VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR = 1000314003, - VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR = 1000314004, - VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR = 1000314005, - VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR = 1000314006, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR = 1000314007, VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV = 1000314008, VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV = 1000314009, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR = 1000323000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR = 1000325000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV = 1000326000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV = 1000326001, VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV = 1000326002, @@ -846,20 +887,9 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT = 1000332000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM = 1000333000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT = 1000335000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR = 1000336000, - VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR = 1000337000, - VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR = 1000337001, - VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR = 1000337002, - VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR = 1000337003, - VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR = 1000337004, - VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR = 1000337005, - VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR = 1000337006, - VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR = 1000337007, - VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR = 1000337008, - VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR = 1000337009, - VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR = 1000337010, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT = 1000340000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM = 1000342000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT = 1000344000, VK_STRUCTURE_TYPE_DIRECTFB_SURFACE_CREATE_INFO_EXT = 1000346000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE = 1000351000, @@ -868,8 +898,9 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT = 1000352001, VK_STRUCTURE_TYPE_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION_2_EXT = 1000352002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRM_PROPERTIES_EXT = 1000353000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT = 1000355000, + VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT = 1000355001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT = 1000356000, - VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR = 1000360000, VK_STRUCTURE_TYPE_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364000, VK_STRUCTURE_TYPE_MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA = 1000364001, VK_STRUCTURE_TYPE_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364002, @@ -895,20 +926,25 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX = 1000378000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT = 1000381000, VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT = 1000381001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = 1000388000, - VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = 1000388001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT = 1000391000, + VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT = 1000391001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT = 1000392000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT = 1000392001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT = 1000411000, 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_MAINTENANCE_4_FEATURES_KHR = 1000413000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = 1000413001, - VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = 1000413002, - VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = 1000413003, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = 1000425000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = 1000425001, + VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = 1000425002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV = 1000430000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, + VK_STRUCTURE_TYPE_RENDERING_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_INFO, + VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO, + VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO, VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_NV = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD, VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES, @@ -929,6 +965,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO, VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO_KHR = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO, VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO_KHR = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES, VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO, @@ -971,6 +1008,10 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES, VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES, + VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK, + VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO, VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2, VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2, VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2_KHR = VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2, @@ -992,9 +1033,11 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES, VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT_KHR = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT, + VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES, + VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES, @@ -1007,12 +1050,17 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR = VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO, VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO_INTEL = VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES, + VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES, VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT, VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES, VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES, @@ -1021,6 +1069,42 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES, + VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO, + VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES, + VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2, + VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2, + VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2, + VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR = VK_STRUCTURE_TYPE_DEPENDENCY_INFO, + VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR = VK_STRUCTURE_TYPE_SUBMIT_INFO_2, + VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES, + VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR = VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2, + VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR = VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, + VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR = VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2, + VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2, + VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR = VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2, + VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR = VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2, + VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR = VK_STRUCTURE_TYPE_BUFFER_COPY_2, + VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR = VK_STRUCTURE_TYPE_IMAGE_COPY_2, + VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR = VK_STRUCTURE_TYPE_IMAGE_BLIT_2, + VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR = VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2, + VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2, + VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR, + VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES, + VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS, + VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF } VkStructureType; @@ -1040,6 +1124,8 @@ typedef enum VkImageLayout { VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL = 1000241001, VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL = 1000241002, VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL = 1000241003, + VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL = 1000314000, + VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL = 1000314001, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR = 1000001002, #ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR = 1000024000, @@ -1062,8 +1148,6 @@ typedef enum VkImageLayout { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR = 1000299002, #endif - VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR = 1000314000, - VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR = 1000314001, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV = VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR, @@ -1071,6 +1155,8 @@ typedef enum VkImageLayout { VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL, + VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL, + VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_MAX_ENUM = 0x7FFFFFFF } VkImageLayout; @@ -1103,6 +1189,7 @@ typedef enum VkObjectType { VK_OBJECT_TYPE_COMMAND_POOL = 25, VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION = 1000156000, VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE = 1000085000, + VK_OBJECT_TYPE_PRIVATE_DATA_SLOT = 1000295000, VK_OBJECT_TYPE_SURFACE_KHR = 1000000000, VK_OBJECT_TYPE_SWAPCHAIN_KHR = 1000001000, VK_OBJECT_TYPE_DISPLAY_KHR = 1000002000, @@ -1123,10 +1210,10 @@ typedef enum VkObjectType { VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL = 1000210000, VK_OBJECT_TYPE_DEFERRED_OPERATION_KHR = 1000268000, VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV = 1000277000, - VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT = 1000295000, VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA = 1000366000, VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR = VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE, VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR = VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION, + VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT = VK_OBJECT_TYPE_PRIVATE_DATA_SLOT, VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF } VkObjectType; @@ -1379,6 +1466,26 @@ typedef enum VkFormat { VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM = 1000156031, VK_FORMAT_G16_B16R16_2PLANE_422_UNORM = 1000156032, VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM = 1000156033, + VK_FORMAT_G8_B8R8_2PLANE_444_UNORM = 1000330000, + VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16 = 1000330001, + VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16 = 1000330002, + VK_FORMAT_G16_B16R16_2PLANE_444_UNORM = 1000330003, + VK_FORMAT_A4R4G4B4_UNORM_PACK16 = 1000340000, + VK_FORMAT_A4B4G4R4_UNORM_PACK16 = 1000340001, + VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK = 1000066000, + VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK = 1000066001, + VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK = 1000066002, + VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK = 1000066003, + VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK = 1000066004, + VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK = 1000066005, + VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK = 1000066006, + VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK = 1000066007, + VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK = 1000066008, + VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK = 1000066009, + VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK = 1000066010, + VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK = 1000066011, + VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK = 1000066012, + VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK = 1000066013, VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG = 1000054000, VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG = 1000054001, VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG = 1000054002, @@ -1387,26 +1494,20 @@ typedef enum VkFormat { VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG = 1000054005, VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG = 1000054006, VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG = 1000054007, - VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT = 1000066000, - VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT = 1000066001, - VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT = 1000066002, - VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT = 1000066003, - VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT = 1000066004, - VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT = 1000066005, - VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT = 1000066006, - VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT = 1000066007, - VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT = 1000066008, - VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT = 1000066009, - VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT = 1000066010, - VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT = 1000066011, - VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT = 1000066012, - VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT = 1000066013, - VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT = 1000330000, - VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT = 1000330001, - VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT = 1000330002, - VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT = 1000330003, - VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT = 1000340000, - VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT = 1000340001, + VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK, + VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK, + VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK, + VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK, + VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK, VK_FORMAT_G8B8G8R8_422_UNORM_KHR = VK_FORMAT_G8B8G8R8_422_UNORM, VK_FORMAT_B8G8R8G8_422_UNORM_KHR = VK_FORMAT_B8G8R8G8_422_UNORM, VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM_KHR = VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, @@ -1441,6 +1542,12 @@ typedef enum VkFormat { VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM_KHR = VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, VK_FORMAT_G16_B16R16_2PLANE_422_UNORM_KHR = VK_FORMAT_G16_B16R16_2PLANE_422_UNORM, VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM_KHR = VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, + VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT = VK_FORMAT_G8_B8R8_2PLANE_444_UNORM, + VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT = VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16, + VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT = VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16, + VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT = VK_FORMAT_G16_B16R16_2PLANE_444_UNORM, + VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT = VK_FORMAT_A4R4G4B4_UNORM_PACK16, + VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT = VK_FORMAT_A4B4G4R4_UNORM_PACK16, VK_FORMAT_MAX_ENUM = 0x7FFFFFFF } VkFormat; @@ -1614,6 +1721,21 @@ typedef enum VkDynamicState { VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK = 6, VK_DYNAMIC_STATE_STENCIL_WRITE_MASK = 7, VK_DYNAMIC_STATE_STENCIL_REFERENCE = 8, + VK_DYNAMIC_STATE_CULL_MODE = 1000267000, + VK_DYNAMIC_STATE_FRONT_FACE = 1000267001, + VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY = 1000267002, + VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT = 1000267003, + VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT = 1000267004, + VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE = 1000267005, + VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE = 1000267006, + VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE = 1000267007, + VK_DYNAMIC_STATE_DEPTH_COMPARE_OP = 1000267008, + VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE = 1000267009, + VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE = 1000267010, + VK_DYNAMIC_STATE_STENCIL_OP = 1000267011, + VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE = 1000377001, + VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE = 1000377002, + VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE = 1000377004, VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV = 1000087000, VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT = 1000099000, VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_EXT = 1000143000, @@ -1623,25 +1745,25 @@ typedef enum VkDynamicState { VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_NV = 1000205001, VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR = 1000226000, VK_DYNAMIC_STATE_LINE_STIPPLE_EXT = 1000259000, - VK_DYNAMIC_STATE_CULL_MODE_EXT = 1000267000, - VK_DYNAMIC_STATE_FRONT_FACE_EXT = 1000267001, - VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT = 1000267002, - VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT = 1000267003, - VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT = 1000267004, - VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT = 1000267005, - VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT = 1000267006, - VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT = 1000267007, - VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT = 1000267008, - VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT = 1000267009, - VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT = 1000267010, - VK_DYNAMIC_STATE_STENCIL_OP_EXT = 1000267011, VK_DYNAMIC_STATE_VERTEX_INPUT_EXT = 1000352000, VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT = 1000377000, - VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT = 1000377001, - VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT = 1000377002, VK_DYNAMIC_STATE_LOGIC_OP_EXT = 1000377003, - VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT = 1000377004, VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT = 1000381000, + VK_DYNAMIC_STATE_CULL_MODE_EXT = VK_DYNAMIC_STATE_CULL_MODE, + VK_DYNAMIC_STATE_FRONT_FACE_EXT = VK_DYNAMIC_STATE_FRONT_FACE, + VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT = VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY, + VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT = VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT, + VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT = VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT, + VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT = VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE, + VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE, + VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE, + VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT = VK_DYNAMIC_STATE_DEPTH_COMPARE_OP, + VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE, + VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT = VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE, + VK_DYNAMIC_STATE_STENCIL_OP_EXT = VK_DYNAMIC_STATE_STENCIL_OP, + VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT = VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE, + VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE, + VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT = VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE, VK_DYNAMIC_STATE_MAX_ENUM = 0x7FFFFFFF } VkDynamicState; @@ -1760,10 +1882,11 @@ typedef enum VkDescriptorType { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC = 8, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC = 9, VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT = 10, - VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT = 1000138000, + VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK = 1000138000, VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR = 1000150000, VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV = 1000165000, VK_DESCRIPTOR_TYPE_MUTABLE_VALVE = 1000351000, + VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, VK_DESCRIPTOR_TYPE_MAX_ENUM = 0x7FFFFFFF } VkDescriptorType; @@ -1778,9 +1901,10 @@ typedef enum VkAttachmentLoadOp { typedef enum VkAttachmentStoreOp { VK_ATTACHMENT_STORE_OP_STORE = 0, VK_ATTACHMENT_STORE_OP_DONT_CARE = 1, - VK_ATTACHMENT_STORE_OP_NONE_KHR = 1000301000, - VK_ATTACHMENT_STORE_OP_NONE_QCOM = VK_ATTACHMENT_STORE_OP_NONE_KHR, - VK_ATTACHMENT_STORE_OP_NONE_EXT = VK_ATTACHMENT_STORE_OP_NONE_KHR, + VK_ATTACHMENT_STORE_OP_NONE = 1000301000, + VK_ATTACHMENT_STORE_OP_NONE_KHR = VK_ATTACHMENT_STORE_OP_NONE, + VK_ATTACHMENT_STORE_OP_NONE_QCOM = VK_ATTACHMENT_STORE_OP_NONE, + VK_ATTACHMENT_STORE_OP_NONE_EXT = VK_ATTACHMENT_STORE_OP_NONE, VK_ATTACHMENT_STORE_OP_MAX_ENUM = 0x7FFFFFFF } VkAttachmentStoreOp; @@ -1832,6 +1956,7 @@ typedef enum VkAccessFlagBits { VK_ACCESS_HOST_WRITE_BIT = 0x00004000, VK_ACCESS_MEMORY_READ_BIT = 0x00008000, VK_ACCESS_MEMORY_WRITE_BIT = 0x00010000, + VK_ACCESS_NONE = 0, VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000, VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000, VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000, @@ -1843,10 +1968,10 @@ typedef enum VkAccessFlagBits { VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR = 0x00800000, VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV = 0x00020000, VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV = 0x00040000, - VK_ACCESS_NONE_KHR = 0, VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV = VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR, VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR, VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV = VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR, + VK_ACCESS_NONE_KHR = VK_ACCESS_NONE, VK_ACCESS_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkAccessFlagBits; typedef VkFlags VkAccessFlags; @@ -1863,6 +1988,7 @@ typedef enum VkImageAspectFlagBits { VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT = 0x00000100, VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT = 0x00000200, VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT = 0x00000400, + VK_IMAGE_ASPECT_NONE_KHR = 0, VK_IMAGE_ASPECT_PLANE_0_BIT_KHR = VK_IMAGE_ASPECT_PLANE_0_BIT, VK_IMAGE_ASPECT_PLANE_1_BIT_KHR = VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT_KHR = VK_IMAGE_ASPECT_PLANE_2_BIT, @@ -1941,6 +2067,7 @@ typedef enum VkImageCreateFlagBits { VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV = 0x00002000, VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT = 0x00001000, VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT = 0x00004000, + VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM = 0x00008000, VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT, VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT, VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT, @@ -2062,6 +2189,7 @@ typedef enum VkPipelineStageFlagBits { VK_PIPELINE_STAGE_HOST_BIT = 0x00004000, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT = 0x00008000, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT = 0x00010000, + VK_PIPELINE_STAGE_NONE = 0, VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000, VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000, VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR = 0x02000000, @@ -2071,10 +2199,10 @@ typedef enum VkPipelineStageFlagBits { VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000, VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000, VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_NV = 0x00020000, - VK_PIPELINE_STAGE_NONE_KHR = 0, VK_PIPELINE_STAGE_SHADING_RATE_IMAGE_BIT_NV = VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_NV = VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_NV = VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR, + VK_PIPELINE_STAGE_NONE_KHR = VK_PIPELINE_STAGE_NONE, VK_PIPELINE_STAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineStageFlagBits; typedef VkFlags VkPipelineStageFlags; @@ -2102,7 +2230,8 @@ typedef VkFlags VkFenceCreateFlags; typedef VkFlags VkSemaphoreCreateFlags; typedef enum VkEventCreateFlagBits { - VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR = 0x00000001, + VK_EVENT_CREATE_DEVICE_ONLY_BIT = 0x00000001, + VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR = VK_EVENT_CREATE_DEVICE_ONLY_BIT, VK_EVENT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkEventCreateFlagBits; typedef VkFlags VkEventCreateFlags; @@ -2194,7 +2323,8 @@ typedef VkFlags VkImageViewCreateFlags; typedef VkFlags VkShaderModuleCreateFlags; typedef enum VkPipelineCacheCreateFlagBits { - VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT = 0x00000001, + VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001, + VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT, VK_PIPELINE_CACHE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineCacheCreateFlagBits; typedef VkFlags VkPipelineCacheCreateFlags; @@ -2214,8 +2344,10 @@ typedef enum VkPipelineCreateFlagBits { VK_PIPELINE_CREATE_DERIVATIVE_BIT = 0x00000004, VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT = 0x00000008, VK_PIPELINE_CREATE_DISPATCH_BASE_BIT = 0x00000010, - VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00200000, - VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 0x00400000, + VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT = 0x00000100, + VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT = 0x00000200, + VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00200000, + VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 0x00400000, VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR = 0x00004000, VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR = 0x00008000, VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR = 0x00010000, @@ -2228,19 +2360,23 @@ typedef enum VkPipelineCreateFlagBits { VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR = 0x00000080, VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV = 0x00040000, VK_PIPELINE_CREATE_LIBRARY_BIT_KHR = 0x00000800, - VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT = 0x00000100, - VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT = 0x00000200, VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV = 0x00100000, VK_PIPELINE_CREATE_DISPATCH_BASE = VK_PIPELINE_CREATE_DISPATCH_BASE_BIT, + VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, + VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT, VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR = VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT, VK_PIPELINE_CREATE_DISPATCH_BASE_KHR = VK_PIPELINE_CREATE_DISPATCH_BASE, + VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT, + VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT, VK_PIPELINE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineCreateFlagBits; typedef VkFlags VkPipelineCreateFlags; typedef enum VkPipelineShaderStageCreateFlagBits { - VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT = 0x00000001, - VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT = 0x00000002, + VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT = 0x00000001, + VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT = 0x00000002, + VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT, + VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT, VK_PIPELINE_SHADER_STAGE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineShaderStageCreateFlagBits; typedef VkFlags VkPipelineShaderStageCreateFlags; @@ -2286,7 +2422,18 @@ typedef VkFlags VkPipelineTessellationStateCreateFlags; typedef VkFlags VkPipelineViewportStateCreateFlags; typedef VkFlags VkPipelineRasterizationStateCreateFlags; typedef VkFlags VkPipelineMultisampleStateCreateFlags; + +typedef enum VkPipelineDepthStencilStateCreateFlagBits { + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM = 0x00000001, + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM = 0x00000002, + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkPipelineDepthStencilStateCreateFlagBits; typedef VkFlags VkPipelineDepthStencilStateCreateFlags; + +typedef enum VkPipelineColorBlendStateCreateFlagBits { + VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_ARM = 0x00000001, + VK_PIPELINE_COLOR_BLEND_STATE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkPipelineColorBlendStateCreateFlagBits; typedef VkFlags VkPipelineColorBlendStateCreateFlags; typedef VkFlags VkPipelineDynamicStateCreateFlags; typedef VkFlags VkPipelineLayoutCreateFlags; @@ -2352,6 +2499,9 @@ typedef enum VkSubpassDescriptionFlagBits { VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX = 0x00000002, VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM = 0x00000004, VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM = 0x00000008, + VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_ARM = 0x00000010, + VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM = 0x00000020, + VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM = 0x00000040, VK_SUBPASS_DESCRIPTION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkSubpassDescriptionFlagBits; typedef VkFlags VkSubpassDescriptionFlags; @@ -5352,6 +5502,8 @@ typedef enum VkDriverId { VK_DRIVER_ID_MESA_TURNIP = 18, VK_DRIVER_ID_MESA_V3DV = 19, VK_DRIVER_ID_MESA_PANVK = 20, + VK_DRIVER_ID_SAMSUNG_PROPRIETARY = 21, + VK_DRIVER_ID_MESA_VENUS = 22, VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY, VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE, VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV, @@ -6073,6 +6225,1041 @@ VKAPI_ATTR uint64_t VKAPI_CALL vkGetDeviceMemoryOpaqueCaptureAddress( #endif +#define VK_VERSION_1_3 1 +// Vulkan 1.3 version number +#define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0)// Patch version should always be set to 0 + +typedef uint64_t VkFlags64; +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPrivateDataSlot) + +typedef enum VkPipelineCreationFeedbackFlagBits { + VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT = 0x00000001, + VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT = 0x00000002, + VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT = 0x00000004, + VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT, + VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT, + VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT, + VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkPipelineCreationFeedbackFlagBits; +typedef VkFlags VkPipelineCreationFeedbackFlags; + +typedef enum VkToolPurposeFlagBits { + VK_TOOL_PURPOSE_VALIDATION_BIT = 0x00000001, + VK_TOOL_PURPOSE_PROFILING_BIT = 0x00000002, + VK_TOOL_PURPOSE_TRACING_BIT = 0x00000004, + VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT = 0x00000008, + VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT = 0x00000010, + VK_TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT = 0x00000020, + VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT = 0x00000040, + VK_TOOL_PURPOSE_VALIDATION_BIT_EXT = VK_TOOL_PURPOSE_VALIDATION_BIT, + VK_TOOL_PURPOSE_PROFILING_BIT_EXT = VK_TOOL_PURPOSE_PROFILING_BIT, + VK_TOOL_PURPOSE_TRACING_BIT_EXT = VK_TOOL_PURPOSE_TRACING_BIT, + VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT_EXT = VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT, + VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT_EXT = VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT, + VK_TOOL_PURPOSE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkToolPurposeFlagBits; +typedef VkFlags VkToolPurposeFlags; + +typedef enum VkPrivateDataSlotCreateFlagBits { + VK_PRIVATE_DATA_SLOT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkPrivateDataSlotCreateFlagBits; +typedef VkFlags VkPrivateDataSlotCreateFlags; +typedef VkFlags64 VkPipelineStageFlags2; + +// Flag bits for VkPipelineStageFlagBits2 +typedef VkFlags64 VkPipelineStageFlagBits2; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE = 0ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE_KHR = 0ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT = 0x00000001ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR = 0x00000001ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT = 0x00000002ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR = 0x00000002ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT = 0x00000004ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR = 0x00000004ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT = 0x00000008ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR = 0x00000008ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT = 0x00000010ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR = 0x00000010ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT = 0x00000020ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR = 0x00000020ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT = 0x00000040ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR = 0x00000040ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT = 0x00000080ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR = 0x00000080ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT = 0x00000100ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR = 0x00000100ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT = 0x00000200ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR = 0x00000200ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT = 0x00000400ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR = 0x00000400ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT = 0x00000800ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR = 0x00000800ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT = 0x00001000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR = 0x00001000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT = 0x00001000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR = 0x00001000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT = 0x00002000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR = 0x00002000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT = 0x00004000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT_KHR = 0x00004000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT = 0x00008000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR = 0x00008000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT = 0x00010000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR = 0x00010000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT = 0x100000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT_KHR = 0x100000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT = 0x200000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR = 0x200000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT = 0x400000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT_KHR = 0x400000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT = 0x800000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR = 0x800000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT = 0x1000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR = 0x1000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT = 0x2000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR = 0x2000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT = 0x4000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR = 0x4000000000ULL; +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR = 0x04000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR = 0x08000000ULL; +#endif +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV = 0x00020000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SHADING_RATE_IMAGE_BIT_NV = 0x00400000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR = 0x02000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR = 0x00200000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_NV = 0x00200000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_NV = 0x02000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_NV = 0x00080000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_NV = 0x00100000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI = 0x8000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INVOCATION_MASK_BIT_HUAWEI = 0x10000000000ULL; + +typedef VkFlags64 VkAccessFlags2; + +// Flag bits for VkAccessFlagBits2 +typedef VkFlags64 VkAccessFlagBits2; +static const VkAccessFlagBits2 VK_ACCESS_2_NONE = 0ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_NONE_KHR = 0ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT = 0x00000001ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR = 0x00000001ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT = 0x00000002ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT_KHR = 0x00000002ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT = 0x00000004ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR = 0x00000004ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT = 0x00000008ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT_KHR = 0x00000008ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT = 0x00000010ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR = 0x00000010ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT = 0x00000020ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT_KHR = 0x00000020ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT = 0x00000040ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT_KHR = 0x00000040ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT = 0x00000080ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR = 0x00000080ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT = 0x00000100ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR = 0x00000100ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT = 0x00000200ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR = 0x00000200ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT = 0x00000400ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR = 0x00000400ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT = 0x00000800ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT_KHR = 0x00000800ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT = 0x00001000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR = 0x00001000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT = 0x00002000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT_KHR = 0x00002000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT = 0x00004000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT_KHR = 0x00004000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT = 0x00008000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT_KHR = 0x00008000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT = 0x00010000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT_KHR = 0x00010000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT = 0x100000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR = 0x100000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT = 0x200000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR = 0x200000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT = 0x400000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR = 0x400000000ULL; +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR = 0x800000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR = 0x1000000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR = 0x2000000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR = 0x4000000000ULL; +#endif +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT = 0x00100000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV = 0x00020000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV = 0x00040000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR = 0x00800000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADING_RATE_IMAGE_READ_BIT_NV = 0x00800000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR = 0x00200000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_KHR = 0x00400000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_NV = 0x00200000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_NV = 0x00400000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_FRAGMENT_DENSITY_MAP_READ_BIT_EXT = 0x01000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT = 0x00080000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INVOCATION_MASK_READ_BIT_HUAWEI = 0x8000000000ULL; + + +typedef enum VkSubmitFlagBits { + VK_SUBMIT_PROTECTED_BIT = 0x00000001, + VK_SUBMIT_PROTECTED_BIT_KHR = VK_SUBMIT_PROTECTED_BIT, + VK_SUBMIT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkSubmitFlagBits; +typedef VkFlags VkSubmitFlags; + +typedef enum VkRenderingFlagBits { + VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT = 0x00000001, + VK_RENDERING_SUSPENDING_BIT = 0x00000002, + VK_RENDERING_RESUMING_BIT = 0x00000004, + VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT, + VK_RENDERING_SUSPENDING_BIT_KHR = VK_RENDERING_SUSPENDING_BIT, + VK_RENDERING_RESUMING_BIT_KHR = VK_RENDERING_RESUMING_BIT, + VK_RENDERING_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkRenderingFlagBits; +typedef VkFlags VkRenderingFlags; +typedef VkFlags64 VkFormatFeatureFlags2; + +// Flag bits for VkFormatFeatureFlagBits2 +typedef VkFlags64 VkFormatFeatureFlagBits2; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT = 0x00000001ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR = 0x00000001ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT = 0x00000002ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR = 0x00000002ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT = 0x00000004ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT_KHR = 0x00000004ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT = 0x00000008ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR = 0x00000008ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT = 0x00000010ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR = 0x00000010ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT = 0x00000020ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT_KHR = 0x00000020ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT = 0x00000040ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT_KHR = 0x00000040ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT = 0x00000080ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR = 0x00000080ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT = 0x00000100ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR = 0x00000100ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000200ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR = 0x00000200ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT = 0x00000400ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR = 0x00000400ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT = 0x00000800ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR = 0x00000800ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT = 0x00001000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT_KHR = 0x00001000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT = 0x00002000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT = 0x00002000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT = 0x00004000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR = 0x00004000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT = 0x00008000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR = 0x00008000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT = 0x00010000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT_KHR = 0x00010000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT = 0x00020000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR = 0x00020000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT = 0x00040000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR = 0x00040000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT = 0x00080000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR = 0x00080000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT = 0x00100000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR = 0x00100000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT = 0x00200000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR = 0x00200000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT = 0x00400000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR = 0x00400000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT = 0x00800000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR = 0x00800000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT = 0x80000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR = 0x80000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT = 0x100000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR = 0x100000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT = 0x200000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR = 0x200000000ULL; +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR = 0x02000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR = 0x04000000ULL; +#endif +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR = 0x20000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x01000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x40000000ULL; +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR = 0x08000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR = 0x10000000ULL; +#endif +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV = 0x4000000000ULL; + +typedef struct VkPhysicalDeviceVulkan13Features { + VkStructureType sType; + void* pNext; + VkBool32 robustImageAccess; + VkBool32 inlineUniformBlock; + VkBool32 descriptorBindingInlineUniformBlockUpdateAfterBind; + VkBool32 pipelineCreationCacheControl; + VkBool32 privateData; + VkBool32 shaderDemoteToHelperInvocation; + VkBool32 shaderTerminateInvocation; + VkBool32 subgroupSizeControl; + VkBool32 computeFullSubgroups; + VkBool32 synchronization2; + VkBool32 textureCompressionASTC_HDR; + VkBool32 shaderZeroInitializeWorkgroupMemory; + VkBool32 dynamicRendering; + VkBool32 shaderIntegerDotProduct; + VkBool32 maintenance4; +} VkPhysicalDeviceVulkan13Features; + +typedef struct VkPhysicalDeviceVulkan13Properties { + VkStructureType sType; + void* pNext; + uint32_t minSubgroupSize; + uint32_t maxSubgroupSize; + uint32_t maxComputeWorkgroupSubgroups; + VkShaderStageFlags requiredSubgroupSizeStages; + uint32_t maxInlineUniformBlockSize; + uint32_t maxPerStageDescriptorInlineUniformBlocks; + uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks; + uint32_t maxDescriptorSetInlineUniformBlocks; + uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks; + uint32_t maxInlineUniformTotalSize; + VkBool32 integerDotProduct8BitUnsignedAccelerated; + VkBool32 integerDotProduct8BitSignedAccelerated; + VkBool32 integerDotProduct8BitMixedSignednessAccelerated; + VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated; + VkBool32 integerDotProduct4x8BitPackedSignedAccelerated; + VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated; + VkBool32 integerDotProduct16BitUnsignedAccelerated; + VkBool32 integerDotProduct16BitSignedAccelerated; + VkBool32 integerDotProduct16BitMixedSignednessAccelerated; + VkBool32 integerDotProduct32BitUnsignedAccelerated; + VkBool32 integerDotProduct32BitSignedAccelerated; + VkBool32 integerDotProduct32BitMixedSignednessAccelerated; + VkBool32 integerDotProduct64BitUnsignedAccelerated; + VkBool32 integerDotProduct64BitSignedAccelerated; + VkBool32 integerDotProduct64BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated; + VkDeviceSize storageTexelBufferOffsetAlignmentBytes; + VkBool32 storageTexelBufferOffsetSingleTexelAlignment; + VkDeviceSize uniformTexelBufferOffsetAlignmentBytes; + VkBool32 uniformTexelBufferOffsetSingleTexelAlignment; + VkDeviceSize maxBufferSize; +} VkPhysicalDeviceVulkan13Properties; + +typedef struct VkPipelineCreationFeedback { + VkPipelineCreationFeedbackFlags flags; + uint64_t duration; +} VkPipelineCreationFeedback; + +typedef struct VkPipelineCreationFeedbackCreateInfo { + VkStructureType sType; + const void* pNext; + VkPipelineCreationFeedback* pPipelineCreationFeedback; + uint32_t pipelineStageCreationFeedbackCount; + VkPipelineCreationFeedback* pPipelineStageCreationFeedbacks; +} VkPipelineCreationFeedbackCreateInfo; + +typedef struct VkPhysicalDeviceShaderTerminateInvocationFeatures { + VkStructureType sType; + void* pNext; + VkBool32 shaderTerminateInvocation; +} VkPhysicalDeviceShaderTerminateInvocationFeatures; + +typedef struct VkPhysicalDeviceToolProperties { + VkStructureType sType; + void* pNext; + char name[VK_MAX_EXTENSION_NAME_SIZE]; + char version[VK_MAX_EXTENSION_NAME_SIZE]; + VkToolPurposeFlags purposes; + char description[VK_MAX_DESCRIPTION_SIZE]; + char layer[VK_MAX_EXTENSION_NAME_SIZE]; +} VkPhysicalDeviceToolProperties; + +typedef struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures { + VkStructureType sType; + void* pNext; + VkBool32 shaderDemoteToHelperInvocation; +} VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures; + +typedef struct VkPhysicalDevicePrivateDataFeatures { + VkStructureType sType; + void* pNext; + VkBool32 privateData; +} VkPhysicalDevicePrivateDataFeatures; + +typedef struct VkDevicePrivateDataCreateInfo { + VkStructureType sType; + const void* pNext; + uint32_t privateDataSlotRequestCount; +} VkDevicePrivateDataCreateInfo; + +typedef struct VkPrivateDataSlotCreateInfo { + VkStructureType sType; + const void* pNext; + VkPrivateDataSlotCreateFlags flags; +} VkPrivateDataSlotCreateInfo; + +typedef struct VkPhysicalDevicePipelineCreationCacheControlFeatures { + VkStructureType sType; + void* pNext; + VkBool32 pipelineCreationCacheControl; +} VkPhysicalDevicePipelineCreationCacheControlFeatures; + +typedef struct VkMemoryBarrier2 { + VkStructureType sType; + const void* pNext; + VkPipelineStageFlags2 srcStageMask; + VkAccessFlags2 srcAccessMask; + VkPipelineStageFlags2 dstStageMask; + VkAccessFlags2 dstAccessMask; +} VkMemoryBarrier2; + +typedef struct VkBufferMemoryBarrier2 { + VkStructureType sType; + const void* pNext; + VkPipelineStageFlags2 srcStageMask; + VkAccessFlags2 srcAccessMask; + VkPipelineStageFlags2 dstStageMask; + VkAccessFlags2 dstAccessMask; + uint32_t srcQueueFamilyIndex; + uint32_t dstQueueFamilyIndex; + VkBuffer buffer; + VkDeviceSize offset; + VkDeviceSize size; +} VkBufferMemoryBarrier2; + +typedef struct VkImageMemoryBarrier2 { + VkStructureType sType; + const void* pNext; + VkPipelineStageFlags2 srcStageMask; + VkAccessFlags2 srcAccessMask; + VkPipelineStageFlags2 dstStageMask; + VkAccessFlags2 dstAccessMask; + VkImageLayout oldLayout; + VkImageLayout newLayout; + uint32_t srcQueueFamilyIndex; + uint32_t dstQueueFamilyIndex; + VkImage image; + VkImageSubresourceRange subresourceRange; +} VkImageMemoryBarrier2; + +typedef struct VkDependencyInfo { + VkStructureType sType; + const void* pNext; + VkDependencyFlags dependencyFlags; + uint32_t memoryBarrierCount; + const VkMemoryBarrier2* pMemoryBarriers; + uint32_t bufferMemoryBarrierCount; + const VkBufferMemoryBarrier2* pBufferMemoryBarriers; + uint32_t imageMemoryBarrierCount; + const VkImageMemoryBarrier2* pImageMemoryBarriers; +} VkDependencyInfo; + +typedef struct VkSemaphoreSubmitInfo { + VkStructureType sType; + const void* pNext; + VkSemaphore semaphore; + uint64_t value; + VkPipelineStageFlags2 stageMask; + uint32_t deviceIndex; +} VkSemaphoreSubmitInfo; + +typedef struct VkCommandBufferSubmitInfo { + VkStructureType sType; + const void* pNext; + VkCommandBuffer commandBuffer; + uint32_t deviceMask; +} VkCommandBufferSubmitInfo; + +typedef struct VkSubmitInfo2 { + VkStructureType sType; + const void* pNext; + VkSubmitFlags flags; + uint32_t waitSemaphoreInfoCount; + const VkSemaphoreSubmitInfo* pWaitSemaphoreInfos; + uint32_t commandBufferInfoCount; + const VkCommandBufferSubmitInfo* pCommandBufferInfos; + uint32_t signalSemaphoreInfoCount; + const VkSemaphoreSubmitInfo* pSignalSemaphoreInfos; +} VkSubmitInfo2; + +typedef struct VkPhysicalDeviceSynchronization2Features { + VkStructureType sType; + void* pNext; + VkBool32 synchronization2; +} VkPhysicalDeviceSynchronization2Features; + +typedef struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures { + VkStructureType sType; + void* pNext; + VkBool32 shaderZeroInitializeWorkgroupMemory; +} VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures; + +typedef struct VkPhysicalDeviceImageRobustnessFeatures { + VkStructureType sType; + void* pNext; + VkBool32 robustImageAccess; +} VkPhysicalDeviceImageRobustnessFeatures; + +typedef struct VkBufferCopy2 { + VkStructureType sType; + const void* pNext; + VkDeviceSize srcOffset; + VkDeviceSize dstOffset; + VkDeviceSize size; +} VkBufferCopy2; + +typedef struct VkCopyBufferInfo2 { + VkStructureType sType; + const void* pNext; + VkBuffer srcBuffer; + VkBuffer dstBuffer; + uint32_t regionCount; + const VkBufferCopy2* pRegions; +} VkCopyBufferInfo2; + +typedef struct VkImageCopy2 { + VkStructureType sType; + const void* pNext; + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffset; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffset; + VkExtent3D extent; +} VkImageCopy2; + +typedef struct VkCopyImageInfo2 { + VkStructureType sType; + const void* pNext; + VkImage srcImage; + VkImageLayout srcImageLayout; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkImageCopy2* pRegions; +} VkCopyImageInfo2; + +typedef struct VkBufferImageCopy2 { + VkStructureType sType; + const void* pNext; + VkDeviceSize bufferOffset; + uint32_t bufferRowLength; + uint32_t bufferImageHeight; + VkImageSubresourceLayers imageSubresource; + VkOffset3D imageOffset; + VkExtent3D imageExtent; +} VkBufferImageCopy2; + +typedef struct VkCopyBufferToImageInfo2 { + VkStructureType sType; + const void* pNext; + VkBuffer srcBuffer; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkBufferImageCopy2* pRegions; +} VkCopyBufferToImageInfo2; + +typedef struct VkCopyImageToBufferInfo2 { + VkStructureType sType; + const void* pNext; + VkImage srcImage; + VkImageLayout srcImageLayout; + VkBuffer dstBuffer; + uint32_t regionCount; + const VkBufferImageCopy2* pRegions; +} VkCopyImageToBufferInfo2; + +typedef struct VkImageBlit2 { + VkStructureType sType; + const void* pNext; + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffsets[2]; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffsets[2]; +} VkImageBlit2; + +typedef struct VkBlitImageInfo2 { + VkStructureType sType; + const void* pNext; + VkImage srcImage; + VkImageLayout srcImageLayout; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkImageBlit2* pRegions; + VkFilter filter; +} VkBlitImageInfo2; + +typedef struct VkImageResolve2 { + VkStructureType sType; + const void* pNext; + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffset; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffset; + VkExtent3D extent; +} VkImageResolve2; + +typedef struct VkResolveImageInfo2 { + VkStructureType sType; + const void* pNext; + VkImage srcImage; + VkImageLayout srcImageLayout; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkImageResolve2* pRegions; +} VkResolveImageInfo2; + +typedef struct VkPhysicalDeviceSubgroupSizeControlFeatures { + VkStructureType sType; + void* pNext; + VkBool32 subgroupSizeControl; + VkBool32 computeFullSubgroups; +} VkPhysicalDeviceSubgroupSizeControlFeatures; + +typedef struct VkPhysicalDeviceSubgroupSizeControlProperties { + VkStructureType sType; + void* pNext; + uint32_t minSubgroupSize; + uint32_t maxSubgroupSize; + uint32_t maxComputeWorkgroupSubgroups; + VkShaderStageFlags requiredSubgroupSizeStages; +} VkPhysicalDeviceSubgroupSizeControlProperties; + +typedef struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfo { + VkStructureType sType; + void* pNext; + uint32_t requiredSubgroupSize; +} VkPipelineShaderStageRequiredSubgroupSizeCreateInfo; + +typedef struct VkPhysicalDeviceInlineUniformBlockFeatures { + VkStructureType sType; + void* pNext; + VkBool32 inlineUniformBlock; + VkBool32 descriptorBindingInlineUniformBlockUpdateAfterBind; +} VkPhysicalDeviceInlineUniformBlockFeatures; + +typedef struct VkPhysicalDeviceInlineUniformBlockProperties { + VkStructureType sType; + void* pNext; + uint32_t maxInlineUniformBlockSize; + uint32_t maxPerStageDescriptorInlineUniformBlocks; + uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks; + uint32_t maxDescriptorSetInlineUniformBlocks; + uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks; +} VkPhysicalDeviceInlineUniformBlockProperties; + +typedef struct VkWriteDescriptorSetInlineUniformBlock { + VkStructureType sType; + const void* pNext; + uint32_t dataSize; + const void* pData; +} VkWriteDescriptorSetInlineUniformBlock; + +typedef struct VkDescriptorPoolInlineUniformBlockCreateInfo { + VkStructureType sType; + const void* pNext; + uint32_t maxInlineUniformBlockBindings; +} VkDescriptorPoolInlineUniformBlockCreateInfo; + +typedef struct VkPhysicalDeviceTextureCompressionASTCHDRFeatures { + VkStructureType sType; + void* pNext; + VkBool32 textureCompressionASTC_HDR; +} VkPhysicalDeviceTextureCompressionASTCHDRFeatures; + +typedef struct VkRenderingAttachmentInfo { + VkStructureType sType; + const void* pNext; + VkImageView imageView; + VkImageLayout imageLayout; + VkResolveModeFlagBits resolveMode; + VkImageView resolveImageView; + VkImageLayout resolveImageLayout; + VkAttachmentLoadOp loadOp; + VkAttachmentStoreOp storeOp; + VkClearValue clearValue; +} VkRenderingAttachmentInfo; + +typedef struct VkRenderingInfo { + VkStructureType sType; + const void* pNext; + VkRenderingFlags flags; + VkRect2D renderArea; + uint32_t layerCount; + uint32_t viewMask; + uint32_t colorAttachmentCount; + const VkRenderingAttachmentInfo* pColorAttachments; + const VkRenderingAttachmentInfo* pDepthAttachment; + const VkRenderingAttachmentInfo* pStencilAttachment; +} VkRenderingInfo; + +typedef struct VkPipelineRenderingCreateInfo { + VkStructureType sType; + const void* pNext; + uint32_t viewMask; + uint32_t colorAttachmentCount; + const VkFormat* pColorAttachmentFormats; + VkFormat depthAttachmentFormat; + VkFormat stencilAttachmentFormat; +} VkPipelineRenderingCreateInfo; + +typedef struct VkPhysicalDeviceDynamicRenderingFeatures { + VkStructureType sType; + void* pNext; + VkBool32 dynamicRendering; +} VkPhysicalDeviceDynamicRenderingFeatures; + +typedef struct VkCommandBufferInheritanceRenderingInfo { + VkStructureType sType; + const void* pNext; + VkRenderingFlags flags; + uint32_t viewMask; + uint32_t colorAttachmentCount; + const VkFormat* pColorAttachmentFormats; + VkFormat depthAttachmentFormat; + VkFormat stencilAttachmentFormat; + VkSampleCountFlagBits rasterizationSamples; +} VkCommandBufferInheritanceRenderingInfo; + +typedef struct VkPhysicalDeviceShaderIntegerDotProductFeatures { + VkStructureType sType; + void* pNext; + VkBool32 shaderIntegerDotProduct; +} VkPhysicalDeviceShaderIntegerDotProductFeatures; + +typedef struct VkPhysicalDeviceShaderIntegerDotProductProperties { + VkStructureType sType; + void* pNext; + VkBool32 integerDotProduct8BitUnsignedAccelerated; + VkBool32 integerDotProduct8BitSignedAccelerated; + VkBool32 integerDotProduct8BitMixedSignednessAccelerated; + VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated; + VkBool32 integerDotProduct4x8BitPackedSignedAccelerated; + VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated; + VkBool32 integerDotProduct16BitUnsignedAccelerated; + VkBool32 integerDotProduct16BitSignedAccelerated; + VkBool32 integerDotProduct16BitMixedSignednessAccelerated; + VkBool32 integerDotProduct32BitUnsignedAccelerated; + VkBool32 integerDotProduct32BitSignedAccelerated; + VkBool32 integerDotProduct32BitMixedSignednessAccelerated; + VkBool32 integerDotProduct64BitUnsignedAccelerated; + VkBool32 integerDotProduct64BitSignedAccelerated; + VkBool32 integerDotProduct64BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated; +} VkPhysicalDeviceShaderIntegerDotProductProperties; + +typedef struct VkPhysicalDeviceTexelBufferAlignmentProperties { + VkStructureType sType; + void* pNext; + VkDeviceSize storageTexelBufferOffsetAlignmentBytes; + VkBool32 storageTexelBufferOffsetSingleTexelAlignment; + VkDeviceSize uniformTexelBufferOffsetAlignmentBytes; + VkBool32 uniformTexelBufferOffsetSingleTexelAlignment; +} VkPhysicalDeviceTexelBufferAlignmentProperties; + +typedef struct VkFormatProperties3 { + VkStructureType sType; + void* pNext; + VkFormatFeatureFlags2 linearTilingFeatures; + VkFormatFeatureFlags2 optimalTilingFeatures; + VkFormatFeatureFlags2 bufferFeatures; +} VkFormatProperties3; + +typedef struct VkPhysicalDeviceMaintenance4Features { + VkStructureType sType; + void* pNext; + VkBool32 maintenance4; +} VkPhysicalDeviceMaintenance4Features; + +typedef struct VkPhysicalDeviceMaintenance4Properties { + VkStructureType sType; + void* pNext; + VkDeviceSize maxBufferSize; +} VkPhysicalDeviceMaintenance4Properties; + +typedef struct VkDeviceBufferMemoryRequirements { + VkStructureType sType; + const void* pNext; + const VkBufferCreateInfo* pCreateInfo; +} VkDeviceBufferMemoryRequirements; + +typedef struct VkDeviceImageMemoryRequirements { + VkStructureType sType; + const void* pNext; + const VkImageCreateInfo* pCreateInfo; + VkImageAspectFlagBits planeAspect; +} VkDeviceImageMemoryRequirements; + +typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceToolProperties)(VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolProperties* pToolProperties); +typedef VkResult (VKAPI_PTR *PFN_vkCreatePrivateDataSlot)(VkDevice device, const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlot* pPrivateDataSlot); +typedef void (VKAPI_PTR *PFN_vkDestroyPrivateDataSlot)(VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI_PTR *PFN_vkSetPrivateData)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data); +typedef void (VKAPI_PTR *PFN_vkGetPrivateData)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t* pData); +typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2)(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo* pDependencyInfo); +typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask); +typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfo* pDependencyInfos); +typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier2)(VkCommandBuffer commandBuffer, const VkDependencyInfo* pDependencyInfo); +typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp2)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query); +typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit2)(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2* pSubmits, VkFence fence); +typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer2)(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2* pCopyBufferInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyImage2)(VkCommandBuffer commandBuffer, const VkCopyImageInfo2* pCopyImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage2)(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer2)(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo); +typedef void (VKAPI_PTR *PFN_vkCmdBlitImage2)(VkCommandBuffer commandBuffer, const VkBlitImageInfo2* pBlitImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdResolveImage2)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2* pResolveImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdBeginRendering)(VkCommandBuffer commandBuffer, const VkRenderingInfo* pRenderingInfo); +typedef void (VKAPI_PTR *PFN_vkCmdEndRendering)(VkCommandBuffer commandBuffer); +typedef void (VKAPI_PTR *PFN_vkCmdSetCullMode)(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode); +typedef void (VKAPI_PTR *PFN_vkCmdSetFrontFace)(VkCommandBuffer commandBuffer, VkFrontFace frontFace); +typedef void (VKAPI_PTR *PFN_vkCmdSetPrimitiveTopology)(VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology); +typedef void (VKAPI_PTR *PFN_vkCmdSetViewportWithCount)(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports); +typedef void (VKAPI_PTR *PFN_vkCmdSetScissorWithCount)(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors); +typedef void (VKAPI_PTR *PFN_vkCmdBindVertexBuffers2)(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthTestEnable)(VkCommandBuffer commandBuffer, VkBool32 depthTestEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthWriteEnable)(VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthCompareOp)(VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthBoundsTestEnable)(VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetStencilTestEnable)(VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetStencilOp)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp); +typedef void (VKAPI_PTR *PFN_vkCmdSetRasterizerDiscardEnable)(VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthBiasEnable)(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetPrimitiveRestartEnable)(VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable); +typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirements)(VkDevice device, const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirements)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirements)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceToolProperties( + VkPhysicalDevice physicalDevice, + uint32_t* pToolCount, + VkPhysicalDeviceToolProperties* pToolProperties); + +VKAPI_ATTR VkResult VKAPI_CALL vkCreatePrivateDataSlot( + VkDevice device, + const VkPrivateDataSlotCreateInfo* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkPrivateDataSlot* pPrivateDataSlot); + +VKAPI_ATTR void VKAPI_CALL vkDestroyPrivateDataSlot( + VkDevice device, + VkPrivateDataSlot privateDataSlot, + const VkAllocationCallbacks* pAllocator); + +VKAPI_ATTR VkResult VKAPI_CALL vkSetPrivateData( + VkDevice device, + VkObjectType objectType, + uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, + uint64_t data); + +VKAPI_ATTR void VKAPI_CALL vkGetPrivateData( + VkDevice device, + VkObjectType objectType, + uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, + uint64_t* pData); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent2( + VkCommandBuffer commandBuffer, + VkEvent event, + const VkDependencyInfo* pDependencyInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent2( + VkCommandBuffer commandBuffer, + VkEvent event, + VkPipelineStageFlags2 stageMask); + +VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents2( + VkCommandBuffer commandBuffer, + uint32_t eventCount, + const VkEvent* pEvents, + const VkDependencyInfo* pDependencyInfos); + +VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier2( + VkCommandBuffer commandBuffer, + const VkDependencyInfo* pDependencyInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp2( + VkCommandBuffer commandBuffer, + VkPipelineStageFlags2 stage, + VkQueryPool queryPool, + uint32_t query); + +VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit2( + VkQueue queue, + uint32_t submitCount, + const VkSubmitInfo2* pSubmits, + VkFence fence); + +VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer2( + VkCommandBuffer commandBuffer, + const VkCopyBufferInfo2* pCopyBufferInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage2( + VkCommandBuffer commandBuffer, + const VkCopyImageInfo2* pCopyImageInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage2( + VkCommandBuffer commandBuffer, + const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer2( + VkCommandBuffer commandBuffer, + const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage2( + VkCommandBuffer commandBuffer, + const VkBlitImageInfo2* pBlitImageInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdResolveImage2( + VkCommandBuffer commandBuffer, + const VkResolveImageInfo2* pResolveImageInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdBeginRendering( + VkCommandBuffer commandBuffer, + const VkRenderingInfo* pRenderingInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdEndRendering( + VkCommandBuffer commandBuffer); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetCullMode( + VkCommandBuffer commandBuffer, + VkCullModeFlags cullMode); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetFrontFace( + VkCommandBuffer commandBuffer, + VkFrontFace frontFace); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetPrimitiveTopology( + VkCommandBuffer commandBuffer, + VkPrimitiveTopology primitiveTopology); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetViewportWithCount( + VkCommandBuffer commandBuffer, + uint32_t viewportCount, + const VkViewport* pViewports); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetScissorWithCount( + VkCommandBuffer commandBuffer, + uint32_t scissorCount, + const VkRect2D* pScissors); + +VKAPI_ATTR void VKAPI_CALL vkCmdBindVertexBuffers2( + VkCommandBuffer commandBuffer, + uint32_t firstBinding, + uint32_t bindingCount, + const VkBuffer* pBuffers, + const VkDeviceSize* pOffsets, + const VkDeviceSize* pSizes, + const VkDeviceSize* pStrides); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthTestEnable( + VkCommandBuffer commandBuffer, + VkBool32 depthTestEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthWriteEnable( + VkCommandBuffer commandBuffer, + VkBool32 depthWriteEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthCompareOp( + VkCommandBuffer commandBuffer, + VkCompareOp depthCompareOp); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBoundsTestEnable( + VkCommandBuffer commandBuffer, + VkBool32 depthBoundsTestEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilTestEnable( + VkCommandBuffer commandBuffer, + VkBool32 stencilTestEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilOp( + VkCommandBuffer commandBuffer, + VkStencilFaceFlags faceMask, + VkStencilOp failOp, + VkStencilOp passOp, + VkStencilOp depthFailOp, + VkCompareOp compareOp); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetRasterizerDiscardEnable( + VkCommandBuffer commandBuffer, + VkBool32 rasterizerDiscardEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBiasEnable( + VkCommandBuffer commandBuffer, + VkBool32 depthBiasEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetPrimitiveRestartEnable( + VkCommandBuffer commandBuffer, + VkBool32 primitiveRestartEnable); + +VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirements( + VkDevice device, + const VkDeviceBufferMemoryRequirements* pInfo, + VkMemoryRequirements2* pMemoryRequirements); + +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirements( + VkDevice device, + const VkDeviceImageMemoryRequirements* pInfo, + VkMemoryRequirements2* pMemoryRequirements); + +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirements( + VkDevice device, + const VkDeviceImageMemoryRequirements* pInfo, + uint32_t* pSparseMemoryRequirementCount, + VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); +#endif + + #define VK_KHR_surface 1 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR) #define VK_KHR_SURFACE_SPEC_VERSION 25 @@ -6502,67 +7689,19 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSharedSwapchainsKHR( #define VK_KHR_dynamic_rendering 1 #define VK_KHR_DYNAMIC_RENDERING_SPEC_VERSION 1 #define VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME "VK_KHR_dynamic_rendering" +typedef VkRenderingFlags VkRenderingFlagsKHR; -typedef enum VkRenderingFlagBitsKHR { - VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR = 0x00000001, - VK_RENDERING_SUSPENDING_BIT_KHR = 0x00000002, - VK_RENDERING_RESUMING_BIT_KHR = 0x00000004, - VK_RENDERING_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkRenderingFlagBitsKHR; -typedef VkFlags VkRenderingFlagsKHR; -typedef struct VkRenderingAttachmentInfoKHR { - VkStructureType sType; - const void* pNext; - VkImageView imageView; - VkImageLayout imageLayout; - VkResolveModeFlagBits resolveMode; - VkImageView resolveImageView; - VkImageLayout resolveImageLayout; - VkAttachmentLoadOp loadOp; - VkAttachmentStoreOp storeOp; - VkClearValue clearValue; -} VkRenderingAttachmentInfoKHR; +typedef VkRenderingFlagBits VkRenderingFlagBitsKHR; -typedef struct VkRenderingInfoKHR { - VkStructureType sType; - const void* pNext; - VkRenderingFlagsKHR flags; - VkRect2D renderArea; - uint32_t layerCount; - uint32_t viewMask; - uint32_t colorAttachmentCount; - const VkRenderingAttachmentInfoKHR* pColorAttachments; - const VkRenderingAttachmentInfoKHR* pDepthAttachment; - const VkRenderingAttachmentInfoKHR* pStencilAttachment; -} VkRenderingInfoKHR; +typedef VkRenderingInfo VkRenderingInfoKHR; -typedef struct VkPipelineRenderingCreateInfoKHR { - VkStructureType sType; - const void* pNext; - uint32_t viewMask; - uint32_t colorAttachmentCount; - const VkFormat* pColorAttachmentFormats; - VkFormat depthAttachmentFormat; - VkFormat stencilAttachmentFormat; -} VkPipelineRenderingCreateInfoKHR; +typedef VkRenderingAttachmentInfo VkRenderingAttachmentInfoKHR; -typedef struct VkPhysicalDeviceDynamicRenderingFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 dynamicRendering; -} VkPhysicalDeviceDynamicRenderingFeaturesKHR; +typedef VkPipelineRenderingCreateInfo VkPipelineRenderingCreateInfoKHR; -typedef struct VkCommandBufferInheritanceRenderingInfoKHR { - VkStructureType sType; - const void* pNext; - VkRenderingFlagsKHR flags; - uint32_t viewMask; - uint32_t colorAttachmentCount; - const VkFormat* pColorAttachmentFormats; - VkFormat depthAttachmentFormat; - VkFormat stencilAttachmentFormat; - VkSampleCountFlagBits rasterizationSamples; -} VkCommandBufferInheritanceRenderingInfoKHR; +typedef VkPhysicalDeviceDynamicRenderingFeatures VkPhysicalDeviceDynamicRenderingFeaturesKHR; + +typedef VkCommandBufferInheritanceRenderingInfo VkCommandBufferInheritanceRenderingInfoKHR; typedef struct VkRenderingFragmentShadingRateAttachmentInfoKHR { VkStructureType sType; @@ -6596,13 +7735,13 @@ typedef struct VkMultiviewPerViewAttributesInfoNVX { VkBool32 perViewAttributesPositionXOnly; } VkMultiviewPerViewAttributesInfoNVX; -typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderingKHR)(VkCommandBuffer commandBuffer, const VkRenderingInfoKHR* pRenderingInfo); +typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderingKHR)(VkCommandBuffer commandBuffer, const VkRenderingInfo* pRenderingInfo); typedef void (VKAPI_PTR *PFN_vkCmdEndRenderingKHR)(VkCommandBuffer commandBuffer); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR void VKAPI_CALL vkCmdBeginRenderingKHR( VkCommandBuffer commandBuffer, - const VkRenderingInfoKHR* pRenderingInfo); + const VkRenderingInfo* pRenderingInfo); VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderingKHR( VkCommandBuffer commandBuffer); @@ -7660,6 +8799,43 @@ typedef struct VkPhysicalDeviceShaderClockFeaturesKHR { +#define VK_KHR_global_priority 1 +#define VK_MAX_GLOBAL_PRIORITY_SIZE_KHR 16U +#define VK_KHR_GLOBAL_PRIORITY_SPEC_VERSION 1 +#define VK_KHR_GLOBAL_PRIORITY_EXTENSION_NAME "VK_KHR_global_priority" + +typedef enum VkQueueGlobalPriorityKHR { + VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR = 128, + VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR = 256, + VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR = 512, + VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR = 1024, + VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT = VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR, + VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR, + VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT = VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR, + VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT = VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR, + VK_QUEUE_GLOBAL_PRIORITY_MAX_ENUM_KHR = 0x7FFFFFFF +} VkQueueGlobalPriorityKHR; +typedef struct VkDeviceQueueGlobalPriorityCreateInfoKHR { + VkStructureType sType; + const void* pNext; + VkQueueGlobalPriorityKHR globalPriority; +} VkDeviceQueueGlobalPriorityCreateInfoKHR; + +typedef struct VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 globalPriorityQuery; +} VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR; + +typedef struct VkQueueFamilyGlobalPriorityPropertiesKHR { + VkStructureType sType; + void* pNext; + uint32_t priorityCount; + VkQueueGlobalPriorityKHR priorities[VK_MAX_GLOBAL_PRIORITY_SIZE_KHR]; +} VkQueueFamilyGlobalPriorityPropertiesKHR; + + + #define VK_KHR_driver_properties 1 #define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1 #define VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME "VK_KHR_driver_properties" @@ -7752,11 +8928,7 @@ typedef VkPhysicalDeviceVulkanMemoryModelFeatures VkPhysicalDeviceVulkanMemoryMo #define VK_KHR_shader_terminate_invocation 1 #define VK_KHR_SHADER_TERMINATE_INVOCATION_SPEC_VERSION 1 #define VK_KHR_SHADER_TERMINATE_INVOCATION_EXTENSION_NAME "VK_KHR_shader_terminate_invocation" -typedef struct VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderTerminateInvocation; -} VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR; +typedef VkPhysicalDeviceShaderTerminateInvocationFeatures VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR; @@ -8053,46 +9225,9 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineExecutableInternalRepresentationsKHR #define VK_KHR_shader_integer_dot_product 1 #define VK_KHR_SHADER_INTEGER_DOT_PRODUCT_SPEC_VERSION 1 #define VK_KHR_SHADER_INTEGER_DOT_PRODUCT_EXTENSION_NAME "VK_KHR_shader_integer_dot_product" -typedef struct VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderIntegerDotProduct; -} VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR; +typedef VkPhysicalDeviceShaderIntegerDotProductFeatures VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR; -typedef struct VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR { - VkStructureType sType; - void* pNext; - VkBool32 integerDotProduct8BitUnsignedAccelerated; - VkBool32 integerDotProduct8BitSignedAccelerated; - VkBool32 integerDotProduct8BitMixedSignednessAccelerated; - VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated; - VkBool32 integerDotProduct4x8BitPackedSignedAccelerated; - VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated; - VkBool32 integerDotProduct16BitUnsignedAccelerated; - VkBool32 integerDotProduct16BitSignedAccelerated; - VkBool32 integerDotProduct16BitMixedSignednessAccelerated; - VkBool32 integerDotProduct32BitUnsignedAccelerated; - VkBool32 integerDotProduct32BitSignedAccelerated; - VkBool32 integerDotProduct32BitMixedSignednessAccelerated; - VkBool32 integerDotProduct64BitUnsignedAccelerated; - VkBool32 integerDotProduct64BitSignedAccelerated; - VkBool32 integerDotProduct64BitMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated; -} VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR; +typedef VkPhysicalDeviceShaderIntegerDotProductProperties VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR; @@ -8132,261 +9267,94 @@ typedef struct VkPhysicalDevicePresentIdFeaturesKHR { #define VK_KHR_synchronization2 1 -typedef uint64_t VkFlags64; #define VK_KHR_SYNCHRONIZATION_2_SPEC_VERSION 1 #define VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME "VK_KHR_synchronization2" -typedef VkFlags64 VkPipelineStageFlags2KHR; +typedef VkPipelineStageFlags2 VkPipelineStageFlags2KHR; -// Flag bits for VkPipelineStageFlagBits2KHR -typedef VkFlags64 VkPipelineStageFlagBits2KHR; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_NONE_KHR = 0ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR = 0x00000001ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR = 0x00000002ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR = 0x00000004ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR = 0x00000008ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR = 0x00000010ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR = 0x00000020ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR = 0x00000040ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR = 0x00000080ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR = 0x00000100ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR = 0x00000200ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR = 0x00000400ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR = 0x00000800ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR = 0x00001000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR = 0x00001000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR = 0x00002000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_HOST_BIT_KHR = 0x00004000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR = 0x00008000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR = 0x00010000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COPY_BIT_KHR = 0x100000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR = 0x200000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_BLIT_BIT_KHR = 0x400000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR = 0x800000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR = 0x1000000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR = 0x2000000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR = 0x4000000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR = 0x04000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR = 0x08000000ULL; -#endif -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV = 0x00020000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_SHADING_RATE_IMAGE_BIT_NV = 0x00400000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR = 0x02000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR = 0x00200000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_NV = 0x00200000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_NV = 0x02000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_NV = 0x00080000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_NV = 0x00100000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI = 0x8000000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_INVOCATION_MASK_BIT_HUAWEI = 0x10000000000ULL; +typedef VkPipelineStageFlagBits2 VkPipelineStageFlagBits2KHR; -typedef VkFlags64 VkAccessFlags2KHR; +typedef VkAccessFlags2 VkAccessFlags2KHR; -// Flag bits for VkAccessFlagBits2KHR -typedef VkFlags64 VkAccessFlagBits2KHR; -static const VkAccessFlagBits2KHR VK_ACCESS_2_NONE_KHR = 0ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR = 0x00000001ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_INDEX_READ_BIT_KHR = 0x00000002ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR = 0x00000004ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_UNIFORM_READ_BIT_KHR = 0x00000008ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR = 0x00000010ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_READ_BIT_KHR = 0x00000020ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_WRITE_BIT_KHR = 0x00000040ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR = 0x00000080ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR = 0x00000100ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR = 0x00000200ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR = 0x00000400ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFER_READ_BIT_KHR = 0x00000800ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR = 0x00001000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_HOST_READ_BIT_KHR = 0x00002000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_HOST_WRITE_BIT_KHR = 0x00004000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_MEMORY_READ_BIT_KHR = 0x00008000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_MEMORY_WRITE_BIT_KHR = 0x00010000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR = 0x100000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR = 0x200000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR = 0x400000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR = 0x800000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR = 0x1000000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR = 0x2000000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR = 0x4000000000ULL; -#endif -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT = 0x00100000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV = 0x00020000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV = 0x00040000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR = 0x00800000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADING_RATE_IMAGE_READ_BIT_NV = 0x00800000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR = 0x00200000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_KHR = 0x00400000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_NV = 0x00200000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_NV = 0x00400000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_FRAGMENT_DENSITY_MAP_READ_BIT_EXT = 0x01000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT = 0x00080000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_INVOCATION_MASK_READ_BIT_HUAWEI = 0x8000000000ULL; +typedef VkAccessFlagBits2 VkAccessFlagBits2KHR; +typedef VkSubmitFlagBits VkSubmitFlagBitsKHR; -typedef enum VkSubmitFlagBitsKHR { - VK_SUBMIT_PROTECTED_BIT_KHR = 0x00000001, - VK_SUBMIT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkSubmitFlagBitsKHR; -typedef VkFlags VkSubmitFlagsKHR; -typedef struct VkMemoryBarrier2KHR { - VkStructureType sType; - const void* pNext; - VkPipelineStageFlags2KHR srcStageMask; - VkAccessFlags2KHR srcAccessMask; - VkPipelineStageFlags2KHR dstStageMask; - VkAccessFlags2KHR dstAccessMask; -} VkMemoryBarrier2KHR; +typedef VkSubmitFlags VkSubmitFlagsKHR; -typedef struct VkBufferMemoryBarrier2KHR { - VkStructureType sType; - const void* pNext; - VkPipelineStageFlags2KHR srcStageMask; - VkAccessFlags2KHR srcAccessMask; - VkPipelineStageFlags2KHR dstStageMask; - VkAccessFlags2KHR dstAccessMask; - uint32_t srcQueueFamilyIndex; - uint32_t dstQueueFamilyIndex; - VkBuffer buffer; - VkDeviceSize offset; - VkDeviceSize size; -} VkBufferMemoryBarrier2KHR; +typedef VkMemoryBarrier2 VkMemoryBarrier2KHR; -typedef struct VkImageMemoryBarrier2KHR { - VkStructureType sType; - const void* pNext; - VkPipelineStageFlags2KHR srcStageMask; - VkAccessFlags2KHR srcAccessMask; - VkPipelineStageFlags2KHR dstStageMask; - VkAccessFlags2KHR dstAccessMask; - VkImageLayout oldLayout; - VkImageLayout newLayout; - uint32_t srcQueueFamilyIndex; - uint32_t dstQueueFamilyIndex; - VkImage image; - VkImageSubresourceRange subresourceRange; -} VkImageMemoryBarrier2KHR; +typedef VkBufferMemoryBarrier2 VkBufferMemoryBarrier2KHR; -typedef struct VkDependencyInfoKHR { - VkStructureType sType; - const void* pNext; - VkDependencyFlags dependencyFlags; - uint32_t memoryBarrierCount; - const VkMemoryBarrier2KHR* pMemoryBarriers; - uint32_t bufferMemoryBarrierCount; - const VkBufferMemoryBarrier2KHR* pBufferMemoryBarriers; - uint32_t imageMemoryBarrierCount; - const VkImageMemoryBarrier2KHR* pImageMemoryBarriers; -} VkDependencyInfoKHR; +typedef VkImageMemoryBarrier2 VkImageMemoryBarrier2KHR; -typedef struct VkSemaphoreSubmitInfoKHR { - VkStructureType sType; - const void* pNext; - VkSemaphore semaphore; - uint64_t value; - VkPipelineStageFlags2KHR stageMask; - uint32_t deviceIndex; -} VkSemaphoreSubmitInfoKHR; +typedef VkDependencyInfo VkDependencyInfoKHR; -typedef struct VkCommandBufferSubmitInfoKHR { - VkStructureType sType; - const void* pNext; - VkCommandBuffer commandBuffer; - uint32_t deviceMask; -} VkCommandBufferSubmitInfoKHR; +typedef VkSubmitInfo2 VkSubmitInfo2KHR; -typedef struct VkSubmitInfo2KHR { - VkStructureType sType; - const void* pNext; - VkSubmitFlagsKHR flags; - uint32_t waitSemaphoreInfoCount; - const VkSemaphoreSubmitInfoKHR* pWaitSemaphoreInfos; - uint32_t commandBufferInfoCount; - const VkCommandBufferSubmitInfoKHR* pCommandBufferInfos; - uint32_t signalSemaphoreInfoCount; - const VkSemaphoreSubmitInfoKHR* pSignalSemaphoreInfos; -} VkSubmitInfo2KHR; +typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfoKHR; -typedef struct VkPhysicalDeviceSynchronization2FeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 synchronization2; -} VkPhysicalDeviceSynchronization2FeaturesKHR; +typedef VkCommandBufferSubmitInfo VkCommandBufferSubmitInfoKHR; + +typedef VkPhysicalDeviceSynchronization2Features VkPhysicalDeviceSynchronization2FeaturesKHR; typedef struct VkQueueFamilyCheckpointProperties2NV { - VkStructureType sType; - void* pNext; - VkPipelineStageFlags2KHR checkpointExecutionStageMask; + VkStructureType sType; + void* pNext; + VkPipelineStageFlags2 checkpointExecutionStageMask; } VkQueueFamilyCheckpointProperties2NV; typedef struct VkCheckpointData2NV { - VkStructureType sType; - void* pNext; - VkPipelineStageFlags2KHR stage; - void* pCheckpointMarker; + VkStructureType sType; + void* pNext; + VkPipelineStageFlags2 stage; + void* pCheckpointMarker; } VkCheckpointData2NV; -typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2KHR)(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfoKHR* pDependencyInfo); -typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2KHR)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2KHR stageMask); -typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2KHR)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos); -typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier2KHR)(VkCommandBuffer commandBuffer, const VkDependencyInfoKHR* pDependencyInfo); -typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp2KHR)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, uint32_t query); -typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit2KHR)(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence); -typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarker2AMD)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); +typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2KHR)(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo* pDependencyInfo); +typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2KHR)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask); +typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2KHR)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfo* pDependencyInfos); +typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier2KHR)(VkCommandBuffer commandBuffer, const VkDependencyInfo* pDependencyInfo); +typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp2KHR)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query); +typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit2KHR)(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2* pSubmits, VkFence fence); +typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarker2AMD)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); typedef void (VKAPI_PTR *PFN_vkGetQueueCheckpointData2NV)(VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent2KHR( VkCommandBuffer commandBuffer, VkEvent event, - const VkDependencyInfoKHR* pDependencyInfo); + const VkDependencyInfo* pDependencyInfo); VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent2KHR( VkCommandBuffer commandBuffer, VkEvent event, - VkPipelineStageFlags2KHR stageMask); + VkPipelineStageFlags2 stageMask); VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents2KHR( VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, - const VkDependencyInfoKHR* pDependencyInfos); + const VkDependencyInfo* pDependencyInfos); VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier2KHR( VkCommandBuffer commandBuffer, - const VkDependencyInfoKHR* pDependencyInfo); + const VkDependencyInfo* pDependencyInfo); VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp2KHR( VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, + VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query); VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit2KHR( VkQueue queue, uint32_t submitCount, - const VkSubmitInfo2KHR* pSubmits, + const VkSubmitInfo2* pSubmits, VkFence fence); VKAPI_ATTR void VKAPI_CALL vkCmdWriteBufferMarker2AMD( VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, + VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); @@ -8412,11 +9380,7 @@ typedef struct VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR { #define VK_KHR_zero_initialize_workgroup_memory 1 #define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_SPEC_VERSION 1 #define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_EXTENSION_NAME "VK_KHR_zero_initialize_workgroup_memory" -typedef struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderZeroInitializeWorkgroupMemory; -} VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR; +typedef VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR; @@ -8437,257 +9401,102 @@ typedef struct VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR { #define VK_KHR_copy_commands2 1 #define VK_KHR_COPY_COMMANDS_2_SPEC_VERSION 1 #define VK_KHR_COPY_COMMANDS_2_EXTENSION_NAME "VK_KHR_copy_commands2" -typedef struct VkBufferCopy2KHR { - VkStructureType sType; - const void* pNext; - VkDeviceSize srcOffset; - VkDeviceSize dstOffset; - VkDeviceSize size; -} VkBufferCopy2KHR; +typedef VkCopyBufferInfo2 VkCopyBufferInfo2KHR; -typedef struct VkCopyBufferInfo2KHR { - VkStructureType sType; - const void* pNext; - VkBuffer srcBuffer; - VkBuffer dstBuffer; - uint32_t regionCount; - const VkBufferCopy2KHR* pRegions; -} VkCopyBufferInfo2KHR; +typedef VkCopyImageInfo2 VkCopyImageInfo2KHR; -typedef struct VkImageCopy2KHR { - VkStructureType sType; - const void* pNext; - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffset; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffset; - VkExtent3D extent; -} VkImageCopy2KHR; +typedef VkCopyBufferToImageInfo2 VkCopyBufferToImageInfo2KHR; -typedef struct VkCopyImageInfo2KHR { - VkStructureType sType; - const void* pNext; - VkImage srcImage; - VkImageLayout srcImageLayout; - VkImage dstImage; - VkImageLayout dstImageLayout; - uint32_t regionCount; - const VkImageCopy2KHR* pRegions; -} VkCopyImageInfo2KHR; +typedef VkCopyImageToBufferInfo2 VkCopyImageToBufferInfo2KHR; -typedef struct VkBufferImageCopy2KHR { - VkStructureType sType; - const void* pNext; - VkDeviceSize bufferOffset; - uint32_t bufferRowLength; - uint32_t bufferImageHeight; - VkImageSubresourceLayers imageSubresource; - VkOffset3D imageOffset; - VkExtent3D imageExtent; -} VkBufferImageCopy2KHR; +typedef VkBlitImageInfo2 VkBlitImageInfo2KHR; -typedef struct VkCopyBufferToImageInfo2KHR { - VkStructureType sType; - const void* pNext; - VkBuffer srcBuffer; - VkImage dstImage; - VkImageLayout dstImageLayout; - uint32_t regionCount; - const VkBufferImageCopy2KHR* pRegions; -} VkCopyBufferToImageInfo2KHR; +typedef VkResolveImageInfo2 VkResolveImageInfo2KHR; -typedef struct VkCopyImageToBufferInfo2KHR { - VkStructureType sType; - const void* pNext; - VkImage srcImage; - VkImageLayout srcImageLayout; - VkBuffer dstBuffer; - uint32_t regionCount; - const VkBufferImageCopy2KHR* pRegions; -} VkCopyImageToBufferInfo2KHR; +typedef VkBufferCopy2 VkBufferCopy2KHR; -typedef struct VkImageBlit2KHR { - VkStructureType sType; - const void* pNext; - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffsets[2]; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffsets[2]; -} VkImageBlit2KHR; +typedef VkImageCopy2 VkImageCopy2KHR; -typedef struct VkBlitImageInfo2KHR { - VkStructureType sType; - const void* pNext; - VkImage srcImage; - VkImageLayout srcImageLayout; - VkImage dstImage; - VkImageLayout dstImageLayout; - uint32_t regionCount; - const VkImageBlit2KHR* pRegions; - VkFilter filter; -} VkBlitImageInfo2KHR; +typedef VkImageBlit2 VkImageBlit2KHR; -typedef struct VkImageResolve2KHR { - VkStructureType sType; - const void* pNext; - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffset; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffset; - VkExtent3D extent; -} VkImageResolve2KHR; +typedef VkBufferImageCopy2 VkBufferImageCopy2KHR; -typedef struct VkResolveImageInfo2KHR { - VkStructureType sType; - const void* pNext; - VkImage srcImage; - VkImageLayout srcImageLayout; - VkImage dstImage; - VkImageLayout dstImageLayout; - uint32_t regionCount; - const VkImageResolve2KHR* pRegions; -} VkResolveImageInfo2KHR; +typedef VkImageResolve2 VkImageResolve2KHR; -typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer2KHR)(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR* pCopyBufferInfo); -typedef void (VKAPI_PTR *PFN_vkCmdCopyImage2KHR)(VkCommandBuffer commandBuffer, const VkCopyImageInfo2KHR* pCopyImageInfo); -typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage2KHR)(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2KHR* pCopyBufferToImageInfo); -typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer2KHR)(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2KHR* pCopyImageToBufferInfo); -typedef void (VKAPI_PTR *PFN_vkCmdBlitImage2KHR)(VkCommandBuffer commandBuffer, const VkBlitImageInfo2KHR* pBlitImageInfo); -typedef void (VKAPI_PTR *PFN_vkCmdResolveImage2KHR)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR* pResolveImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer2KHR)(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2* pCopyBufferInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyImage2KHR)(VkCommandBuffer commandBuffer, const VkCopyImageInfo2* pCopyImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage2KHR)(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer2KHR)(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo); +typedef void (VKAPI_PTR *PFN_vkCmdBlitImage2KHR)(VkCommandBuffer commandBuffer, const VkBlitImageInfo2* pBlitImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdResolveImage2KHR)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2* pResolveImageInfo); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer2KHR( VkCommandBuffer commandBuffer, - const VkCopyBufferInfo2KHR* pCopyBufferInfo); + const VkCopyBufferInfo2* pCopyBufferInfo); VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage2KHR( VkCommandBuffer commandBuffer, - const VkCopyImageInfo2KHR* pCopyImageInfo); + const VkCopyImageInfo2* pCopyImageInfo); VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage2KHR( VkCommandBuffer commandBuffer, - const VkCopyBufferToImageInfo2KHR* pCopyBufferToImageInfo); + const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo); VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer2KHR( VkCommandBuffer commandBuffer, - const VkCopyImageToBufferInfo2KHR* pCopyImageToBufferInfo); + const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo); VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage2KHR( VkCommandBuffer commandBuffer, - const VkBlitImageInfo2KHR* pBlitImageInfo); + const VkBlitImageInfo2* pBlitImageInfo); VKAPI_ATTR void VKAPI_CALL vkCmdResolveImage2KHR( VkCommandBuffer commandBuffer, - const VkResolveImageInfo2KHR* pResolveImageInfo); + const VkResolveImageInfo2* pResolveImageInfo); #endif #define VK_KHR_format_feature_flags2 1 #define VK_KHR_FORMAT_FEATURE_FLAGS_2_SPEC_VERSION 1 #define VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME "VK_KHR_format_feature_flags2" -typedef VkFlags64 VkFormatFeatureFlags2KHR; +typedef VkFormatFeatureFlags2 VkFormatFeatureFlags2KHR; -// Flag bits for VkFormatFeatureFlagBits2KHR -typedef VkFlags64 VkFormatFeatureFlagBits2KHR; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR = 0x00000001ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR = 0x00000002ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT_KHR = 0x00000004ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR = 0x00000008ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR = 0x00000010ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT_KHR = 0x00000020ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT_KHR = 0x00000040ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR = 0x00000080ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR = 0x00000100ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR = 0x00000200ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR = 0x00000400ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR = 0x00000800ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT_KHR = 0x00001000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT = 0x00002000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR = 0x00004000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR = 0x00008000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT_KHR = 0x00010000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR = 0x00020000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR = 0x00040000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR = 0x00080000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR = 0x00100000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR = 0x00200000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR = 0x00400000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR = 0x00800000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR = 0x80000000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR = 0x100000000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR = 0x200000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR = 0x02000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR = 0x04000000ULL; -#endif -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR = 0x20000000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x01000000ULL; -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x40000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR = 0x08000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR = 0x10000000ULL; -#endif +typedef VkFormatFeatureFlagBits2 VkFormatFeatureFlagBits2KHR; -typedef struct VkFormatProperties3KHR { - VkStructureType sType; - void* pNext; - VkFormatFeatureFlags2KHR linearTilingFeatures; - VkFormatFeatureFlags2KHR optimalTilingFeatures; - VkFormatFeatureFlags2KHR bufferFeatures; -} VkFormatProperties3KHR; +typedef VkFormatProperties3 VkFormatProperties3KHR; #define VK_KHR_maintenance4 1 -#define VK_KHR_MAINTENANCE_4_SPEC_VERSION 1 +#define VK_KHR_MAINTENANCE_4_SPEC_VERSION 2 #define VK_KHR_MAINTENANCE_4_EXTENSION_NAME "VK_KHR_maintenance4" -typedef struct VkPhysicalDeviceMaintenance4FeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 maintenance4; -} VkPhysicalDeviceMaintenance4FeaturesKHR; +typedef VkPhysicalDeviceMaintenance4Features VkPhysicalDeviceMaintenance4FeaturesKHR; -typedef struct VkPhysicalDeviceMaintenance4PropertiesKHR { - VkStructureType sType; - void* pNext; - VkDeviceSize maxBufferSize; -} VkPhysicalDeviceMaintenance4PropertiesKHR; +typedef VkPhysicalDeviceMaintenance4Properties VkPhysicalDeviceMaintenance4PropertiesKHR; -typedef struct VkDeviceBufferMemoryRequirementsKHR { - VkStructureType sType; - const void* pNext; - const VkBufferCreateInfo* pCreateInfo; -} VkDeviceBufferMemoryRequirementsKHR; +typedef VkDeviceBufferMemoryRequirements VkDeviceBufferMemoryRequirementsKHR; -typedef struct VkDeviceImageMemoryRequirementsKHR { - VkStructureType sType; - const void* pNext; - const VkImageCreateInfo* pCreateInfo; - VkImageAspectFlagBits planeAspect; -} VkDeviceImageMemoryRequirementsKHR; +typedef VkDeviceImageMemoryRequirements VkDeviceImageMemoryRequirementsKHR; -typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirementsKHR)(VkDevice device, const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirementsKHR)(VkDevice device, const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirementsKHR( VkDevice device, - const VkDeviceBufferMemoryRequirementsKHR* pInfo, + const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirementsKHR( VkDevice device, - const VkDeviceImageMemoryRequirementsKHR* pInfo, + const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirementsKHR( VkDevice device, - const VkDeviceImageMemoryRequirementsKHR* pInfo, + const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); #endif @@ -9323,11 +10132,7 @@ typedef struct VkValidationFlagsEXT { #define VK_EXT_texture_compression_astc_hdr 1 #define VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_SPEC_VERSION 1 #define VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME "VK_EXT_texture_compression_astc_hdr" -typedef struct VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 textureCompressionASTC_HDR; -} VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT; +typedef VkPhysicalDeviceTextureCompressionASTCHDRFeatures VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT; @@ -9955,35 +10760,13 @@ typedef VkPhysicalDeviceSamplerFilterMinmaxProperties VkPhysicalDeviceSamplerFil #define VK_EXT_inline_uniform_block 1 #define VK_EXT_INLINE_UNIFORM_BLOCK_SPEC_VERSION 1 #define VK_EXT_INLINE_UNIFORM_BLOCK_EXTENSION_NAME "VK_EXT_inline_uniform_block" -typedef struct VkPhysicalDeviceInlineUniformBlockFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 inlineUniformBlock; - VkBool32 descriptorBindingInlineUniformBlockUpdateAfterBind; -} VkPhysicalDeviceInlineUniformBlockFeaturesEXT; +typedef VkPhysicalDeviceInlineUniformBlockFeatures VkPhysicalDeviceInlineUniformBlockFeaturesEXT; -typedef struct VkPhysicalDeviceInlineUniformBlockPropertiesEXT { - VkStructureType sType; - void* pNext; - uint32_t maxInlineUniformBlockSize; - uint32_t maxPerStageDescriptorInlineUniformBlocks; - uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks; - uint32_t maxDescriptorSetInlineUniformBlocks; - uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks; -} VkPhysicalDeviceInlineUniformBlockPropertiesEXT; +typedef VkPhysicalDeviceInlineUniformBlockProperties VkPhysicalDeviceInlineUniformBlockPropertiesEXT; -typedef struct VkWriteDescriptorSetInlineUniformBlockEXT { - VkStructureType sType; - const void* pNext; - uint32_t dataSize; - const void* pData; -} VkWriteDescriptorSetInlineUniformBlockEXT; +typedef VkWriteDescriptorSetInlineUniformBlock VkWriteDescriptorSetInlineUniformBlockEXT; -typedef struct VkDescriptorPoolInlineUniformBlockCreateInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t maxInlineUniformBlockBindings; -} VkDescriptorPoolInlineUniformBlockCreateInfoEXT; +typedef VkDescriptorPoolInlineUniformBlockCreateInfo VkDescriptorPoolInlineUniformBlockCreateInfoEXT; @@ -10216,9 +10999,9 @@ typedef struct VkImageDrmFormatModifierPropertiesEXT { } VkImageDrmFormatModifierPropertiesEXT; typedef struct VkDrmFormatModifierProperties2EXT { - uint64_t drmFormatModifier; - uint32_t drmFormatModifierPlaneCount; - VkFormatFeatureFlags2KHR drmFormatModifierTilingFeatures; + uint64_t drmFormatModifier; + uint32_t drmFormatModifierPlaneCount; + VkFormatFeatureFlags2 drmFormatModifierTilingFeatures; } VkDrmFormatModifierProperties2EXT; typedef struct VkDrmFormatModifierPropertiesList2EXT { @@ -10829,19 +11612,9 @@ typedef struct VkFilterCubicImageViewImageFormatPropertiesEXT { #define VK_EXT_global_priority 1 #define VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION 2 #define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority" +typedef VkQueueGlobalPriorityKHR VkQueueGlobalPriorityEXT; -typedef enum VkQueueGlobalPriorityEXT { - VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT = 128, - VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT = 256, - VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT = 512, - VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT = 1024, - VK_QUEUE_GLOBAL_PRIORITY_MAX_ENUM_EXT = 0x7FFFFFFF -} VkQueueGlobalPriorityEXT; -typedef struct VkDeviceQueueGlobalPriorityCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkQueueGlobalPriorityEXT globalPriority; -} VkDeviceQueueGlobalPriorityCreateInfoEXT; +typedef VkDeviceQueueGlobalPriorityCreateInfoKHR VkDeviceQueueGlobalPriorityCreateInfoEXT; @@ -11019,26 +11792,13 @@ typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT { #define VK_EXT_pipeline_creation_feedback 1 #define VK_EXT_PIPELINE_CREATION_FEEDBACK_SPEC_VERSION 1 #define VK_EXT_PIPELINE_CREATION_FEEDBACK_EXTENSION_NAME "VK_EXT_pipeline_creation_feedback" +typedef VkPipelineCreationFeedbackFlagBits VkPipelineCreationFeedbackFlagBitsEXT; -typedef enum VkPipelineCreationFeedbackFlagBitsEXT { - VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT = 0x00000001, - VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT_EXT = 0x00000002, - VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT_EXT = 0x00000004, - VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkPipelineCreationFeedbackFlagBitsEXT; -typedef VkFlags VkPipelineCreationFeedbackFlagsEXT; -typedef struct VkPipelineCreationFeedbackEXT { - VkPipelineCreationFeedbackFlagsEXT flags; - uint64_t duration; -} VkPipelineCreationFeedbackEXT; +typedef VkPipelineCreationFeedbackFlags VkPipelineCreationFeedbackFlagsEXT; -typedef struct VkPipelineCreationFeedbackCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkPipelineCreationFeedbackEXT* pPipelineCreationFeedback; - uint32_t pipelineStageCreationFeedbackCount; - VkPipelineCreationFeedbackEXT* pPipelineStageCreationFeedbacks; -} VkPipelineCreationFeedbackCreateInfoEXT; +typedef VkPipelineCreationFeedbackCreateInfo VkPipelineCreationFeedbackCreateInfoEXT; + +typedef VkPipelineCreationFeedback VkPipelineCreationFeedbackEXT; @@ -11437,27 +12197,11 @@ typedef VkPhysicalDeviceScalarBlockLayoutFeatures VkPhysicalDeviceScalarBlockLay #define VK_EXT_subgroup_size_control 1 #define VK_EXT_SUBGROUP_SIZE_CONTROL_SPEC_VERSION 2 #define VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME "VK_EXT_subgroup_size_control" -typedef struct VkPhysicalDeviceSubgroupSizeControlFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 subgroupSizeControl; - VkBool32 computeFullSubgroups; -} VkPhysicalDeviceSubgroupSizeControlFeaturesEXT; +typedef VkPhysicalDeviceSubgroupSizeControlFeatures VkPhysicalDeviceSubgroupSizeControlFeaturesEXT; -typedef struct VkPhysicalDeviceSubgroupSizeControlPropertiesEXT { - VkStructureType sType; - void* pNext; - uint32_t minSubgroupSize; - uint32_t maxSubgroupSize; - uint32_t maxComputeWorkgroupSubgroups; - VkShaderStageFlags requiredSubgroupSizeStages; -} VkPhysicalDeviceSubgroupSizeControlPropertiesEXT; +typedef VkPhysicalDeviceSubgroupSizeControlProperties VkPhysicalDeviceSubgroupSizeControlPropertiesEXT; -typedef struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT { - VkStructureType sType; - void* pNext; - uint32_t requiredSubgroupSize; -} VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT; +typedef VkPipelineShaderStageRequiredSubgroupSizeCreateInfo VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT; @@ -11574,35 +12318,19 @@ VKAPI_ATTR VkDeviceAddress VKAPI_CALL vkGetBufferDeviceAddressEXT( #define VK_EXT_tooling_info 1 #define VK_EXT_TOOLING_INFO_SPEC_VERSION 1 #define VK_EXT_TOOLING_INFO_EXTENSION_NAME "VK_EXT_tooling_info" +typedef VkToolPurposeFlagBits VkToolPurposeFlagBitsEXT; -typedef enum VkToolPurposeFlagBitsEXT { - VK_TOOL_PURPOSE_VALIDATION_BIT_EXT = 0x00000001, - VK_TOOL_PURPOSE_PROFILING_BIT_EXT = 0x00000002, - VK_TOOL_PURPOSE_TRACING_BIT_EXT = 0x00000004, - VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT_EXT = 0x00000008, - VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT_EXT = 0x00000010, - VK_TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT = 0x00000020, - VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT = 0x00000040, - VK_TOOL_PURPOSE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkToolPurposeFlagBitsEXT; -typedef VkFlags VkToolPurposeFlagsEXT; -typedef struct VkPhysicalDeviceToolPropertiesEXT { - VkStructureType sType; - void* pNext; - char name[VK_MAX_EXTENSION_NAME_SIZE]; - char version[VK_MAX_EXTENSION_NAME_SIZE]; - VkToolPurposeFlagsEXT purposes; - char description[VK_MAX_DESCRIPTION_SIZE]; - char layer[VK_MAX_EXTENSION_NAME_SIZE]; -} VkPhysicalDeviceToolPropertiesEXT; +typedef VkToolPurposeFlags VkToolPurposeFlagsEXT; -typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceToolPropertiesEXT)(VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties); +typedef VkPhysicalDeviceToolProperties VkPhysicalDeviceToolPropertiesEXT; + +typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceToolPropertiesEXT)(VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolProperties* pToolProperties); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceToolPropertiesEXT( VkPhysicalDevice physicalDevice, uint32_t* pToolCount, - VkPhysicalDeviceToolPropertiesEXT* pToolProperties); + VkPhysicalDeviceToolProperties* pToolProperties); #endif @@ -12033,11 +12761,7 @@ typedef struct VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT { #define VK_EXT_shader_demote_to_helper_invocation 1 #define VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_SPEC_VERSION 1 #define VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME "VK_EXT_shader_demote_to_helper_invocation" -typedef struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 shaderDemoteToHelperInvocation; -} VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT; +typedef VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT; @@ -12259,14 +12983,7 @@ typedef struct VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT { VkBool32 texelBufferAlignment; } VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT; -typedef struct VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT { - VkStructureType sType; - void* pNext; - VkDeviceSize storageTexelBufferOffsetAlignmentBytes; - VkBool32 storageTexelBufferOffsetSingleTexelAlignment; - VkDeviceSize uniformTexelBufferOffsetAlignmentBytes; - VkBool32 uniformTexelBufferOffsetSingleTexelAlignment; -} VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT; +typedef VkPhysicalDeviceTexelBufferAlignmentProperties VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT; @@ -12404,61 +13121,49 @@ typedef struct VkPhysicalDeviceCustomBorderColorFeaturesEXT { #define VK_EXT_private_data 1 -VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPrivateDataSlotEXT) +typedef VkPrivateDataSlot VkPrivateDataSlotEXT; + #define VK_EXT_PRIVATE_DATA_SPEC_VERSION 1 #define VK_EXT_PRIVATE_DATA_EXTENSION_NAME "VK_EXT_private_data" +typedef VkPrivateDataSlotCreateFlags VkPrivateDataSlotCreateFlagsEXT; -typedef enum VkPrivateDataSlotCreateFlagBitsEXT { - VK_PRIVATE_DATA_SLOT_CREATE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkPrivateDataSlotCreateFlagBitsEXT; -typedef VkFlags VkPrivateDataSlotCreateFlagsEXT; -typedef struct VkPhysicalDevicePrivateDataFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 privateData; -} VkPhysicalDevicePrivateDataFeaturesEXT; +typedef VkPrivateDataSlotCreateFlagBits VkPrivateDataSlotCreateFlagBitsEXT; -typedef struct VkDevicePrivateDataCreateInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t privateDataSlotRequestCount; -} VkDevicePrivateDataCreateInfoEXT; +typedef VkPhysicalDevicePrivateDataFeatures VkPhysicalDevicePrivateDataFeaturesEXT; -typedef struct VkPrivateDataSlotCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkPrivateDataSlotCreateFlagsEXT flags; -} VkPrivateDataSlotCreateInfoEXT; +typedef VkDevicePrivateDataCreateInfo VkDevicePrivateDataCreateInfoEXT; -typedef VkResult (VKAPI_PTR *PFN_vkCreatePrivateDataSlotEXT)(VkDevice device, const VkPrivateDataSlotCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlotEXT* pPrivateDataSlot); -typedef void (VKAPI_PTR *PFN_vkDestroyPrivateDataSlotEXT)(VkDevice device, VkPrivateDataSlotEXT privateDataSlot, const VkAllocationCallbacks* pAllocator); -typedef VkResult (VKAPI_PTR *PFN_vkSetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data); -typedef void (VKAPI_PTR *PFN_vkGetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t* pData); +typedef VkPrivateDataSlotCreateInfo VkPrivateDataSlotCreateInfoEXT; + +typedef VkResult (VKAPI_PTR *PFN_vkCreatePrivateDataSlotEXT)(VkDevice device, const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlot* pPrivateDataSlot); +typedef void (VKAPI_PTR *PFN_vkDestroyPrivateDataSlotEXT)(VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI_PTR *PFN_vkSetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data); +typedef void (VKAPI_PTR *PFN_vkGetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t* pData); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR VkResult VKAPI_CALL vkCreatePrivateDataSlotEXT( VkDevice device, - const VkPrivateDataSlotCreateInfoEXT* pCreateInfo, + const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, - VkPrivateDataSlotEXT* pPrivateDataSlot); + VkPrivateDataSlot* pPrivateDataSlot); VKAPI_ATTR void VKAPI_CALL vkDestroyPrivateDataSlotEXT( VkDevice device, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator); VKAPI_ATTR VkResult VKAPI_CALL vkSetPrivateDataEXT( VkDevice device, VkObjectType objectType, uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, uint64_t data); VKAPI_ATTR void VKAPI_CALL vkGetPrivateDataEXT( VkDevice device, VkObjectType objectType, uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, uint64_t* pData); #endif @@ -12466,11 +13171,7 @@ VKAPI_ATTR void VKAPI_CALL vkGetPrivateDataEXT( #define VK_EXT_pipeline_creation_cache_control 1 #define VK_EXT_PIPELINE_CREATION_CACHE_CONTROL_SPEC_VERSION 3 #define VK_EXT_PIPELINE_CREATION_CACHE_CONTROL_EXTENSION_NAME "VK_EXT_pipeline_creation_cache_control" -typedef struct VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 pipelineCreationCacheControl; -} VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT; +typedef VkPhysicalDevicePipelineCreationCacheControlFeatures VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT; @@ -12696,11 +13397,7 @@ typedef struct VkCopyCommandTransformInfoQCOM { #define VK_EXT_image_robustness 1 #define VK_EXT_IMAGE_ROBUSTNESS_SPEC_VERSION 1 #define VK_EXT_IMAGE_ROBUSTNESS_EXTENSION_NAME "VK_EXT_image_robustness" -typedef struct VkPhysicalDeviceImageRobustnessFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 robustImageAccess; -} VkPhysicalDeviceImageRobustnessFeaturesEXT; +typedef VkPhysicalDeviceImageRobustnessFeatures VkPhysicalDeviceImageRobustnessFeaturesEXT; @@ -12716,6 +13413,19 @@ typedef struct VkPhysicalDevice4444FormatsFeaturesEXT { +#define VK_ARM_rasterization_order_attachment_access 1 +#define VK_ARM_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_SPEC_VERSION 1 +#define VK_ARM_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_EXTENSION_NAME "VK_ARM_rasterization_order_attachment_access" +typedef struct VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM { + VkStructureType sType; + const void* pNext; + VkBool32 rasterizationOrderColorAttachmentAccess; + VkBool32 rasterizationOrderDepthAttachmentAccess; + VkBool32 rasterizationOrderStencilAttachmentAccess; +} VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM; + + + #define VK_EXT_rgba10x6_formats 1 #define VK_EXT_RGBA10X6_FORMATS_SPEC_VERSION 1 #define VK_EXT_RGBA10X6_FORMATS_EXTENSION_NAME "VK_EXT_rgba10x6_formats" @@ -12823,6 +13533,23 @@ typedef struct VkPhysicalDeviceDrmPropertiesEXT { +#define VK_EXT_depth_clip_control 1 +#define VK_EXT_DEPTH_CLIP_CONTROL_SPEC_VERSION 1 +#define VK_EXT_DEPTH_CLIP_CONTROL_EXTENSION_NAME "VK_EXT_depth_clip_control" +typedef struct VkPhysicalDeviceDepthClipControlFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 depthClipControl; +} VkPhysicalDeviceDepthClipControlFeaturesEXT; + +typedef struct VkPipelineViewportDepthClipControlCreateInfoEXT { + VkStructureType sType; + const void* pNext; + VkBool32 negativeOneToOne; +} VkPipelineViewportDepthClipControlCreateInfoEXT; + + + #define VK_EXT_primitive_topology_list_restart 1 #define VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_SPEC_VERSION 1 #define VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_EXTENSION_NAME "VK_EXT_primitive_topology_list_restart" @@ -12984,21 +13711,29 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetColorWrite #define VK_EXT_global_priority_query 1 -#define VK_MAX_GLOBAL_PRIORITY_SIZE_EXT 16U #define VK_EXT_GLOBAL_PRIORITY_QUERY_SPEC_VERSION 1 #define VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME "VK_EXT_global_priority_query" -typedef struct VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT { +#define VK_MAX_GLOBAL_PRIORITY_SIZE_EXT VK_MAX_GLOBAL_PRIORITY_SIZE_KHR +typedef VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT; + +typedef VkQueueFamilyGlobalPriorityPropertiesKHR VkQueueFamilyGlobalPriorityPropertiesEXT; + + + +#define VK_EXT_image_view_min_lod 1 +#define VK_EXT_IMAGE_VIEW_MIN_LOD_SPEC_VERSION 1 +#define VK_EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME "VK_EXT_image_view_min_lod" +typedef struct VkPhysicalDeviceImageViewMinLodFeaturesEXT { VkStructureType sType; void* pNext; - VkBool32 globalPriorityQuery; -} VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT; + VkBool32 minLod; +} VkPhysicalDeviceImageViewMinLodFeaturesEXT; -typedef struct VkQueueFamilyGlobalPriorityPropertiesEXT { - VkStructureType sType; - void* pNext; - uint32_t priorityCount; - VkQueueGlobalPriorityEXT priorities[VK_MAX_GLOBAL_PRIORITY_SIZE_EXT]; -} VkQueueFamilyGlobalPriorityPropertiesEXT; +typedef struct VkImageViewMinLodCreateInfoEXT { + VkStructureType sType; + const void* pNext; + float minLod; +} VkImageViewMinLodCreateInfoEXT; @@ -13094,6 +13829,46 @@ VKAPI_ATTR void VKAPI_CALL vkSetDeviceMemoryPriorityEXT( #endif +#define VK_QCOM_fragment_density_map_offset 1 +#define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION 1 +#define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME "VK_QCOM_fragment_density_map_offset" +typedef struct VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM { + VkStructureType sType; + void* pNext; + VkBool32 fragmentDensityMapOffset; +} VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM; + +typedef struct VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM { + VkStructureType sType; + void* pNext; + VkExtent2D fragmentDensityOffsetGranularity; +} VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM; + +typedef struct VkSubpassFragmentDensityMapOffsetEndInfoQCOM { + VkStructureType sType; + const void* pNext; + uint32_t fragmentDensityOffsetCount; + const VkOffset2D* pFragmentDensityOffsets; +} VkSubpassFragmentDensityMapOffsetEndInfoQCOM; + + + +#define VK_NV_linear_color_attachment 1 +#define VK_NV_LINEAR_COLOR_ATTACHMENT_SPEC_VERSION 1 +#define VK_NV_LINEAR_COLOR_ATTACHMENT_EXTENSION_NAME "VK_NV_linear_color_attachment" +typedef struct VkPhysicalDeviceLinearColorAttachmentFeaturesNV { + VkStructureType sType; + void* pNext; + VkBool32 linearColorAttachment; +} VkPhysicalDeviceLinearColorAttachmentFeaturesNV; + + + +#define VK_GOOGLE_surfaceless_query 1 +#define VK_GOOGLE_SURFACELESS_QUERY_SPEC_VERSION 1 +#define VK_GOOGLE_SURFACELESS_QUERY_EXTENSION_NAME "VK_GOOGLE_surfaceless_query" + + #define VK_KHR_acceleration_structure 1 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkAccelerationStructureKHR) #define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13 diff --git a/renderdoc/driver/vulkan/official/vulkan_directfb.h b/renderdoc/driver/vulkan/official/vulkan_directfb.h index 8eaac6e48..ab3504efa 100644 --- a/renderdoc/driver/vulkan/official/vulkan_directfb.h +++ b/renderdoc/driver/vulkan/official/vulkan_directfb.h @@ -2,7 +2,7 @@ #define VULKAN_DIRECTFB_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_fuchsia.h b/renderdoc/driver/vulkan/official/vulkan_fuchsia.h index 44b4ace3e..61774ff9c 100644 --- a/renderdoc/driver/vulkan/official/vulkan_fuchsia.h +++ b/renderdoc/driver/vulkan/official/vulkan_fuchsia.h @@ -2,7 +2,7 @@ #define VULKAN_FUCHSIA_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_ggp.h b/renderdoc/driver/vulkan/official/vulkan_ggp.h index 9a6a582c5..19dfd2261 100644 --- a/renderdoc/driver/vulkan/official/vulkan_ggp.h +++ b/renderdoc/driver/vulkan/official/vulkan_ggp.h @@ -2,7 +2,7 @@ #define VULKAN_GGP_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_ios.h b/renderdoc/driver/vulkan/official/vulkan_ios.h index 6e7e6afea..579220543 100644 --- a/renderdoc/driver/vulkan/official/vulkan_ios.h +++ b/renderdoc/driver/vulkan/official/vulkan_ios.h @@ -2,7 +2,7 @@ #define VULKAN_IOS_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_macos.h b/renderdoc/driver/vulkan/official/vulkan_macos.h index c49b123d0..8e197c7cf 100644 --- a/renderdoc/driver/vulkan/official/vulkan_macos.h +++ b/renderdoc/driver/vulkan/official/vulkan_macos.h @@ -2,7 +2,7 @@ #define VULKAN_MACOS_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_metal.h b/renderdoc/driver/vulkan/official/vulkan_metal.h index 5cf4a703a..3631f1200 100644 --- a/renderdoc/driver/vulkan/official/vulkan_metal.h +++ b/renderdoc/driver/vulkan/official/vulkan_metal.h @@ -2,7 +2,7 @@ #define VULKAN_METAL_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_vi.h b/renderdoc/driver/vulkan/official/vulkan_vi.h index 9e0dcca20..0355e7a16 100644 --- a/renderdoc/driver/vulkan/official/vulkan_vi.h +++ b/renderdoc/driver/vulkan/official/vulkan_vi.h @@ -2,7 +2,7 @@ #define VULKAN_VI_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_wayland.h b/renderdoc/driver/vulkan/official/vulkan_wayland.h index 2a329be9d..9afd0b76d 100644 --- a/renderdoc/driver/vulkan/official/vulkan_wayland.h +++ b/renderdoc/driver/vulkan/official/vulkan_wayland.h @@ -2,7 +2,7 @@ #define VULKAN_WAYLAND_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_win32.h b/renderdoc/driver/vulkan/official/vulkan_win32.h index 1b680f0b1..affe0c02a 100644 --- a/renderdoc/driver/vulkan/official/vulkan_win32.h +++ b/renderdoc/driver/vulkan/official/vulkan_win32.h @@ -2,7 +2,7 @@ #define VULKAN_WIN32_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_xcb.h b/renderdoc/driver/vulkan/official/vulkan_xcb.h index 5ba2ad850..68e61b88f 100644 --- a/renderdoc/driver/vulkan/official/vulkan_xcb.h +++ b/renderdoc/driver/vulkan/official/vulkan_xcb.h @@ -2,7 +2,7 @@ #define VULKAN_XCB_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_xlib.h b/renderdoc/driver/vulkan/official/vulkan_xlib.h index 75c75dc2e..ea5360ab6 100644 --- a/renderdoc/driver/vulkan/official/vulkan_xlib.h +++ b/renderdoc/driver/vulkan/official/vulkan_xlib.h @@ -2,7 +2,7 @@ #define VULKAN_XLIB_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/official/vulkan_xlib_xrandr.h b/renderdoc/driver/vulkan/official/vulkan_xlib_xrandr.h index fa2749342..8fc35cfc5 100644 --- a/renderdoc/driver/vulkan/official/vulkan_xlib_xrandr.h +++ b/renderdoc/driver/vulkan/official/vulkan_xlib_xrandr.h @@ -2,7 +2,7 @@ #define VULKAN_XLIB_XRANDR_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/renderdoc/driver/vulkan/renderdoc.json b/renderdoc/driver/vulkan/renderdoc.json index 0183c22d4..f0e7a529e 100644 --- a/renderdoc/driver/vulkan/renderdoc.json +++ b/renderdoc/driver/vulkan/renderdoc.json @@ -4,7 +4,7 @@ "name": "VK_LAYER_RENDERDOC_Capture", "type": "GLOBAL", "library_path": "@VULKAN_LAYER_MODULE_PATH@", - "api_version": "1.2.131", + "api_version": "1.3.131", "implementation_version": "@RENDERDOC_VERSION_MINOR@", "description": "Debugging capture layer for RenderDoc", "functions": { diff --git a/renderdoc/driver/vulkan/vk.xml b/renderdoc/driver/vulkan/vk.xml index af8373af9..9477feae1 100644 --- a/renderdoc/driver/vulkan/vk.xml +++ b/renderdoc/driver/vulkan/vk.xml @@ -1,7 +1,7 @@ -Copyright 2015-2021 The Khronos Group Inc. +Copyright 2015-2022 The Khronos Group Inc. SPDX-License-Identifier: Apache-2.0 OR MIT @@ -154,10 +154,12 @@ branch of the member gitlab server. #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0)// Patch version should always be set to 0 // Vulkan 1.2 version number #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0)// Patch version should always be set to 0 + // Vulkan 1.3 version number +#define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 197 +#define VK_HEADER_VERSION 204 // 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, 3, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -233,9 +235,9 @@ typedef void CAMetalLayer; typedef VkFlags VkSamplerCreateFlags; typedef VkFlags VkPipelineLayoutCreateFlags; typedef VkFlags VkPipelineCacheCreateFlags; - typedef VkFlags VkPipelineDepthStencilStateCreateFlags; + typedef VkFlags VkPipelineDepthStencilStateCreateFlags; typedef VkFlags VkPipelineDynamicStateCreateFlags; - typedef VkFlags VkPipelineColorBlendStateCreateFlags; + typedef VkFlags VkPipelineColorBlendStateCreateFlags; typedef VkFlags VkPipelineMultisampleStateCreateFlags; typedef VkFlags VkPipelineRasterizationStateCreateFlags; typedef VkFlags VkPipelineViewportStateCreateFlags; @@ -294,11 +296,13 @@ typedef void CAMetalLayer; typedef VkFlags VkBuildAccelerationStructureFlagsKHR; - typedef VkFlags VkPrivateDataSlotCreateFlagsEXT; + typedef VkFlags VkPrivateDataSlotCreateFlags; + typedef VkFlags VkAccelerationStructureCreateFlagsKHR; typedef VkFlags VkDescriptorUpdateTemplateCreateFlags; - typedef VkFlags VkPipelineCreationFeedbackFlagsEXT; + typedef VkFlags VkPipelineCreationFeedbackFlags; + typedef VkFlags VkPerformanceCounterDescriptionFlagsKHR; typedef VkFlags VkAcquireProfilingLockFlagsKHR; typedef VkFlags VkSemaphoreWaitFlags; @@ -306,12 +310,16 @@ typedef void CAMetalLayer; typedef VkFlags VkPipelineCompilerControlFlagsAMD; typedef VkFlags VkShaderCorePropertiesFlagsAMD; typedef VkFlags VkDeviceDiagnosticsConfigFlagsNV; - typedef VkFlags64 VkAccessFlags2KHR; - typedef VkFlags64 VkPipelineStageFlags2KHR; - typedef VkFlags VkAccelerationStructureMotionInfoFlagsNV; - typedef VkFlags VkAccelerationStructureMotionInstanceFlagsNV; - typedef VkFlags64 VkFormatFeatureFlags2KHR; - typedef VkFlags VkRenderingFlagsKHR; + typedef VkFlags64 VkAccessFlags2; + + typedef VkFlags64 VkPipelineStageFlags2; + + typedef VkFlags VkAccelerationStructureMotionInfoFlagsNV; + typedef VkFlags VkAccelerationStructureMotionInstanceFlagsNV; + typedef VkFlags64 VkFormatFeatureFlags2; + + typedef VkFlags VkRenderingFlags; + WSI extensions typedef VkFlags VkCompositeAlphaFlagsKHR; @@ -382,10 +390,12 @@ typedef void CAMetalLayer; typedef VkFlags VkPipelineRasterizationStateStreamCreateFlagsEXT; typedef VkFlags VkPipelineRasterizationDepthClipStateCreateFlagsEXT; typedef VkFlags VkSwapchainImageUsageFlagsANDROID; - typedef VkFlags VkToolPurposeFlagsEXT; - typedef VkFlags VkSubmitFlagsKHR; + typedef VkFlags VkToolPurposeFlags; + + typedef VkFlags VkSubmitFlags; + typedef VkFlags VkImageFormatConstraintsFlagsFUCHSIA; - typedef VkFlags VkImageConstraintsInfoFlagsFUCHSIA; + typedef VkFlags VkImageConstraintsInfoFlagsFUCHSIA; Video Core extension typedef VkFlags VkVideoCodecOperationFlagsKHR; @@ -418,6 +428,7 @@ typedef void CAMetalLayer; typedef VkFlags VkVideoEncodeH264InputModeFlagsEXT; typedef VkFlags VkVideoEncodeH264OutputModeFlagsEXT; typedef VkFlags VkVideoEncodeH264CreateFlagsEXT; + typedef VkFlags VkVideoEncodeH264RateControlStructureFlagsEXT; Video Encode H.265 extension typedef VkFlags VkVideoEncodeH265CapabilityFlagsEXT; @@ -425,6 +436,7 @@ typedef void CAMetalLayer; typedef VkFlags VkVideoEncodeH265OutputModeFlagsEXT; typedef VkFlags VkVideoEncodeH265CreateFlagsEXT; typedef VkFlags VkVideoEncodeH265CtbSizeFlagsEXT; + typedef VkFlags VkVideoEncodeH265RateControlStructureFlagsEXT; Types which can be void pointers or class pointers, selected at compile time VK_DEFINE_HANDLE(VkInstance) @@ -463,7 +475,8 @@ typedef void CAMetalLayer; VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPerformanceConfigurationINTEL) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkBufferCollectionFUCHSIA) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDeferredOperationKHR) - VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPrivateDataSlotEXT) + VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPrivateDataSlot) + VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCuModuleNVX) VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkCuFunctionNVX) @@ -565,7 +578,8 @@ typedef void CAMetalLayer; - + + @@ -577,7 +591,8 @@ typedef void CAMetalLayer; - + + @@ -611,7 +626,8 @@ typedef void CAMetalLayer; - + + @@ -628,16 +644,23 @@ typedef void CAMetalLayer; - + + - - + + + + - - + + + + + + WSI extensions @@ -699,7 +722,8 @@ typedef void CAMetalLayer; - + + Enumerated types in the header, but not used by the API @@ -737,11 +761,13 @@ typedef void CAMetalLayer; + Video H.265 Encode extensions + The PFN_vk*Function types are used by VkAllocationCallbacks below typedef void (VKAPI_PTR *PFN_vkInternalAllocationNotification)( @@ -1566,7 +1592,7 @@ typedef void CAMetalLayer; VkBool32 dualSrcBlendblend operations which take two sources VkBool32 logicOplogic operations VkBool32 multiDrawIndirectmulti draw indirect - VkBool32 drawIndirectFirstInstanceindirect draws can use non-zero firstInstance + VkBool32 drawIndirectFirstInstanceindirect drawing can use non-zero firstInstance VkBool32 depthClampdepth clamping VkBool32 depthBiasClampdepth bias clamping VkBool32 fillModeNonSolidpoint and wireframe fill modes @@ -1688,7 +1714,7 @@ typedef void CAMetalLayer; uint32_t subTexelPrecisionBitsnumber bits of precision for selecting texel weights uint32_t mipmapPrecisionBitsnumber bits of precision for selecting mipmap weights uint32_t maxDrawIndexedIndexValuemax index value for indexed draw calls (for 32-bit indices) - uint32_t maxDrawIndirectCountmax draw count for indirect draw calls + uint32_t maxDrawIndirectCountmax draw count for indirect drawing calls float maxSamplerLodBiasmax absolute sampler LOD bias float maxSamplerAnisotropymax degree of sampler anisotropy uint32_t maxViewportsmax number of active viewports @@ -2060,7 +2086,7 @@ typedef void CAMetalLayer; const SECURITY_ATTRIBUTES* pAttributes DWORD dwAccess - + VkStructureType sType const void* pNext uint32_t acquireCount @@ -2076,21 +2102,24 @@ typedef void CAMetalLayer; void* pNext VkBool32 deviceGeneratedCommands - - VkStructureType sType + + VkStructureType sType const void* pNext uint32_t privateDataSlotRequestCount - - VkStructureType sType + + + VkStructureType sType const void* pNext - VkPrivateDataSlotCreateFlagsEXT flags + VkPrivateDataSlotCreateFlags flags - - VkStructureType sType + + + VkStructureType sType void* pNext VkBool32 privateData + VkStructureType sType void* pNext @@ -2423,7 +2452,7 @@ typedef void CAMetalLayer; VkDeviceMemory memory VkExternalMemoryHandleTypeFlagBits handleType - + VkStructureType sType const void* pNext uint32_t acquireCount @@ -2676,7 +2705,7 @@ typedef void CAMetalLayer; const VkRect2D* pSplitInstanceBindRegions - + VkStructureType sType const void* pNext uint32_t deviceMask @@ -2916,7 +2945,7 @@ typedef void CAMetalLayer; VkStructureType sType const void* pNext - VkSurfaceKHR surface + VkSurfaceKHR surface VkStructureType sType @@ -2988,11 +3017,12 @@ typedef void CAMetalLayer; VkBuffer buffer - - VkStructureType sType + + VkStructureType sType const void* pNext const VkBufferCreateInfo* pCreateInfo + VkStructureType sType const void* pNext @@ -3005,12 +3035,13 @@ typedef void CAMetalLayer; VkImage image - - VkStructureType sType + + VkStructureType sType const void* pNext const VkImageCreateInfo* pCreateInfo VkImageAspectFlagBits planeAspect + VkStructureType sType void* pNext @@ -3227,14 +3258,15 @@ typedef void CAMetalLayer; VkBool32 dstPremultiplied VkBlendOverlapEXT blendOverlap - - VkStructureType sType - void* pNext + + VkStructureType sType + void* pNext VkBool32 inlineUniformBlock VkBool32 descriptorBindingInlineUniformBlockUpdateAfterBind - - VkStructureType sType + + + VkStructureType sType void* pNext uint32_t maxInlineUniformBlockSize uint32_t maxPerStageDescriptorInlineUniformBlocks @@ -3242,17 +3274,20 @@ typedef void CAMetalLayer; uint32_t maxDescriptorSetInlineUniformBlocks uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks - - VkStructureType sType - const void* pNext - uint32_t dataSize - const void* pData + + + VkStructureType sType + const void* pNext + uint32_t dataSize + const void* pData - - VkStructureType sType - const void* pNext - uint32_t maxInlineUniformBlockBindings + + + VkStructureType sType + const void* pNext + uint32_t maxInlineUniformBlockBindings + VkStructureType sType const void* pNext @@ -3288,16 +3323,18 @@ typedef void CAMetalLayer; VkDeviceSize maxMemoryAllocationSize - - VkStructureType sType + + VkStructureType sType void* pNext VkBool32 maintenance4 - - VkStructureType sType + + + VkStructureType sType void* pNext VkDeviceSize maxBufferSize + VkStructureType sType void* pNext @@ -3385,22 +3422,25 @@ typedef void CAMetalLayer; uint32_t numAvailableSgprs uint32_t computeWorkGroupSize[3] - - VkStructureType sType + + VkStructureType sType const void* pNext - VkQueueGlobalPriorityEXT globalPriority + VkQueueGlobalPriorityKHR globalPriority - - VkStructureType sType + + + VkStructureType sType void* pNext VkBool32 globalPriorityQuery - - VkStructureType sType + + + VkStructureType sType void* pNext uint32_t priorityCount - VkQueueGlobalPriorityEXT priorities[VK_MAX_GLOBAL_PRIORITY_SIZE_EXT] + VkQueueGlobalPriorityKHR priorities[VK_MAX_GLOBAL_PRIORITY_SIZE_KHR] + VkStructureType sType const void* pNext @@ -4298,26 +4338,42 @@ typedef void CAMetalLayer; void* pNext VkBool32 fragmentDensityMapDeferred + + VkStructureType sType + void* pNext + VkBool32 fragmentDensityMapOffset + VkStructureType sType void* pNext VkExtent2D minFragmentDensityTexelSize VkExtent2D maxFragmentDensityTexelSize - VkBool32 fragmentDensityInvocations + VkBool32 fragmentDensityInvocations VkStructureType sType void* pNext - VkBool32 subsampledLoads - VkBool32 subsampledCoarseReconstructionEarlyAccess + VkBool32 subsampledLoads + VkBool32 subsampledCoarseReconstructionEarlyAccess uint32_t maxSubsampledArrayLayers uint32_t maxDescriptorSetSubsampledSamplers + + VkStructureType sType + void* pNext + VkExtent2D fragmentDensityOffsetGranularity + VkStructureType sType const void* pNext VkAttachmentReference fragmentDensityMapAttachment + + VkStructureType sType + const void* pNext + uint32_t fragmentDensityOffsetCount + const VkOffset2D* pFragmentDensityOffsets + VkStructureType sType void* pNext @@ -4444,11 +4500,12 @@ typedef void CAMetalLayer; const VkImageView* pAttachments - - VkStructureType sType - void* pNext + + VkStructureType sType + void* pNext VkBool32 textureCompressionASTC_HDR + VkStructureType sType void* pNext @@ -4495,17 +4552,19 @@ typedef void CAMetalLayer; const void* pNext GgpFrameToken frameToken - - VkPipelineCreationFeedbackFlagsEXT flags + + VkPipelineCreationFeedbackFlags flags uint64_t duration - - VkStructureType sType - const void* pNext - VkPipelineCreationFeedbackEXT* pPipelineCreationFeedbackOutput pipeline creation feedback. + + + VkStructureType sType + const void* pNext + VkPipelineCreationFeedback* pPipelineCreationFeedbackOutput pipeline creation feedback. uint32_t pipelineStageCreationFeedbackCount - VkPipelineCreationFeedbackEXT* pPipelineStageCreationFeedbacksOne entry for each shader stage specified in the parent Vk*PipelineCreateInfo struct + VkPipelineCreationFeedback* pPipelineStageCreationFeedbacksOne entry for each shader stage specified in the parent Vk*PipelineCreateInfo struct + VkStructureType sType void* pNext @@ -4569,7 +4628,7 @@ typedef void CAMetalLayer; VkAcquireProfilingLockFlagsKHR flagsAcquire profiling lock flags uint64_t timeout - + VkStructureType sType const void* pNext uint32_t counterPassIndexIndex for which counter pass to submit @@ -4748,43 +4807,48 @@ typedef void CAMetalLayer; size_t dataSize void* pData - - VkStructureType sType - void* pNext - VkBool32 shaderDemoteToHelperInvocation + + VkStructureType sType + void* pNext + VkBool32 shaderDemoteToHelperInvocation + VkStructureType sType void* pNext VkBool32 texelBufferAlignment - - VkStructureType sType + + VkStructureType sType void* pNext VkDeviceSize storageTexelBufferOffsetAlignmentBytes VkBool32 storageTexelBufferOffsetSingleTexelAlignment VkDeviceSize uniformTexelBufferOffsetAlignmentBytes VkBool32 uniformTexelBufferOffsetSingleTexelAlignment - - VkStructureType sType - void* pNext - VkBool32 subgroupSizeControl - VkBool32 computeFullSubgroups + + + VkStructureType sType + void* pNext + VkBool32 subgroupSizeControl + VkBool32 computeFullSubgroups - - VkStructureType sType + + + VkStructureType sType void* pNext uint32_t minSubgroupSizeThe minimum subgroup size supported by this device uint32_t maxSubgroupSizeThe maximum subgroup size supported by this device uint32_t maxComputeWorkgroupSubgroupsThe maximum number of subgroups supported in a workgroup - VkShaderStageFlags requiredSubgroupSizeStagesThe shader stages that support specifying a subgroup size + VkShaderStageFlags requiredSubgroupSizeStagesThe shader stages that support specifying a subgroup size - - VkStructureType sType - void* pNext + + + VkStructureType sType + void* pNext uint32_t requiredSubgroupSize + VkStructureType sType void* pNext @@ -4831,11 +4895,12 @@ typedef void CAMetalLayer; uint32_t lineStippleFactor uint16_t lineStipplePattern - - VkStructureType sType + + VkStructureType sType void* pNext - VkBool32 pipelineCreationCacheControl + VkBool32 pipelineCreationCacheControl + VkStructureTypesType void* pNext @@ -4978,6 +5043,74 @@ typedef void CAMetalLayer; uint64_t maxTimelineSemaphoreValueDifference VkSampleCountFlags framebufferIntegerColorSampleCounts + + VkStructureTypesType + void* pNext + VkBool32 robustImageAccess + VkBool32 inlineUniformBlock + VkBool32 descriptorBindingInlineUniformBlockUpdateAfterBind + VkBool32 pipelineCreationCacheControl + VkBool32 privateData + VkBool32 shaderDemoteToHelperInvocation + VkBool32 shaderTerminateInvocation + VkBool32 subgroupSizeControl + VkBool32 computeFullSubgroups + VkBool32 synchronization2 + VkBool32 textureCompressionASTC_HDR + VkBool32 shaderZeroInitializeWorkgroupMemory + VkBool32 dynamicRendering + VkBool32 shaderIntegerDotProduct + VkBool32 maintenance4 + + + VkStructureTypesType + void* pNext + uint32_t minSubgroupSizeThe minimum subgroup size supported by this device + uint32_t maxSubgroupSizeThe maximum subgroup size supported by this device + uint32_t maxComputeWorkgroupSubgroupsThe maximum number of subgroups supported in a workgroup + VkShaderStageFlags requiredSubgroupSizeStagesThe shader stages that support specifying a subgroup size + uint32_t maxInlineUniformBlockSize + uint32_t maxPerStageDescriptorInlineUniformBlocks + uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks + uint32_t maxDescriptorSetInlineUniformBlocks + uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks + uint32_t maxInlineUniformTotalSize + VkBool32 integerDotProduct8BitUnsignedAccelerated + VkBool32 integerDotProduct8BitSignedAccelerated + VkBool32 integerDotProduct8BitMixedSignednessAccelerated + VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated + VkBool32 integerDotProduct4x8BitPackedSignedAccelerated + VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated + VkBool32 integerDotProduct16BitUnsignedAccelerated + VkBool32 integerDotProduct16BitSignedAccelerated + VkBool32 integerDotProduct16BitMixedSignednessAccelerated + VkBool32 integerDotProduct32BitUnsignedAccelerated + VkBool32 integerDotProduct32BitSignedAccelerated + VkBool32 integerDotProduct32BitMixedSignednessAccelerated + VkBool32 integerDotProduct64BitUnsignedAccelerated + VkBool32 integerDotProduct64BitSignedAccelerated + VkBool32 integerDotProduct64BitMixedSignednessAccelerated + VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated + VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated + VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated + VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated + VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated + VkDeviceSize storageTexelBufferOffsetAlignmentBytes + VkBool32 storageTexelBufferOffsetSingleTexelAlignment + VkDeviceSize uniformTexelBufferOffsetAlignmentBytes + VkBool32 uniformTexelBufferOffsetSingleTexelAlignment + VkDeviceSize maxBufferSize + VkStructureType sType const void* pNext @@ -4988,15 +5121,16 @@ typedef void CAMetalLayer; void* pNext VkBool32 deviceCoherentMemory - - VkStructureType sType + + VkStructureType sType void* pNext - char name[VK_MAX_EXTENSION_NAME_SIZE] - char version[VK_MAX_EXTENSION_NAME_SIZE] - VkToolPurposeFlagsEXT purposes - char description[VK_MAX_DESCRIPTION_SIZE] - char layer[VK_MAX_EXTENSION_NAME_SIZE] + char name[VK_MAX_EXTENSION_NAME_SIZE] + char version[VK_MAX_EXTENSION_NAME_SIZE] + VkToolPurposeFlags purposes + char description[VK_MAX_DESCRIPTION_SIZE] + char layer[VK_MAX_EXTENSION_NAME_SIZE] + VkStructureType sType const void* pNext @@ -5202,11 +5336,12 @@ typedef void CAMetalLayer; const void* pNext VkDeviceDiagnosticsConfigFlagsNV flags - - VkStructureType sType + + VkStructureType sType void* pNext VkBool32 shaderZeroInitializeWorkgroupMemory + VkStructureType sType void* pNext @@ -5214,22 +5349,23 @@ typedef void CAMetalLayer; VkStructureType sType - void* pNext + void* pNext VkBool32 robustBufferAccess2 VkBool32 robustImageAccess2 VkBool32 nullDescriptor VkStructureType sType - void* pNext - VkDeviceSize robustStorageBufferAccessSizeAlignment - VkDeviceSize robustUniformBufferAccessSizeAlignment + void* pNext + VkDeviceSize robustStorageBufferAccessSizeAlignment + VkDeviceSize robustUniformBufferAccessSizeAlignment - - VkStructureType sType - void* pNext + + VkStructureType sType + void* pNext VkBool32 robustImageAccess + VkStructureType sType void* pNext @@ -5260,119 +5396,130 @@ typedef void CAMetalLayer; VkStructureType sType void* pNext - uint32_t minVertexInputBindingStrideAlignment + uint32_t minVertexInputBindingStrideAlignment VkStructureType sType - void* pNext + void* pNext VkBool32 formatA4R4G4B4 VkBool32 formatA4B4G4R4 VkStructureType sType - void* pNext + void* pNext VkBool32 subpassShading - - VkStructureType sType - const void* pNext - VkDeviceSize srcOffsetSpecified in bytes - VkDeviceSize dstOffsetSpecified in bytes + + VkStructureType sType + const void* pNext + VkDeviceSize srcOffsetSpecified in bytes + VkDeviceSize dstOffsetSpecified in bytes VkDeviceSize sizeSpecified in bytes - - VkStructureType sType - const void* pNext - VkImageSubresourceLayers srcSubresource - VkOffset3D srcOffsetSpecified in pixels for both compressed and uncompressed images - VkImageSubresourceLayers dstSubresource - VkOffset3D dstOffsetSpecified in pixels for both compressed and uncompressed images - VkExtent3D extentSpecified in pixels for both compressed and uncompressed images + + + VkStructureType sType + const void* pNext + VkImageSubresourceLayers srcSubresource + VkOffset3D srcOffsetSpecified in pixels for both compressed and uncompressed images + VkImageSubresourceLayers dstSubresource + VkOffset3D dstOffsetSpecified in pixels for both compressed and uncompressed images + VkExtent3D extentSpecified in pixels for both compressed and uncompressed images - - VkStructureType sType - const void* pNext - VkImageSubresourceLayers srcSubresource - VkOffset3D srcOffsets[2]Specified in pixels for both compressed and uncompressed images - VkImageSubresourceLayers dstSubresource - VkOffset3D dstOffsets[2]Specified in pixels for both compressed and uncompressed images + + + VkStructureType sType + const void* pNext + VkImageSubresourceLayers srcSubresource + VkOffset3D srcOffsets[2]Specified in pixels for both compressed and uncompressed images + VkImageSubresourceLayers dstSubresource + VkOffset3D dstOffsets[2]Specified in pixels for both compressed and uncompressed images - - VkStructureType sType - const void* pNext - VkDeviceSize bufferOffsetSpecified in bytes - uint32_t bufferRowLengthSpecified in texels - uint32_t bufferImageHeight - VkImageSubresourceLayers imageSubresource - VkOffset3D imageOffsetSpecified in pixels for both compressed and uncompressed images - VkExtent3D imageExtentSpecified in pixels for both compressed and uncompressed images + + + VkStructureType sType + const void* pNext + VkDeviceSize bufferOffsetSpecified in bytes + uint32_t bufferRowLengthSpecified in texels + uint32_t bufferImageHeight + VkImageSubresourceLayers imageSubresource + VkOffset3D imageOffsetSpecified in pixels for both compressed and uncompressed images + VkExtent3D imageExtentSpecified in pixels for both compressed and uncompressed images - - VkStructureType sType - const void* pNext - VkImageSubresourceLayers srcSubresource - VkOffset3D srcOffset - VkImageSubresourceLayers dstSubresource - VkOffset3D dstOffset - VkExtent3D extent + + + VkStructureType sType + const void* pNext + VkImageSubresourceLayers srcSubresource + VkOffset3D srcOffset + VkImageSubresourceLayers dstSubresource + VkOffset3D dstOffset + VkExtent3D extent - - VkStructureType sType - const void* pNext - VkBuffer srcBuffer - VkBuffer dstBuffer - uint32_t regionCount - const VkBufferCopy2KHR* pRegions + + + VkStructureType sType + const void* pNext + VkBuffer srcBuffer + VkBuffer dstBuffer + uint32_t regionCount + const VkBufferCopy2* pRegions - - VkStructureType sType - const void* pNext - VkImage srcImage - VkImageLayout srcImageLayout - VkImage dstImage - VkImageLayout dstImageLayout - uint32_t regionCount - const VkImageCopy2KHR* pRegions + + + VkStructureType sType + const void* pNext + VkImage srcImage + VkImageLayout srcImageLayout + VkImage dstImage + VkImageLayout dstImageLayout + uint32_t regionCount + const VkImageCopy2* pRegions - - VkStructureType sType - const void* pNext - VkImage srcImage - VkImageLayout srcImageLayout - VkImage dstImage - VkImageLayout dstImageLayout - uint32_t regionCount - const VkImageBlit2KHR* pRegions - VkFilter filter + + + VkStructureType sType + const void* pNext + VkImage srcImage + VkImageLayout srcImageLayout + VkImage dstImage + VkImageLayout dstImageLayout + uint32_t regionCount + const VkImageBlit2* pRegions + VkFilter filter - - VkStructureType sType - const void* pNext - VkBuffer srcBuffer - VkImage dstImage - VkImageLayout dstImageLayout - uint32_t regionCount - const VkBufferImageCopy2KHR* pRegions + + + VkStructureType sType + const void* pNext + VkBuffer srcBuffer + VkImage dstImage + VkImageLayout dstImageLayout + uint32_t regionCount + const VkBufferImageCopy2* pRegions - - VkStructureType sType - const void* pNext - VkImage srcImage - VkImageLayout srcImageLayout - VkBuffer dstBuffer - uint32_t regionCount - const VkBufferImageCopy2KHR* pRegions + + + VkStructureType sType + const void* pNext + VkImage srcImage + VkImageLayout srcImageLayout + VkBuffer dstBuffer + uint32_t regionCount + const VkBufferImageCopy2* pRegions - - VkStructureType sType - const void* pNext - VkImage srcImage - VkImageLayout srcImageLayout - VkImage dstImage - VkImageLayout dstImageLayout - uint32_t regionCount - const VkImageResolve2KHR* pRegions + + + VkStructureType sType + const void* pNext + VkImage srcImage + VkImageLayout srcImageLayout + VkImage dstImage + VkImageLayout dstImageLayout + uint32_t regionCount + const VkImageResolve2* pRegions + VkStructureType sType void* pNext @@ -5425,14 +5572,15 @@ typedef void CAMetalLayer; VkSampleCountFlags sampleCounts VkExtent2D fragmentSize - - VkStructureTypesType + + VkStructureTypesType void* pNext - VkBool32 shaderTerminateInvocation + VkBool32 shaderTerminateInvocation + VkStructureType sType - void* pNext + void* pNext VkBool32 fragmentShadingRateEnums VkBool32 supersampleFragmentShadingRates VkBool32 noInvocationFragmentShadingRates @@ -5471,6 +5619,16 @@ typedef void CAMetalLayer; uint32_t mutableDescriptorTypeListCount const VkMutableDescriptorTypeListVALVE* pMutableDescriptorTypeLists + + VkStructureType sType + void* pNext + VkBool32 depthClipControl + + + VkStructureType sType + const void* pNext + VkBool32 negativeOneToOne + VkStructureType sType void* pNext @@ -5508,98 +5666,111 @@ typedef void CAMetalLayer; uint32_t attachmentCount# of pAttachments const VkBool32* pColorWriteEnables - - VkStructureType sType - const void* pNext - VkPipelineStageFlags2KHR srcStageMask - VkAccessFlags2KHR srcAccessMask - VkPipelineStageFlags2KHR dstStageMask - VkAccessFlags2KHR dstAccessMask + + VkStructureType sType + const void* pNext + VkPipelineStageFlags2 srcStageMask + VkAccessFlags2 srcAccessMask + VkPipelineStageFlags2 dstStageMask + VkAccessFlags2 dstAccessMask - - VkStructureType sType - const void* pNext - VkPipelineStageFlags2KHR srcStageMask - VkAccessFlags2KHR srcAccessMask - VkPipelineStageFlags2KHR dstStageMask - VkAccessFlags2KHR dstAccessMask - VkImageLayout oldLayout - VkImageLayout newLayout - uint32_t srcQueueFamilyIndex - uint32_t dstQueueFamilyIndex - VkImage image - VkImageSubresourceRange subresourceRange + + + VkStructureType sType + const void* pNext + VkPipelineStageFlags2 srcStageMask + VkAccessFlags2 srcAccessMask + VkPipelineStageFlags2 dstStageMask + VkAccessFlags2 dstAccessMask + VkImageLayout oldLayout + VkImageLayout newLayout + uint32_t srcQueueFamilyIndex + uint32_t dstQueueFamilyIndex + VkImage image + VkImageSubresourceRange subresourceRange - - VkStructureType sType - const void* pNext - VkPipelineStageFlags2KHR srcStageMask - VkAccessFlags2KHR srcAccessMask - VkPipelineStageFlags2KHR dstStageMask - VkAccessFlags2KHR dstAccessMask - uint32_t srcQueueFamilyIndex - uint32_t dstQueueFamilyIndex - VkBuffer buffer - VkDeviceSize offset - VkDeviceSize size + + + VkStructureType sType + const void* pNext + VkPipelineStageFlags2 srcStageMask + VkAccessFlags2 srcAccessMask + VkPipelineStageFlags2 dstStageMask + VkAccessFlags2 dstAccessMask + uint32_t srcQueueFamilyIndex + uint32_t dstQueueFamilyIndex + VkBuffer buffer + VkDeviceSize offset + VkDeviceSize size - - VkStructureType sType - const void* pNext - VkDependencyFlags dependencyFlags - uint32_t memoryBarrierCount - const VkMemoryBarrier2KHR* pMemoryBarriers - uint32_t bufferMemoryBarrierCount - const VkBufferMemoryBarrier2KHR* pBufferMemoryBarriers - uint32_t imageMemoryBarrierCount - const VkImageMemoryBarrier2KHR* pImageMemoryBarriers + + + VkStructureType sType + const void* pNext + VkDependencyFlags dependencyFlags + uint32_t memoryBarrierCount + const VkMemoryBarrier2* pMemoryBarriers + uint32_t bufferMemoryBarrierCount + const VkBufferMemoryBarrier2* pBufferMemoryBarriers + uint32_t imageMemoryBarrierCount + const VkImageMemoryBarrier2* pImageMemoryBarriers - - VkStructureType sType + + + VkStructureType sType const void* pNext VkSemaphore semaphore uint64_t value - VkPipelineStageFlags2KHR stageMask + VkPipelineStageFlags2 stageMask uint32_t deviceIndex - - VkStructureType sType + + + VkStructureType sType const void* pNext VkCommandBuffer commandBuffer uint32_t deviceMask - - VkStructureType sType + + + VkStructureType sType const void* pNext - VkSubmitFlagsKHR flags + VkSubmitFlags flags uint32_t waitSemaphoreInfoCount - const VkSemaphoreSubmitInfoKHR* pWaitSemaphoreInfos + const VkSemaphoreSubmitInfo* pWaitSemaphoreInfos uint32_t commandBufferInfoCount - const VkCommandBufferSubmitInfoKHR* pCommandBufferInfos + const VkCommandBufferSubmitInfo* pCommandBufferInfos uint32_t signalSemaphoreInfoCount - const VkSemaphoreSubmitInfoKHR* pSignalSemaphoreInfos + const VkSemaphoreSubmitInfo* pSignalSemaphoreInfos + VkStructureType sType void* pNext - VkPipelineStageFlags2KHR checkpointExecutionStageMask + VkPipelineStageFlags2 checkpointExecutionStageMask VkStructureType sType void* pNext - VkPipelineStageFlags2KHR stage + VkPipelineStageFlags2 stage void* pCheckpointMarker - - VkStructureType sType + + VkStructureType sType void* pNext VkBool32 synchronization2 + VkStructureTypesType void* pNext VkVideoCodecOperationFlagsKHR videoCodecOperations + + VkStructureTypesType + void* pNext + VkBool32 supported + VkStructureTypesType void* pNext @@ -5884,17 +6055,25 @@ typedef void CAMetalLayer; const VkVideoReferenceSlotKHR* pSetupReferenceSlot uint32_t referenceSlotCount const VkVideoReferenceSlotKHR* pReferenceSlots + uint32_t precedingExternallyEncodedBytes VkStructureTypesType - const void* pNext - VkVideoEncodeRateControlFlagsKHR flags + const void* pNext + VkVideoEncodeRateControlFlagsKHR flags VkVideoEncodeRateControlModeFlagBitsKHR rateControlMode + uint8_t layerCount + const VkVideoEncodeRateControlLayerInfoKHR* pLayerConfigs + + + VkStructureTypesType + const void* pNext uint32_t averageBitrate - uint16_t peakToAverageBitrateRatio - uint16_t frameRateNumerator - uint16_t frameRateDenominator + uint32_t maxBitrate + uint32_t frameRateNumerator + uint32_t frameRateDenominator uint32_t virtualBufferSizeInMs + uint32_t initialVirtualBufferSizeInMs VkStructureTypesType @@ -5981,9 +6160,38 @@ typedef void CAMetalLayer; const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList0Entries uint8_t refFinalList1EntryCount const VkVideoEncodeH264DpbSlotInfoEXT* pRefFinalList1Entries - uint32_t precedingNaluBytes - uint8_t minQp - uint8_t maxQp + + + VkStructureTypesType + const void* pNext + uint32_t gopFrameCount + uint32_t idrPeriod + uint32_t consecutiveBFrameCount + VkVideoEncodeH264RateControlStructureFlagBitsEXT rateControlStructure + uint8_t temporalLayerCount + + + int32_t qpI + int32_t qpP + int32_t qpB + + + uint32_t frameISize + uint32_t framePSize + uint32_t frameBSize + + + VkStructureTypesType + const void* pNext + uint8_t temporalLayerId + VkBool32 useInitialRcQp + VkVideoEncodeH264QpEXT initialRcQp + VkBool32 useMinQp + VkVideoEncodeH264QpEXT minQp + VkBool32 useMaxQp + VkVideoEncodeH264QpEXT maxQp + VkBool32 useMaxFrameSize + VkVideoEncodeH264FrameSizeEXT maxFrameSize VkStructureTypesType @@ -6008,7 +6216,6 @@ typedef void CAMetalLayer; #include "vk_video/vulkan_video_codec_h265std_encode.h" - @@ -6059,6 +6266,38 @@ typedef void CAMetalLayer; const VkVideoEncodeH265ReferenceListsEXT* pReferenceFinalLists const StdVideoEncodeH265SliceHeader* pSliceHeaderStd + + VkStructureTypesType + const void* pNext + uint32_t gopFrameCount + uint32_t idrPeriod + uint32_t consecutiveBFrameCount + VkVideoEncodeH265RateControlStructureFlagBitsEXT rateControlStructure + uint8_t subLayerCount + + + int32_t qpI + int32_t qpP + int32_t qpB + + + uint32_t frameISize + uint32_t framePSize + uint32_t frameBSize + + + VkStructureTypesType + const void* pNext + uint8_t temporalId + VkBool32 useInitialRcQp + VkVideoEncodeH265QpEXT initialRcQp + VkBool32 useMinQp + VkVideoEncodeH265QpEXT minQp + VkBool32 useMaxQp + VkVideoEncodeH265QpEXT maxQp + VkBool32 useMaxFrameSize + VkVideoEncodeH265FrameSizeEXT maxFrameSize + VkStructureTypesType const void* pNext @@ -6136,18 +6375,19 @@ typedef void CAMetalLayer; uint32_t blockDimY uint32_t blockDimZ uint32_t sharedMemBytes - size_t paramCount + size_t paramCount const void* const * pParams - size_t extraCount + size_t extraCount const void* const * pExtras - - VkStructureType sType + + VkStructureType sType void* pNext VkBool32 shaderIntegerDotProduct - - VkStructureType sType + + + VkStructureType sType void* pNext VkBool32 integerDotProduct8BitUnsignedAccelerated VkBool32 integerDotProduct8BitSignedAccelerated @@ -6180,6 +6420,7 @@ typedef void CAMetalLayer; VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated + VkStructureType sType void* pNext @@ -6345,13 +6586,14 @@ typedef void CAMetalLayer; void* pNext VkBool32 formatRgba10x6WithoutYCbCrSampler - - VkStructureType sType + + VkStructureType sType void* pNext - VkFormatFeatureFlags2KHR linearTilingFeatures - VkFormatFeatureFlags2KHR optimalTilingFeatures - VkFormatFeatureFlags2KHR bufferFeatures + VkFormatFeatureFlags2 linearTilingFeatures + VkFormatFeatureFlags2 optimalTilingFeatures + VkFormatFeatureFlags2 bufferFeatures + VkStructureType sType void* pNext @@ -6361,22 +6603,22 @@ typedef void CAMetalLayer; uint64_t drmFormatModifier uint32_t drmFormatModifierPlaneCount - VkFormatFeatureFlags2KHR drmFormatModifierTilingFeatures + VkFormatFeatureFlags2 drmFormatModifierTilingFeatures VkStructureType sType void* pNext VkFormat format uint64_t externalFormat - VkFormatFeatureFlags2KHR formatFeatures + VkFormatFeatureFlags2 formatFeatures VkComponentMapping samplerYcbcrConversionComponents VkSamplerYcbcrModelConversion suggestedYcbcrModel VkSamplerYcbcrRange suggestedYcbcrRange VkChromaLocation suggestedXChromaOffset VkChromaLocation suggestedYChromaOffset - - VkStructureType sType + + VkStructureType sType const void* pNext uint32_t viewMask uint32_t colorAttachmentCount @@ -6384,20 +6626,22 @@ typedef void CAMetalLayer; VkFormat depthAttachmentFormat VkFormat stencilAttachmentFormat - - VkStructureType sType + + + VkStructureType sType const void* pNext - VkRenderingFlagsKHR flags + VkRenderingFlags flags VkRect2D renderArea uint32_t layerCount uint32_t viewMask uint32_t colorAttachmentCount - const VkRenderingAttachmentInfoKHR* pColorAttachments - const VkRenderingAttachmentInfoKHR* pDepthAttachment - const VkRenderingAttachmentInfoKHR* pStencilAttachment + const VkRenderingAttachmentInfo* pColorAttachments + const VkRenderingAttachmentInfo* pDepthAttachment + const VkRenderingAttachmentInfo* pStencilAttachment - - VkStructureType sType + + + VkStructureType sType const void* pNext VkImageView imageView VkImageLayout imageLayout @@ -6408,35 +6652,38 @@ typedef void CAMetalLayer; VkAttachmentStoreOp storeOp VkClearValue clearValue - + + VkStructureType sType const void* pNext VkImageView imageView VkImageLayout imageLayout VkExtent2D shadingRateAttachmentTexelSize - + VkStructureType sType const void* pNext VkImageView imageView VkImageLayout imageLayout - - VkStructureType sType + + VkStructureType sType void* pNext VkBool32 dynamicRendering - - VkStructureType sType + + + VkStructureType sType const void* pNext - VkRenderingFlagsKHR flags + VkRenderingFlags flags uint32_t viewMask - uint32_t colorAttachmentCount + uint32_t colorAttachmentCount const VkFormat* pColorAttachmentFormats VkFormat depthAttachmentFormat VkFormat stencilAttachmentFormat VkSampleCountFlagBits rasterizationSamples + VkStructureType sType const void* pNext @@ -6445,12 +6692,34 @@ typedef void CAMetalLayer; VkSampleCountFlagBits depthStencilAttachmentSamples - + VkStructureType sType const void* pNext VkBool32 perViewAttributes VkBool32 perViewAttributesPositionXOnly + + VkStructureType sType + void* pNext + VkBool32 minLod + + + VkStructureType sType + const void* pNext + float minLod + + + VkStructureType sType + const void* pNext + VkBool32 rasterizationOrderColorAttachmentAccess + VkBool32 rasterizationOrderDepthAttachmentAccess + VkBool32 rasterizationOrderStencilAttachmentAccess + + + VkStructureType sType + void* pNext + VkBool32 linearColorAttachment + Vulkan enumerant (token) definitions @@ -6483,7 +6752,8 @@ typedef void CAMetalLayer; - + + @@ -7238,7 +7508,7 @@ typedef void CAMetalLayer; - + @@ -7413,7 +7683,7 @@ typedef void CAMetalLayer; - + @@ -7558,11 +7828,15 @@ typedef void CAMetalLayer; - - - - - + + + + + + + + + @@ -7622,6 +7896,8 @@ typedef void CAMetalLayer; + + @@ -7750,10 +8026,13 @@ typedef void CAMetalLayer; - - - - + + + + + + + @@ -7765,9 +8044,9 @@ typedef void CAMetalLayer; - - - + + + @@ -7842,12 +8121,17 @@ typedef void CAMetalLayer; - - - - - - + + + + + + + + + + + @@ -7874,61 +8158,109 @@ typedef void CAMetalLayer; - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - + + + @@ -7943,6 +8275,10 @@ typedef void CAMetalLayer; + + + + @@ -7997,7 +8333,7 @@ typedef void CAMetalLayer; - + @@ -8015,7 +8351,7 @@ typedef void CAMetalLayer; - + @@ -8031,6 +8367,11 @@ typedef void CAMetalLayer; + + + + + @@ -8040,34 +8381,69 @@ typedef void CAMetalLayer; - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8085,10 +8461,10 @@ typedef void CAMetalLayer; - - - - + + + + @@ -9020,14 +9396,14 @@ typedef void CAMetalLayer; uint32_t imageMemoryBarrierCount const VkImageMemoryBarrier* pImageMemoryBarriers - + void vkCmdBeginQuery VkCommandBuffer commandBuffer VkQueryPool queryPool uint32_t query VkQueryControlFlags flags - + void vkCmdEndQuery VkCommandBuffer commandBuffer VkQueryPool queryPool @@ -9042,14 +9418,14 @@ typedef void CAMetalLayer; void vkCmdEndConditionalRenderingEXT VkCommandBuffer commandBuffer - + void vkCmdResetQueryPool VkCommandBuffer commandBuffer VkQueryPool queryPool uint32_t firstQuery uint32_t queryCount - + void vkCmdWriteTimestamp VkCommandBuffer commandBuffer VkPipelineStageFlagBits pipelineStage @@ -9182,14 +9558,14 @@ typedef void CAMetalLayer; VkResult vkGetPhysicalDeviceSurfaceFormatsKHR VkPhysicalDevice physicalDevice - VkSurfaceKHR surface + VkSurfaceKHR surface uint32_t* pSurfaceFormatCount VkSurfaceFormatKHR* pSurfaceFormats VkResult vkGetPhysicalDeviceSurfacePresentModesKHR VkPhysicalDevice physicalDevice - VkSurfaceKHR surface + VkSurfaceKHR surface uint32_t* pPresentModeCount VkPresentModeKHR* pPresentModes @@ -9909,26 +10285,29 @@ typedef void CAMetalLayer; uint32_t* pSparseMemoryRequirementCount VkSparseImageMemoryRequirements2* pSparseMemoryRequirements + - void vkGetDeviceBufferMemoryRequirementsKHR + void vkGetDeviceBufferMemoryRequirements VkDevice device - const VkDeviceBufferMemoryRequirementsKHR* pInfo + const VkDeviceBufferMemoryRequirements* pInfo VkMemoryRequirements2* pMemoryRequirements + - void vkGetDeviceImageMemoryRequirementsKHR + void vkGetDeviceImageMemoryRequirements VkDevice device - const VkDeviceImageMemoryRequirementsKHR* pInfo + const VkDeviceImageMemoryRequirements* pInfo VkMemoryRequirements2* pMemoryRequirements + - void vkGetDeviceImageSparseMemoryRequirementsKHR + void vkGetDeviceImageSparseMemoryRequirements VkDevice device - const VkDeviceImageMemoryRequirementsKHR* pInfo + const VkDeviceImageMemoryRequirements* pInfo uint32_t* pSparseMemoryRequirementCount VkSparseImageMemoryRequirements2* pSparseMemoryRequirements - + VkResult vkCreateSamplerYcbcrConversion VkDevice device @@ -10113,7 +10492,7 @@ typedef void CAMetalLayer; void vkCmdWriteBufferMarkerAMD VkCommandBuffer commandBuffer - VkPipelineStageFlagBits pipelineStage + VkPipelineStageFlagBits pipelineStage VkBuffer dstBuffer VkDeviceSize dstOffset uint32_t marker @@ -10713,11 +11092,12 @@ typedef void CAMetalLayer; uint16_t lineStipplePattern - VkResult vkGetPhysicalDeviceToolPropertiesEXT + VkResult vkGetPhysicalDeviceToolProperties VkPhysicalDevice physicalDevice uint32_t* pToolCount - VkPhysicalDeviceToolPropertiesEXT* pToolProperties + VkPhysicalDeviceToolProperties* pToolProperties + VkResult vkCreateAccelerationStructureKHR VkDevice device @@ -10782,34 +11162,39 @@ typedef void CAMetalLayer; VkDeferredOperationKHR operation - void vkCmdSetCullModeEXT + void vkCmdSetCullMode VkCommandBuffer commandBuffer VkCullModeFlags cullMode + - void vkCmdSetFrontFaceEXT + void vkCmdSetFrontFace VkCommandBuffer commandBuffer VkFrontFace frontFace + - void vkCmdSetPrimitiveTopologyEXT + void vkCmdSetPrimitiveTopology VkCommandBuffer commandBuffer VkPrimitiveTopology primitiveTopology + - void vkCmdSetViewportWithCountEXT + void vkCmdSetViewportWithCount VkCommandBuffer commandBuffer uint32_t viewportCount const VkViewport* pViewports + - void vkCmdSetScissorWithCountEXT + void vkCmdSetScissorWithCount VkCommandBuffer commandBuffer uint32_t scissorCount const VkRect2D* pScissors + - void vkCmdBindVertexBuffers2EXT + void vkCmdBindVertexBuffers2 VkCommandBuffer commandBuffer uint32_t firstBinding uint32_t bindingCount @@ -10818,33 +11203,39 @@ typedef void CAMetalLayer; const VkDeviceSize* pSizes const VkDeviceSize* pStrides + - void vkCmdSetDepthTestEnableEXT + void vkCmdSetDepthTestEnable VkCommandBuffer commandBuffer VkBool32 depthTestEnable + - void vkCmdSetDepthWriteEnableEXT + void vkCmdSetDepthWriteEnable VkCommandBuffer commandBuffer VkBool32 depthWriteEnable + - void vkCmdSetDepthCompareOpEXT + void vkCmdSetDepthCompareOp VkCommandBuffer commandBuffer VkCompareOp depthCompareOp + - void vkCmdSetDepthBoundsTestEnableEXT + void vkCmdSetDepthBoundsTestEnable VkCommandBuffer commandBuffer VkBool32 depthBoundsTestEnable + - void vkCmdSetStencilTestEnableEXT + void vkCmdSetStencilTestEnable VkCommandBuffer commandBuffer VkBool32 stencilTestEnable + - void vkCmdSetStencilOpEXT + void vkCmdSetStencilOp VkCommandBuffer commandBuffer VkStencilFaceFlags faceMask VkStencilOp failOp @@ -10852,90 +11243,104 @@ typedef void CAMetalLayer; VkStencilOp depthFailOp VkCompareOp compareOp + void vkCmdSetPatchControlPointsEXT VkCommandBuffer commandBuffer uint32_t patchControlPoints - void vkCmdSetRasterizerDiscardEnableEXT + void vkCmdSetRasterizerDiscardEnable VkCommandBuffer commandBuffer VkBool32 rasterizerDiscardEnable + - void vkCmdSetDepthBiasEnableEXT + void vkCmdSetDepthBiasEnable VkCommandBuffer commandBuffer VkBool32 depthBiasEnable + void vkCmdSetLogicOpEXT VkCommandBuffer commandBuffer VkLogicOp logicOp - void vkCmdSetPrimitiveRestartEnableEXT + void vkCmdSetPrimitiveRestartEnable VkCommandBuffer commandBuffer VkBool32 primitiveRestartEnable + - VkResult vkCreatePrivateDataSlotEXT + VkResult vkCreatePrivateDataSlot VkDevice device - const VkPrivateDataSlotCreateInfoEXT* pCreateInfo + const VkPrivateDataSlotCreateInfo* pCreateInfo const VkAllocationCallbacks* pAllocator - VkPrivateDataSlotEXT* pPrivateDataSlot + VkPrivateDataSlot* pPrivateDataSlot + - void vkDestroyPrivateDataSlotEXT + void vkDestroyPrivateDataSlot VkDevice device - VkPrivateDataSlotEXT privateDataSlot + VkPrivateDataSlot privateDataSlot const VkAllocationCallbacks* pAllocator + - VkResult vkSetPrivateDataEXT + VkResult vkSetPrivateData VkDevice device VkObjectType objectType uint64_t objectHandle - VkPrivateDataSlotEXT privateDataSlot + VkPrivateDataSlot privateDataSlot uint64_t data + - void vkGetPrivateDataEXT + void vkGetPrivateData VkDevice device VkObjectType objectType uint64_t objectHandle - VkPrivateDataSlotEXT privateDataSlot + VkPrivateDataSlot privateDataSlot uint64_t* pData + - void vkCmdCopyBuffer2KHR + void vkCmdCopyBuffer2 VkCommandBuffer commandBuffer - const VkCopyBufferInfo2KHR* pCopyBufferInfo + const VkCopyBufferInfo2* pCopyBufferInfo + - void vkCmdCopyImage2KHR + void vkCmdCopyImage2 VkCommandBuffer commandBuffer - const VkCopyImageInfo2KHR* pCopyImageInfo + const VkCopyImageInfo2* pCopyImageInfo + - void vkCmdBlitImage2KHR + void vkCmdBlitImage2 VkCommandBuffer commandBuffer - const VkBlitImageInfo2KHR* pBlitImageInfo + const VkBlitImageInfo2* pBlitImageInfo + - void vkCmdCopyBufferToImage2KHR + void vkCmdCopyBufferToImage2 VkCommandBuffer commandBuffer - const VkCopyBufferToImageInfo2KHR* pCopyBufferToImageInfo + const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo + - void vkCmdCopyImageToBuffer2KHR + void vkCmdCopyImageToBuffer2 VkCommandBuffer commandBuffer - const VkCopyImageToBufferInfo2KHR* pCopyImageToBufferInfo + const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo + - void vkCmdResolveImage2KHR + void vkCmdResolveImage2 VkCommandBuffer commandBuffer - const VkResolveImageInfo2KHR* pResolveImageInfo + const VkResolveImageInfo2* pResolveImageInfo + void vkCmdSetFragmentShadingRateKHR VkCommandBuffer commandBuffer @@ -10977,47 +11382,53 @@ typedef void CAMetalLayer; const VkBool32* pColorWriteEnables - void vkCmdSetEvent2KHR + void vkCmdSetEvent2 VkCommandBuffer commandBuffer VkEvent event - const VkDependencyInfoKHR* pDependencyInfo + const VkDependencyInfo* pDependencyInfo + - void vkCmdResetEvent2KHR + void vkCmdResetEvent2 VkCommandBuffer commandBuffer VkEvent event - VkPipelineStageFlags2KHR stageMask + VkPipelineStageFlags2 stageMask + - void vkCmdWaitEvents2KHR + void vkCmdWaitEvents2 VkCommandBuffer commandBuffer uint32_t eventCount const VkEvent* pEvents - const VkDependencyInfoKHR* pDependencyInfos + const VkDependencyInfo* pDependencyInfos + - void vkCmdPipelineBarrier2KHR + void vkCmdPipelineBarrier2 VkCommandBuffer commandBuffer - const VkDependencyInfoKHR* pDependencyInfo + const VkDependencyInfo* pDependencyInfo + - VkResult vkQueueSubmit2KHR + VkResult vkQueueSubmit2 VkQueue queue uint32_t submitCount - const VkSubmitInfo2KHR* pSubmits + const VkSubmitInfo2* pSubmits VkFence fence - - void vkCmdWriteTimestamp2KHR + + + void vkCmdWriteTimestamp2 VkCommandBuffer commandBuffer - VkPipelineStageFlags2KHR stage + VkPipelineStageFlags2 stage VkQueryPool queryPool uint32_t query + void vkCmdWriteBufferMarker2AMD VkCommandBuffer commandBuffer - VkPipelineStageFlags2KHR stage + VkPipelineStageFlags2 stage VkBuffer dstBuffer VkDeviceSize dstOffset uint32_t marker @@ -11201,14 +11612,16 @@ typedef void CAMetalLayer; VkBufferCollectionPropertiesFUCHSIA* pProperties - void vkCmdBeginRenderingKHR + void vkCmdBeginRendering VkCommandBuffer commandBuffer - const VkRenderingInfoKHR* pRenderingInfo + const VkRenderingInfo* pRenderingInfo + - void vkCmdEndRenderingKHR + void vkCmdEndRendering VkCommandBuffer commandBuffer + @@ -11876,7 +12289,7 @@ typedef void CAMetalLayer; - + @@ -12245,6 +12658,268 @@ typedef void CAMetalLayer; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12418,7 +13093,7 @@ typedef void CAMetalLayer; - 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. + 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. @@ -12568,6 +13243,7 @@ typedef void CAMetalLayer; + @@ -12595,6 +13271,7 @@ typedef void CAMetalLayer; + @@ -12635,9 +13312,9 @@ typedef void CAMetalLayer; - - - + + + @@ -12656,8 +13333,8 @@ typedef void CAMetalLayer; - - + + @@ -12798,7 +13475,7 @@ typedef void CAMetalLayer; - + @@ -12809,6 +13486,8 @@ typedef void CAMetalLayer; + + @@ -12828,11 +13507,17 @@ typedef void CAMetalLayer; + + + + + + - + @@ -12844,6 +13529,8 @@ typedef void CAMetalLayer; + + @@ -12865,6 +13552,12 @@ typedef void CAMetalLayer; + + + + + + @@ -12917,18 +13610,18 @@ typedef void CAMetalLayer; - + - - - - - - + + + + + + @@ -12938,17 +13631,19 @@ typedef void CAMetalLayer; - - + + + - - + + + - + @@ -12956,7 +13651,7 @@ typedef void CAMetalLayer; - + @@ -13214,26 +13909,26 @@ typedef void CAMetalLayer; - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -13714,7 +14409,7 @@ typedef void CAMetalLayer; - + @@ -14136,15 +14831,15 @@ typedef void CAMetalLayer; - + - - - - - + + + + + @@ -14392,7 +15087,7 @@ typedef void CAMetalLayer; - + @@ -14873,12 +15568,12 @@ typedef void CAMetalLayer; - + - - + + @@ -15008,10 +15703,19 @@ typedef void CAMetalLayer; - + - - + + + + + + + + + + + @@ -15044,11 +15748,11 @@ typedef void CAMetalLayer; - + - + - + @@ -15254,7 +15958,7 @@ typedef void CAMetalLayer; - + @@ -15326,11 +16030,11 @@ typedef void CAMetalLayer; - + - + @@ -15372,7 +16076,7 @@ typedef void CAMetalLayer; - + @@ -15416,18 +16120,18 @@ typedef void CAMetalLayer; - + - - - - - - - - - - + + + + + + + + + + @@ -15455,7 +16159,7 @@ typedef void CAMetalLayer; - + @@ -15608,25 +16312,25 @@ typedef void CAMetalLayer; - + - + - + - + - - + + @@ -15853,24 +16557,24 @@ typedef void CAMetalLayer; - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -15965,11 +16669,11 @@ typedef void CAMetalLayer; - + - + @@ -16037,23 +16741,23 @@ typedef void CAMetalLayer; - + - - + + - + - - - + + + @@ -16189,7 +16893,7 @@ typedef void CAMetalLayer; - + @@ -16205,14 +16909,14 @@ typedef void CAMetalLayer; - + - - - - + + + + @@ -16232,22 +16936,17 @@ typedef void CAMetalLayer; - + - - - + + + - - - - - + + + + + @@ -16264,11 +16963,12 @@ typedef void CAMetalLayer; - - - + + + + @@ -16292,11 +16992,12 @@ typedef void CAMetalLayer; + - - + + @@ -16315,7 +17016,7 @@ typedef void CAMetalLayer; - + @@ -16391,23 +17092,23 @@ typedef void CAMetalLayer; - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -16431,52 +17132,52 @@ typedef void CAMetalLayer; - - - - + + + + - - + + - - - + + + - - + + - - + + - - - + + + - + - - - - + + + + - - + + - + - - + + @@ -16505,6 +17206,7 @@ typedef void CAMetalLayer; + @@ -16562,11 +17264,11 @@ typedef void CAMetalLayer; - + - + - + @@ -16620,15 +17322,20 @@ typedef void CAMetalLayer; - + + + VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT and + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_2_PLANE_444_FORMATS_FEATURES_EXT + were not promoted to Vulkan 1.3. + - - - - + + + + @@ -16663,11 +17370,11 @@ typedef void CAMetalLayer; - + - + @@ -16679,21 +17386,21 @@ typedef void CAMetalLayer; - + - - - - - - - - - - - + + + + + + + + + + + @@ -16726,13 +17433,18 @@ typedef void CAMetalLayer; - + + + VkPhysicalDevice4444FormatsFeaturesEXT and + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT + were not promoted to Vulkan 1.3. + - - + + @@ -16742,10 +17454,20 @@ typedef void CAMetalLayer; - + - - + + + + + + + + + + + + @@ -16837,10 +17559,14 @@ typedef void CAMetalLayer; - + - - + + + + + + @@ -16869,11 +17595,11 @@ typedef void CAMetalLayer; - + - + @@ -16983,7 +17709,7 @@ typedef void CAMetalLayer; - + @@ -16997,9 +17723,9 @@ typedef void CAMetalLayer; - + - + @@ -17041,33 +17767,33 @@ typedef void CAMetalLayer; - + - + - + - - - - - - - - - + + + + + + + + + - + @@ -17134,8 +17860,8 @@ typedef void CAMetalLayer; - - + + @@ -17144,12 +17870,12 @@ typedef void CAMetalLayer; - + - - + + @@ -17167,10 +17893,14 @@ typedef void CAMetalLayer; - + - - + + + + + + @@ -17235,7 +17965,7 @@ typedef void CAMetalLayer; - + @@ -17317,14 +18047,15 @@ typedef void CAMetalLayer; - + - - - - - - + + + + + + + @@ -17401,11 +18132,17 @@ typedef void CAMetalLayer; - + - - - + + + + + + + + + @@ -17432,10 +18169,15 @@ typedef void CAMetalLayer; - + - - + + + + + + + @@ -17450,10 +18192,1502 @@ typedef void CAMetalLayer; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -17484,26 +19718,26 @@ typedef void CAMetalLayer; - + - + - + - + - + @@ -17534,18 +19768,18 @@ typedef void CAMetalLayer; - + - + - + @@ -17582,7 +19816,7 @@ typedef void CAMetalLayer; - + @@ -17598,22 +19832,25 @@ typedef void CAMetalLayer; + + + - + @@ -17623,6 +19860,7 @@ typedef void CAMetalLayer; + @@ -17632,36 +19870,37 @@ typedef void CAMetalLayer; + - + - + - + - + - + - + - + - + - + @@ -17761,17 +20000,19 @@ typedef void CAMetalLayer; - + + + @@ -17787,7 +20028,7 @@ typedef void CAMetalLayer; - + @@ -17890,7 +20131,7 @@ typedef void CAMetalLayer; - + @@ -18039,6 +20280,7 @@ typedef void CAMetalLayer; + @@ -18056,15 +20298,19 @@ typedef void CAMetalLayer; + + + + diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp index 9c8aaca83..7658c4505 100644 --- a/renderdoc/driver/vulkan/vk_common.cpp +++ b/renderdoc/driver/vulkan/vk_common.cpp @@ -1023,7 +1023,7 @@ FrameRefType GetRefType(VkDescriptorType descType) case VK_DESCRIPTOR_TYPE_SAMPLER: case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: @@ -1040,7 +1040,7 @@ FrameRefType GetRefType(VkDescriptorType descType) bool IsValid(bool allowNULLDescriptors, const VkWriteDescriptorSet &write, uint32_t arrayElement) { - if(write.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(write.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) return true; // this makes assumptions that only hold within the context of Serialise_InitialState below, @@ -1325,12 +1325,12 @@ TEST_CASE("Validate CombineDepthStencilLayouts works", "[vulkan]") // could merge, but different layouts b.image = imga; - b.oldLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + b.oldLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; b.subresourceRange = {VK_IMAGE_ASPECT_DEPTH_BIT, 0, 2, 0, 1}; barriers.push_back(b); b.image = imgb; - b.oldLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + b.oldLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; b.subresourceRange = {VK_IMAGE_ASPECT_STENCIL_BIT, 0, 2, 0, 1}; barriers.push_back(b); @@ -1342,12 +1342,12 @@ TEST_CASE("Validate CombineDepthStencilLayouts works", "[vulkan]") barriers.clear(); b.image = imga; - b.newLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + b.newLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; b.subresourceRange = {VK_IMAGE_ASPECT_DEPTH_BIT, 0, 2, 0, 1}; barriers.push_back(b); b.image = imgb; - b.newLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + b.newLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; b.subresourceRange = {VK_IMAGE_ASPECT_STENCIL_BIT, 0, 2, 0, 1}; barriers.push_back(b); diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h index e7d99d70e..b4ac41553 100644 --- a/renderdoc/driver/vulkan/vk_common.h +++ b/renderdoc/driver/vulkan/vk_common.h @@ -57,9 +57,9 @@ // set up these defines so that vulkan_core.h doesn't trash the enum names we want to define as real // 64-bit enums -#define VkAccessFlagBits2KHR VkAccessFlagBits2KHR_VkFlags64_typedef -#define VkPipelineStageFlagBits2KHR VkPipelineStageFlagBits2KHR_VkFlags64_typedef -#define VkFormatFeatureFlagBits2KHR VkFormatFeatureFlagBits2KHR_VkFlags64_typedef +#define VkAccessFlagBits2 VkAccessFlagBits2_VkFlags64_typedef +#define VkPipelineStageFlagBits2 VkPipelineStageFlagBits2_VkFlags64_typedef +#define VkFormatFeatureFlagBits2 VkFormatFeatureFlagBits2_VkFlags64_typedef #include "core/core.h" #include "core/resource_manager.h" @@ -68,13 +68,16 @@ #include "serialise/serialiser.h" #include "vk_dispatchtables.h" -#undef VkAccessFlagBits2KHR -#undef VkPipelineStageFlagBits2KHR -#undef VkFormatFeatureFlagBits2KHR +#undef VkAccessFlagBits2 +#undef VkPipelineStageFlagBits2 +#undef VkFormatFeatureFlagBits2 #undef Bool #undef None +typedef VkBufferDeviceAddressInfo VkBufferDeviceAddressInfoEXT; +typedef VkPhysicalDeviceBufferDeviceAddressFeatures VkPhysicalDeviceBufferDeviceAddressFeaturesKHR; + // enable this to cause every internal QueueSubmit to immediately call DeviceWaitIdle(), and to only // submit one command buffer at once to narrow down the cause of device lost errors #define SINGLE_FLUSH_VALIDATE OPTION_OFF @@ -689,41 +692,41 @@ enum class VulkanChunk : uint32_t vkWaitSemaphores, vkSignalSemaphore, vkQueuePresentKHR, - vkCmdSetCullModeEXT, - vkCmdSetFrontFaceEXT, - vkCmdSetPrimitiveTopologyEXT, - vkCmdSetViewportWithCountEXT, - vkCmdSetScissorWithCountEXT, - vkCmdBindVertexBuffers2EXT, - vkCmdSetDepthTestEnableEXT, - vkCmdSetDepthWriteEnableEXT, - vkCmdSetDepthCompareOpEXT, - vkCmdSetDepthBoundsTestEnableEXT, - vkCmdSetStencilTestEnableEXT, - vkCmdSetStencilOpEXT, + vkCmdSetCullMode, + vkCmdSetFrontFace, + vkCmdSetPrimitiveTopology, + vkCmdSetViewportWithCount, + vkCmdSetScissorWithCount, + vkCmdBindVertexBuffers2, + vkCmdSetDepthTestEnable, + vkCmdSetDepthWriteEnable, + vkCmdSetDepthCompareOp, + vkCmdSetDepthBoundsTestEnable, + vkCmdSetStencilTestEnable, + vkCmdSetStencilOp, CoherentMapWrite, - vkCmdCopyBuffer2KHR, - vkCmdCopyImage2KHR, - vkCmdCopyBufferToImage2KHR, - vkCmdCopyImageToBuffer2KHR, - vkCmdBlitImage2KHR, - vkCmdResolveImage2KHR, - vkCmdSetEvent2KHR, - vkCmdResetEvent2KHR, - vkCmdWaitEvents2KHR, - vkCmdPipelineBarrier2KHR, - vkCmdWriteTimestamp2KHR, - vkQueueSubmit2KHR, + vkCmdCopyBuffer2, + vkCmdCopyImage2, + vkCmdCopyBufferToImage2, + vkCmdCopyImageToBuffer2, + vkCmdBlitImage2, + vkCmdResolveImage2, + vkCmdSetEvent2, + vkCmdResetEvent2, + vkCmdWaitEvents2, + vkCmdPipelineBarrier2, + vkCmdWriteTimestamp2, + vkQueueSubmit2, vkCmdWriteBufferMarker2AMD, vkCmdSetColorWriteEnableEXT, - vkCmdSetDepthBiasEnableEXT, + vkCmdSetDepthBiasEnable, vkCmdSetLogicOpEXT, vkCmdSetPatchControlPointsEXT, - vkCmdSetPrimitiveRestartEnableEXT, - vkCmdSetRasterizerDiscardEnableEXT, + vkCmdSetPrimitiveRestartEnable, + vkCmdSetRasterizerDiscardEnable, vkCmdSetVertexInputEXT, - vkCmdBeginRenderingKHR, - vkCmdEndRenderingKHR, + vkCmdBeginRendering, + vkCmdEndRendering, Max, }; @@ -786,14 +789,14 @@ DECLARE_REFLECTION_STRUCT(VkBindImageMemoryInfo); DECLARE_REFLECTION_STRUCT(VkBindImageMemorySwapchainInfoKHR); DECLARE_REFLECTION_STRUCT(VkBindImagePlaneMemoryInfo); DECLARE_REFLECTION_STRUCT(VkBindSparseInfo); -DECLARE_REFLECTION_STRUCT(VkBlitImageInfo2KHR); -DECLARE_REFLECTION_STRUCT(VkBufferCopy2KHR); +DECLARE_REFLECTION_STRUCT(VkBlitImageInfo2); +DECLARE_REFLECTION_STRUCT(VkBufferCopy2); DECLARE_REFLECTION_STRUCT(VkBufferCreateInfo); DECLARE_REFLECTION_STRUCT(VkBufferDeviceAddressCreateInfoEXT); DECLARE_REFLECTION_STRUCT(VkBufferDeviceAddressInfo); -DECLARE_REFLECTION_STRUCT(VkBufferImageCopy2KHR); +DECLARE_REFLECTION_STRUCT(VkBufferImageCopy2); DECLARE_REFLECTION_STRUCT(VkBufferMemoryBarrier); -DECLARE_REFLECTION_STRUCT(VkBufferMemoryBarrier2KHR); +DECLARE_REFLECTION_STRUCT(VkBufferMemoryBarrier2); DECLARE_REFLECTION_STRUCT(VkBufferMemoryRequirementsInfo2); DECLARE_REFLECTION_STRUCT(VkBufferOpaqueCaptureAddressCreateInfo); DECLARE_REFLECTION_STRUCT(VkBufferViewCreateInfo); @@ -801,17 +804,17 @@ DECLARE_REFLECTION_STRUCT(VkCalibratedTimestampInfoEXT); DECLARE_REFLECTION_STRUCT(VkCommandBufferAllocateInfo); DECLARE_REFLECTION_STRUCT(VkCommandBufferBeginInfo); DECLARE_REFLECTION_STRUCT(VkCommandBufferInheritanceConditionalRenderingInfoEXT); -DECLARE_REFLECTION_STRUCT(VkCommandBufferInheritanceRenderingInfoKHR); +DECLARE_REFLECTION_STRUCT(VkCommandBufferInheritanceRenderingInfo); DECLARE_REFLECTION_STRUCT(VkCommandBufferInheritanceInfo); -DECLARE_REFLECTION_STRUCT(VkCommandBufferSubmitInfoKHR); +DECLARE_REFLECTION_STRUCT(VkCommandBufferSubmitInfo); DECLARE_REFLECTION_STRUCT(VkCommandPoolCreateInfo); DECLARE_REFLECTION_STRUCT(VkComputePipelineCreateInfo); DECLARE_REFLECTION_STRUCT(VkConditionalRenderingBeginInfoEXT); -DECLARE_REFLECTION_STRUCT(VkCopyBufferInfo2KHR); -DECLARE_REFLECTION_STRUCT(VkCopyBufferToImageInfo2KHR); +DECLARE_REFLECTION_STRUCT(VkCopyBufferInfo2); +DECLARE_REFLECTION_STRUCT(VkCopyBufferToImageInfo2); DECLARE_REFLECTION_STRUCT(VkCopyDescriptorSet); -DECLARE_REFLECTION_STRUCT(VkCopyImageInfo2KHR); -DECLARE_REFLECTION_STRUCT(VkCopyImageToBufferInfo2KHR); +DECLARE_REFLECTION_STRUCT(VkCopyImageInfo2); +DECLARE_REFLECTION_STRUCT(VkCopyImageToBufferInfo2); DECLARE_REFLECTION_STRUCT(VkDebugMarkerMarkerInfoEXT); DECLARE_REFLECTION_STRUCT(VkDebugMarkerObjectNameInfoEXT); DECLARE_REFLECTION_STRUCT(VkDebugMarkerObjectTagInfoEXT); @@ -824,9 +827,9 @@ DECLARE_REFLECTION_STRUCT(VkDebugUtilsObjectTagInfoEXT); DECLARE_REFLECTION_STRUCT(VkDedicatedAllocationBufferCreateInfoNV); DECLARE_REFLECTION_STRUCT(VkDedicatedAllocationImageCreateInfoNV); DECLARE_REFLECTION_STRUCT(VkDedicatedAllocationMemoryAllocateInfoNV); -DECLARE_REFLECTION_STRUCT(VkDependencyInfoKHR); +DECLARE_REFLECTION_STRUCT(VkDependencyInfo); DECLARE_REFLECTION_STRUCT(VkDescriptorPoolCreateInfo); -DECLARE_REFLECTION_STRUCT(VkDescriptorPoolInlineUniformBlockCreateInfoEXT); +DECLARE_REFLECTION_STRUCT(VkDescriptorPoolInlineUniformBlockCreateInfo); DECLARE_REFLECTION_STRUCT(VkDescriptorSetAllocateInfo); DECLARE_REFLECTION_STRUCT(VkDescriptorSetLayoutBindingFlagsCreateInfo) DECLARE_REFLECTION_STRUCT(VkDescriptorSetLayoutCreateInfo); @@ -834,7 +837,7 @@ DECLARE_REFLECTION_STRUCT(VkDescriptorSetLayoutSupport); DECLARE_REFLECTION_STRUCT(VkDescriptorSetVariableDescriptorCountAllocateInfo) DECLARE_REFLECTION_STRUCT(VkDescriptorSetVariableDescriptorCountLayoutSupport) DECLARE_REFLECTION_STRUCT(VkDescriptorUpdateTemplateCreateInfo); -DECLARE_REFLECTION_STRUCT(VkDeviceBufferMemoryRequirementsKHR); +DECLARE_REFLECTION_STRUCT(VkDeviceBufferMemoryRequirements); DECLARE_REFLECTION_STRUCT(VkDeviceCreateInfo); DECLARE_REFLECTION_STRUCT(VkDeviceEventInfoEXT); DECLARE_REFLECTION_STRUCT(VkDeviceGroupBindSparseInfo); @@ -845,11 +848,11 @@ DECLARE_REFLECTION_STRUCT(VkDeviceGroupPresentInfoKHR); DECLARE_REFLECTION_STRUCT(VkDeviceGroupRenderPassBeginInfo); DECLARE_REFLECTION_STRUCT(VkDeviceGroupSubmitInfo); DECLARE_REFLECTION_STRUCT(VkDeviceGroupSwapchainCreateInfoKHR); -DECLARE_REFLECTION_STRUCT(VkDeviceImageMemoryRequirementsKHR); +DECLARE_REFLECTION_STRUCT(VkDeviceImageMemoryRequirements); DECLARE_REFLECTION_STRUCT(VkDeviceMemoryOpaqueCaptureAddressInfo); -DECLARE_REFLECTION_STRUCT(VkDevicePrivateDataCreateInfoEXT); +DECLARE_REFLECTION_STRUCT(VkDevicePrivateDataCreateInfo); DECLARE_REFLECTION_STRUCT(VkDeviceQueueCreateInfo); -DECLARE_REFLECTION_STRUCT(VkDeviceQueueGlobalPriorityCreateInfoEXT); +DECLARE_REFLECTION_STRUCT(VkDeviceQueueGlobalPriorityCreateInfoKHR); DECLARE_REFLECTION_STRUCT(VkDeviceQueueInfo2); DECLARE_REFLECTION_STRUCT(VkDisplayEventInfoEXT); DECLARE_REFLECTION_STRUCT(VkDisplayModeProperties2KHR); @@ -882,16 +885,16 @@ DECLARE_REFLECTION_STRUCT(VkFramebufferAttachmentsCreateInfo); DECLARE_REFLECTION_STRUCT(VkFramebufferCreateInfo); DECLARE_REFLECTION_STRUCT(VkGraphicsPipelineCreateInfo); DECLARE_REFLECTION_STRUCT(VkHdrMetadataEXT); -DECLARE_REFLECTION_STRUCT(VkImageBlit2KHR); -DECLARE_REFLECTION_STRUCT(VkImageCopy2KHR); +DECLARE_REFLECTION_STRUCT(VkImageBlit2); +DECLARE_REFLECTION_STRUCT(VkImageCopy2); DECLARE_REFLECTION_STRUCT(VkImageCreateInfo); DECLARE_REFLECTION_STRUCT(VkImageFormatListCreateInfo); DECLARE_REFLECTION_STRUCT(VkImageFormatProperties2); DECLARE_REFLECTION_STRUCT(VkImageMemoryBarrier); -DECLARE_REFLECTION_STRUCT(VkImageMemoryBarrier2KHR); +DECLARE_REFLECTION_STRUCT(VkImageMemoryBarrier2); DECLARE_REFLECTION_STRUCT(VkImageMemoryRequirementsInfo2); DECLARE_REFLECTION_STRUCT(VkImagePlaneMemoryRequirementsInfo); -DECLARE_REFLECTION_STRUCT(VkImageResolve2KHR); +DECLARE_REFLECTION_STRUCT(VkImageResolve2); DECLARE_REFLECTION_STRUCT(VkImageSparseMemoryRequirementsInfo2); DECLARE_REFLECTION_STRUCT(VkImageStencilUsageCreateInfo); DECLARE_REFLECTION_STRUCT(VkImageSwapchainCreateInfoKHR); @@ -908,7 +911,7 @@ DECLARE_REFLECTION_STRUCT(VkMappedMemoryRange); DECLARE_REFLECTION_STRUCT(VkMemoryAllocateFlagsInfo); DECLARE_REFLECTION_STRUCT(VkMemoryAllocateInfo); DECLARE_REFLECTION_STRUCT(VkMemoryBarrier); -DECLARE_REFLECTION_STRUCT(VkMemoryBarrier2KHR); +DECLARE_REFLECTION_STRUCT(VkMemoryBarrier2); DECLARE_REFLECTION_STRUCT(VkMemoryDedicatedAllocateInfo); DECLARE_REFLECTION_STRUCT(VkMemoryDedicatedRequirements); DECLARE_REFLECTION_STRUCT(VkMemoryFdPropertiesKHR); @@ -940,7 +943,7 @@ DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceDescriptorIndexingFeatures) DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceDescriptorIndexingProperties) DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceDiscardRectanglePropertiesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceDriverProperties); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceDynamicRenderingFeaturesKHR); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceDynamicRenderingFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceExtendedDynamicStateFeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceExtendedDynamicState2FeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceExternalBufferInfo); @@ -955,22 +958,22 @@ DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceFragmentDensityMap2FeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceFragmentDensityMap2PropertiesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceGroupProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceHostQueryResetFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceIDProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceImageFormatInfo2); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceImagelessFramebufferFeatures); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceImageRobustnessFeaturesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceImageRobustnessFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceImageViewImageFormatInfoEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceIndexTypeUint8FeaturesEXT); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceInlineUniformBlockFeaturesEXT); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceInlineUniformBlockPropertiesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceInlineUniformBlockFeatures); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceInlineUniformBlockProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceLineRasterizationFeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceLineRasterizationPropertiesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMaintenance3Properties); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMaintenance4FeaturesKHR); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMaintenance4PropertiesKHR); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMaintenance4Features); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMaintenance4Properties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMemoryBudgetPropertiesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMemoryPriorityFeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMemoryProperties2); @@ -979,10 +982,10 @@ DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMultiviewProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePCIBusInfoPropertiesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePerformanceQueryFeaturesKHR); DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePerformanceQueryPropertiesKHR); -DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePipelineCreationCacheControlFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR); DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePointClippingProperties); -DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePrivateDataFeaturesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePrivateDataFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePresentIdFeaturesKHR); DECLARE_REFLECTION_STRUCT(VkPhysicalDevicePresentWaitFeaturesKHR); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceProperties2); @@ -1002,28 +1005,28 @@ DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderAtomicInt64Features); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderClockFeaturesKHR); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderCorePropertiesAMD); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderDrawParametersFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderFloat16Int8Features); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderImageFootprintFeaturesNV); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderIntegerDotProductFeatures); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderIntegerDotProductProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceShaderTerminateInvocationFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSparseImageFormatInfo2); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSubgroupProperties); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSubgroupSizeControlFeaturesEXT); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSubgroupSizeControlPropertiesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSubgroupSizeControlFeatures); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSubgroupSizeControlProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSurfaceInfo2KHR); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSynchronization2FeaturesKHR); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSynchronization2Features); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTexelBufferAlignmentProperties); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTextureCompressionASTCHDRFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTimelineSemaphoreFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTimelineSemaphoreProperties); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceToolPropertiesEXT); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceToolProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTransformFeedbackFeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceTransformFeedbackPropertiesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceUniformBufferStandardLayoutFeatures); @@ -1035,15 +1038,17 @@ DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceVulkan11Features); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceVulkan11Properties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceVulkan12Features); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceVulkan12Properties); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceVulkan13Features); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceVulkan13Properties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceVulkanMemoryModelFeatures); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceYcbcrImageArraysFeaturesEXT); -DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures); DECLARE_REFLECTION_STRUCT(VkPipelineCacheCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineColorBlendStateCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineColorWriteCreateInfoEXT); -DECLARE_REFLECTION_STRUCT(VkPipelineCreationFeedbackCreateInfoEXT); +DECLARE_REFLECTION_STRUCT(VkPipelineCreationFeedbackCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineDepthStencilStateCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineDiscardRectangleStateCreateInfoEXT); DECLARE_REFLECTION_STRUCT(VkPipelineDynamicStateCreateInfo); @@ -1060,10 +1065,10 @@ DECLARE_REFLECTION_STRUCT(VkPipelineRasterizationDepthClipStateCreateInfoEXT); DECLARE_REFLECTION_STRUCT(VkPipelineRasterizationLineStateCreateInfoEXT); DECLARE_REFLECTION_STRUCT(VkPipelineRasterizationStateCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineRasterizationStateStreamCreateInfoEXT); -DECLARE_REFLECTION_STRUCT(VkPipelineRenderingCreateInfoKHR); +DECLARE_REFLECTION_STRUCT(VkPipelineRenderingCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineSampleLocationsStateCreateInfoEXT); DECLARE_REFLECTION_STRUCT(VkPipelineShaderStageCreateInfo); -DECLARE_REFLECTION_STRUCT(VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT); +DECLARE_REFLECTION_STRUCT(VkPipelineShaderStageRequiredSubgroupSizeCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineTessellationDomainOriginStateCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineTessellationStateCreateInfo); DECLARE_REFLECTION_STRUCT(VkPipelineVertexInputDivisorStateCreateInfoEXT); @@ -1074,16 +1079,16 @@ DECLARE_REFLECTION_STRUCT(VkPresentInfoKHR); DECLARE_REFLECTION_STRUCT(VkPresentRegionsKHR); DECLARE_REFLECTION_STRUCT(VkPresentTimeGOOGLE); DECLARE_REFLECTION_STRUCT(VkPresentTimesInfoGOOGLE); -DECLARE_REFLECTION_STRUCT(VkPrivateDataSlotCreateInfoEXT); +DECLARE_REFLECTION_STRUCT(VkPrivateDataSlotCreateInfo); DECLARE_REFLECTION_STRUCT(VkProtectedSubmitInfo); DECLARE_REFLECTION_STRUCT(VkQueryPoolCreateInfo); DECLARE_REFLECTION_STRUCT(VkQueryPoolPerformanceCreateInfoKHR); -DECLARE_REFLECTION_STRUCT(VkQueueFamilyGlobalPriorityPropertiesEXT); +DECLARE_REFLECTION_STRUCT(VkQueueFamilyGlobalPriorityPropertiesKHR); DECLARE_REFLECTION_STRUCT(VkQueueFamilyProperties2); DECLARE_REFLECTION_STRUCT(VkRefreshCycleDurationGOOGLE); -DECLARE_REFLECTION_STRUCT(VkRenderingAttachmentInfoKHR); +DECLARE_REFLECTION_STRUCT(VkRenderingAttachmentInfo); DECLARE_REFLECTION_STRUCT(VkRenderingFragmentDensityMapAttachmentInfoEXT); -DECLARE_REFLECTION_STRUCT(VkRenderingInfoKHR); +DECLARE_REFLECTION_STRUCT(VkRenderingInfo); DECLARE_REFLECTION_STRUCT(VkRenderPassAttachmentBeginInfo); DECLARE_REFLECTION_STRUCT(VkRenderPassBeginInfo); DECLARE_REFLECTION_STRUCT(VkRenderPassCreateInfo); @@ -1092,7 +1097,7 @@ DECLARE_REFLECTION_STRUCT(VkRenderPassFragmentDensityMapCreateInfoEXT); DECLARE_REFLECTION_STRUCT(VkRenderPassInputAttachmentAspectCreateInfo); DECLARE_REFLECTION_STRUCT(VkRenderPassMultiviewCreateInfo); DECLARE_REFLECTION_STRUCT(VkRenderPassSampleLocationsBeginInfoEXT); -DECLARE_REFLECTION_STRUCT(VkResolveImageInfo2KHR); +DECLARE_REFLECTION_STRUCT(VkResolveImageInfo2); DECLARE_REFLECTION_STRUCT(VkSampleLocationsInfoEXT); DECLARE_REFLECTION_STRUCT(VkSamplerCreateInfo); DECLARE_REFLECTION_STRUCT(VkSamplerCustomBorderColorCreateInfoEXT); @@ -1103,7 +1108,7 @@ DECLARE_REFLECTION_STRUCT(VkSamplerYcbcrConversionInfo); DECLARE_REFLECTION_STRUCT(VkSemaphoreCreateInfo); DECLARE_REFLECTION_STRUCT(VkSemaphoreGetFdInfoKHR); DECLARE_REFLECTION_STRUCT(VkSemaphoreSignalInfo); -DECLARE_REFLECTION_STRUCT(VkSemaphoreSubmitInfoKHR); +DECLARE_REFLECTION_STRUCT(VkSemaphoreSubmitInfo); DECLARE_REFLECTION_STRUCT(VkSemaphoreTypeCreateInfo); DECLARE_REFLECTION_STRUCT(VkSemaphoreWaitInfo); DECLARE_REFLECTION_STRUCT(VkShaderModuleCreateInfo); @@ -1112,7 +1117,7 @@ DECLARE_REFLECTION_STRUCT(VkSharedPresentSurfaceCapabilitiesKHR); DECLARE_REFLECTION_STRUCT(VkSparseImageFormatProperties2); DECLARE_REFLECTION_STRUCT(VkSparseImageMemoryRequirements2); DECLARE_REFLECTION_STRUCT(VkSubmitInfo); -DECLARE_REFLECTION_STRUCT(VkSubmitInfo2KHR); +DECLARE_REFLECTION_STRUCT(VkSubmitInfo2); DECLARE_REFLECTION_STRUCT(VkSubpassBeginInfo); DECLARE_REFLECTION_STRUCT(VkSubpassDependency2); DECLARE_REFLECTION_STRUCT(VkSubpassDescription2); @@ -1134,7 +1139,7 @@ DECLARE_REFLECTION_STRUCT(VkValidationFlagsEXT); DECLARE_REFLECTION_STRUCT(VkVertexInputAttributeDescription2EXT); DECLARE_REFLECTION_STRUCT(VkVertexInputBindingDescription2EXT); DECLARE_REFLECTION_STRUCT(VkWriteDescriptorSet); -DECLARE_REFLECTION_STRUCT(VkWriteDescriptorSetInlineUniformBlockEXT); +DECLARE_REFLECTION_STRUCT(VkWriteDescriptorSetInlineUniformBlock); DECLARE_DESERIALISE_TYPE(VkAcquireNextImageInfoKHR); DECLARE_DESERIALISE_TYPE(VkAcquireProfilingLockInfoKHR); @@ -1151,12 +1156,12 @@ DECLARE_DESERIALISE_TYPE(VkBindImageMemoryInfo); DECLARE_DESERIALISE_TYPE(VkBindImageMemorySwapchainInfoKHR); DECLARE_DESERIALISE_TYPE(VkBindImagePlaneMemoryInfo); DECLARE_DESERIALISE_TYPE(VkBindSparseInfo); -DECLARE_DESERIALISE_TYPE(VkBlitImageInfo2KHR); -DECLARE_DESERIALISE_TYPE(VkBufferCopy2KHR); +DECLARE_DESERIALISE_TYPE(VkBlitImageInfo2); +DECLARE_DESERIALISE_TYPE(VkBufferCopy2); DECLARE_DESERIALISE_TYPE(VkBufferCreateInfo); -DECLARE_DESERIALISE_TYPE(VkBufferImageCopy2KHR); +DECLARE_DESERIALISE_TYPE(VkBufferImageCopy2); DECLARE_DESERIALISE_TYPE(VkBufferMemoryBarrier); -DECLARE_DESERIALISE_TYPE(VkBufferMemoryBarrier2KHR); +DECLARE_DESERIALISE_TYPE(VkBufferMemoryBarrier2); DECLARE_DESERIALISE_TYPE(VkBufferMemoryRequirementsInfo2); DECLARE_DESERIALISE_TYPE(VkBufferOpaqueCaptureAddressCreateInfo); DECLARE_DESERIALISE_TYPE(VkBufferViewCreateInfo); @@ -1164,17 +1169,17 @@ DECLARE_DESERIALISE_TYPE(VkCalibratedTimestampInfoEXT); DECLARE_DESERIALISE_TYPE(VkCommandBufferAllocateInfo); DECLARE_DESERIALISE_TYPE(VkCommandBufferBeginInfo); DECLARE_DESERIALISE_TYPE(VkCommandBufferInheritanceConditionalRenderingInfoEXT); -DECLARE_DESERIALISE_TYPE(VkCommandBufferInheritanceRenderingInfoKHR); +DECLARE_DESERIALISE_TYPE(VkCommandBufferInheritanceRenderingInfo); DECLARE_DESERIALISE_TYPE(VkCommandBufferInheritanceInfo); -DECLARE_DESERIALISE_TYPE(VkCommandBufferSubmitInfoKHR); +DECLARE_DESERIALISE_TYPE(VkCommandBufferSubmitInfo); DECLARE_DESERIALISE_TYPE(VkCommandPoolCreateInfo); DECLARE_DESERIALISE_TYPE(VkComputePipelineCreateInfo); DECLARE_DESERIALISE_TYPE(VkConditionalRenderingBeginInfoEXT); -DECLARE_DESERIALISE_TYPE(VkCopyBufferInfo2KHR); -DECLARE_DESERIALISE_TYPE(VkCopyBufferToImageInfo2KHR); +DECLARE_DESERIALISE_TYPE(VkCopyBufferInfo2); +DECLARE_DESERIALISE_TYPE(VkCopyBufferToImageInfo2); DECLARE_DESERIALISE_TYPE(VkCopyDescriptorSet); -DECLARE_DESERIALISE_TYPE(VkCopyImageInfo2KHR); -DECLARE_DESERIALISE_TYPE(VkCopyImageToBufferInfo2KHR); +DECLARE_DESERIALISE_TYPE(VkCopyImageInfo2); +DECLARE_DESERIALISE_TYPE(VkCopyImageToBufferInfo2); DECLARE_DESERIALISE_TYPE(VkDebugMarkerMarkerInfoEXT); DECLARE_DESERIALISE_TYPE(VkDebugMarkerObjectNameInfoEXT); DECLARE_DESERIALISE_TYPE(VkDebugMarkerObjectTagInfoEXT); @@ -1187,9 +1192,9 @@ DECLARE_DESERIALISE_TYPE(VkDebugUtilsObjectTagInfoEXT); DECLARE_DESERIALISE_TYPE(VkDedicatedAllocationBufferCreateInfoNV); DECLARE_DESERIALISE_TYPE(VkDedicatedAllocationImageCreateInfoNV); DECLARE_DESERIALISE_TYPE(VkDedicatedAllocationMemoryAllocateInfoNV); -DECLARE_DESERIALISE_TYPE(VkDependencyInfoKHR); +DECLARE_DESERIALISE_TYPE(VkDependencyInfo); DECLARE_DESERIALISE_TYPE(VkDescriptorPoolCreateInfo); -DECLARE_DESERIALISE_TYPE(VkDescriptorPoolInlineUniformBlockCreateInfoEXT); +DECLARE_DESERIALISE_TYPE(VkDescriptorPoolInlineUniformBlockCreateInfo); DECLARE_DESERIALISE_TYPE(VkDescriptorSetAllocateInfo); DECLARE_DESERIALISE_TYPE(VkDescriptorSetLayoutBindingFlagsCreateInfo) DECLARE_DESERIALISE_TYPE(VkDescriptorSetLayoutCreateInfo); @@ -1197,7 +1202,7 @@ DECLARE_DESERIALISE_TYPE(VkDescriptorSetLayoutSupport); DECLARE_DESERIALISE_TYPE(VkDescriptorSetVariableDescriptorCountAllocateInfo) DECLARE_DESERIALISE_TYPE(VkDescriptorSetVariableDescriptorCountLayoutSupport) DECLARE_DESERIALISE_TYPE(VkDescriptorUpdateTemplateCreateInfo); -DECLARE_DESERIALISE_TYPE(VkDeviceBufferMemoryRequirementsKHR); +DECLARE_DESERIALISE_TYPE(VkDeviceBufferMemoryRequirements); DECLARE_DESERIALISE_TYPE(VkDeviceCreateInfo); DECLARE_DESERIALISE_TYPE(VkDeviceEventInfoEXT); DECLARE_DESERIALISE_TYPE(VkDeviceGroupBindSparseInfo); @@ -1208,11 +1213,11 @@ DECLARE_DESERIALISE_TYPE(VkDeviceGroupPresentInfoKHR); DECLARE_DESERIALISE_TYPE(VkDeviceGroupRenderPassBeginInfo); DECLARE_DESERIALISE_TYPE(VkDeviceGroupSubmitInfo); DECLARE_DESERIALISE_TYPE(VkDeviceGroupSwapchainCreateInfoKHR); -DECLARE_DESERIALISE_TYPE(VkDeviceImageMemoryRequirementsKHR); +DECLARE_DESERIALISE_TYPE(VkDeviceImageMemoryRequirements); DECLARE_DESERIALISE_TYPE(VkDeviceMemoryOpaqueCaptureAddressInfo); -DECLARE_DESERIALISE_TYPE(VkDevicePrivateDataCreateInfoEXT); +DECLARE_DESERIALISE_TYPE(VkDevicePrivateDataCreateInfo); DECLARE_DESERIALISE_TYPE(VkDeviceQueueCreateInfo); -DECLARE_DESERIALISE_TYPE(VkDeviceQueueGlobalPriorityCreateInfoEXT); +DECLARE_DESERIALISE_TYPE(VkDeviceQueueGlobalPriorityCreateInfoKHR); DECLARE_DESERIALISE_TYPE(VkDeviceQueueInfo2); DECLARE_DESERIALISE_TYPE(VkDisplayEventInfoEXT); DECLARE_DESERIALISE_TYPE(VkDisplayModeProperties2KHR); @@ -1244,16 +1249,16 @@ DECLARE_DESERIALISE_TYPE(VkFramebufferAttachmentImageInfo); DECLARE_DESERIALISE_TYPE(VkFramebufferAttachmentsCreateInfo); DECLARE_DESERIALISE_TYPE(VkFramebufferCreateInfo); DECLARE_DESERIALISE_TYPE(VkGraphicsPipelineCreateInfo); -DECLARE_DESERIALISE_TYPE(VkImageBlit2KHR); -DECLARE_DESERIALISE_TYPE(VkImageCopy2KHR); +DECLARE_DESERIALISE_TYPE(VkImageBlit2); +DECLARE_DESERIALISE_TYPE(VkImageCopy2); DECLARE_DESERIALISE_TYPE(VkImageCreateInfo); DECLARE_DESERIALISE_TYPE(VkImageFormatListCreateInfo); DECLARE_DESERIALISE_TYPE(VkImageFormatProperties2); DECLARE_DESERIALISE_TYPE(VkImageMemoryBarrier); -DECLARE_DESERIALISE_TYPE(VkImageMemoryBarrier2KHR); +DECLARE_DESERIALISE_TYPE(VkImageMemoryBarrier2); DECLARE_DESERIALISE_TYPE(VkImageMemoryRequirementsInfo2); DECLARE_DESERIALISE_TYPE(VkImagePlaneMemoryRequirementsInfo); -DECLARE_DESERIALISE_TYPE(VkImageResolve2KHR); +DECLARE_DESERIALISE_TYPE(VkImageResolve2); DECLARE_DESERIALISE_TYPE(VkImageSparseMemoryRequirementsInfo2); DECLARE_DESERIALISE_TYPE(VkImageStencilUsageCreateInfo); DECLARE_DESERIALISE_TYPE(VkImageSwapchainCreateInfoKHR); @@ -1270,7 +1275,7 @@ DECLARE_DESERIALISE_TYPE(VkMappedMemoryRange); DECLARE_DESERIALISE_TYPE(VkMemoryAllocateFlagsInfo); DECLARE_DESERIALISE_TYPE(VkMemoryAllocateInfo); DECLARE_DESERIALISE_TYPE(VkMemoryBarrier); -DECLARE_DESERIALISE_TYPE(VkMemoryBarrier2KHR); +DECLARE_DESERIALISE_TYPE(VkMemoryBarrier2); DECLARE_DESERIALISE_TYPE(VkMemoryDedicatedAllocateInfo); DECLARE_DESERIALISE_TYPE(VkMemoryDedicatedRequirements); DECLARE_DESERIALISE_TYPE(VkMemoryFdPropertiesKHR); @@ -1299,7 +1304,7 @@ DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceDescriptorIndexingFeatures) DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceDescriptorIndexingProperties) DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceDiscardRectanglePropertiesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceDriverProperties); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceDynamicRenderingFeaturesKHR); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceDynamicRenderingFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceExtendedDynamicStateFeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceExtendedDynamicState2FeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceExternalBufferInfo); @@ -1314,22 +1319,22 @@ DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceFragmentDensityMap2FeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceFragmentDensityMap2PropertiesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceGroupProperties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceHostQueryResetFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceIDProperties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceImageFormatInfo2); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceImagelessFramebufferFeatures); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceImageRobustnessFeaturesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceImageRobustnessFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceImageViewImageFormatInfoEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceIndexTypeUint8FeaturesEXT); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceInlineUniformBlockFeaturesEXT); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceInlineUniformBlockPropertiesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceInlineUniformBlockFeatures); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceInlineUniformBlockProperties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceLineRasterizationFeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceLineRasterizationPropertiesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMaintenance3Properties); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMaintenance4FeaturesKHR); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMaintenance4PropertiesKHR); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMaintenance4Features); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMaintenance4Properties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMemoryBudgetPropertiesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMemoryPriorityFeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMemoryProperties2); @@ -1338,10 +1343,10 @@ DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMultiviewProperties); DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePCIBusInfoPropertiesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePerformanceQueryFeaturesKHR); DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePerformanceQueryPropertiesKHR); -DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePipelineCreationCacheControlFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR); DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePointClippingProperties); -DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePrivateDataFeaturesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePrivateDataFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePresentIdFeaturesKHR); DECLARE_DESERIALISE_TYPE(VkPhysicalDevicePresentWaitFeaturesKHR); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceProperties2); @@ -1361,28 +1366,28 @@ DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderAtomicInt64Features); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderClockFeaturesKHR); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderCorePropertiesAMD); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderDrawParametersFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderFloat16Int8Features); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderImageFootprintFeaturesNV); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderIntegerDotProductFeatures); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderIntegerDotProductProperties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceShaderTerminateInvocationFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSparseImageFormatInfo2); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSubgroupProperties); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSubgroupSizeControlFeaturesEXT); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSubgroupSizeControlPropertiesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSubgroupSizeControlFeatures); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSubgroupSizeControlProperties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSurfaceInfo2KHR); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSynchronization2FeaturesKHR); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceSynchronization2Features); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTexelBufferAlignmentProperties); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTextureCompressionASTCHDRFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTimelineSemaphoreFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTimelineSemaphoreProperties); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceToolPropertiesEXT); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceToolProperties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTransformFeedbackFeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceTransformFeedbackPropertiesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceUniformBufferStandardLayoutFeatures); @@ -1394,15 +1399,17 @@ DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceVulkan11Features); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceVulkan11Properties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceVulkan12Features); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceVulkan12Properties); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceVulkan13Features); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceVulkan13Properties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceVulkanMemoryModelFeatures); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceYcbcrImageArraysFeaturesEXT); -DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures); DECLARE_DESERIALISE_TYPE(VkPipelineCacheCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineColorBlendStateCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineColorWriteCreateInfoEXT); -DECLARE_DESERIALISE_TYPE(VkPipelineCreationFeedbackCreateInfoEXT); +DECLARE_DESERIALISE_TYPE(VkPipelineCreationFeedbackCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineDepthStencilStateCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineDiscardRectangleStateCreateInfoEXT); DECLARE_DESERIALISE_TYPE(VkPipelineDynamicStateCreateInfo); @@ -1419,10 +1426,10 @@ DECLARE_DESERIALISE_TYPE(VkPipelineRasterizationDepthClipStateCreateInfoEXT); DECLARE_DESERIALISE_TYPE(VkPipelineRasterizationLineStateCreateInfoEXT); DECLARE_DESERIALISE_TYPE(VkPipelineRasterizationStateCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineRasterizationStateStreamCreateInfoEXT); -DECLARE_DESERIALISE_TYPE(VkPipelineRenderingCreateInfoKHR); +DECLARE_DESERIALISE_TYPE(VkPipelineRenderingCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineSampleLocationsStateCreateInfoEXT); DECLARE_DESERIALISE_TYPE(VkPipelineShaderStageCreateInfo); -DECLARE_DESERIALISE_TYPE(VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT); +DECLARE_DESERIALISE_TYPE(VkPipelineShaderStageRequiredSubgroupSizeCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineTessellationDomainOriginStateCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineTessellationStateCreateInfo); DECLARE_DESERIALISE_TYPE(VkPipelineVertexInputDivisorStateCreateInfoEXT); @@ -1432,15 +1439,15 @@ DECLARE_DESERIALISE_TYPE(VkPresentIdKHR); DECLARE_DESERIALISE_TYPE(VkPresentInfoKHR); DECLARE_DESERIALISE_TYPE(VkPresentRegionsKHR); DECLARE_DESERIALISE_TYPE(VkPresentTimesInfoGOOGLE); -DECLARE_DESERIALISE_TYPE(VkPrivateDataSlotCreateInfoEXT); +DECLARE_DESERIALISE_TYPE(VkPrivateDataSlotCreateInfo); DECLARE_DESERIALISE_TYPE(VkProtectedSubmitInfo); DECLARE_DESERIALISE_TYPE(VkQueryPoolCreateInfo); DECLARE_DESERIALISE_TYPE(VkQueryPoolPerformanceCreateInfoKHR); -DECLARE_DESERIALISE_TYPE(VkQueueFamilyGlobalPriorityPropertiesEXT); +DECLARE_DESERIALISE_TYPE(VkQueueFamilyGlobalPriorityPropertiesKHR); DECLARE_DESERIALISE_TYPE(VkQueueFamilyProperties2); -DECLARE_DESERIALISE_TYPE(VkRenderingAttachmentInfoKHR); +DECLARE_DESERIALISE_TYPE(VkRenderingAttachmentInfo); DECLARE_DESERIALISE_TYPE(VkRenderingFragmentShadingRateAttachmentInfoKHR); -DECLARE_DESERIALISE_TYPE(VkRenderingInfoKHR); +DECLARE_DESERIALISE_TYPE(VkRenderingInfo); DECLARE_DESERIALISE_TYPE(VkRenderPassAttachmentBeginInfo); DECLARE_DESERIALISE_TYPE(VkRenderPassBeginInfo); DECLARE_DESERIALISE_TYPE(VkRenderPassCreateInfo); @@ -1448,7 +1455,7 @@ DECLARE_DESERIALISE_TYPE(VkRenderPassCreateInfo2); DECLARE_DESERIALISE_TYPE(VkRenderPassInputAttachmentAspectCreateInfo); DECLARE_DESERIALISE_TYPE(VkRenderPassMultiviewCreateInfo); DECLARE_DESERIALISE_TYPE(VkRenderPassSampleLocationsBeginInfoEXT); -DECLARE_DESERIALISE_TYPE(VkResolveImageInfo2KHR); +DECLARE_DESERIALISE_TYPE(VkResolveImageInfo2); DECLARE_DESERIALISE_TYPE(VkSampleLocationsInfoEXT); DECLARE_DESERIALISE_TYPE(VkSamplerCreateInfo); DECLARE_DESERIALISE_TYPE(VkSamplerCustomBorderColorCreateInfoEXT); @@ -1459,7 +1466,7 @@ DECLARE_DESERIALISE_TYPE(VkSamplerYcbcrConversionInfo); DECLARE_DESERIALISE_TYPE(VkSemaphoreCreateInfo); DECLARE_DESERIALISE_TYPE(VkSemaphoreGetFdInfoKHR); DECLARE_DESERIALISE_TYPE(VkSemaphoreSignalInfo); -DECLARE_DESERIALISE_TYPE(VkSemaphoreSubmitInfoKHR); +DECLARE_DESERIALISE_TYPE(VkSemaphoreSubmitInfo); DECLARE_DESERIALISE_TYPE(VkSemaphoreTypeCreateInfo); DECLARE_DESERIALISE_TYPE(VkSemaphoreWaitInfo); DECLARE_DESERIALISE_TYPE(VkShaderModuleCreateInfo); @@ -1468,7 +1475,7 @@ DECLARE_DESERIALISE_TYPE(VkSharedPresentSurfaceCapabilitiesKHR); DECLARE_DESERIALISE_TYPE(VkSparseImageFormatProperties2); DECLARE_DESERIALISE_TYPE(VkSparseImageMemoryRequirements2); DECLARE_DESERIALISE_TYPE(VkSubmitInfo); -DECLARE_DESERIALISE_TYPE(VkSubmitInfo2KHR); +DECLARE_DESERIALISE_TYPE(VkSubmitInfo2); DECLARE_DESERIALISE_TYPE(VkSubpassBeginInfo); DECLARE_DESERIALISE_TYPE(VkSubpassDependency2); DECLARE_DESERIALISE_TYPE(VkSubpassDescription2); @@ -1490,7 +1497,7 @@ DECLARE_DESERIALISE_TYPE(VkValidationFlagsEXT); DECLARE_DESERIALISE_TYPE(VkVertexInputAttributeDescription2EXT); DECLARE_DESERIALISE_TYPE(VkVertexInputBindingDescription2EXT); DECLARE_DESERIALISE_TYPE(VkWriteDescriptorSet); -DECLARE_DESERIALISE_TYPE(VkWriteDescriptorSetInlineUniformBlockEXT); +DECLARE_DESERIALISE_TYPE(VkWriteDescriptorSetInlineUniformBlock); // plain structs with no next chain DECLARE_REFLECTION_STRUCT(VkAllocationCallbacks); @@ -1542,7 +1549,7 @@ DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMemoryProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceSparseProperties); DECLARE_REFLECTION_STRUCT(VkPipelineColorBlendAttachmentState); -DECLARE_REFLECTION_STRUCT(VkPipelineCreationFeedbackEXT); +DECLARE_REFLECTION_STRUCT(VkPipelineCreationFeedback); DECLARE_REFLECTION_STRUCT(VkPipelineExecutableStatisticValueKHR); DECLARE_REFLECTION_STRUCT(VkPresentRegionKHR); DECLARE_REFLECTION_STRUCT(VkPushConstantRange); @@ -1649,24 +1656,24 @@ DECLARE_DESERIALISE_TYPE(VkPresentFrameTokenGGP); // the vulkan API doesn't define native 64-bit enums itself // // if you get a compile error here, then somehow the macro shenanigans we play above to stop -// vulkan_core.h from defining 'typedef VkFlags64 VkAccessFlagBits2KHR' has failed. We try to make +// vulkan_core.h from defining 'typedef VkFlags64 VkAccessFlagBits2' has failed. We try to make // it use a different non-clashing name so that this name can be clear for a proper separate type. -enum VkAccessFlagBits2KHR : uint64_t +enum VkAccessFlagBits2 : uint64_t { }; -enum VkPipelineStageFlagBits2KHR : uint64_t +enum VkPipelineStageFlagBits2 : uint64_t { }; -enum VkFormatFeatureFlagBits2KHR : uint64_t +enum VkFormatFeatureFlagBits2 : uint64_t { }; // enums DECLARE_REFLECTION_ENUM(VkAccessFlagBits); -DECLARE_REFLECTION_ENUM(VkAccessFlagBits2KHR); +DECLARE_REFLECTION_ENUM(VkAccessFlagBits2); DECLARE_REFLECTION_ENUM(VkAcquireProfilingLockFlagBitsKHR); DECLARE_REFLECTION_ENUM(VkAttachmentDescriptionFlagBits); DECLARE_REFLECTION_ENUM(VkAttachmentLoadOp); @@ -1721,7 +1728,7 @@ DECLARE_REFLECTION_ENUM(VkFilter); DECLARE_REFLECTION_ENUM(VkFlagWithNoBits); DECLARE_REFLECTION_ENUM(VkFormat); DECLARE_REFLECTION_ENUM(VkFormatFeatureFlagBits); -DECLARE_REFLECTION_ENUM(VkFormatFeatureFlagBits2KHR); +DECLARE_REFLECTION_ENUM(VkFormatFeatureFlagBits2); DECLARE_REFLECTION_ENUM(VkFramebufferCreateFlagBits); DECLARE_REFLECTION_ENUM(VkFrontFace); DECLARE_REFLECTION_ENUM(VkImageAspectFlagBits); @@ -1746,17 +1753,19 @@ DECLARE_REFLECTION_ENUM(VkPhysicalDeviceType); DECLARE_REFLECTION_ENUM(VkPipelineBindPoint); DECLARE_REFLECTION_ENUM(VkPipelineCacheCreateFlagBits); DECLARE_REFLECTION_ENUM(VkPipelineCreateFlagBits); -DECLARE_REFLECTION_ENUM(VkPipelineCreationFeedbackFlagBitsEXT); +DECLARE_REFLECTION_ENUM(VkPipelineCreationFeedbackFlagBits); DECLARE_REFLECTION_ENUM(VkPipelineExecutableStatisticFormatKHR); +DECLARE_REFLECTION_ENUM(VkPipelineColorBlendStateCreateFlagBits); +DECLARE_REFLECTION_ENUM(VkPipelineDepthStencilStateCreateFlagBits); DECLARE_REFLECTION_ENUM(VkPipelineShaderStageCreateFlagBits); DECLARE_REFLECTION_ENUM(VkPipelineStageFlagBits); -DECLARE_REFLECTION_ENUM(VkPipelineStageFlagBits2KHR); +DECLARE_REFLECTION_ENUM(VkPipelineStageFlagBits2); DECLARE_REFLECTION_ENUM(VkPointClippingBehavior); DECLARE_REFLECTION_ENUM(VkPolygonMode); DECLARE_REFLECTION_ENUM(VkPresentModeKHR); DECLARE_REFLECTION_ENUM(VkPrimitiveTopology); -DECLARE_REFLECTION_ENUM(VkPrivateDataSlotCreateFlagBitsEXT); -DECLARE_REFLECTION_ENUM(VkRenderingFlagBitsKHR); +DECLARE_REFLECTION_ENUM(VkPrivateDataSlotCreateFlagBits); +DECLARE_REFLECTION_ENUM(VkRenderingFlagBits); DECLARE_REFLECTION_ENUM(VkQueryControlFlagBits); DECLARE_REFLECTION_ENUM(VkQueryPipelineStatisticFlagBits); DECLARE_REFLECTION_ENUM(VkQueryResultFlagBits); @@ -1785,7 +1794,7 @@ DECLARE_REFLECTION_ENUM(VkStencilFaceFlagBits); DECLARE_REFLECTION_ENUM(VkStencilOp); DECLARE_REFLECTION_ENUM(VkStructureType); DECLARE_REFLECTION_ENUM(VkSubgroupFeatureFlagBits); -DECLARE_REFLECTION_ENUM(VkSubmitFlagBitsKHR); +DECLARE_REFLECTION_ENUM(VkSubmitFlagBits); DECLARE_REFLECTION_ENUM(VkSubpassContents); DECLARE_REFLECTION_ENUM(VkSubpassDescriptionFlagBits); DECLARE_REFLECTION_ENUM(VkSurfaceCounterFlagBitsEXT); @@ -1793,7 +1802,7 @@ DECLARE_REFLECTION_ENUM(VkSurfaceTransformFlagBitsKHR); DECLARE_REFLECTION_ENUM(VkSwapchainCreateFlagBitsKHR); DECLARE_REFLECTION_ENUM(VkTessellationDomainOrigin); DECLARE_REFLECTION_ENUM(VkTimeDomainEXT); -DECLARE_REFLECTION_ENUM(VkToolPurposeFlagBitsEXT); +DECLARE_REFLECTION_ENUM(VkToolPurposeFlagBits); DECLARE_REFLECTION_ENUM(VkValidationCheckEXT); DECLARE_REFLECTION_ENUM(VkValidationFeatureDisableEXT); DECLARE_REFLECTION_ENUM(VkValidationFeatureEnableEXT); diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index b16d2ca6f..faee65ac9 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -1240,6 +1240,9 @@ static const VkExtensionProperties supportedExtensions[] = { VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME, VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION, }, + { + VK_KHR_GLOBAL_PRIORITY_EXTENSION_NAME, VK_KHR_GLOBAL_PRIORITY_SPEC_VERSION, + }, { VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME, VK_KHR_IMAGE_FORMAT_LIST_SPEC_VERSION, }, @@ -3443,84 +3446,81 @@ bool WrappedVulkan::ProcessChunk(ReadSerialiser &ser, VulkanChunk chunk) case VulkanChunk::vkQueuePresentKHR: return Serialise_vkQueuePresentKHR(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdSetCullModeEXT: - return Serialise_vkCmdSetCullModeEXT(ser, VK_NULL_HANDLE, VK_CULL_MODE_FLAG_BITS_MAX_ENUM); - case VulkanChunk::vkCmdSetFrontFaceEXT: - return Serialise_vkCmdSetFrontFaceEXT(ser, VK_NULL_HANDLE, VK_FRONT_FACE_MAX_ENUM); - case VulkanChunk::vkCmdSetPrimitiveTopologyEXT: - return Serialise_vkCmdSetPrimitiveTopologyEXT(ser, VK_NULL_HANDLE, - VK_PRIMITIVE_TOPOLOGY_MAX_ENUM); - case VulkanChunk::vkCmdSetViewportWithCountEXT: - return Serialise_vkCmdSetViewportWithCountEXT(ser, VK_NULL_HANDLE, 0, NULL); - case VulkanChunk::vkCmdSetScissorWithCountEXT: - return Serialise_vkCmdSetScissorWithCountEXT(ser, VK_NULL_HANDLE, 0, NULL); - case VulkanChunk::vkCmdBindVertexBuffers2EXT: - return Serialise_vkCmdBindVertexBuffers2EXT(ser, VK_NULL_HANDLE, 0, 0, NULL, NULL, NULL, NULL); - case VulkanChunk::vkCmdSetDepthTestEnableEXT: - return Serialise_vkCmdSetDepthTestEnableEXT(ser, VK_NULL_HANDLE, VK_FALSE); - case VulkanChunk::vkCmdSetDepthWriteEnableEXT: - return Serialise_vkCmdSetDepthWriteEnableEXT(ser, VK_NULL_HANDLE, VK_FALSE); - case VulkanChunk::vkCmdSetDepthCompareOpEXT: - return Serialise_vkCmdSetDepthCompareOpEXT(ser, VK_NULL_HANDLE, VK_COMPARE_OP_MAX_ENUM); - case VulkanChunk::vkCmdSetDepthBoundsTestEnableEXT: - return Serialise_vkCmdSetDepthBoundsTestEnableEXT(ser, VK_NULL_HANDLE, VK_FALSE); - case VulkanChunk::vkCmdSetStencilTestEnableEXT: - return Serialise_vkCmdSetStencilTestEnableEXT(ser, VK_NULL_HANDLE, VK_FALSE); - case VulkanChunk::vkCmdSetStencilOpEXT: - return Serialise_vkCmdSetStencilOpEXT(ser, VK_NULL_HANDLE, VK_STENCIL_FACE_FLAG_BITS_MAX_ENUM, - VK_STENCIL_OP_MAX_ENUM, VK_STENCIL_OP_MAX_ENUM, - VK_STENCIL_OP_MAX_ENUM, VK_COMPARE_OP_MAX_ENUM); + case VulkanChunk::vkCmdSetCullMode: + return Serialise_vkCmdSetCullMode(ser, VK_NULL_HANDLE, VK_CULL_MODE_FLAG_BITS_MAX_ENUM); + case VulkanChunk::vkCmdSetFrontFace: + return Serialise_vkCmdSetFrontFace(ser, VK_NULL_HANDLE, VK_FRONT_FACE_MAX_ENUM); + case VulkanChunk::vkCmdSetPrimitiveTopology: + return Serialise_vkCmdSetPrimitiveTopology(ser, VK_NULL_HANDLE, VK_PRIMITIVE_TOPOLOGY_MAX_ENUM); + case VulkanChunk::vkCmdSetViewportWithCount: + return Serialise_vkCmdSetViewportWithCount(ser, VK_NULL_HANDLE, 0, NULL); + case VulkanChunk::vkCmdSetScissorWithCount: + return Serialise_vkCmdSetScissorWithCount(ser, VK_NULL_HANDLE, 0, NULL); + case VulkanChunk::vkCmdBindVertexBuffers2: + return Serialise_vkCmdBindVertexBuffers2(ser, VK_NULL_HANDLE, 0, 0, NULL, NULL, NULL, NULL); + case VulkanChunk::vkCmdSetDepthTestEnable: + return Serialise_vkCmdSetDepthTestEnable(ser, VK_NULL_HANDLE, VK_FALSE); + case VulkanChunk::vkCmdSetDepthWriteEnable: + return Serialise_vkCmdSetDepthWriteEnable(ser, VK_NULL_HANDLE, VK_FALSE); + case VulkanChunk::vkCmdSetDepthCompareOp: + return Serialise_vkCmdSetDepthCompareOp(ser, VK_NULL_HANDLE, VK_COMPARE_OP_MAX_ENUM); + case VulkanChunk::vkCmdSetDepthBoundsTestEnable: + return Serialise_vkCmdSetDepthBoundsTestEnable(ser, VK_NULL_HANDLE, VK_FALSE); + case VulkanChunk::vkCmdSetStencilTestEnable: + return Serialise_vkCmdSetStencilTestEnable(ser, VK_NULL_HANDLE, VK_FALSE); + case VulkanChunk::vkCmdSetStencilOp: + return Serialise_vkCmdSetStencilOp(ser, VK_NULL_HANDLE, VK_STENCIL_FACE_FLAG_BITS_MAX_ENUM, + VK_STENCIL_OP_MAX_ENUM, VK_STENCIL_OP_MAX_ENUM, + VK_STENCIL_OP_MAX_ENUM, VK_COMPARE_OP_MAX_ENUM); - case VulkanChunk::vkCmdCopyBuffer2KHR: - return Serialise_vkCmdCopyBuffer2KHR(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdCopyImage2KHR: - return Serialise_vkCmdCopyImage2KHR(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdCopyBufferToImage2KHR: - return Serialise_vkCmdCopyBufferToImage2KHR(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdCopyImageToBuffer2KHR: - return Serialise_vkCmdCopyImageToBuffer2KHR(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdBlitImage2KHR: - return Serialise_vkCmdBlitImage2KHR(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdResolveImage2KHR: - return Serialise_vkCmdResolveImage2KHR(ser, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdCopyBuffer2: + return Serialise_vkCmdCopyBuffer2(ser, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdCopyImage2: return Serialise_vkCmdCopyImage2(ser, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdCopyBufferToImage2: + return Serialise_vkCmdCopyBufferToImage2(ser, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdCopyImageToBuffer2: + return Serialise_vkCmdCopyImageToBuffer2(ser, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdBlitImage2: return Serialise_vkCmdBlitImage2(ser, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdResolveImage2: + return Serialise_vkCmdResolveImage2(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdSetEvent2KHR: - return Serialise_vkCmdSetEvent2KHR(ser, VK_NULL_HANDLE, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdResetEvent2KHR: - return Serialise_vkCmdResetEvent2KHR(ser, VK_NULL_HANDLE, VK_NULL_HANDLE, - VK_PIPELINE_STAGE_2_NONE_KHR); - case VulkanChunk::vkCmdWaitEvents2KHR: - return Serialise_vkCmdWaitEvents2KHR(ser, VK_NULL_HANDLE, 0, NULL, NULL); - case VulkanChunk::vkCmdPipelineBarrier2KHR: - return Serialise_vkCmdPipelineBarrier2KHR(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdWriteTimestamp2KHR: - return Serialise_vkCmdWriteTimestamp2KHR(ser, VK_NULL_HANDLE, VK_PIPELINE_STAGE_2_NONE_KHR, - VK_NULL_HANDLE, 0); - case VulkanChunk::vkQueueSubmit2KHR: - return Serialise_vkQueueSubmit2KHR(ser, VK_NULL_HANDLE, 1, NULL, VK_NULL_HANDLE); + case VulkanChunk::vkCmdSetEvent2: + return Serialise_vkCmdSetEvent2(ser, VK_NULL_HANDLE, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdResetEvent2: + return Serialise_vkCmdResetEvent2(ser, VK_NULL_HANDLE, VK_NULL_HANDLE, + VK_PIPELINE_STAGE_2_NONE); + case VulkanChunk::vkCmdWaitEvents2: + return Serialise_vkCmdWaitEvents2(ser, VK_NULL_HANDLE, 0, NULL, NULL); + case VulkanChunk::vkCmdPipelineBarrier2: + return Serialise_vkCmdPipelineBarrier2(ser, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdWriteTimestamp2: + return Serialise_vkCmdWriteTimestamp2(ser, VK_NULL_HANDLE, VK_PIPELINE_STAGE_2_NONE, + VK_NULL_HANDLE, 0); + case VulkanChunk::vkQueueSubmit2: + return Serialise_vkQueueSubmit2(ser, VK_NULL_HANDLE, 1, NULL, VK_NULL_HANDLE); case VulkanChunk::vkCmdWriteBufferMarker2AMD: - return Serialise_vkCmdWriteBufferMarker2AMD(ser, VK_NULL_HANDLE, VK_PIPELINE_STAGE_2_NONE_KHR, + return Serialise_vkCmdWriteBufferMarker2AMD(ser, VK_NULL_HANDLE, VK_PIPELINE_STAGE_2_NONE, VK_NULL_HANDLE, 0, 0); case VulkanChunk::vkCmdSetColorWriteEnableEXT: return Serialise_vkCmdSetColorWriteEnableEXT(ser, VK_NULL_HANDLE, 0, NULL); - case VulkanChunk::vkCmdSetDepthBiasEnableEXT: - return Serialise_vkCmdSetDepthBiasEnableEXT(ser, VK_NULL_HANDLE, VK_FALSE); + case VulkanChunk::vkCmdSetDepthBiasEnable: + return Serialise_vkCmdSetDepthBiasEnable(ser, VK_NULL_HANDLE, VK_FALSE); case VulkanChunk::vkCmdSetLogicOpEXT: return Serialise_vkCmdSetLogicOpEXT(ser, VK_NULL_HANDLE, VK_LOGIC_OP_MAX_ENUM); case VulkanChunk::vkCmdSetPatchControlPointsEXT: return Serialise_vkCmdSetPatchControlPointsEXT(ser, VK_NULL_HANDLE, 0); - case VulkanChunk::vkCmdSetPrimitiveRestartEnableEXT: - return Serialise_vkCmdSetPrimitiveRestartEnableEXT(ser, VK_NULL_HANDLE, VK_FALSE); - case VulkanChunk::vkCmdSetRasterizerDiscardEnableEXT: - return Serialise_vkCmdSetRasterizerDiscardEnableEXT(ser, VK_NULL_HANDLE, VK_FALSE); + case VulkanChunk::vkCmdSetPrimitiveRestartEnable: + return Serialise_vkCmdSetPrimitiveRestartEnable(ser, VK_NULL_HANDLE, VK_FALSE); + case VulkanChunk::vkCmdSetRasterizerDiscardEnable: + return Serialise_vkCmdSetRasterizerDiscardEnable(ser, VK_NULL_HANDLE, VK_FALSE); case VulkanChunk::vkCmdSetVertexInputEXT: return Serialise_vkCmdSetVertexInputEXT(ser, VK_NULL_HANDLE, 0, NULL, 0, NULL); - case VulkanChunk::vkCmdBeginRenderingKHR: - return Serialise_vkCmdBeginRenderingKHR(ser, VK_NULL_HANDLE, NULL); - case VulkanChunk::vkCmdEndRenderingKHR: - return Serialise_vkCmdEndRenderingKHR(ser, VK_NULL_HANDLE); + case VulkanChunk::vkCmdBeginRendering: + return Serialise_vkCmdBeginRendering(ser, VK_NULL_HANDLE, NULL); + case VulkanChunk::vkCmdEndRendering: + return Serialise_vkCmdEndRendering(ser, VK_NULL_HANDLE); // chunks that are reserved but not yet serialised case VulkanChunk::vkResetCommandPool: @@ -4528,7 +4528,7 @@ void WrappedVulkan::AddUsage(VulkanActionTreeNode &actionNode, rdcarray &commandBuffers, VkFence fence); - void ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2KHR submitInfo, rdcstr basename); + void ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2 submitInfo, rdcstr basename); void InternalFlushMemoryRange(VkDevice device, const VkMappedMemoryRange &memRange, bool internalFlush, bool capframe); - void DoSubmit(VkQueue queue, VkSubmitInfo2KHR submitInfo); + void DoSubmit(VkQueue queue, VkSubmitInfo2 submitInfo); rdcarray m_ActionStack; @@ -2059,7 +2059,7 @@ public: VkDeviceSize dstOffset, uint32_t marker); // VK_KHR_synchronization2 interaction IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdWriteBufferMarker2AMD, VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, + VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); // VK_EXT_debug_utils @@ -2373,99 +2373,97 @@ public: // VK_EXT_tooling_info - VkResult vkGetPhysicalDeviceToolPropertiesEXT(VkPhysicalDevice physicalDevice, uint32_t *pToolCount, - VkPhysicalDeviceToolPropertiesEXT *pToolProperties); + VkResult vkGetPhysicalDeviceToolProperties(VkPhysicalDevice physicalDevice, uint32_t *pToolCount, + VkPhysicalDeviceToolProperties *pToolProperties); // VK_EXT_private_data - VkResult vkCreatePrivateDataSlotEXT(VkDevice device, - const VkPrivateDataSlotCreateInfoEXT *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkPrivateDataSlotEXT *pPrivateDataSlot); + VkResult vkCreatePrivateDataSlot(VkDevice device, const VkPrivateDataSlotCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkPrivateDataSlot *pPrivateDataSlot); - void vkDestroyPrivateDataSlotEXT(VkDevice device, VkPrivateDataSlotEXT privateDataSlot, - const VkAllocationCallbacks *pAllocator); + void vkDestroyPrivateDataSlot(VkDevice device, VkPrivateDataSlot privateDataSlot, + const VkAllocationCallbacks *pAllocator); - VkResult vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, uint64_t data); + VkResult vkSetPrivateData(VkDevice device, VkObjectType objectType, uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, uint64_t data); - void vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData); + void vkGetPrivateData(VkDevice device, VkObjectType objectType, uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, uint64_t *pData); // VK_EXT_extended_dynamic_state - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetCullModeEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetCullMode, VkCommandBuffer commandBuffer, VkCullModeFlags cullMode); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetFrontFaceEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetFrontFace, VkCommandBuffer commandBuffer, VkFrontFace frontFace); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetPrimitiveTopologyEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetPrimitiveTopology, VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetViewportWithCountEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetViewportWithCount, VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport *pViewports); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetScissorWithCountEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetScissorWithCount, VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D *pScissors); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdBindVertexBuffers2EXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdBindVertexBuffers2, VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes, const VkDeviceSize *pStrides); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthTestEnableEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthTestEnable, VkCommandBuffer commandBuffer, VkBool32 depthTestEnable); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthWriteEnableEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthWriteEnable, VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthCompareOpEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthCompareOp, VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthBoundsTestEnableEXT, - VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthBoundsTestEnable, VkCommandBuffer commandBuffer, + VkBool32 depthBoundsTestEnable); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetStencilTestEnableEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetStencilTestEnable, VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetStencilOpEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetStencilOp, VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp); // VK_KHR_copy_commands2 - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdCopyBuffer2KHR, VkCommandBuffer commandBuffer, - const VkCopyBufferInfo2KHR *pCopyBufferInfo); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdCopyImage2KHR, VkCommandBuffer commandBuffer, - const VkCopyImageInfo2KHR *pCopyImageInfo); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdCopyBufferToImage2KHR, VkCommandBuffer commandBuffer, - const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdCopyImageToBuffer2KHR, VkCommandBuffer commandBuffer, - const VkCopyImageToBufferInfo2KHR *pCopyImageToBufferInfo); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdBlitImage2KHR, VkCommandBuffer commandBuffer, - const VkBlitImageInfo2KHR *pBlitImageInfo); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdResolveImage2KHR, VkCommandBuffer commandBuffer, - const VkResolveImageInfo2KHR *pResolveImageInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdCopyBuffer2, VkCommandBuffer commandBuffer, + const VkCopyBufferInfo2 *pCopyBufferInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdCopyImage2, VkCommandBuffer commandBuffer, + const VkCopyImageInfo2 *pCopyImageInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdCopyBufferToImage2, VkCommandBuffer commandBuffer, + const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdCopyImageToBuffer2, VkCommandBuffer commandBuffer, + const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdBlitImage2, VkCommandBuffer commandBuffer, + const VkBlitImageInfo2 *pBlitImageInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdResolveImage2, VkCommandBuffer commandBuffer, + const VkResolveImageInfo2 *pResolveImageInfo); // VK_KHR_synchronization2 - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetEvent2KHR, VkCommandBuffer commandBuffer, - VkEvent event, const VkDependencyInfoKHR *pDependencyInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetEvent2, VkCommandBuffer commandBuffer, VkEvent event, + const VkDependencyInfo *pDependencyInfo); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdResetEvent2KHR, VkCommandBuffer commandBuffer, - VkEvent event, VkPipelineStageFlags2KHR stageMask); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdResetEvent2, VkCommandBuffer commandBuffer, + VkEvent event, VkPipelineStageFlags2 stageMask); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdWaitEvents2KHR, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdWaitEvents2, VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, - const VkDependencyInfoKHR *pDependencyInfos); + const VkDependencyInfo *pDependencyInfos); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdPipelineBarrier2KHR, VkCommandBuffer commandBuffer, - const VkDependencyInfoKHR *pDependencyInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdPipelineBarrier2, VkCommandBuffer commandBuffer, + const VkDependencyInfo *pDependencyInfo); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdWriteTimestamp2KHR, VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, - uint32_t query); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdWriteTimestamp2, VkCommandBuffer commandBuffer, + VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query); - IMPLEMENT_FUNCTION_SERIALISED(VkResult, vkQueueSubmit2KHR, VkQueue queue, uint32_t submitCount, - const VkSubmitInfo2KHR *pSubmits, VkFence fence); + IMPLEMENT_FUNCTION_SERIALISED(VkResult, vkQueueSubmit2, VkQueue queue, uint32_t submitCount, + const VkSubmitInfo2 *pSubmits, VkFence fence); // VK_KHR_present_wait @@ -2473,16 +2471,16 @@ public: VkSwapchainKHR swapchain, uint64_t presentId, uint64_t timeout); // VK_KHR_maintenance4 - IMPLEMENT_FUNCTION_SERIALISED(void, vkGetDeviceBufferMemoryRequirementsKHR, VkDevice device, - const VkDeviceBufferMemoryRequirementsKHR *pInfo, + IMPLEMENT_FUNCTION_SERIALISED(void, vkGetDeviceBufferMemoryRequirements, VkDevice device, + const VkDeviceBufferMemoryRequirements *pInfo, VkMemoryRequirements2 *pMemoryRequirements); - IMPLEMENT_FUNCTION_SERIALISED(void, vkGetDeviceImageMemoryRequirementsKHR, VkDevice device, - const VkDeviceImageMemoryRequirementsKHR *pInfo, + IMPLEMENT_FUNCTION_SERIALISED(void, vkGetDeviceImageMemoryRequirements, VkDevice device, + const VkDeviceImageMemoryRequirements *pInfo, VkMemoryRequirements2 *pMemoryRequirements); - IMPLEMENT_FUNCTION_SERIALISED(void, vkGetDeviceImageSparseMemoryRequirementsKHR, VkDevice device, - const VkDeviceImageMemoryRequirementsKHR *pInfo, + IMPLEMENT_FUNCTION_SERIALISED(void, vkGetDeviceImageSparseMemoryRequirements, VkDevice device, + const VkDeviceImageMemoryRequirements *pInfo, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements); @@ -2493,15 +2491,15 @@ public: // VK_EXT_extended_dynamic_state2 - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthBiasEnableEXT, VkCommandBuffer commandBuffer, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetDepthBiasEnable, VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable); IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetLogicOpEXT, VkCommandBuffer commandBuffer, VkLogicOp logicOp); IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetPatchControlPointsEXT, VkCommandBuffer commandBuffer, uint32_t patchControlPoints); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetPrimitiveRestartEnableEXT, - VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetRasterizerDiscardEnableEXT, + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetPrimitiveRestartEnable, VkCommandBuffer commandBuffer, + VkBool32 primitiveRestartEnable); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdSetRasterizerDiscardEnable, VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable); // VK_EXT_vertex_input_dynamic_state @@ -2515,8 +2513,8 @@ public: // VK_KHR_dynamic_rendering - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdBeginRenderingKHR, VkCommandBuffer commandBuffer, - const VkRenderingInfoKHR *pRenderingInfo); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdBeginRendering, VkCommandBuffer commandBuffer, + const VkRenderingInfo *pRenderingInfo); - IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdEndRenderingKHR, VkCommandBuffer commandBuffer); + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdEndRendering, VkCommandBuffer commandBuffer); }; diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index f70475eb4..abf584e02 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -2336,21 +2336,21 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe, delete[] a; for(VkBufferView *a : bufViewWrites) delete[] a; - for(VkWriteDescriptorSetInlineUniformBlockEXT *a : inlineWrites) + for(VkWriteDescriptorSetInlineUniformBlock *a : inlineWrites) delete a; } rdcarray imgWrites; rdcarray bufWrites; rdcarray bufViewWrites; - rdcarray inlineWrites; + rdcarray inlineWrites; } alloced; rdcarray &allocImgWrites = alloced.imgWrites; rdcarray &allocBufWrites = alloced.bufWrites; rdcarray &allocBufViewWrites = alloced.bufViewWrites; - rdcarray &allocInlineWrites = alloced.inlineWrites; + rdcarray &allocInlineWrites = alloced.inlineWrites; // one for each descriptor type. 1 of each to start with, we then increment for each descriptor // we need to allocate @@ -2366,11 +2366,11 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe, {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, 1}, {VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, 1}, - {VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 0}, + {VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 0}, }; - VkDescriptorPoolInlineUniformBlockCreateInfoEXT inlineCreateInfo = { - VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT, + VkDescriptorPoolInlineUniformBlockCreateInfo inlineCreateInfo = { + VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO, }; static const uint32_t InlinePoolIndex = 11; @@ -2480,8 +2480,8 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe, if(m_pDriver->GetExtensions(NULL).ext_EXT_inline_uniform_block) { - VkPhysicalDeviceInlineUniformBlockPropertiesEXT inlineProps = { - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT, + VkPhysicalDeviceInlineUniformBlockProperties inlineProps = { + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES, }; VkPhysicalDeviceProperties2 availBase = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2}; @@ -2570,7 +2570,7 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe, descriptorCount = setInfo.data.variableDescriptorCount; // make room in the pool - if(bind.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(bind.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { poolSizes[InlinePoolIndex].descriptorCount += descriptorCount; inlineCreateInfo.maxInlineUniformBlockBindings++; @@ -2648,7 +2648,7 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe, UPDATE_AND_CHECK_LIMIT(maxDescriptorSetInputAttachments); UPDATE_AND_CHECK_STAGE_LIMIT(maxPerStageDescriptorInputAttachments); break; - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: descriptorCount = 1; UPDATE_AND_CHECK_LIMIT(maxDescriptorSetInlineUniformBlocks); UPDATE_AND_CHECK_STAGE_LIMIT(maxPerStageDescriptorInlineUniformBlocks); @@ -2825,11 +2825,11 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe, allocBufWrites.push_back(out); break; } - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: { - allocInlineWrites.push_back(new VkWriteDescriptorSetInlineUniformBlockEXT); - VkWriteDescriptorSetInlineUniformBlockEXT *inlineWrite = allocInlineWrites.back(); - inlineWrite->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT; + allocInlineWrites.push_back(new VkWriteDescriptorSetInlineUniformBlock); + VkWriteDescriptorSetInlineUniformBlock *inlineWrite = allocInlineWrites.back(); + inlineWrite->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK; inlineWrite->pNext = NULL; inlineWrite->dataSize = descriptorCount; inlineWrite->pData = setInfo.data.inlineBytes.data() + slot[0].inlineOffset; @@ -2841,7 +2841,7 @@ void VulkanReplay::PatchReservedDescriptors(const VulkanStatePipeline &pipe, // skip validity check for inline uniform block as the descriptor count means something // different - if(write.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(write.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { write.descriptorCount = descriptorCount; descWrites.push_back(write); diff --git a/renderdoc/driver/vulkan/vk_dispatch_defs.h b/renderdoc/driver/vulkan/vk_dispatch_defs.h index 2e9d4548e..71eaa5150 100644 --- a/renderdoc/driver/vulkan/vk_dispatch_defs.h +++ b/renderdoc/driver/vulkan/vk_dispatch_defs.h @@ -25,7 +25,7 @@ /****************************************************************************** * Generated from Khronos's vk.xml: * - * Copyright 2015-2021 The Khronos Group Inc. + * Copyright 2015-2022 The Khronos Group Inc. * * SPDX-License-Identifier: Apache-2.0 OR MIT * * @@ -85,6 +85,9 @@ struct VkInstDispatchTable PFN_vkGetPhysicalDeviceExternalFenceProperties GetPhysicalDeviceExternalFenceProperties; PFN_vkGetPhysicalDeviceExternalSemaphoreProperties GetPhysicalDeviceExternalSemaphoreProperties; + // Vulkan 1.3 core API interface definitions. + PFN_vkGetPhysicalDeviceToolProperties GetPhysicalDeviceToolProperties; + // VK_KHR_surface PFN_vkDestroySurfaceKHR DestroySurfaceKHR; PFN_vkGetPhysicalDeviceSurfaceSupportKHR GetPhysicalDeviceSurfaceSupportKHR; @@ -436,6 +439,44 @@ struct VkDevDispatchTable PFN_vkGetBufferOpaqueCaptureAddress GetBufferOpaqueCaptureAddress; PFN_vkGetDeviceMemoryOpaqueCaptureAddress GetDeviceMemoryOpaqueCaptureAddress; + // Vulkan 1.3 core API interface definitions. + PFN_vkCreatePrivateDataSlot CreatePrivateDataSlot; + PFN_vkDestroyPrivateDataSlot DestroyPrivateDataSlot; + PFN_vkSetPrivateData SetPrivateData; + PFN_vkGetPrivateData GetPrivateData; + PFN_vkCmdSetEvent2 CmdSetEvent2; + PFN_vkCmdResetEvent2 CmdResetEvent2; + PFN_vkCmdWaitEvents2 CmdWaitEvents2; + PFN_vkCmdPipelineBarrier2 CmdPipelineBarrier2; + PFN_vkCmdWriteTimestamp2 CmdWriteTimestamp2; + PFN_vkQueueSubmit2 QueueSubmit2; + PFN_vkCmdCopyBuffer2 CmdCopyBuffer2; + PFN_vkCmdCopyImage2 CmdCopyImage2; + PFN_vkCmdCopyBufferToImage2 CmdCopyBufferToImage2; + PFN_vkCmdCopyImageToBuffer2 CmdCopyImageToBuffer2; + PFN_vkCmdBlitImage2 CmdBlitImage2; + PFN_vkCmdResolveImage2 CmdResolveImage2; + PFN_vkCmdBeginRendering CmdBeginRendering; + PFN_vkCmdEndRendering CmdEndRendering; + PFN_vkCmdSetCullMode CmdSetCullMode; + PFN_vkCmdSetFrontFace CmdSetFrontFace; + PFN_vkCmdSetPrimitiveTopology CmdSetPrimitiveTopology; + PFN_vkCmdSetViewportWithCount CmdSetViewportWithCount; + PFN_vkCmdSetScissorWithCount CmdSetScissorWithCount; + PFN_vkCmdBindVertexBuffers2 CmdBindVertexBuffers2; + PFN_vkCmdSetDepthTestEnable CmdSetDepthTestEnable; + PFN_vkCmdSetDepthWriteEnable CmdSetDepthWriteEnable; + PFN_vkCmdSetDepthCompareOp CmdSetDepthCompareOp; + PFN_vkCmdSetDepthBoundsTestEnable CmdSetDepthBoundsTestEnable; + PFN_vkCmdSetStencilTestEnable CmdSetStencilTestEnable; + PFN_vkCmdSetStencilOp CmdSetStencilOp; + PFN_vkCmdSetRasterizerDiscardEnable CmdSetRasterizerDiscardEnable; + PFN_vkCmdSetDepthBiasEnable CmdSetDepthBiasEnable; + PFN_vkCmdSetPrimitiveRestartEnable CmdSetPrimitiveRestartEnable; + PFN_vkGetDeviceBufferMemoryRequirements GetDeviceBufferMemoryRequirements; + PFN_vkGetDeviceImageMemoryRequirements GetDeviceImageMemoryRequirements; + PFN_vkGetDeviceImageSparseMemoryRequirements GetDeviceImageSparseMemoryRequirements; + // VK_KHR_swapchain PFN_vkCreateSwapchainKHR CreateSwapchainKHR; PFN_vkDestroySwapchainKHR DestroySwapchainKHR; diff --git a/renderdoc/driver/vulkan/vk_hookset_defs.h b/renderdoc/driver/vulkan/vk_hookset_defs.h index 6f4374a2c..af14c7ede 100644 --- a/renderdoc/driver/vulkan/vk_hookset_defs.h +++ b/renderdoc/driver/vulkan/vk_hookset_defs.h @@ -30,6 +30,9 @@ // extensions made core in 1.2 #define VK12 VK_MAKE_VERSION(1, 2, 0) +// extensions made core in 1.3 +#define VK13 VK_MAKE_VERSION(1, 3, 0) + // extensions that are not core in any version #define VKXX VK_MAKE_VERSION(99, 99, 0) @@ -623,23 +626,23 @@ CheckExt(KHR_timeline_semaphore, VK12); \ CheckExt(KHR_performance_query, VKXX); \ CheckExt(KHR_buffer_device_address, VK12); \ - CheckExt(EXT_tooling_info, VKXX); \ + CheckExt(EXT_tooling_info, VK13); \ CheckExt(KHR_separate_depth_stencil_layouts, VK12); \ - CheckExt(KHR_shader_non_semantic_info, VKXX); \ - CheckExt(EXT_inline_uniform_block, VKXX); \ + CheckExt(KHR_shader_non_semantic_info, VK13); \ + CheckExt(EXT_inline_uniform_block, VK13); \ CheckExt(EXT_custom_border_color, VKXX); \ CheckExt(EXT_robustness2, VKXX); \ CheckExt(EXT_pipeline_creation_cache_control, VKXX); \ - CheckExt(EXT_private_data, VKXX); \ - CheckExt(EXT_extended_dynamic_state, VKXX); \ - CheckExt(KHR_copy_commands2, VKXX); \ - CheckExt(KHR_synchronization2, VKXX); \ + CheckExt(EXT_private_data, VK13); \ + CheckExt(EXT_extended_dynamic_state, VK13); \ + CheckExt(KHR_copy_commands2, VK13); \ + CheckExt(KHR_synchronization2, VK13); \ CheckExt(KHR_present_wait, VKXX); \ - CheckExt(KHR_maintenance4, VKXX); \ + CheckExt(KHR_maintenance4, VK13); \ CheckExt(EXT_color_write_enable, VKXX); \ - CheckExt(EXT_extended_dynamic_state2, VKXX); \ + CheckExt(EXT_extended_dynamic_state2, VK13); \ CheckExt(EXT_vertex_input_dynamic_state, VKXX); \ - CheckExt(KHR_dynamic_rendering, VKXX); + CheckExt(KHR_dynamic_rendering, VK13); #define HookInitVulkanInstanceExts_PhysDev() \ HookInitExtension(KHR_surface, GetPhysicalDeviceSurfaceSupportKHR); \ @@ -684,7 +687,7 @@ HookInitExtension(KHR_performance_query, \ EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR); \ HookInitExtension(KHR_performance_query, GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR); \ - HookInitExtension(EXT_tooling_info, GetPhysicalDeviceToolPropertiesEXT); \ + HookInitPromotedExtension(EXT_tooling_info, GetPhysicalDeviceToolProperties, EXT); \ HookInitExtension_PhysDev_Win32(); \ HookInitExtension_PhysDev_Linux(); \ HookInitExtension_PhysDev_GGP(); \ @@ -749,7 +752,7 @@ HookInitExtension(KHR_performance_query, \ EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR); \ HookInitExtension(KHR_performance_query, GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR); \ - HookInitExtension(EXT_tooling_info, GetPhysicalDeviceToolPropertiesEXT); \ + HookInitPromotedExtension(EXT_tooling_info, GetPhysicalDeviceToolProperties, EXT); \ HookInitExtension_Instance_Win32(); \ HookInitExtension_Instance_Linux(); \ HookInitExtension_Instance_GGP(); \ @@ -851,49 +854,49 @@ HookInitPromotedExtension(KHR_buffer_device_address, GetBufferDeviceAddress, KHR); \ HookInitPromotedExtension(KHR_buffer_device_address, GetBufferOpaqueCaptureAddress, KHR); \ HookInitPromotedExtension(KHR_buffer_device_address, GetDeviceMemoryOpaqueCaptureAddress, KHR); \ - HookInitExtension(EXT_private_data, CreatePrivateDataSlotEXT); \ - HookInitExtension(EXT_private_data, DestroyPrivateDataSlotEXT); \ - HookInitExtension(EXT_private_data, SetPrivateDataEXT); \ - HookInitExtension(EXT_private_data, GetPrivateDataEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetCullModeEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetFrontFaceEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetPrimitiveTopologyEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetViewportWithCountEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetScissorWithCountEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdBindVertexBuffers2EXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetDepthTestEnableEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetDepthWriteEnableEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetDepthCompareOpEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetDepthBoundsTestEnableEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetStencilTestEnableEXT); \ - HookInitExtension(EXT_extended_dynamic_state, CmdSetStencilOpEXT); \ - HookInitExtension(KHR_copy_commands2, CmdCopyBuffer2KHR); \ - HookInitExtension(KHR_copy_commands2, CmdCopyImage2KHR); \ - HookInitExtension(KHR_copy_commands2, CmdCopyBufferToImage2KHR); \ - HookInitExtension(KHR_copy_commands2, CmdCopyImageToBuffer2KHR); \ - HookInitExtension(KHR_copy_commands2, CmdBlitImage2KHR); \ - HookInitExtension(KHR_copy_commands2, CmdResolveImage2KHR); \ - HookInitExtension(KHR_synchronization2, CmdSetEvent2KHR); \ - HookInitExtension(KHR_synchronization2, CmdResetEvent2KHR); \ - HookInitExtension(KHR_synchronization2, CmdWaitEvents2KHR); \ - HookInitExtension(KHR_synchronization2, CmdPipelineBarrier2KHR); \ - HookInitExtension(KHR_synchronization2, CmdWriteTimestamp2KHR); \ - HookInitExtension(KHR_synchronization2, QueueSubmit2KHR); \ + HookInitPromotedExtension(EXT_private_data, CreatePrivateDataSlot, EXT); \ + HookInitPromotedExtension(EXT_private_data, DestroyPrivateDataSlot, EXT); \ + HookInitPromotedExtension(EXT_private_data, SetPrivateData, EXT); \ + HookInitPromotedExtension(EXT_private_data, GetPrivateData, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetCullMode, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetFrontFace, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetPrimitiveTopology, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetViewportWithCount, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetScissorWithCount, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdBindVertexBuffers2, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetDepthTestEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetDepthWriteEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetDepthCompareOp, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetDepthBoundsTestEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetStencilTestEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetStencilOp, EXT); \ + HookInitPromotedExtension(KHR_copy_commands2, CmdCopyBuffer2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, CmdCopyImage2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, CmdCopyBufferToImage2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, CmdCopyImageToBuffer2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, CmdBlitImage2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, CmdResolveImage2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, CmdSetEvent2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, CmdResetEvent2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, CmdWaitEvents2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, CmdPipelineBarrier2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, CmdWriteTimestamp2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, QueueSubmit2, KHR); \ HookInitExtension(KHR_synchronization2 &&AMD_buffer_marker, CmdWriteBufferMarker2AMD); \ /* No GetQueueCheckpointData2NV without VK_NV_device_diagnostic_checkpoints */ \ HookInitExtension(KHR_present_wait, WaitForPresentKHR); \ - HookInitExtension(KHR_maintenance4, GetDeviceBufferMemoryRequirementsKHR); \ - HookInitExtension(KHR_maintenance4, GetDeviceImageMemoryRequirementsKHR); \ - HookInitExtension(KHR_maintenance4, GetDeviceImageSparseMemoryRequirementsKHR); \ + HookInitPromotedExtension(KHR_maintenance4, GetDeviceBufferMemoryRequirements, KHR); \ + HookInitPromotedExtension(KHR_maintenance4, GetDeviceImageMemoryRequirements, KHR); \ + HookInitPromotedExtension(KHR_maintenance4, GetDeviceImageSparseMemoryRequirements, KHR); \ HookInitExtension(EXT_color_write_enable, CmdSetColorWriteEnableEXT); \ - HookInitExtension(EXT_extended_dynamic_state2, CmdSetDepthBiasEnableEXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state2, CmdSetDepthBiasEnable, EXT); \ HookInitExtension(EXT_extended_dynamic_state2, CmdSetLogicOpEXT); \ HookInitExtension(EXT_extended_dynamic_state2, CmdSetPatchControlPointsEXT); \ - HookInitExtension(EXT_extended_dynamic_state2, CmdSetPrimitiveRestartEnableEXT); \ - HookInitExtension(EXT_extended_dynamic_state2, CmdSetRasterizerDiscardEnableEXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state2, CmdSetPrimitiveRestartEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state2, CmdSetRasterizerDiscardEnable, EXT); \ HookInitExtension(EXT_vertex_input_dynamic_state, CmdSetVertexInputEXT); \ - HookInitExtension(KHR_dynamic_rendering, CmdBeginRenderingKHR); \ - HookInitExtension(KHR_dynamic_rendering, CmdEndRenderingKHR); \ + HookInitPromotedExtension(KHR_dynamic_rendering, CmdBeginRendering, KHR); \ + HookInitPromotedExtension(KHR_dynamic_rendering, CmdEndRendering, KHR); \ HookInitExtension_Device_Win32(); \ HookInitExtension_Device_Linux(); \ HookInitExtension_Device_GGP(); \ @@ -1467,7 +1470,7 @@ HookDefine4(void, vkResetQueryPool, VkDevice, device, VkQueryPool, queryPool, uint32_t, \ firstQuery, uint32_t, queryCount); \ HookDefine2(VkDeviceAddress, vkGetBufferDeviceAddressEXT, VkDevice, device, \ - VkBufferDeviceAddressInfoEXT *, pInfo); \ + VkBufferDeviceAddressInfo *, pInfo); \ HookDefine4(void, vkSetHdrMetadataEXT, VkDevice, device, uint32_t, swapchainCount, \ const VkSwapchainKHR *, pSwapchains, const VkHdrMetadataEXT *, pMetadata); \ HookDefine3(void, vkSetLocalDimmingAMD, VkDevice, device, VkSwapchainKHR, swapChain, VkBool32, \ @@ -1514,99 +1517,98 @@ VkBufferDeviceAddressInfo *, pInfo); \ HookDefine2(uint64_t, vkGetDeviceMemoryOpaqueCaptureAddress, VkDevice, device, \ VkDeviceMemoryOpaqueCaptureAddressInfo *, pInfo); \ - HookDefine3(VkResult, vkGetPhysicalDeviceToolPropertiesEXT, VkPhysicalDevice, physicalDevice, \ - uint32_t *, pToolCount, VkPhysicalDeviceToolPropertiesEXT *, pToolProperties); \ - HookDefine4(VkResult, vkCreatePrivateDataSlotEXT, VkDevice, device, \ - const VkPrivateDataSlotCreateInfoEXT *, pCreateInfo, const VkAllocationCallbacks *, \ - pAllocator, VkPrivateDataSlotEXT *, pPrivateDataSlot); \ - HookDefine3(void, vkDestroyPrivateDataSlotEXT, VkDevice, device, VkPrivateDataSlotEXT, \ + HookDefine3(VkResult, vkGetPhysicalDeviceToolProperties, VkPhysicalDevice, physicalDevice, \ + uint32_t *, pToolCount, VkPhysicalDeviceToolProperties *, pToolProperties); \ + HookDefine4(VkResult, vkCreatePrivateDataSlot, VkDevice, device, \ + const VkPrivateDataSlotCreateInfo *, pCreateInfo, const VkAllocationCallbacks *, \ + pAllocator, VkPrivateDataSlot *, pPrivateDataSlot); \ + HookDefine3(void, vkDestroyPrivateDataSlot, VkDevice, device, VkPrivateDataSlot, \ privateDataSlot, const VkAllocationCallbacks *, pAllocator); \ - HookDefine5(VkResult, vkSetPrivateDataEXT, VkDevice, device, VkObjectType, objectType, uint64_t, \ - objectHandle, VkPrivateDataSlotEXT, privateDataSlot, uint64_t, data); \ - HookDefine5(void, vkGetPrivateDataEXT, VkDevice, device, VkObjectType, objectType, uint64_t, \ - objectHandle, VkPrivateDataSlotEXT, privateDataSlot, uint64_t *, pData); \ - HookDefine2(void, vkCmdSetCullModeEXT, VkCommandBuffer, commandBuffer, VkCullModeFlags, cullMode); \ - HookDefine2(void, vkCmdSetFrontFaceEXT, VkCommandBuffer, commandBuffer, VkFrontFace, frontFace); \ - HookDefine2(void, vkCmdSetPrimitiveTopologyEXT, VkCommandBuffer, commandBuffer, \ + HookDefine5(VkResult, vkSetPrivateData, VkDevice, device, VkObjectType, objectType, uint64_t, \ + objectHandle, VkPrivateDataSlot, privateDataSlot, uint64_t, data); \ + HookDefine5(void, vkGetPrivateData, VkDevice, device, VkObjectType, objectType, uint64_t, \ + objectHandle, VkPrivateDataSlot, privateDataSlot, uint64_t *, pData); \ + HookDefine2(void, vkCmdSetCullMode, VkCommandBuffer, commandBuffer, VkCullModeFlags, cullMode); \ + HookDefine2(void, vkCmdSetFrontFace, VkCommandBuffer, commandBuffer, VkFrontFace, frontFace); \ + HookDefine2(void, vkCmdSetPrimitiveTopology, VkCommandBuffer, commandBuffer, \ VkPrimitiveTopology, primitiveTopology); \ - HookDefine3(void, vkCmdSetViewportWithCountEXT, VkCommandBuffer, commandBuffer, uint32_t, \ + HookDefine3(void, vkCmdSetViewportWithCount, VkCommandBuffer, commandBuffer, uint32_t, \ viewportCount, const VkViewport *, pViewports); \ - HookDefine3(void, vkCmdSetScissorWithCountEXT, VkCommandBuffer, commandBuffer, uint32_t, \ + HookDefine3(void, vkCmdSetScissorWithCount, VkCommandBuffer, commandBuffer, uint32_t, \ scissorCount, const VkRect2D *, pScissors); \ - HookDefine7(void, vkCmdBindVertexBuffers2EXT, VkCommandBuffer, commandBuffer, uint32_t, \ - firstBinding, uint32_t, bindingCount, const VkBuffer *, pBuffers, \ - const VkDeviceSize *, pOffsets, const VkDeviceSize *, pSizes, const VkDeviceSize *, \ - pStrides); \ - HookDefine2(void, vkCmdSetDepthTestEnableEXT, VkCommandBuffer, commandBuffer, VkBool32, \ + HookDefine7(void, vkCmdBindVertexBuffers2, VkCommandBuffer, commandBuffer, uint32_t, firstBinding, \ + uint32_t, bindingCount, const VkBuffer *, pBuffers, const VkDeviceSize *, pOffsets, \ + const VkDeviceSize *, pSizes, const VkDeviceSize *, pStrides); \ + HookDefine2(void, vkCmdSetDepthTestEnable, VkCommandBuffer, commandBuffer, VkBool32, \ depthTestEnable); \ - HookDefine2(void, vkCmdSetDepthWriteEnableEXT, VkCommandBuffer, commandBuffer, VkBool32, \ + HookDefine2(void, vkCmdSetDepthWriteEnable, VkCommandBuffer, commandBuffer, VkBool32, \ depthWriteEnable); \ - HookDefine2(void, vkCmdSetDepthCompareOpEXT, VkCommandBuffer, commandBuffer, VkCompareOp, \ + HookDefine2(void, vkCmdSetDepthCompareOp, VkCommandBuffer, commandBuffer, VkCompareOp, \ depthCompareOp); \ - HookDefine2(void, vkCmdSetDepthBoundsTestEnableEXT, VkCommandBuffer, commandBuffer, VkBool32, \ + HookDefine2(void, vkCmdSetDepthBoundsTestEnable, VkCommandBuffer, commandBuffer, VkBool32, \ depthBoundsTestEnable); \ - HookDefine2(void, vkCmdSetStencilTestEnableEXT, VkCommandBuffer, commandBuffer, VkBool32, \ + HookDefine2(void, vkCmdSetStencilTestEnable, VkCommandBuffer, commandBuffer, VkBool32, \ stencilTestEnable); \ - HookDefine6(void, vkCmdSetStencilOpEXT, VkCommandBuffer, commandBuffer, VkStencilFaceFlags, \ + HookDefine6(void, vkCmdSetStencilOp, VkCommandBuffer, commandBuffer, VkStencilFaceFlags, \ faceMask, VkStencilOp, failOp, VkStencilOp, passOp, VkStencilOp, depthFailOp, \ VkCompareOp, compareOp); \ - HookDefine2(void, vkCmdCopyBuffer2KHR, VkCommandBuffer, commandBuffer, \ - const VkCopyBufferInfo2KHR *, pCopyBufferInfo); \ - HookDefine2(void, vkCmdCopyImage2KHR, VkCommandBuffer, commandBuffer, \ - const VkCopyImageInfo2KHR *, pCopyImageInfo); \ - HookDefine2(void, vkCmdCopyBufferToImage2KHR, VkCommandBuffer, commandBuffer, \ - const VkCopyBufferToImageInfo2KHR *, pCopyBufferToImageInfo); \ - HookDefine2(void, vkCmdCopyImageToBuffer2KHR, VkCommandBuffer, commandBuffer, \ - const VkCopyImageToBufferInfo2KHR *, pCopyImageToBufferInfo); \ - HookDefine2(void, vkCmdBlitImage2KHR, VkCommandBuffer, commandBuffer, \ - const VkBlitImageInfo2KHR *, pBlitImageInfo); \ - HookDefine2(void, vkCmdResolveImage2KHR, VkCommandBuffer, commandBuffer, \ - const VkResolveImageInfo2KHR *, pResolveImageInfo); \ - HookDefine3(void, vkCmdSetEvent2KHR, VkCommandBuffer, commandBuffer, VkEvent, event, \ - const VkDependencyInfoKHR *, pDependencyInfo); \ - HookDefine3(void, vkCmdResetEvent2KHR, VkCommandBuffer, commandBuffer, VkEvent, event, \ - VkPipelineStageFlags2KHR, stageMask); \ - HookDefine4(void, vkCmdWaitEvents2KHR, VkCommandBuffer, commandBuffer, uint32_t, eventCount, \ - const VkEvent *, pEvents, const VkDependencyInfoKHR *, pDependencyInfos); \ - HookDefine2(void, vkCmdPipelineBarrier2KHR, VkCommandBuffer, commandBuffer, \ - const VkDependencyInfoKHR *, pDependencyInfo); \ - HookDefine4(void, vkCmdWriteTimestamp2KHR, VkCommandBuffer, commandBuffer, \ - VkPipelineStageFlags2KHR, stage, VkQueryPool, queryPool, uint32_t, query); \ - HookDefine4(VkResult, vkQueueSubmit2KHR, VkQueue, queue, uint32_t, submitCount, \ - const VkSubmitInfo2KHR *, pSubmits, VkFence, fence); \ + HookDefine2(void, vkCmdCopyBuffer2, VkCommandBuffer, commandBuffer, const VkCopyBufferInfo2 *, \ + pCopyBufferInfo); \ + HookDefine2(void, vkCmdCopyImage2, VkCommandBuffer, commandBuffer, const VkCopyImageInfo2 *, \ + pCopyImageInfo); \ + HookDefine2(void, vkCmdCopyBufferToImage2, VkCommandBuffer, commandBuffer, \ + const VkCopyBufferToImageInfo2 *, pCopyBufferToImageInfo); \ + HookDefine2(void, vkCmdCopyImageToBuffer2, VkCommandBuffer, commandBuffer, \ + const VkCopyImageToBufferInfo2 *, pCopyImageToBufferInfo); \ + HookDefine2(void, vkCmdBlitImage2, VkCommandBuffer, commandBuffer, const VkBlitImageInfo2 *, \ + pBlitImageInfo); \ + HookDefine2(void, vkCmdResolveImage2, VkCommandBuffer, commandBuffer, \ + const VkResolveImageInfo2 *, pResolveImageInfo); \ + HookDefine3(void, vkCmdSetEvent2, VkCommandBuffer, commandBuffer, VkEvent, event, \ + const VkDependencyInfo *, pDependencyInfo); \ + HookDefine3(void, vkCmdResetEvent2, VkCommandBuffer, commandBuffer, VkEvent, event, \ + VkPipelineStageFlags2, stageMask); \ + HookDefine4(void, vkCmdWaitEvents2, VkCommandBuffer, commandBuffer, uint32_t, eventCount, \ + const VkEvent *, pEvents, const VkDependencyInfo *, pDependencyInfos); \ + HookDefine2(void, vkCmdPipelineBarrier2, VkCommandBuffer, commandBuffer, \ + const VkDependencyInfo *, pDependencyInfo); \ + HookDefine4(void, vkCmdWriteTimestamp2, VkCommandBuffer, commandBuffer, VkPipelineStageFlags2, \ + stage, VkQueryPool, queryPool, uint32_t, query); \ + HookDefine4(VkResult, vkQueueSubmit2, VkQueue, queue, uint32_t, submitCount, \ + const VkSubmitInfo2 *, pSubmits, VkFence, fence); \ HookDefine5(void, vkCmdWriteBufferMarker2AMD, VkCommandBuffer, commandBuffer, \ - VkPipelineStageFlags2KHR, stage, VkBuffer, dstBuffer, VkDeviceSize, dstOffset, \ + VkPipelineStageFlags2, stage, VkBuffer, dstBuffer, VkDeviceSize, dstOffset, \ uint32_t, marker); \ HookDefine4(VkResult, vkWaitForPresentKHR, VkDevice, device, VkSwapchainKHR, swapchain, \ uint64_t, presentId, uint64_t, timeout); \ - HookDefine3(void, vkGetDeviceBufferMemoryRequirementsKHR, VkDevice, device, \ - const VkDeviceBufferMemoryRequirementsKHR *, pInfo, VkMemoryRequirements2 *, \ + HookDefine3(void, vkGetDeviceBufferMemoryRequirements, VkDevice, device, \ + const VkDeviceBufferMemoryRequirements *, pInfo, VkMemoryRequirements2 *, \ pMemoryRequirements); \ - HookDefine3(void, vkGetDeviceImageMemoryRequirementsKHR, VkDevice, device, \ - const VkDeviceImageMemoryRequirementsKHR *, pInfo, VkMemoryRequirements2 *, \ + HookDefine3(void, vkGetDeviceImageMemoryRequirements, VkDevice, device, \ + const VkDeviceImageMemoryRequirements *, pInfo, VkMemoryRequirements2 *, \ pMemoryRequirements); \ - HookDefine4(void, vkGetDeviceImageSparseMemoryRequirementsKHR, VkDevice, device, \ - const VkDeviceImageMemoryRequirementsKHR *, pInfo, uint32_t *, \ + HookDefine4(void, vkGetDeviceImageSparseMemoryRequirements, VkDevice, device, \ + const VkDeviceImageMemoryRequirements *, pInfo, uint32_t *, \ pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *, \ pSparseMemoryRequirements); \ HookDefine3(void, vkCmdSetColorWriteEnableEXT, VkCommandBuffer, commandBuffer, uint32_t, \ attachmentCount, const VkBool32 *, pColorWriteEnables); \ - HookDefine2(void, vkCmdSetDepthBiasEnableEXT, VkCommandBuffer, commandBuffer, VkBool32, \ + HookDefine2(void, vkCmdSetDepthBiasEnable, VkCommandBuffer, commandBuffer, VkBool32, \ depthBiasEnable); \ HookDefine2(void, vkCmdSetLogicOpEXT, VkCommandBuffer, commandBuffer, VkLogicOp, logicOp); \ HookDefine2(void, vkCmdSetPatchControlPointsEXT, VkCommandBuffer, commandBuffer, uint32_t, \ patchControlPoints); \ - HookDefine2(void, vkCmdSetPrimitiveRestartEnableEXT, VkCommandBuffer, commandBuffer, VkBool32, \ + HookDefine2(void, vkCmdSetPrimitiveRestartEnable, VkCommandBuffer, commandBuffer, VkBool32, \ primitiveRestartEnable); \ - HookDefine2(void, vkCmdSetRasterizerDiscardEnableEXT, VkCommandBuffer, commandBuffer, VkBool32, \ + HookDefine2(void, vkCmdSetRasterizerDiscardEnable, VkCommandBuffer, commandBuffer, VkBool32, \ rasterizerDiscardEnable); \ HookDefine5(void, vkCmdSetVertexInputEXT, VkCommandBuffer, commandBuffer, uint32_t, \ vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT *, \ pVertexBindingDescriptions, uint32_t, vertexAttributeDescriptionCount, \ const VkVertexInputAttributeDescription2EXT *, pVertexAttributeDescriptions); \ - HookDefine2(void, vkCmdBeginRenderingKHR, VkCommandBuffer, commandBuffer, \ - const VkRenderingInfoKHR *, pRenderingInfo); \ - HookDefine1(void, vkCmdEndRenderingKHR, VkCommandBuffer, commandBuffer); \ + HookDefine2(void, vkCmdBeginRendering, VkCommandBuffer, commandBuffer, const VkRenderingInfo *, \ + pRenderingInfo); \ + HookDefine1(void, vkCmdEndRendering, VkCommandBuffer, commandBuffer); \ HookDefine_Win32(); \ HookDefine_Linux(); \ HookDefine_GGP(); \ diff --git a/renderdoc/driver/vulkan/vk_info.cpp b/renderdoc/driver/vulkan/vk_info.cpp index 0ad28e1d0..cb3079a6e 100644 --- a/renderdoc/driver/vulkan/vk_info.cpp +++ b/renderdoc/driver/vulkan/vk_info.cpp @@ -40,7 +40,7 @@ VkDynamicState ConvertDynamicState(VulkanDynamicStateIndex idx) case VkDynamicViewportWScalingNV: return VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV; case VkDynamicDiscardRectangleEXT: return VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT; case VkDynamicSampleLocationsEXT: return VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_EXT; - case VkDynamicRayTracingStackSizeEXT: + case VkDynamicRayTracingStackSizeKHR: return VK_DYNAMIC_STATE_RAY_TRACING_PIPELINE_STACK_SIZE_KHR; case VkDynamicViewportShadingRatePaletteNV: return VK_DYNAMIC_STATE_VIEWPORT_SHADING_RATE_PALETTE_NV; @@ -49,25 +49,24 @@ VkDynamicState ConvertDynamicState(VulkanDynamicStateIndex idx) case VkDynamicExclusiveScissorNV: return VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_NV; case VkDynamicShadingRateKHR: return VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR; case VkDynamicLineStippleEXT: return VK_DYNAMIC_STATE_LINE_STIPPLE_EXT; - case VkDynamicCullModeEXT: return VK_DYNAMIC_STATE_CULL_MODE_EXT; - case VkDynamicFrontFaceEXT: return VK_DYNAMIC_STATE_FRONT_FACE_EXT; - case VkDynamicPrimitiveTopologyEXT: return VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT; - case VkDynamicViewportCountEXT: return VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT; - case VkDynamicScissorCountEXT: return VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT; - case VkDynamicVertexInputBindingStrideEXT: - return VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT; - case VkDynamicDepthTestEnableEXT: return VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT; - case VkDynamicDepthWriteEnableEXT: return VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT; - case VkDynamicDepthCompareOpEXT: return VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT; - case VkDynamicDepthBoundsTestEnableEXT: return VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT; - case VkDynamicStencilTestEnableEXT: return VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT; - case VkDynamicStencilOpEXT: return VK_DYNAMIC_STATE_STENCIL_OP_EXT; + case VkDynamicCullMode: return VK_DYNAMIC_STATE_CULL_MODE; + case VkDynamicFrontFace: return VK_DYNAMIC_STATE_FRONT_FACE; + case VkDynamicPrimitiveTopology: return VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY; + case VkDynamicViewportCount: return VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT; + case VkDynamicScissorCount: return VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT; + case VkDynamicVertexInputBindingStride: return VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE; + case VkDynamicDepthTestEnable: return VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE; + case VkDynamicDepthWriteEnable: return VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE; + case VkDynamicDepthCompareOp: return VK_DYNAMIC_STATE_DEPTH_COMPARE_OP; + case VkDynamicDepthBoundsTestEnable: return VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE; + case VkDynamicStencilTestEnable: return VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE; + case VkDynamicStencilOp: return VK_DYNAMIC_STATE_STENCIL_OP; case VkDynamicVertexInputEXT: return VK_DYNAMIC_STATE_VERTEX_INPUT_EXT; case VkDynamicControlPointsEXT: return VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT; - case VkDynamicRastDiscardEXT: return VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT; - case VkDynamicDepthBiasEnableEXT: return VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT; + case VkDynamicRastDiscard: return VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE; + case VkDynamicDepthBiasEnable: return VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE; case VkDynamicLogicOpEXT: return VK_DYNAMIC_STATE_LOGIC_OP_EXT; - case VkDynamicPrimRestartEXT: return VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT; + case VkDynamicPrimRestart: return VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE; case VkDynamicColorWriteEXT: return VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT; case VkDynamicCount: break; } @@ -94,7 +93,7 @@ VulkanDynamicStateIndex ConvertDynamicState(VkDynamicState state) case VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT: return VkDynamicDiscardRectangleEXT; case VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_EXT: return VkDynamicSampleLocationsEXT; case VK_DYNAMIC_STATE_RAY_TRACING_PIPELINE_STACK_SIZE_KHR: - return VkDynamicRayTracingStackSizeEXT; + return VkDynamicRayTracingStackSizeKHR; case VK_DYNAMIC_STATE_VIEWPORT_SHADING_RATE_PALETTE_NV: return VkDynamicViewportShadingRatePaletteNV; case VK_DYNAMIC_STATE_VIEWPORT_COARSE_SAMPLE_ORDER_NV: @@ -102,25 +101,24 @@ VulkanDynamicStateIndex ConvertDynamicState(VkDynamicState state) case VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_NV: return VkDynamicExclusiveScissorNV; case VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR: return VkDynamicShadingRateKHR; case VK_DYNAMIC_STATE_LINE_STIPPLE_EXT: return VkDynamicLineStippleEXT; - case VK_DYNAMIC_STATE_CULL_MODE_EXT: return VkDynamicCullModeEXT; - case VK_DYNAMIC_STATE_FRONT_FACE_EXT: return VkDynamicFrontFaceEXT; - case VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT: return VkDynamicPrimitiveTopologyEXT; - case VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT: return VkDynamicViewportCountEXT; - case VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT: return VkDynamicScissorCountEXT; - case VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT: - return VkDynamicVertexInputBindingStrideEXT; - case VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT: return VkDynamicDepthTestEnableEXT; - case VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT: return VkDynamicDepthWriteEnableEXT; - case VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT: return VkDynamicDepthCompareOpEXT; - case VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT: return VkDynamicDepthBoundsTestEnableEXT; - case VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT: return VkDynamicStencilTestEnableEXT; - case VK_DYNAMIC_STATE_STENCIL_OP_EXT: return VkDynamicStencilOpEXT; + case VK_DYNAMIC_STATE_CULL_MODE: return VkDynamicCullMode; + case VK_DYNAMIC_STATE_FRONT_FACE: return VkDynamicFrontFace; + case VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY: return VkDynamicPrimitiveTopology; + case VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT: return VkDynamicViewportCount; + case VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT: return VkDynamicScissorCount; + case VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE: return VkDynamicVertexInputBindingStride; + case VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE: return VkDynamicDepthTestEnable; + case VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE: return VkDynamicDepthWriteEnable; + case VK_DYNAMIC_STATE_DEPTH_COMPARE_OP: return VkDynamicDepthCompareOp; + case VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE: return VkDynamicDepthBoundsTestEnable; + case VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE: return VkDynamicStencilTestEnable; + case VK_DYNAMIC_STATE_STENCIL_OP: return VkDynamicStencilOp; case VK_DYNAMIC_STATE_VERTEX_INPUT_EXT: return VkDynamicVertexInputEXT; case VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT: return VkDynamicControlPointsEXT; - case VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT: return VkDynamicRastDiscardEXT; - case VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT: return VkDynamicDepthBiasEnableEXT; + case VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE: return VkDynamicRastDiscard; + case VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE: return VkDynamicDepthBiasEnable; case VK_DYNAMIC_STATE_LOGIC_OP_EXT: return VkDynamicLogicOpEXT; - case VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT: return VkDynamicPrimRestartEXT; + case VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE: return VkDynamicPrimRestart; case VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT: return VkDynamicColorWriteEXT; case VK_DYNAMIC_STATE_MAX_ENUM: break; } @@ -166,7 +164,7 @@ void DescSetLayout::Init(VulkanResourceManager *resourceMan, VulkanCreationInfo bindings[b].descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC) dynamicCount++; - if(bindings[b].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(bindings[b].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { inlineCount++; inlineByteSize = AlignUp4(inlineByteSize + bindings[b].descriptorCount); @@ -202,7 +200,7 @@ void DescSetLayout::Init(VulkanResourceManager *resourceMan, VulkanCreationInfo if(bindings[b].variableSize) break; - if(bindings[b].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(bindings[b].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { elemOffset++; } @@ -238,7 +236,7 @@ void DescSetLayout::CreateBindingsArray(BindingStorage &bindingStorage, uint32_t { bindingStorage.binds[i] = bindingStorage.elems.data() + bindings[i].elemOffset; - if(bindings[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(bindings[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { bindingStorage.binds[i]->inlineOffset = inlineOffset; inlineOffset = AlignUp4(inlineOffset + bindings[i].descriptorCount); @@ -287,7 +285,7 @@ void DescSetLayout::UpdateBindingsArray(const DescSetLayout &prevLayout, { DescriptorSetSlot *newSlots = newElems.data() + bindings[i].elemOffset; - if(bindings[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(bindings[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { bindingStorage.binds[i]->inlineOffset = inlineOffset; inlineOffset = AlignUp4(inlineOffset + bindings[i].descriptorCount); @@ -362,9 +360,9 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan, renderpass = GetResID(pCreateInfo->renderPass); subpass = pCreateInfo->subpass; - const VkPipelineRenderingCreateInfoKHR *dynRenderCreate = - (const VkPipelineRenderingCreateInfoKHR *)FindNextStruct( - pCreateInfo, VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR); + const VkPipelineRenderingCreateInfo *dynRenderCreate = + (const VkPipelineRenderingCreateInfo *)FindNextStruct( + pCreateInfo, VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO); if(dynRenderCreate) { viewMask = dynRenderCreate->viewMask; @@ -390,9 +388,9 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan, // if the viewports and counts are dynamic this supersets the viewport only being dynamic. For // ease of code elsewhere, turn off the older one if both are specified so that we don't call // vkCmdSetViewports when the count is also dynamic. - if(dynamicStates[VkDynamicViewportCountEXT]) + if(dynamicStates[VkDynamicViewportCount]) dynamicStates[VkDynamicViewport] = false; - if(dynamicStates[VkDynamicScissorCountEXT]) + if(dynamicStates[VkDynamicScissorCount]) dynamicStates[VkDynamicScissor] = false; } @@ -965,10 +963,9 @@ void VulkanCreationInfo::RenderPass::Init(VulkanResourceManager *resourceMan, dst.stencilFinalLayout = dst.finalLayout = pCreateInfo->pAttachments[i].finalLayout; // VK_KHR_separate_depth_stencil_layouts - const VkAttachmentDescriptionStencilLayoutKHR *separateStencil = - (const VkAttachmentDescriptionStencilLayoutKHR *)FindNextStruct( - &pCreateInfo->pAttachments[i], - VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR); + const VkAttachmentDescriptionStencilLayout *separateStencil = + (const VkAttachmentDescriptionStencilLayout *)FindNextStruct( + &pCreateInfo->pAttachments[i], VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT); if(separateStencil) { @@ -995,9 +992,9 @@ void VulkanCreationInfo::RenderPass::Init(VulkanResourceManager *resourceMan, { dst.inputAttachments[i] = src.pInputAttachments[i].attachment; dst.inputStencilLayouts[i] = dst.inputLayouts[i] = src.pInputAttachments[i].layout; - const VkAttachmentReferenceStencilLayoutKHR *stencilLayout = - (const VkAttachmentReferenceStencilLayoutKHR *)FindNextStruct( - &src.pInputAttachments[i], VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); + const VkAttachmentReferenceStencilLayout *stencilLayout = + (const VkAttachmentReferenceStencilLayout *)FindNextStruct( + &src.pInputAttachments[i], VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT); if(stencilLayout != NULL) dst.inputStencilLayouts[i] = stencilLayout->stencilLayout; } @@ -1033,9 +1030,9 @@ void VulkanCreationInfo::RenderPass::Init(VulkanResourceManager *resourceMan, attachments[dst.depthstencilAttachment].used = true; // VK_KHR_separate_depth_stencil_layouts - const VkAttachmentReferenceStencilLayoutKHR *separateStencil = - (const VkAttachmentReferenceStencilLayoutKHR *)FindNextStruct( - src.pDepthStencilAttachment, VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); + const VkAttachmentReferenceStencilLayout *separateStencil = + (const VkAttachmentReferenceStencilLayout *)FindNextStruct( + src.pDepthStencilAttachment, VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT); if(separateStencil) dst.stencilLayout = separateStencil->stencilLayout; @@ -1434,7 +1431,7 @@ void DescUpdateTemplate::Init(VulkanResourceManager *resourceMan, VulkanCreation imageInfoCount += entry.descriptorCount; } - else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // a bit of magic handling. The calculation is stride * descriptorCount bytes for the data, // plus the size of the 'base' structure. For inline uniform blocks there's no base structure @@ -1540,12 +1537,12 @@ void DescUpdateTemplate::Apply(const void *pData, DescUpdateTemplateApplication write.pImageInfo = &application.imgInfo[idx]; } - else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { application.inlineUniform.push_back({}); - VkWriteDescriptorSetInlineUniformBlockEXT &inlineWrite = application.inlineUniform.back(); - inlineWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT; + VkWriteDescriptorSetInlineUniformBlock &inlineWrite = application.inlineUniform.back(); + inlineWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK; inlineWrite.pNext = NULL; inlineWrite.dataSize = entry.descriptorCount; diff --git a/renderdoc/driver/vulkan/vk_info.h b/renderdoc/driver/vulkan/vk_info.h index 9fb96ea2d..67cfcc652 100644 --- a/renderdoc/driver/vulkan/vk_info.h +++ b/renderdoc/driver/vulkan/vk_info.h @@ -51,25 +51,25 @@ enum VulkanDynamicStateIndex VkDynamicExclusiveScissorNV, VkDynamicShadingRateKHR, VkDynamicLineStippleEXT, - VkDynamicCullModeEXT, - VkDynamicFrontFaceEXT, - VkDynamicPrimitiveTopologyEXT, - VkDynamicViewportCountEXT, - VkDynamicScissorCountEXT, - VkDynamicVertexInputBindingStrideEXT, - VkDynamicDepthTestEnableEXT, - VkDynamicDepthWriteEnableEXT, - VkDynamicDepthCompareOpEXT, - VkDynamicDepthBoundsTestEnableEXT, - VkDynamicStencilTestEnableEXT, - VkDynamicStencilOpEXT, - VkDynamicRayTracingStackSizeEXT, + VkDynamicCullMode, + VkDynamicFrontFace, + VkDynamicPrimitiveTopology, + VkDynamicViewportCount, + VkDynamicScissorCount, + VkDynamicVertexInputBindingStride, + VkDynamicDepthTestEnable, + VkDynamicDepthWriteEnable, + VkDynamicDepthCompareOp, + VkDynamicDepthBoundsTestEnable, + VkDynamicStencilTestEnable, + VkDynamicStencilOp, + VkDynamicRayTracingStackSizeKHR, VkDynamicVertexInputEXT, VkDynamicControlPointsEXT, - VkDynamicRastDiscardEXT, - VkDynamicDepthBiasEnableEXT, + VkDynamicRastDiscard, + VkDynamicDepthBiasEnable, VkDynamicLogicOpEXT, - VkDynamicPrimRestartEXT, + VkDynamicPrimRestart, VkDynamicColorWriteEXT, VkDynamicCount, }; @@ -169,7 +169,7 @@ struct DescUpdateTemplateApplication rdcarray bufInfo; rdcarray imgInfo; rdcarray bufView; - rdcarray inlineUniform; + rdcarray inlineUniform; bytebuf inlineData; rdcarray writes; diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index fa9a9e00d..9d51f2520 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -1041,8 +1041,7 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id, V if(layout.inlineCount > 0) { - initialContents.inlineInfo = - new VkWriteDescriptorSetInlineUniformBlockEXT[layout.inlineCount]; + initialContents.inlineInfo = new VkWriteDescriptorSetInlineUniformBlock[layout.inlineCount]; initialContents.inlineData = AllocAlignedBuffer(InlineData.size()); RDCASSERTEQUAL(layout.inlineByteSize, InlineData.size()); memcpy(initialContents.inlineData, InlineData.data(), InlineData.size()); @@ -1058,7 +1057,7 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id, V VkWriteDescriptorSet *writes = initialContents.descriptorWrites; VkDescriptorBufferInfo *dstData = initialContents.descriptorInfo; - VkWriteDescriptorSetInlineUniformBlockEXT *dstInline = initialContents.inlineInfo; + VkWriteDescriptorSetInlineUniformBlock *dstInline = initialContents.inlineInfo; DescriptorSetSlot *srcData = Bindings; byte *srcInlineData = initialContents.inlineData; @@ -1079,7 +1078,7 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id, V uint32_t inlineSize = 0; - if(layout.bindings[j].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(layout.bindings[j].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { inlineSize = descriptorCount; descriptorCount = 1; @@ -1130,12 +1129,12 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id, V // For the array case we batch up updates as much as possible, iterating along the array and // skipping any invalid descriptors. - if(writes[bind].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(writes[bind].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // handle inline uniform block specially because the descriptorCount doesn't mean what it // normally means in the write. - dstInline->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT; + dstInline->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK; dstInline->pNext = NULL; dstInline->pData = srcInlineData + src->inlineOffset; dstInline->dataSize = inlineSize; @@ -1849,11 +1848,11 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, const VkInitialConten DescriptorSetSlot *bind = bindings[writes[i].dstBinding]; - if(writes[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(writes[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { - VkWriteDescriptorSetInlineUniformBlockEXT *inlineWrite = - (VkWriteDescriptorSetInlineUniformBlockEXT *)FindNextStruct( - &writes[i], VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT); + VkWriteDescriptorSetInlineUniformBlock *inlineWrite = + (VkWriteDescriptorSetInlineUniformBlock *)FindNextStruct( + &writes[i], VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK); memcpy(inlineData.data() + bind->inlineOffset + writes[i].dstArrayElement, inlineWrite->pData, inlineWrite->dataSize); continue; diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp index 27d9aafa7..c40587a51 100644 --- a/renderdoc/driver/vulkan/vk_manager.cpp +++ b/renderdoc/driver/vulkan/vk_manager.cpp @@ -255,7 +255,7 @@ void VulkanResourceManager::RecordBarriers(rdcarray &states, uint32_t queueFamilyIndex, uint32_t numBarriers, - const VkImageMemoryBarrier2KHR *barriers) + const VkImageMemoryBarrier2 *barriers) { rdcarray downcast; downcast.reserve(numBarriers); diff --git a/renderdoc/driver/vulkan/vk_manager.h b/renderdoc/driver/vulkan/vk_manager.h index cdb13d097..008c00cea 100644 --- a/renderdoc/driver/vulkan/vk_manager.h +++ b/renderdoc/driver/vulkan/vk_manager.h @@ -119,7 +119,7 @@ struct VkInitialContents DescriptorSetSlot *descriptorSlots; VkWriteDescriptorSet *descriptorWrites; VkDescriptorBufferInfo *descriptorInfo; - VkWriteDescriptorSetInlineUniformBlockEXT *inlineInfo; + VkWriteDescriptorSetInlineUniformBlock *inlineInfo; byte *inlineData; size_t inlineByteSize; uint32_t numDescriptors; @@ -244,7 +244,7 @@ public: // VkImageMemoryBarrier2KHR. This includes new image layouts added (which should only be used if // the extension is supported). void RecordBarriers(rdcflatmap &states, uint32_t queueFamilyIndex, - uint32_t numBarriers, const VkImageMemoryBarrier2KHR *barriers); + uint32_t numBarriers, const VkImageMemoryBarrier2 *barriers); template void SerialiseImageStates(SerialiserType &ser, std::map &states); diff --git a/renderdoc/driver/vulkan/vk_next_chains.cpp b/renderdoc/driver/vulkan/vk_next_chains.cpp index c7ba6e53b..799581fde 100644 --- a/renderdoc/driver/vulkan/vk_next_chains.cpp +++ b/renderdoc/driver/vulkan/vk_next_chains.cpp @@ -101,11 +101,11 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, COPY_STRUCT(VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO, \ VkBindImageMemoryDeviceGroupInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO, VkBindImagePlaneMemoryInfo); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR, VkBufferCopy2KHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_BUFFER_COPY_2, VkBufferCopy2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, VkBufferCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT, \ VkBufferDeviceAddressCreateInfoEXT); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR, VkBufferImageCopy2KHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2, VkBufferImageCopy2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO, \ VkBufferOpaqueCaptureAddressCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT, VkCalibratedTimestampInfoEXT); \ @@ -124,8 +124,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, COPY_STRUCT(VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV, \ VkDedicatedAllocationImageCreateInfoNV); \ COPY_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, VkDescriptorPoolCreateInfo); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT, \ - VkDescriptorPoolInlineUniformBlockCreateInfoEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO, \ + VkDescriptorPoolInlineUniformBlockCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO, \ VkDescriptorSetLayoutBindingFlagsCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT, VkDescriptorSetLayoutSupport); \ @@ -145,11 +145,10 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO, VkDeviceGroupSubmitInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR, \ VkDeviceGroupSwapchainCreateInfoKHR); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT, \ - VkDevicePrivateDataCreateInfoEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO, VkDevicePrivateDataCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, VkDeviceQueueCreateInfo); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT, \ - VkDeviceQueueGlobalPriorityCreateInfoEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR, \ + VkDeviceQueueGlobalPriorityCreateInfoKHR); \ COPY_STRUCT(VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2, VkDeviceQueueInfo2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_DISPLAY_MODE_PROPERTIES_2_KHR, VkDisplayModeProperties2KHR); \ COPY_STRUCT(VK_STRUCTURE_TYPE_DISPLAY_NATIVE_HDR_SURFACE_CAPABILITIES_AMD, \ @@ -166,16 +165,16 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, COPY_STRUCT(VK_STRUCTURE_TYPE_FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT, \ VkFilterCubicImageViewImageFormatPropertiesEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2, VkFormatProperties2); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR, VkFormatProperties3KHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3, VkFormatProperties3); \ COPY_STRUCT(VK_STRUCTURE_TYPE_HDR_METADATA_EXT, VkHdrMetadataEXT) \ - COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR, VkImageBlit2KHR); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR, VkImageCopy2KHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_BLIT_2, VkImageBlit2); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_COPY_2, VkImageCopy2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, VkImageCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO, VkImageFormatListCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2, VkImageFormatProperties2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO, \ VkImagePlaneMemoryRequirementsInfo); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR, VkImageResolve2KHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2, VkImageResolve2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO, VkImageStencilUsageCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT, VkImageViewASTCDecodeModeEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO, VkImageViewUsageCreateInfo); \ @@ -183,7 +182,7 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, COPY_STRUCT(VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO, VkMemoryAllocateFlagsInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, VkMemoryAllocateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_MEMORY_BARRIER, VkMemoryBarrier); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR, VkMemoryBarrier2KHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_MEMORY_BARRIER_2, VkMemoryBarrier2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS, VkMemoryDedicatedRequirements); \ COPY_STRUCT(VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO, \ VkMemoryOpaqueCaptureAddressAllocateInfo); \ @@ -234,8 +233,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkPhysicalDeviceDiscardRectanglePropertiesEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES, \ VkPhysicalDeviceDriverProperties); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR, \ - VkPhysicalDeviceDynamicRenderingFeaturesKHR) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES, \ + VkPhysicalDeviceDynamicRenderingFeatures) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT, \ VkPhysicalDeviceExtendedDynamicStateFeaturesEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT, \ @@ -251,8 +250,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkPhysicalDeviceFloatControlsProperties); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV, \ VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV) \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT, \ - VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR, \ + VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES, VkPhysicalDeviceGroupProperties) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES, \ VkPhysicalDeviceShaderFloat16Int8Features); \ @@ -275,20 +274,20 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkPhysicalDeviceImageViewImageFormatInfoEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES, \ VkPhysicalDeviceImagelessFramebufferFeatures) \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT, \ - VkPhysicalDeviceImageRobustnessFeaturesEXT) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES, \ + VkPhysicalDeviceImageRobustnessFeatures) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT, \ VkPhysicalDeviceIndexTypeUint8FeaturesEXT); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT, \ - VkPhysicalDeviceInlineUniformBlockFeaturesEXT); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT, \ - VkPhysicalDeviceInlineUniformBlockPropertiesEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES, \ + VkPhysicalDeviceInlineUniformBlockFeatures); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES, \ + VkPhysicalDeviceInlineUniformBlockProperties); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES, \ VkPhysicalDeviceMaintenance3Properties); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR, \ - VkPhysicalDeviceMaintenance4FeaturesKHR); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR, \ - VkPhysicalDeviceMaintenance4PropertiesKHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES, \ + VkPhysicalDeviceMaintenance4Features); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES, \ + VkPhysicalDeviceMaintenance4Properties); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT, \ VkPhysicalDeviceMemoryBudgetPropertiesEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2, \ @@ -309,14 +308,14 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkPhysicalDevicePerformanceQueryFeaturesKHR); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR, \ VkPhysicalDevicePerformanceQueryPropertiesKHR); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT, \ - VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES, \ + VkPhysicalDevicePipelineCreationCacheControlFeatures); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR, \ VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES, \ VkPhysicalDevicePointClippingProperties); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT, \ - VkPhysicalDevicePrivateDataFeaturesEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES, \ + VkPhysicalDevicePrivateDataFeatures); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR, \ VkPhysicalDevicePresentIdFeaturesKHR); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR, \ @@ -354,46 +353,45 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkPhysicalDeviceShaderCorePropertiesAMD); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR, \ VkPhysicalDeviceShaderClockFeaturesKHR); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT, \ - VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES, \ + VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, \ VkPhysicalDeviceShaderDrawParametersFeatures); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT, \ VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV, \ VkPhysicalDeviceShaderImageFootprintFeaturesNV); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR, \ - VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR, \ - VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES, \ + VkPhysicalDeviceShaderIntegerDotProductFeatures); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES, \ + VkPhysicalDeviceShaderIntegerDotProductProperties); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, \ VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR, \ VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR) \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR, \ - VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES, \ + VkPhysicalDeviceShaderTerminateInvocationFeatures) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2, \ VkPhysicalDeviceSparseImageFormatInfo2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES, \ VkPhysicalDeviceSubgroupProperties); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT, \ - VkPhysicalDeviceSubgroupSizeControlFeaturesEXT) \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT, \ - VkPhysicalDeviceSubgroupSizeControlPropertiesEXT) \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR, \ - VkPhysicalDeviceSynchronization2FeaturesKHR); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES, \ + VkPhysicalDeviceSubgroupSizeControlFeatures) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES, \ + VkPhysicalDeviceSubgroupSizeControlProperties) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES, \ + VkPhysicalDeviceSynchronization2Features); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT, \ VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT, \ - VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT, \ - VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES, \ + VkPhysicalDeviceTexelBufferAlignmentProperties); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES, \ + VkPhysicalDeviceTextureCompressionASTCHDRFeatures); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES, \ VkPhysicalDeviceTimelineSemaphoreFeatures); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES, \ VkPhysicalDeviceTimelineSemaphoreProperties); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT, \ - VkPhysicalDeviceToolPropertiesEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES, VkPhysicalDeviceToolProperties); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT, \ VkPhysicalDeviceTransformFeedbackFeaturesEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT, \ @@ -416,6 +414,10 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkPhysicalDeviceVulkan12Features); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES, \ VkPhysicalDeviceVulkan12Properties); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES, \ + VkPhysicalDeviceVulkan13Features); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES, \ + VkPhysicalDeviceVulkan13Properties); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES, \ VkPhysicalDeviceVulkanMemoryModelFeatures); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR, \ @@ -424,11 +426,11 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT, \ VkPhysicalDeviceYcbcrImageArraysFeaturesEXT) \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR, \ - VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES, \ + VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO, VkPipelineCacheCreateInfo); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT, \ - VkPipelineCreationFeedbackCreateInfoEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO, \ + VkPipelineCreationFeedbackCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, \ VkPipelineColorBlendStateCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT, \ @@ -461,8 +463,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT, \ VkPipelineSampleLocationsStateCreateInfoEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, VkPipelineShaderStageCreateInfo); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT, \ - VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO, \ + VkPipelineShaderStageRequiredSubgroupSizeCreateInfo) \ COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO, \ VkPipelineTessellationDomainOriginStateCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO, \ @@ -476,12 +478,12 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, COPY_STRUCT(VK_STRUCTURE_TYPE_PRESENT_ID_KHR, VkPresentIdKHR); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR, VkPresentRegionsKHR); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE, VkPresentTimesInfoGOOGLE) \ - COPY_STRUCT(VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT, VkPrivateDataSlotCreateInfoEXT) \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO, VkPrivateDataSlotCreateInfo) \ COPY_STRUCT(VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO, VkQueryPoolCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR, \ VkQueryPoolPerformanceCreateInfoKHR); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT, \ - VkQueueFamilyGlobalPriorityPropertiesEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR, \ + VkQueueFamilyGlobalPriorityPropertiesKHR); \ COPY_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2, VkQueueFamilyProperties2); \ COPY_STRUCT(VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, VkRenderPassCreateInfo); \ COPY_STRUCT(VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2, VkRenderPassCreateInfo2); \ @@ -532,8 +534,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkVertexInputAttributeDescription2EXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT, \ VkVertexInputBindingDescription2EXT); \ - COPY_STRUCT(VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT, \ - VkWriteDescriptorSetInlineUniformBlockEXT); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK, \ + VkWriteDescriptorSetInlineUniformBlock); \ COPY_STRUCT_CAPTURE_ONLY(VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO, \ VkLayerInstanceCreateInfo); \ COPY_STRUCT_CAPTURE_ONLY(VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO, VkLayerDeviceCreateInfo); \ @@ -572,7 +574,7 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, UnwrapInPlace(out->image), UnwrapInPlace(out->memory)); \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, VkBufferMemoryBarrier, \ UnwrapInPlace(out->buffer)); \ - UNWRAP_STRUCT(VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR, VkBufferMemoryBarrier2KHR, \ + UNWRAP_STRUCT(VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2, VkBufferMemoryBarrier2, \ UnwrapInPlace(out->buffer)); \ /* VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT aliased by KHR */ \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO, VkBufferDeviceAddressInfo, \ @@ -585,7 +587,7 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, UnwrapInPlace(out->commandPool)); \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, VkCommandBufferInheritanceInfo, \ UnwrapInPlace(out->renderPass), UnwrapInPlace(out->framebuffer)); \ - UNWRAP_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR, VkCommandBufferSubmitInfoKHR, \ + UNWRAP_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO, VkCommandBufferSubmitInfo, \ UnwrapInPlace(out->commandBuffer)); \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT, \ VkConditionalRenderingBeginInfoEXT, UnwrapInPlace(out->buffer)); \ @@ -603,7 +605,7 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkDeviceMemoryOpaqueCaptureAddressInfo, UnwrapInPlace(out->memory)); \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, VkImageMemoryBarrier, \ UnwrapInPlace(out->image)); \ - UNWRAP_STRUCT(VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR, VkImageMemoryBarrier2KHR, \ + UNWRAP_STRUCT(VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2, VkImageMemoryBarrier2, \ UnwrapInPlace(out->image)); \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2, \ VkImageMemoryRequirementsInfo2, UnwrapInPlace(out->image)); \ @@ -619,7 +621,7 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, UnwrapInPlace(out->pipeline)); \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR, VkPipelineExecutableInfoKHR, \ UnwrapInPlace(out->pipeline)); \ - UNWRAP_STRUCT(VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR, VkRenderingAttachmentInfoKHR, \ + UNWRAP_STRUCT(VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO, VkRenderingAttachmentInfo, \ UnwrapInPlace(out->imageView), UnwrapInPlace(out->resolveImageView)); \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, VkRenderPassBeginInfo, \ UnwrapInPlace(out->renderPass), UnwrapInPlace(out->framebuffer)); \ @@ -627,7 +629,7 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, UnwrapInPlace(out->conversion)); \ UNWRAP_STRUCT(VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO, VkSemaphoreSignalInfo, \ UnwrapInPlace(out->semaphore)); \ - UNWRAP_STRUCT(VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR, VkSemaphoreSubmitInfoKHR, \ + UNWRAP_STRUCT(VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO, VkSemaphoreSubmitInfo, \ UnwrapInPlace(out->semaphore)); \ UNWRAP_STRUCT_CAPTURE_ONLY(VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR, \ VkAcquireNextImageInfoKHR, UnwrapInPlace(out->swapchain), \ @@ -653,181 +655,190 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, // define cases for structs we don't handle at all - only the body of the case needs to be defined // per-function. -#define UNHANDLED_STRUCTS() \ - /* Surface creation structs would pull in dependencies on OS-specific includes, */ \ - /* so we treat them as unsupported. */ \ - case VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_DIRECTFB_SURFACE_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK: \ - case VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK: \ - case VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP: \ - case VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN: \ - case VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR: \ - /* Output structure containing objects. Must be *wrapped* not unwrapped. */ \ - /* So we treat this as unhandled in generic code and require specific handling. */ \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_AABBS_DATA_KHR: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_MOTION_TRIANGLES_DATA_NV: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_INFO_NV: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NV: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MOTION_INFO_NV: \ - case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_VERSION_INFO_KHR: \ - case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_2_ANDROID: \ - case VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD: \ - case VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NV: \ - case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_BUFFER_CREATE_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CONSTRAINTS_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_IMAGE_CREATE_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_PROPERTIES_FUCHSIA: \ - case VK_STRUCTURE_TYPE_BUFFER_CONSTRAINTS_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV: \ - case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV: \ - case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM: \ - case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV: \ - case VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_TO_MEMORY_INFO_KHR: \ - case VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM: \ - case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_ACCELERATION_STRUCTURE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX: \ - case VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX: \ - case VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX: \ - case VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD: \ - case VK_STRUCTURE_TYPE_DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT: \ - case VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_2_EXT: \ - case VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT: \ - case VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR: \ - case VK_STRUCTURE_TYPE_FRAMEBUFFER_MIXED_SAMPLES_COMBINATION_NV: \ - case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_NV: \ - case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_NV: \ - case VK_STRUCTURE_TYPE_GEOMETRY_AABB_NV: \ - case VK_STRUCTURE_TYPE_GEOMETRY_NV: \ - case VK_STRUCTURE_TYPE_GEOMETRY_TRIANGLES_NV: \ - case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_IMAGE_CONSTRAINTS_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT: \ - case VK_STRUCTURE_TYPE_IMAGE_FORMAT_CONSTRAINTS_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX: \ - case VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX: \ - case VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA: \ - case VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT: \ - case VK_STRUCTURE_TYPE_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_NV: \ - case VK_STRUCTURE_TYPE_INITIALIZE_PERFORMANCE_API_INFO_INTEL: \ - case VK_STRUCTURE_TYPE_MEMORY_GET_REMOTE_ADDRESS_INFO_NV: \ - case VK_STRUCTURE_TYPE_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT: \ - case VK_STRUCTURE_TYPE_MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA: \ - case VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX: \ - case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE: \ - case VK_STRUCTURE_TYPE_PERFORMANCE_CONFIGURATION_ACQUIRE_INFO_INTEL: \ - case VK_STRUCTURE_TYPE_PERFORMANCE_MARKER_INFO_INTEL: \ - case VK_STRUCTURE_TYPE_PERFORMANCE_OVERRIDE_INFO_INTEL: \ - case VK_STRUCTURE_TYPE_PERFORMANCE_STREAM_MARKER_INFO_INTEL: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COVERAGE_REDUCTION_MODE_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRM_PROPERTIES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_RDMA_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INVOCATION_MASK_FEATURES_HUAWEI: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MOTION_BLUR_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_REPRESENTATIVE_FRAGMENT_TEST_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SM_BUILTINS_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SM_BUILTINS_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_SHADING_FEATURES_HUAWEI: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_SHADING_PROPERTIES_HUAWEI: \ - case VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_ADVANCED_STATE_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD: \ - case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_REDUCTION_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_TO_COLOR_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD: \ - case VK_STRUCTURE_TYPE_PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_COARSE_SAMPLE_ORDER_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_EXCLUSIVE_SCISSOR_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SHADING_RATE_IMAGE_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL: \ - case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV: \ - case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV: \ - case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_INTERFACE_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR: \ - case VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_NV: \ - case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR: \ - case VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM: \ - case VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT: \ - case VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX: \ - case VK_STRUCTURE_TYPE_SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA: \ - case VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI: \ - case VK_STRUCTURE_TYPE_SYSMEM_COLOR_SPACE_FUCHSIA: \ - case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR: \ +#define UNHANDLED_STRUCTS() \ + /* Surface creation structs would pull in dependencies on OS-specific includes, */ \ + /* so we treat them as unsupported. */ \ + case VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_DIRECTFB_SURFACE_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK: \ + case VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK: \ + case VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP: \ + case VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN: \ + case VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR: \ + /* Output structure containing objects. Must be *wrapped* not unwrapped. */ \ + /* So we treat this as unhandled in generic code and require specific handling. */ \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_AABBS_DATA_KHR: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_MOTION_TRIANGLES_DATA_NV: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_INFO_NV: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NV: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MOTION_INFO_NV: \ + case VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_VERSION_INFO_KHR: \ + case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_2_ANDROID: \ + case VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD: \ + case VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NV: \ + case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_BUFFER_CREATE_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CONSTRAINTS_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_IMAGE_CREATE_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_BUFFER_COLLECTION_PROPERTIES_FUCHSIA: \ + case VK_STRUCTURE_TYPE_BUFFER_CONSTRAINTS_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV: \ + case VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV: \ + case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM: \ + case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV: \ + case VK_STRUCTURE_TYPE_COOPERATIVE_MATRIX_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_TO_MEMORY_INFO_KHR: \ + case VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM: \ + case VK_STRUCTURE_TYPE_COPY_MEMORY_TO_ACCELERATION_STRUCTURE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_CU_FUNCTION_CREATE_INFO_NVX: \ + case VK_STRUCTURE_TYPE_CU_LAUNCH_INFO_NVX: \ + case VK_STRUCTURE_TYPE_CU_MODULE_CREATE_INFO_NVX: \ + case VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD: \ + case VK_STRUCTURE_TYPE_DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT: \ + case VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_2_EXT: \ + case VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT: \ + case VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR: \ + case VK_STRUCTURE_TYPE_FRAMEBUFFER_MIXED_SAMPLES_COMBINATION_NV: \ + case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_NV: \ + case VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_NV: \ + case VK_STRUCTURE_TYPE_GEOMETRY_AABB_NV: \ + case VK_STRUCTURE_TYPE_GEOMETRY_NV: \ + case VK_STRUCTURE_TYPE_GEOMETRY_TRIANGLES_NV: \ + case VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_IMAGE_CONSTRAINTS_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT: \ + case VK_STRUCTURE_TYPE_IMAGE_FORMAT_CONSTRAINTS_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX: \ + case VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX: \ + case VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA: \ + case VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT: \ + case VK_STRUCTURE_TYPE_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_NV: \ + case VK_STRUCTURE_TYPE_INITIALIZE_PERFORMANCE_API_INFO_INTEL: \ + case VK_STRUCTURE_TYPE_MEMORY_GET_REMOTE_ADDRESS_INFO_NV: \ + case VK_STRUCTURE_TYPE_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT: \ + case VK_STRUCTURE_TYPE_MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA: \ + case VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX: \ + case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE: \ + case VK_STRUCTURE_TYPE_PERFORMANCE_CONFIGURATION_ACQUIRE_INFO_INTEL: \ + case VK_STRUCTURE_TYPE_PERFORMANCE_MARKER_INFO_INTEL: \ + case VK_STRUCTURE_TYPE_PERFORMANCE_OVERRIDE_INFO_INTEL: \ + case VK_STRUCTURE_TYPE_PERFORMANCE_STREAM_MARKER_INFO_INTEL: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COVERAGE_REDUCTION_MODE_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRM_PROPERTIES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_RDMA_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INVOCATION_MASK_FEATURES_HUAWEI: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MOTION_BLUR_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_REPRESENTATIVE_FRAGMENT_TEST_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SM_BUILTINS_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SM_BUILTINS_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_SHADING_FEATURES_HUAWEI: \ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_SHADING_PROPERTIES_HUAWEI: \ + case VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_ADVANCED_STATE_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD: \ + case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_REDUCTION_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_TO_COLOR_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD: \ + case VK_STRUCTURE_TYPE_PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_COARSE_SAMPLE_ORDER_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_EXCLUSIVE_SCISSOR_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SHADING_RATE_IMAGE_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL: \ + case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV: \ + case VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV: \ + case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_INTERFACE_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR: \ + case VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_NV: \ + case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR: \ + case VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM: \ + case VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT: \ + case VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX: \ + case VK_STRUCTURE_TYPE_SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA: \ + case VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM: \ + case VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI: \ + case VK_STRUCTURE_TYPE_SYSMEM_COLOR_SPACE_FUCHSIA: \ + case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR: \ case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_NV: size_t GetNextPatchSize(const void *pNext) @@ -882,22 +893,22 @@ size_t GetNextPatchSize(const void *pNext) memSize += info->pImageBinds[i].bindCount * sizeof(VkSparseImageMemoryBind); break; } - case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR: + case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2: { - memSize += sizeof(VkBlitImageInfo2KHR); - VkBlitImageInfo2KHR *info = (VkBlitImageInfo2KHR *)next; - memSize += info->regionCount * sizeof(VkImageBlit2KHR); + memSize += sizeof(VkBlitImageInfo2); + VkBlitImageInfo2 *info = (VkBlitImageInfo2 *)next; + memSize += info->regionCount * sizeof(VkImageBlit2); for(uint32_t i = 0; i < info->regionCount; i++) memSize += GetNextPatchSize(info->pRegions[i].pNext); break; } - case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR: + case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO: { - memSize += sizeof(VkCommandBufferInheritanceRenderingInfoKHR); + memSize += sizeof(VkCommandBufferInheritanceRenderingInfo); - VkCommandBufferInheritanceRenderingInfoKHR *info = - (VkCommandBufferInheritanceRenderingInfoKHR *)next; - memSize += info->colorAttachmentCount * sizeof(VkCommandBufferInheritanceRenderingInfoKHR); + VkCommandBufferInheritanceRenderingInfo *info = + (VkCommandBufferInheritanceRenderingInfo *)next; + memSize += info->colorAttachmentCount * sizeof(VkCommandBufferInheritanceRenderingInfo); break; } case VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO: @@ -905,57 +916,57 @@ size_t GetNextPatchSize(const void *pNext) memSize += sizeof(VkComputePipelineCreateInfo); break; } - case VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR: + case VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2: { - memSize += sizeof(VkCopyBufferInfo2KHR); - VkCopyBufferInfo2KHR *info = (VkCopyBufferInfo2KHR *)next; - memSize += info->regionCount * sizeof(VkBufferCopy2KHR); + memSize += sizeof(VkCopyBufferInfo2); + VkCopyBufferInfo2 *info = (VkCopyBufferInfo2 *)next; + memSize += info->regionCount * sizeof(VkBufferCopy2); for(uint32_t i = 0; i < info->regionCount; i++) memSize += GetNextPatchSize(info->pRegions[i].pNext); break; } - case VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR: + case VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2: { - memSize += sizeof(VkCopyBufferToImageInfo2KHR); - VkCopyBufferToImageInfo2KHR *info = (VkCopyBufferToImageInfo2KHR *)next; - memSize += info->regionCount * sizeof(VkBufferImageCopy2KHR); + memSize += sizeof(VkCopyBufferToImageInfo2); + VkCopyBufferToImageInfo2 *info = (VkCopyBufferToImageInfo2 *)next; + memSize += info->regionCount * sizeof(VkBufferImageCopy2); for(uint32_t i = 0; i < info->regionCount; i++) memSize += GetNextPatchSize(info->pRegions[i].pNext); break; } - case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR: + case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2: { - memSize += sizeof(VkCopyImageToBufferInfo2KHR); - VkCopyImageToBufferInfo2KHR *info = (VkCopyImageToBufferInfo2KHR *)next; - memSize += info->regionCount * sizeof(VkBufferImageCopy2KHR); + memSize += sizeof(VkCopyImageToBufferInfo2); + VkCopyImageToBufferInfo2 *info = (VkCopyImageToBufferInfo2 *)next; + memSize += info->regionCount * sizeof(VkBufferImageCopy2); for(uint32_t i = 0; i < info->regionCount; i++) memSize += GetNextPatchSize(info->pRegions[i].pNext); break; } - case VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR: + case VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2: { - memSize += sizeof(VkCopyImageInfo2KHR); - VkCopyImageInfo2KHR *info = (VkCopyImageInfo2KHR *)next; - memSize += info->regionCount * sizeof(VkImageCopy2KHR); + memSize += sizeof(VkCopyImageInfo2); + VkCopyImageInfo2 *info = (VkCopyImageInfo2 *)next; + memSize += info->regionCount * sizeof(VkImageCopy2); for(uint32_t i = 0; i < info->regionCount; i++) memSize += GetNextPatchSize(info->pRegions[i].pNext); break; } - case VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR: + case VK_STRUCTURE_TYPE_DEPENDENCY_INFO: { - memSize += sizeof(VkDependencyInfoKHR); + memSize += sizeof(VkDependencyInfo); - VkDependencyInfoKHR *info = (VkDependencyInfoKHR *)next; + VkDependencyInfo *info = (VkDependencyInfo *)next; - memSize += info->memoryBarrierCount * sizeof(VkBufferMemoryBarrier2KHR); + memSize += info->memoryBarrierCount * sizeof(VkBufferMemoryBarrier2); for(uint32_t i = 0; i < info->memoryBarrierCount; i++) memSize += GetNextPatchSize(info->pMemoryBarriers[i].pNext); - memSize += info->bufferMemoryBarrierCount * sizeof(VkBufferMemoryBarrier2KHR); + memSize += info->bufferMemoryBarrierCount * sizeof(VkBufferMemoryBarrier2); for(uint32_t i = 0; i < info->bufferMemoryBarrierCount; i++) memSize += GetNextPatchSize(info->pBufferMemoryBarriers[i].pNext); - memSize += info->imageMemoryBarrierCount * sizeof(VkImageMemoryBarrier2KHR); + memSize += info->imageMemoryBarrierCount * sizeof(VkImageMemoryBarrier2); for(uint32_t i = 0; i < info->imageMemoryBarrierCount; i++) memSize += GetNextPatchSize(info->pImageMemoryBarriers[i].pNext); @@ -981,11 +992,11 @@ size_t GetNextPatchSize(const void *pNext) memSize += info->pBindings[i].descriptorCount * sizeof(VkSampler); break; } - case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR: + case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS: { - memSize += sizeof(VkDeviceBufferMemoryRequirementsKHR); + memSize += sizeof(VkDeviceBufferMemoryRequirements); - VkDeviceBufferMemoryRequirementsKHR *info = (VkDeviceBufferMemoryRequirementsKHR *)next; + VkDeviceBufferMemoryRequirements *info = (VkDeviceBufferMemoryRequirements *)next; memSize += GetNextPatchSize(info->pCreateInfo); break; } @@ -997,11 +1008,11 @@ size_t GetNextPatchSize(const void *pNext) memSize += info->physicalDeviceCount * sizeof(VkPhysicalDevice); break; } - case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR: + case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS: { - memSize += sizeof(VkDeviceImageMemoryRequirementsKHR); + memSize += sizeof(VkDeviceImageMemoryRequirements); - VkDeviceImageMemoryRequirementsKHR *info = (VkDeviceImageMemoryRequirementsKHR *)next; + VkDeviceImageMemoryRequirements *info = (VkDeviceImageMemoryRequirements *)next; memSize += GetNextPatchSize(info->pCreateInfo); break; } @@ -1077,12 +1088,12 @@ size_t GetNextPatchSize(const void *pNext) memSize += info->setLayoutCount * sizeof(VkDescriptorSetLayout); break; } - case VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR: + case VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO: { - memSize += sizeof(VkPipelineRenderingCreateInfoKHR); + memSize += sizeof(VkPipelineRenderingCreateInfo); - VkPipelineRenderingCreateInfoKHR *info = (VkPipelineRenderingCreateInfoKHR *)next; - memSize += info->colorAttachmentCount * sizeof(VkPipelineRenderingCreateInfoKHR); + VkPipelineRenderingCreateInfo *info = (VkPipelineRenderingCreateInfo *)next; + memSize += info->colorAttachmentCount * sizeof(VkPipelineRenderingCreateInfo); break; } case VK_STRUCTURE_TYPE_PRESENT_INFO_KHR: @@ -1094,12 +1105,12 @@ size_t GetNextPatchSize(const void *pNext) memSize += info->swapchainCount * sizeof(VkSwapchainKHR); break; } - case VK_STRUCTURE_TYPE_RENDERING_INFO_KHR: + case VK_STRUCTURE_TYPE_RENDERING_INFO: { - memSize += sizeof(VkRenderingInfoKHR); + memSize += sizeof(VkRenderingInfo); - VkRenderingInfoKHR *info = (VkRenderingInfoKHR *)next; - memSize += info->colorAttachmentCount * sizeof(VkRenderingAttachmentInfoKHR); + VkRenderingInfo *info = (VkRenderingInfo *)next; + memSize += info->colorAttachmentCount * sizeof(VkRenderingAttachmentInfo); for(uint32_t i = 0; i < info->colorAttachmentCount; i++) memSize += GetNextPatchSize(info->pColorAttachments[i].pNext); if(info->pDepthAttachment) @@ -1122,11 +1133,11 @@ size_t GetNextPatchSize(const void *pNext) memSize += info->attachmentCount * sizeof(VkImageView); break; } - case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR: + case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2: { - memSize += sizeof(VkResolveImageInfo2KHR); - VkResolveImageInfo2KHR *info = (VkResolveImageInfo2KHR *)next; - memSize += info->regionCount * sizeof(VkImageResolve2KHR); + memSize += sizeof(VkResolveImageInfo2); + VkResolveImageInfo2 *info = (VkResolveImageInfo2 *)next; + memSize += info->regionCount * sizeof(VkImageResolve2); for(uint32_t i = 0; i < info->regionCount; i++) memSize += GetNextPatchSize(info->pRegions[i].pNext); break; @@ -1149,21 +1160,21 @@ size_t GetNextPatchSize(const void *pNext) memSize += info->signalSemaphoreCount * sizeof(VkSemaphore); break; } - case VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR: + case VK_STRUCTURE_TYPE_SUBMIT_INFO_2: { - memSize += sizeof(VkSubmitInfo2KHR); + memSize += sizeof(VkSubmitInfo2); - VkSubmitInfo2KHR *info = (VkSubmitInfo2KHR *)next; + VkSubmitInfo2 *info = (VkSubmitInfo2 *)next; - memSize += info->waitSemaphoreInfoCount * sizeof(VkSemaphoreSubmitInfoKHR); + memSize += info->waitSemaphoreInfoCount * sizeof(VkSemaphoreSubmitInfo); for(uint32_t i = 0; i < info->waitSemaphoreInfoCount; i++) memSize += GetNextPatchSize(info->pWaitSemaphoreInfos[i].pNext); - memSize += info->commandBufferInfoCount * sizeof(VkCommandBufferSubmitInfoKHR); + memSize += info->commandBufferInfoCount * sizeof(VkCommandBufferSubmitInfo); for(uint32_t i = 0; i < info->commandBufferInfoCount; i++) memSize += GetNextPatchSize(info->pCommandBufferInfos[i].pNext); - memSize += info->signalSemaphoreInfoCount * sizeof(VkSemaphoreSubmitInfoKHR); + memSize += info->signalSemaphoreInfoCount * sizeof(VkSemaphoreSubmitInfo); for(uint32_t i = 0; i < info->signalSemaphoreInfoCount; i++) memSize += GetNextPatchSize(info->pSignalSemaphoreInfos[i].pNext); break; @@ -1192,7 +1203,7 @@ size_t GetNextPatchSize(const void *pNext) case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: memSize += info->descriptorCount * sizeof(VkDescriptorBufferInfo); break; - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: // nothing to unwrap for inline uniform blocks, it's on the next chain break; default: RDCERR("Unhandled descriptor type unwrapping VkWriteDescriptorSet"); break; @@ -1509,17 +1520,17 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR: + case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2: { - const VkBlitImageInfo2KHR *in = (const VkBlitImageInfo2KHR *)nextInput; - VkBlitImageInfo2KHR *out = (VkBlitImageInfo2KHR *)tempMem; + const VkBlitImageInfo2 *in = (const VkBlitImageInfo2 *)nextInput; + VkBlitImageInfo2 *out = (VkBlitImageInfo2 *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped array - VkImageBlit2KHR *outRegions = (VkImageBlit2KHR *)tempMem; - tempMem += sizeof(VkImageBlit2KHR) * in->regionCount; + VkImageBlit2 *outRegions = (VkImageBlit2 *)tempMem; + tempMem += sizeof(VkImageBlit2) * in->regionCount; *out = *in; UnwrapInPlace(out->srcImage); @@ -1529,17 +1540,17 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, for(uint32_t i = 0; i < in->regionCount; i++) { outRegions[i] = in->pRegions[i]; - UnwrapNextChain(state, "VkImageBlit2KHR", tempMem, (VkBaseInStructure *)&outRegions[i]); + UnwrapNextChain(state, "VkImageBlit2", tempMem, (VkBaseInStructure *)&outRegions[i]); } break; } - case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR: + case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO: { - const VkCommandBufferInheritanceRenderingInfoKHR *in = - (const VkCommandBufferInheritanceRenderingInfoKHR *)nextInput; - VkCommandBufferInheritanceRenderingInfoKHR *out = - (VkCommandBufferInheritanceRenderingInfoKHR *)tempMem; + const VkCommandBufferInheritanceRenderingInfo *in = + (const VkCommandBufferInheritanceRenderingInfo *)nextInput; + VkCommandBufferInheritanceRenderingInfo *out = + (VkCommandBufferInheritanceRenderingInfo *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); @@ -1571,17 +1582,17 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR: + case VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2: { - const VkCopyBufferInfo2KHR *in = (const VkCopyBufferInfo2KHR *)nextInput; - VkCopyBufferInfo2KHR *out = (VkCopyBufferInfo2KHR *)tempMem; + const VkCopyBufferInfo2 *in = (const VkCopyBufferInfo2 *)nextInput; + VkCopyBufferInfo2 *out = (VkCopyBufferInfo2 *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped array - VkBufferCopy2KHR *outRegions = (VkBufferCopy2KHR *)tempMem; - tempMem += sizeof(VkBufferCopy2KHR) * in->regionCount; + VkBufferCopy2 *outRegions = (VkBufferCopy2 *)tempMem; + tempMem += sizeof(VkBufferCopy2) * in->regionCount; *out = *in; UnwrapInPlace(out->srcBuffer); @@ -1591,22 +1602,22 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, for(uint32_t i = 0; i < in->regionCount; i++) { outRegions[i] = in->pRegions[i]; - UnwrapNextChain(state, "VkBufferCopy2KHR", tempMem, (VkBaseInStructure *)&outRegions[i]); + UnwrapNextChain(state, "VkBufferCopy2", tempMem, (VkBaseInStructure *)&outRegions[i]); } break; } - case VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR: + case VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2: { - const VkCopyBufferToImageInfo2KHR *in = (const VkCopyBufferToImageInfo2KHR *)nextInput; - VkCopyBufferToImageInfo2KHR *out = (VkCopyBufferToImageInfo2KHR *)tempMem; + const VkCopyBufferToImageInfo2 *in = (const VkCopyBufferToImageInfo2 *)nextInput; + VkCopyBufferToImageInfo2 *out = (VkCopyBufferToImageInfo2 *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped array - VkBufferImageCopy2KHR *outRegions = (VkBufferImageCopy2KHR *)tempMem; - tempMem += sizeof(VkBufferImageCopy2KHR) * in->regionCount; + VkBufferImageCopy2 *outRegions = (VkBufferImageCopy2 *)tempMem; + tempMem += sizeof(VkBufferImageCopy2) * in->regionCount; *out = *in; UnwrapInPlace(out->srcBuffer); @@ -1616,23 +1627,22 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, for(uint32_t i = 0; i < in->regionCount; i++) { outRegions[i] = in->pRegions[i]; - UnwrapNextChain(state, "VkBufferImageCopy2KHR", tempMem, - (VkBaseInStructure *)&outRegions[i]); + UnwrapNextChain(state, "VkBufferImageCopy2", tempMem, (VkBaseInStructure *)&outRegions[i]); } break; } - case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR: + case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2: { - const VkCopyImageToBufferInfo2KHR *in = (const VkCopyImageToBufferInfo2KHR *)nextInput; - VkCopyImageToBufferInfo2KHR *out = (VkCopyImageToBufferInfo2KHR *)tempMem; + const VkCopyImageToBufferInfo2 *in = (const VkCopyImageToBufferInfo2 *)nextInput; + VkCopyImageToBufferInfo2 *out = (VkCopyImageToBufferInfo2 *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped array - VkBufferImageCopy2KHR *outRegions = (VkBufferImageCopy2KHR *)tempMem; - tempMem += sizeof(VkBufferImageCopy2KHR) * in->regionCount; + VkBufferImageCopy2 *outRegions = (VkBufferImageCopy2 *)tempMem; + tempMem += sizeof(VkBufferImageCopy2) * in->regionCount; *out = *in; UnwrapInPlace(out->srcImage); @@ -1642,23 +1652,22 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, for(uint32_t i = 0; i < in->regionCount; i++) { outRegions[i] = in->pRegions[i]; - UnwrapNextChain(state, "VkBufferImageCopy2KHR", tempMem, - (VkBaseInStructure *)&outRegions[i]); + UnwrapNextChain(state, "VkBufferImageCopy2", tempMem, (VkBaseInStructure *)&outRegions[i]); } break; } - case VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR: + case VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2: { - const VkCopyImageInfo2KHR *in = (const VkCopyImageInfo2KHR *)nextInput; - VkCopyImageInfo2KHR *out = (VkCopyImageInfo2KHR *)tempMem; + const VkCopyImageInfo2 *in = (const VkCopyImageInfo2 *)nextInput; + VkCopyImageInfo2 *out = (VkCopyImageInfo2 *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped array - VkImageCopy2KHR *outRegions = (VkImageCopy2KHR *)tempMem; - tempMem += sizeof(VkImageCopy2KHR) * in->regionCount; + VkImageCopy2 *outRegions = (VkImageCopy2 *)tempMem; + tempMem += sizeof(VkImageCopy2) * in->regionCount; *out = *in; UnwrapInPlace(out->srcImage); @@ -1668,26 +1677,26 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, for(uint32_t i = 0; i < in->regionCount; i++) { outRegions[i] = in->pRegions[i]; - UnwrapNextChain(state, "VkImageCopy2KHR", tempMem, (VkBaseInStructure *)&outRegions[i]); + UnwrapNextChain(state, "VkImageCopy2", tempMem, (VkBaseInStructure *)&outRegions[i]); } break; } - case VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR: + case VK_STRUCTURE_TYPE_DEPENDENCY_INFO: { - const VkDependencyInfoKHR *in = (const VkDependencyInfoKHR *)nextInput; - VkDependencyInfoKHR *out = (VkDependencyInfoKHR *)tempMem; + const VkDependencyInfo *in = (const VkDependencyInfo *)nextInput; + VkDependencyInfo *out = (VkDependencyInfo *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped arrays - VkMemoryBarrier2KHR *outMemoryBarriers = (VkMemoryBarrier2KHR *)tempMem; - tempMem += sizeof(VkMemoryBarrier2KHR) * in->memoryBarrierCount; - VkBufferMemoryBarrier2KHR *outBufferBarriers = (VkBufferMemoryBarrier2KHR *)tempMem; - tempMem += sizeof(VkBufferMemoryBarrier2KHR) * in->bufferMemoryBarrierCount; - VkImageMemoryBarrier2KHR *outImageBarriers = (VkImageMemoryBarrier2KHR *)tempMem; - tempMem += sizeof(VkImageMemoryBarrier2KHR) * in->imageMemoryBarrierCount; + VkMemoryBarrier2 *outMemoryBarriers = (VkMemoryBarrier2 *)tempMem; + tempMem += sizeof(VkMemoryBarrier2) * in->memoryBarrierCount; + VkBufferMemoryBarrier2 *outBufferBarriers = (VkBufferMemoryBarrier2 *)tempMem; + tempMem += sizeof(VkBufferMemoryBarrier2) * in->bufferMemoryBarrierCount; + VkImageMemoryBarrier2 *outImageBarriers = (VkImageMemoryBarrier2 *)tempMem; + tempMem += sizeof(VkImageMemoryBarrier2) * in->imageMemoryBarrierCount; *out = *in; out->pMemoryBarriers = outMemoryBarriers; @@ -1697,7 +1706,7 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, for(uint32_t i = 0; i < in->memoryBarrierCount; i++) { outMemoryBarriers[i] = in->pMemoryBarriers[i]; - UnwrapNextChain(state, "VkMemoryBarrier2KHR", tempMem, + UnwrapNextChain(state, "VkMemoryBarrier2", tempMem, (VkBaseInStructure *)&outMemoryBarriers[i]); } @@ -1705,7 +1714,7 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, { outBufferBarriers[i] = in->pBufferMemoryBarriers[i]; UnwrapInPlace(outBufferBarriers[i].buffer); - UnwrapNextChain(state, "VkBufferMemoryBarrier2KHR", tempMem, + UnwrapNextChain(state, "VkBufferMemoryBarrier2", tempMem, (VkBaseInStructure *)&outBufferBarriers[i]); } @@ -1713,7 +1722,7 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, { outImageBarriers[i] = in->pImageMemoryBarriers[i]; UnwrapInPlace(outImageBarriers[i].image); - UnwrapNextChain(state, "VkImageMemoryBarrier2KHR", tempMem, + UnwrapNextChain(state, "VkImageMemoryBarrier2", tempMem, (VkBaseInStructure *)&outImageBarriers[i]); } @@ -1775,16 +1784,16 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR: + case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS: { - const VkDeviceBufferMemoryRequirementsKHR *in = - (const VkDeviceBufferMemoryRequirementsKHR *)nextInput; - VkDeviceBufferMemoryRequirementsKHR *out = (VkDeviceBufferMemoryRequirementsKHR *)tempMem; + const VkDeviceBufferMemoryRequirements *in = + (const VkDeviceBufferMemoryRequirements *)nextInput; + VkDeviceBufferMemoryRequirements *out = (VkDeviceBufferMemoryRequirements *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); - out->sType = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR; + out->sType = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS; out->pNext = in->pNext; out->pCreateInfo = AllocStructCopy(tempMem, in->pCreateInfo); @@ -1812,16 +1821,16 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR: + case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS: { - const VkDeviceImageMemoryRequirementsKHR *in = - (const VkDeviceImageMemoryRequirementsKHR *)nextInput; - VkDeviceImageMemoryRequirementsKHR *out = (VkDeviceImageMemoryRequirementsKHR *)tempMem; + const VkDeviceImageMemoryRequirements *in = + (const VkDeviceImageMemoryRequirements *)nextInput; + VkDeviceImageMemoryRequirements *out = (VkDeviceImageMemoryRequirements *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); - out->sType = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR; + out->sType = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS; out->pNext = in->pNext; out->planeAspect = in->planeAspect; @@ -1987,11 +1996,10 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR: + case VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO: { - const VkPipelineRenderingCreateInfoKHR *in = - (const VkPipelineRenderingCreateInfoKHR *)nextInput; - VkPipelineRenderingCreateInfoKHR *out = (VkPipelineRenderingCreateInfoKHR *)tempMem; + const VkPipelineRenderingCreateInfo *in = (const VkPipelineRenderingCreateInfo *)nextInput; + VkPipelineRenderingCreateInfo *out = (VkPipelineRenderingCreateInfo *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); @@ -2033,19 +2041,19 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_STRUCTURE_TYPE_RENDERING_INFO_KHR: + case VK_STRUCTURE_TYPE_RENDERING_INFO: { - const VkRenderingInfoKHR *in = (const VkRenderingInfoKHR *)nextInput; - VkRenderingInfoKHR *out = (VkRenderingInfoKHR *)tempMem; + const VkRenderingInfo *in = (const VkRenderingInfo *)nextInput; + VkRenderingInfo *out = (VkRenderingInfo *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped array - VkRenderingAttachmentInfoKHR *outAttachs = (VkRenderingAttachmentInfoKHR *)tempMem; - tempMem += sizeof(VkRenderingAttachmentInfoKHR) * in->colorAttachmentCount; + VkRenderingAttachmentInfo *outAttachs = (VkRenderingAttachmentInfo *)tempMem; + tempMem += sizeof(VkRenderingAttachmentInfo) * in->colorAttachmentCount; - out->sType = VK_STRUCTURE_TYPE_RENDERING_INFO_KHR; + out->sType = VK_STRUCTURE_TYPE_RENDERING_INFO; out->pNext = in->pNext; out->flags = in->flags; out->renderArea = in->renderArea; @@ -2058,20 +2066,20 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, outAttachs[i] = in->pColorAttachments[i]; UnwrapInPlace(outAttachs[i].imageView); UnwrapInPlace(outAttachs[i].resolveImageView); - UnwrapNextChain(state, "VkRenderingAttachmentInfoKHR", tempMem, + UnwrapNextChain(state, "VkRenderingAttachmentInfo", tempMem, (VkBaseInStructure *)&outAttachs[i]); } if(in->pDepthAttachment) { - VkRenderingAttachmentInfoKHR *depth = (VkRenderingAttachmentInfoKHR *)tempMem; + VkRenderingAttachmentInfo *depth = (VkRenderingAttachmentInfo *)tempMem; out->pDepthAttachment = depth; - tempMem += sizeof(VkRenderingAttachmentInfoKHR); + tempMem += sizeof(VkRenderingAttachmentInfo); *depth = *in->pDepthAttachment; UnwrapInPlace(depth->imageView); UnwrapInPlace(depth->resolveImageView); - UnwrapNextChain(state, "VkRenderingAttachmentInfoKHR", tempMem, (VkBaseInStructure *)depth); + UnwrapNextChain(state, "VkRenderingAttachmentInfo", tempMem, (VkBaseInStructure *)depth); } else { @@ -2080,15 +2088,14 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, if(in->pStencilAttachment) { - VkRenderingAttachmentInfoKHR *stencil = (VkRenderingAttachmentInfoKHR *)tempMem; + VkRenderingAttachmentInfo *stencil = (VkRenderingAttachmentInfo *)tempMem; out->pStencilAttachment = stencil; - tempMem += sizeof(VkRenderingAttachmentInfoKHR); + tempMem += sizeof(VkRenderingAttachmentInfo); *stencil = *in->pStencilAttachment; UnwrapInPlace(stencil->imageView); UnwrapInPlace(stencil->resolveImageView); - UnwrapNextChain(state, "VkRenderingAttachmentInfoKHR", tempMem, - (VkBaseInStructure *)stencil); + UnwrapNextChain(state, "VkRenderingAttachmentInfo", tempMem, (VkBaseInStructure *)stencil); } else { @@ -2118,17 +2125,17 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR: + case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2: { - const VkResolveImageInfo2KHR *in = (const VkResolveImageInfo2KHR *)nextInput; - VkResolveImageInfo2KHR *out = (VkResolveImageInfo2KHR *)tempMem; + const VkResolveImageInfo2 *in = (const VkResolveImageInfo2 *)nextInput; + VkResolveImageInfo2 *out = (VkResolveImageInfo2 *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped array - VkImageResolve2KHR *outRegions = (VkImageResolve2KHR *)tempMem; - tempMem += sizeof(VkImageResolve2KHR) * in->regionCount; + VkImageResolve2 *outRegions = (VkImageResolve2 *)tempMem; + tempMem += sizeof(VkImageResolve2) * in->regionCount; *out = *in; UnwrapInPlace(out->srcImage); @@ -2138,7 +2145,7 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, for(uint32_t i = 0; i < in->regionCount; i++) { outRegions[i] = in->pRegions[i]; - UnwrapNextChain(state, "VkImageResolve2KHR", tempMem, (VkBaseInStructure *)&outRegions[i]); + UnwrapNextChain(state, "VkImageResolve2", tempMem, (VkBaseInStructure *)&outRegions[i]); } break; @@ -2193,21 +2200,21 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR: + case VK_STRUCTURE_TYPE_SUBMIT_INFO_2: { - const VkSubmitInfo2KHR *in = (const VkSubmitInfo2KHR *)nextInput; - VkSubmitInfo2KHR *out = (VkSubmitInfo2KHR *)tempMem; + const VkSubmitInfo2 *in = (const VkSubmitInfo2 *)nextInput; + VkSubmitInfo2 *out = (VkSubmitInfo2 *)tempMem; // append immediately so tempMem is incremented AppendModifiedChainedStruct(tempMem, out, nextChainTail); // allocate unwrapped arrays - VkSemaphoreSubmitInfoKHR *outWaitSemaphores = (VkSemaphoreSubmitInfoKHR *)tempMem; - tempMem += sizeof(VkSemaphoreSubmitInfoKHR) * in->waitSemaphoreInfoCount; - VkCommandBufferSubmitInfoKHR *outCmdBuffers = (VkCommandBufferSubmitInfoKHR *)tempMem; - tempMem += sizeof(VkCommandBufferSubmitInfoKHR) * in->commandBufferInfoCount; - VkSemaphoreSubmitInfoKHR *outSignalSemaphores = (VkSemaphoreSubmitInfoKHR *)tempMem; - tempMem += sizeof(VkSemaphoreSubmitInfoKHR) * in->signalSemaphoreInfoCount; + VkSemaphoreSubmitInfo *outWaitSemaphores = (VkSemaphoreSubmitInfo *)tempMem; + tempMem += sizeof(VkSemaphoreSubmitInfo) * in->waitSemaphoreInfoCount; + VkCommandBufferSubmitInfo *outCmdBuffers = (VkCommandBufferSubmitInfo *)tempMem; + tempMem += sizeof(VkCommandBufferSubmitInfo) * in->commandBufferInfoCount; + VkSemaphoreSubmitInfo *outSignalSemaphores = (VkSemaphoreSubmitInfo *)tempMem; + tempMem += sizeof(VkSemaphoreSubmitInfo) * in->signalSemaphoreInfoCount; *out = *in; out->pWaitSemaphoreInfos = outWaitSemaphores; @@ -2218,21 +2225,21 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, { outWaitSemaphores[i] = in->pWaitSemaphoreInfos[i]; UnwrapInPlace(outWaitSemaphores[i].semaphore); - UnwrapNextChain(state, "VkSemaphoreSubmitInfoKHR", tempMem, + UnwrapNextChain(state, "VkSemaphoreSubmitInfo", tempMem, (VkBaseInStructure *)&outWaitSemaphores[i]); } for(uint32_t i = 0; i < in->commandBufferInfoCount; i++) { outCmdBuffers[i] = in->pCommandBufferInfos[i]; UnwrapInPlace(outCmdBuffers[i].commandBuffer); - UnwrapNextChain(state, "VkCommandBufferSubmitInfoKHR", tempMem, + UnwrapNextChain(state, "VkCommandBufferSubmitInfo", tempMem, (VkBaseInStructure *)&outCmdBuffers[i]); } for(uint32_t i = 0; i < in->signalSemaphoreInfoCount; i++) { outSignalSemaphores[i] = in->pSignalSemaphoreInfos[i]; UnwrapInPlace(outSignalSemaphores[i].semaphore); - UnwrapNextChain(state, "VkSemaphoreSubmitInfoKHR", tempMem, + UnwrapNextChain(state, "VkSemaphoreSubmitInfo", tempMem, (VkBaseInStructure *)&outSignalSemaphores[i]); } @@ -2296,7 +2303,7 @@ void UnwrapNextChain(CaptureState state, const char *structName, byte *&tempMem, break; } - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: { // nothing to do/patch break; @@ -2525,30 +2532,30 @@ void CopyNextChainForPatching(const char *structName, byte *&tempMem, VkBaseInSt case VK_STRUCTURE_TYPE_BIND_SPARSE_INFO: CopyNextChainedStruct(sizeof(VkBindSparseInfo), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR: - CopyNextChainedStruct(sizeof(VkBlitImageInfo2KHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2: + CopyNextChainedStruct(sizeof(VkBlitImageInfo2), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR: - CopyNextChainedStruct(sizeof(VkCommandBufferInheritanceRenderingInfoKHR), tempMem, - nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO: + CopyNextChainedStruct(sizeof(VkCommandBufferInheritanceRenderingInfo), tempMem, nextInput, + nextChainTail); break; case VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO: CopyNextChainedStruct(sizeof(VkComputePipelineCreateInfo), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR: - CopyNextChainedStruct(sizeof(VkCopyBufferInfo2KHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2: + CopyNextChainedStruct(sizeof(VkCopyBufferInfo2), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR: - CopyNextChainedStruct(sizeof(VkCopyBufferToImageInfo2KHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2: + CopyNextChainedStruct(sizeof(VkCopyBufferToImageInfo2), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR: - CopyNextChainedStruct(sizeof(VkCopyImageToBufferInfo2KHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2: + CopyNextChainedStruct(sizeof(VkCopyImageToBufferInfo2), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR: - CopyNextChainedStruct(sizeof(VkCopyImageInfo2KHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2: + CopyNextChainedStruct(sizeof(VkCopyImageInfo2), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR: - CopyNextChainedStruct(sizeof(VkDependencyInfoKHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_DEPENDENCY_INFO: + CopyNextChainedStruct(sizeof(VkDependencyInfo), tempMem, nextInput, nextChainTail); break; case VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO: CopyNextChainedStruct(sizeof(VkDescriptorSetAllocateInfo), tempMem, nextInput, nextChainTail); @@ -2557,16 +2564,16 @@ void CopyNextChainForPatching(const char *structName, byte *&tempMem, VkBaseInSt CopyNextChainedStruct(sizeof(VkDescriptorSetLayoutCreateInfo), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR: - CopyNextChainedStruct(sizeof(VkDeviceBufferMemoryRequirementsKHR), tempMem, nextInput, + case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS: + CopyNextChainedStruct(sizeof(VkDeviceBufferMemoryRequirements), tempMem, nextInput, nextChainTail); break; case VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO: CopyNextChainedStruct(sizeof(VkDeviceGroupDeviceCreateInfo), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR: - CopyNextChainedStruct(sizeof(VkDeviceImageMemoryRequirementsKHR), tempMem, nextInput, + case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS: + CopyNextChainedStruct(sizeof(VkDeviceImageMemoryRequirements), tempMem, nextInput, nextChainTail); break; case VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO: @@ -2587,22 +2594,22 @@ void CopyNextChainForPatching(const char *structName, byte *&tempMem, VkBaseInSt case VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO: CopyNextChainedStruct(sizeof(VkPipelineLayoutCreateInfo), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR: - CopyNextChainedStruct(sizeof(VkPipelineRenderingCreateInfoKHR), tempMem, nextInput, + case VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO: + CopyNextChainedStruct(sizeof(VkPipelineRenderingCreateInfo), tempMem, nextInput, nextChainTail); break; case VK_STRUCTURE_TYPE_PRESENT_INFO_KHR: CopyNextChainedStruct(sizeof(VkPresentInfoKHR), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_RENDERING_INFO_KHR: - CopyNextChainedStruct(sizeof(VkRenderingInfoKHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_RENDERING_INFO: + CopyNextChainedStruct(sizeof(VkRenderingInfo), tempMem, nextInput, nextChainTail); break; case VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO: CopyNextChainedStruct(sizeof(VkRenderPassAttachmentBeginInfo), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR: - CopyNextChainedStruct(sizeof(VkResolveImageInfo2KHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2: + CopyNextChainedStruct(sizeof(VkResolveImageInfo2), tempMem, nextInput, nextChainTail); break; case VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO: CopyNextChainedStruct(sizeof(VkSemaphoreWaitInfo), tempMem, nextInput, nextChainTail); @@ -2610,8 +2617,8 @@ void CopyNextChainForPatching(const char *structName, byte *&tempMem, VkBaseInSt case VK_STRUCTURE_TYPE_SUBMIT_INFO: CopyNextChainedStruct(sizeof(VkSubmitInfo), tempMem, nextInput, nextChainTail); break; - case VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR: - CopyNextChainedStruct(sizeof(VkSubmitInfo2KHR), tempMem, nextInput, nextChainTail); + case VK_STRUCTURE_TYPE_SUBMIT_INFO_2: + CopyNextChainedStruct(sizeof(VkSubmitInfo2), tempMem, nextInput, nextChainTail); break; case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: CopyNextChainedStruct(sizeof(VkWriteDescriptorSet), tempMem, nextInput, nextChainTail); diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp index f01ff675c..ac86b6bdd 100644 --- a/renderdoc/driver/vulkan/vk_overlay.cpp +++ b/renderdoc/driver/vulkan/vk_overlay.cpp @@ -2614,9 +2614,9 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D // we are controlling the vertex binding so we don't need the stride or input to be // dynamic. // Similarly we're controlling the topology so that doesn't need to be dynamic - if(dynamicStateList[i] == VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT || + if(dynamicStateList[i] == VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE || dynamicStateList[i] == VK_DYNAMIC_STATE_VERTEX_INPUT_EXT || - dynamicStateList[i] == VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT) + dynamicStateList[i] == VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY) { // swap with the last item if this isn't the last one if(i != dynamicStateCount - 1) @@ -2747,54 +2747,54 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D vt->CmdSetStencilReference(Unwrap(cmd), VK_STENCIL_FACE_BACK_BIT, state.back.ref); vt->CmdSetStencilReference(Unwrap(cmd), VK_STENCIL_FACE_FRONT_BIT, state.front.ref); } - else if(d == VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT) + else if(d == VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT) { vt->CmdSetViewportWithCountEXT(Unwrap(cmd), (uint32_t)state.views.size(), state.views.data()); } - else if(d == VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT) + else if(d == VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT) { vt->CmdSetScissorWithCountEXT(Unwrap(cmd), (uint32_t)state.scissors.size(), state.scissors.data()); } - else if(d == VK_DYNAMIC_STATE_CULL_MODE_EXT) + else if(d == VK_DYNAMIC_STATE_CULL_MODE) { vt->CmdSetCullModeEXT(Unwrap(cmd), state.cullMode); } - else if(d == VK_DYNAMIC_STATE_FRONT_FACE_EXT) + else if(d == VK_DYNAMIC_STATE_FRONT_FACE) { vt->CmdSetFrontFaceEXT(Unwrap(cmd), state.frontFace); } - else if(d == VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT) + else if(d == VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY) { RDCERR("Primitive topology dynamic state found, should have been stripped"); } - else if(d == VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT) + else if(d == VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE) { RDCERR( "Vertex input binding stride dynamic state found, should have been stripped"); } - else if(d == VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT) + else if(d == VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE) { vt->CmdSetDepthTestEnableEXT(Unwrap(cmd), state.depthTestEnable); } - else if(d == VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT) + else if(d == VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE) { vt->CmdSetDepthWriteEnableEXT(Unwrap(cmd), state.depthWriteEnable); } - else if(d == VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT) + else if(d == VK_DYNAMIC_STATE_DEPTH_COMPARE_OP) { vt->CmdSetDepthCompareOpEXT(Unwrap(cmd), state.depthCompareOp); } - else if(d == VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT) + else if(d == VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE) { vt->CmdSetDepthBoundsTestEnableEXT(Unwrap(cmd), state.depthBoundsTestEnable); } - else if(d == VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT) + else if(d == VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE) { vt->CmdSetStencilTestEnableEXT(Unwrap(cmd), state.stencilTestEnable); } - else if(d == VK_DYNAMIC_STATE_STENCIL_OP_EXT) + else if(d == VK_DYNAMIC_STATE_STENCIL_OP) { vt->CmdSetStencilOpEXT(Unwrap(cmd), VK_STENCIL_FACE_FRONT_BIT, state.front.failOp, state.front.passOp, state.front.depthFailOp, @@ -2808,7 +2808,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D vt->CmdSetColorWriteEnableEXT(Unwrap(cmd), (uint32_t)state.colorWriteEnable.size(), state.colorWriteEnable.data()); } - else if(d == VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT) + else if(d == VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE) { vt->CmdSetDepthBiasEnableEXT(Unwrap(cmd), state.depthBiasEnable); } @@ -2820,11 +2820,11 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D { vt->CmdSetPatchControlPointsEXT(Unwrap(cmd), state.patchControlPoints); } - else if(d == VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT) + else if(d == VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE) { vt->CmdSetPrimitiveRestartEnableEXT(Unwrap(cmd), state.primRestartEnable); } - else if(d == VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT) + else if(d == VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE) { vt->CmdSetRasterizerDiscardEnableEXT(Unwrap(cmd), state.rastDiscardEnable); } diff --git a/renderdoc/driver/vulkan/vk_pixelhistory.cpp b/renderdoc/driver/vulkan/vk_pixelhistory.cpp index 9235af977..479b3ccf2 100644 --- a/renderdoc/driver/vulkan/vk_pixelhistory.cpp +++ b/renderdoc/driver/vulkan/vk_pixelhistory.cpp @@ -539,27 +539,26 @@ protected: SetupDynamicStates(pipeCreateInfo); // remove any dynamic states where we want to use exactly the fixed ones we're setting up - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_OP_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_OP); m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT); if(disableTests) { - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_CULL_MODE_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_CULL_MODE); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE); } ApplyDynamicStates(pipeCreateInfo); // need to patch the pipeline rendering info if it exists and we're patching the depth // attachment - VkPipelineRenderingCreateInfoKHR *dynRenderCreate = - (VkPipelineRenderingCreateInfoKHR *)FindNextStruct( - &pipeCreateInfo, VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR); + VkPipelineRenderingCreateInfo *dynRenderCreate = (VkPipelineRenderingCreateInfo *)FindNextStruct( + &pipeCreateInfo, VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO); if(patchDepthAttachment && dynRenderCreate) { @@ -705,7 +704,7 @@ protected: if(dyn.color[i].loadOp != VK_ATTACHMENT_LOAD_OP_NONE_EXT) dyn.color[i].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - if(dyn.color[i].storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(dyn.color[i].storeOp != VK_ATTACHMENT_STORE_OP_NONE) dyn.color[i].storeOp = VK_ATTACHMENT_STORE_OP_STORE; // nothing to do with newColorFormat here - we patch that when creating the pipeline @@ -713,8 +712,8 @@ protected: if(colorIdx >= (uint32_t)dyn.color.size()) { - VkRenderingAttachmentInfoKHR c = { - VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR, + VkRenderingAttachmentInfo c = { + VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO, NULL, VK_NULL_HANDLE, // the image view will be bound in PatchFramebuffer VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, @@ -733,13 +732,13 @@ protected: dyn.depth.resolveImageView = VK_NULL_HANDLE; if(dyn.depth.loadOp != VK_ATTACHMENT_LOAD_OP_NONE_EXT) dyn.depth.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - if(dyn.depth.storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(dyn.depth.storeOp != VK_ATTACHMENT_STORE_OP_NONE) dyn.depth.storeOp = VK_ATTACHMENT_STORE_OP_STORE; dyn.stencil.resolveMode = VK_RESOLVE_MODE_NONE; dyn.stencil.resolveImageView = VK_NULL_HANDLE; dyn.stencil.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; - if(dyn.stencil.storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(dyn.stencil.storeOp != VK_ATTACHMENT_STORE_OP_NONE) dyn.stencil.storeOp = VK_ATTACHMENT_STORE_OP_STORE; // we'll be using our own depth/stencil attachment but it will be updated in PatchFramebuffer. @@ -796,12 +795,12 @@ protected: descs[i].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; if(rpInfo.attachments[i].loadOp == VK_ATTACHMENT_LOAD_OP_NONE_EXT) descs[i].loadOp = VK_ATTACHMENT_LOAD_OP_NONE_EXT; - if(rpInfo.attachments[i].storeOp == VK_ATTACHMENT_STORE_OP_NONE_EXT) - descs[i].storeOp = VK_ATTACHMENT_STORE_OP_NONE_EXT; + if(rpInfo.attachments[i].storeOp == VK_ATTACHMENT_STORE_OP_NONE) + descs[i].storeOp = VK_ATTACHMENT_STORE_OP_NONE; if(rpInfo.attachments[i].stencilLoadOp == VK_ATTACHMENT_LOAD_OP_NONE_EXT) descs[i].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_NONE_EXT; - if(rpInfo.attachments[i].stencilStoreOp == VK_ATTACHMENT_STORE_OP_NONE_EXT) - descs[i].stencilStoreOp = VK_ATTACHMENT_STORE_OP_NONE_EXT; + if(rpInfo.attachments[i].stencilStoreOp == VK_ATTACHMENT_STORE_OP_NONE) + descs[i].stencilStoreOp = VK_ATTACHMENT_STORE_OP_NONE; descs[i].initialLayout = rpInfo.attachments[i].initialLayout; descs[i].finalLayout = rpInfo.attachments[i].finalLayout; @@ -2321,17 +2320,17 @@ private: SetupDynamicStates(ci); // remove any dynamic states where we want to use exactly the fixed ones we're setting up - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE); if(pipeCreateFlags & PipelineCreationFlags_DisableDepthTest) - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE); if(pipeCreateFlags & PipelineCreationFlags_DisableDepthBoundsTest) - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE); if(pipeCreateFlags & PipelineCreationFlags_DisableStencilTest) - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE); if(pipeCreateFlags & PipelineCreationFlags_DisableCulling) - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_CULL_MODE_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_CULL_MODE); ApplyDynamicStates(ci); @@ -2769,20 +2768,20 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback SetupDynamicStates(pipeCreateInfo); // remove any dynamic states where we want to use exactly the fixed ones we're setting up - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_OP_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_STENCIL_OP); m_DynamicStates.removeOne(VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT); - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP); ApplyDynamicStates(pipeCreateInfo); // if RP is null we need to patch the pipeline rendering info if(rp == VK_NULL_HANDLE) { - VkPipelineRenderingCreateInfoKHR *dynRenderCreate = - (VkPipelineRenderingCreateInfoKHR *)FindNextStruct( - &pipeCreateInfo, VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR); + VkPipelineRenderingCreateInfo *dynRenderCreate = + (VkPipelineRenderingCreateInfo *)FindNextStruct( + &pipeCreateInfo, VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO); RDCASSERT(dynRenderCreate); @@ -2905,7 +2904,7 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback ds->depthWriteEnable = VK_FALSE; } - m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT); + m_DynamicStates.removeOne(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE); ApplyDynamicStates(pipeCreateInfo); diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 78f3f1af5..e8cdcf84e 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -1888,7 +1888,7 @@ void VulkanReplay::SavePipelineState(uint32_t eventId) case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: dst.bindings[b].type = BindType::InputAttachment; break; - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: dst.bindings[b].descriptorCount = 1; dst.bindings[b].type = BindType::ConstantBuffer; break; @@ -2086,7 +2086,7 @@ void VulkanReplay::SavePipelineState(uint32_t eventId) dst.bindings[b].binds[a].byteSize = 0; } } - else if(layoutBind.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(layoutBind.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { dst.bindings[b].binds[a].viewResourceId = ResourceId(); dst.bindings[b].binds[a].resourceResourceId = ResourceId(); @@ -2230,7 +2230,7 @@ void VulkanReplay::FillCBufferVariables(ResourceId pipeline, ResourceId shader, const DescSetLayout::Binding &layoutBind = m_pDriver->m_CreationInfo.m_DescSetLayout[layoutId].bindings[bind.bind]; - if(layoutBind.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(layoutBind.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { bytebuf inlineData; inlineData.assign( diff --git a/renderdoc/driver/vulkan/vk_resources.cpp b/renderdoc/driver/vulkan/vk_resources.cpp index 08f2c9160..d04fcbeac 100644 --- a/renderdoc/driver/vulkan/vk_resources.cpp +++ b/renderdoc/driver/vulkan/vk_resources.cpp @@ -205,20 +205,20 @@ bool IsBlockFormat(VkFormat f) case VK_FORMAT_ASTC_12x10_SRGB_BLOCK: case VK_FORMAT_ASTC_12x12_UNORM_BLOCK: case VK_FORMAT_ASTC_12x12_SRGB_BLOCK: - case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK: case VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG: case VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG: case VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG: @@ -466,10 +466,10 @@ bool IsYUVFormat(VkFormat f) case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: return true; + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: return true; default: break; } @@ -488,10 +488,10 @@ uint32_t GetYUVPlaneCount(VkFormat f) case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: return 2; + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: return 2; case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM: case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM: case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: @@ -554,28 +554,28 @@ VkFormat GetYUVViewPlaneFormat(VkFormat f, uint32_t plane) case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: return VK_FORMAT_R8_UNORM; case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM: case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: return plane == 0 ? VK_FORMAT_R8_UNORM : VK_FORMAT_R8G8_UNORM; case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16: return VK_FORMAT_R10X6_UNORM_PACK16; case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: return plane == 0 ? VK_FORMAT_R10X6_UNORM_PACK16 : VK_FORMAT_R10X6G10X6_UNORM_2PACK16; case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16: return VK_FORMAT_R12X4_UNORM_PACK16; case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: return plane == 0 ? VK_FORMAT_R12X4_UNORM_PACK16 : VK_FORMAT_R12X4G12X4_UNORM_2PACK16; case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM: return VK_FORMAT_R16_UNORM; case VK_FORMAT_G16_B16R16_2PLANE_420_UNORM: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: return plane == 0 ? VK_FORMAT_R16_UNORM : VK_FORMAT_R16G16_UNORM; default: break; @@ -624,7 +624,7 @@ void GetYUVShaderParameters(VkFormat f, Vec4u &YUVDownsampleRate, Vec4u &YUVACha case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM: YUVAChannels = {0, 4, 8, 0xff}; break; case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM: YUVAChannels = {0, 4, 5, 0xff}; break; case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: YUVAChannels = {0, 4, 8, 0xff}; break; - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: YUVAChannels = {0, 4, 5, 0xff}; break; + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: YUVAChannels = {0, 4, 5, 0xff}; break; case VK_FORMAT_R10X6_UNORM_PACK16: YUVAChannels = {0, 0xff, 0xff, 0xff}; break; case VK_FORMAT_R10X6G10X6_UNORM_2PACK16: YUVAChannels = {0xff, 0, 1, 0xff}; break; case VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16: YUVAChannels = {1, 2, 0, 3}; break; @@ -645,7 +645,7 @@ void GetYUVShaderParameters(VkFormat f, Vec4u &YUVDownsampleRate, Vec4u &YUVACha case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16: YUVAChannels = {0, 4, 8, 0xff}; break; - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: YUVAChannels = {0, 4, 5, 0xff}; break; case VK_FORMAT_R12X4_UNORM_PACK16: YUVAChannels = {0, 0xff, 0xff, 0xff}; break; @@ -668,7 +668,7 @@ void GetYUVShaderParameters(VkFormat f, Vec4u &YUVDownsampleRate, Vec4u &YUVACha case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16: YUVAChannels = {0, 4, 8, 0xff}; break; - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: YUVAChannels = {0, 4, 5, 0xff}; break; case VK_FORMAT_G16B16G16R16_422_UNORM: YUVAChannels = {0, 2, 1, 0xff}; break; @@ -678,7 +678,7 @@ void GetYUVShaderParameters(VkFormat f, Vec4u &YUVDownsampleRate, Vec4u &YUVACha case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM: YUVAChannels = {0, 4, 8, 0xff}; break; case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: YUVAChannels = {0, 4, 5, 0xff}; break; case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM: YUVAChannels = {0, 4, 8, 0xff}; break; - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: YUVAChannels = {0, 4, 5, 0xff}; break; + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: YUVAChannels = {0, 4, 5, 0xff}; break; default: break; } } @@ -1161,155 +1161,155 @@ VkFormat GetViewCastedFormat(VkFormat f, CompType typeCast) return (typeCast == CompType::UNormSRGB) ? VK_FORMAT_BC7_SRGB_BLOCK : VK_FORMAT_BC7_UNORM_BLOCK; case VK_FORMAT_ASTC_4x4_UNORM_BLOCK: case VK_FORMAT_ASTC_4x4_SRGB_BLOCK: - case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_4x4_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_4x4_UNORM_BLOCK; } case VK_FORMAT_ASTC_5x4_UNORM_BLOCK: case VK_FORMAT_ASTC_5x4_SRGB_BLOCK: - case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_5x4_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_5x4_UNORM_BLOCK; } case VK_FORMAT_ASTC_5x5_UNORM_BLOCK: case VK_FORMAT_ASTC_5x5_SRGB_BLOCK: - case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_5x5_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_5x5_UNORM_BLOCK; } case VK_FORMAT_ASTC_6x5_UNORM_BLOCK: case VK_FORMAT_ASTC_6x5_SRGB_BLOCK: - case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_6x5_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_6x5_UNORM_BLOCK; } case VK_FORMAT_ASTC_6x6_UNORM_BLOCK: case VK_FORMAT_ASTC_6x6_SRGB_BLOCK: - case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_6x6_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_6x6_UNORM_BLOCK; } case VK_FORMAT_ASTC_8x5_UNORM_BLOCK: case VK_FORMAT_ASTC_8x5_SRGB_BLOCK: - case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_8x5_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_8x5_UNORM_BLOCK; } case VK_FORMAT_ASTC_8x6_UNORM_BLOCK: case VK_FORMAT_ASTC_8x6_SRGB_BLOCK: - case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_8x6_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_8x6_UNORM_BLOCK; } case VK_FORMAT_ASTC_8x8_UNORM_BLOCK: case VK_FORMAT_ASTC_8x8_SRGB_BLOCK: - case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_8x8_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_8x8_UNORM_BLOCK; } case VK_FORMAT_ASTC_10x5_UNORM_BLOCK: case VK_FORMAT_ASTC_10x5_SRGB_BLOCK: - case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_10x5_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_10x5_UNORM_BLOCK; } case VK_FORMAT_ASTC_10x6_UNORM_BLOCK: case VK_FORMAT_ASTC_10x6_SRGB_BLOCK: - case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_10x6_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_10x6_UNORM_BLOCK; } case VK_FORMAT_ASTC_10x8_UNORM_BLOCK: case VK_FORMAT_ASTC_10x8_SRGB_BLOCK: - case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_10x8_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_10x8_UNORM_BLOCK; } case VK_FORMAT_ASTC_10x10_UNORM_BLOCK: case VK_FORMAT_ASTC_10x10_SRGB_BLOCK: - case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_10x10_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_10x10_UNORM_BLOCK; } case VK_FORMAT_ASTC_12x10_UNORM_BLOCK: case VK_FORMAT_ASTC_12x10_SRGB_BLOCK: - case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_12x10_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_12x10_UNORM_BLOCK; } case VK_FORMAT_ASTC_12x12_UNORM_BLOCK: case VK_FORMAT_ASTC_12x12_SRGB_BLOCK: - case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK: { if(typeCast == CompType::UNormSRGB) return VK_FORMAT_ASTC_12x12_SRGB_BLOCK; else if(typeCast == CompType::Float) - return VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT; + return VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK; else return VK_FORMAT_ASTC_12x12_UNORM_BLOCK; } @@ -1477,8 +1477,8 @@ BlockShape GetBlockShape(VkFormat Format, uint32_t plane) case VK_FORMAT_B5G5R5A1_UNORM_PACK16: case VK_FORMAT_A1R5G5B5_UNORM_PACK16: case VK_FORMAT_B5G6R5_UNORM_PACK16: - case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT: - case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT: + case VK_FORMAT_A4R4G4B4_UNORM_PACK16: + case VK_FORMAT_A4B4G4R4_UNORM_PACK16: case VK_FORMAT_R4G4B4A4_UNORM_PACK16: case VK_FORMAT_B4G4R4A4_UNORM_PACK16: return {1, 1, 2}; case VK_FORMAT_R4G4_UNORM_PACK8: @@ -1518,46 +1518,46 @@ BlockShape GetBlockShape(VkFormat Format, uint32_t plane) case VK_FORMAT_EAC_R11G11_SNORM_BLOCK: return {4, 4, 16}; case VK_FORMAT_ASTC_4x4_UNORM_BLOCK: case VK_FORMAT_ASTC_4x4_SRGB_BLOCK: - case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT: return {4, 4, 16}; + case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK: return {4, 4, 16}; case VK_FORMAT_ASTC_5x4_UNORM_BLOCK: case VK_FORMAT_ASTC_5x4_SRGB_BLOCK: - case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT: return {5, 4, 16}; + case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK: return {5, 4, 16}; case VK_FORMAT_ASTC_5x5_UNORM_BLOCK: case VK_FORMAT_ASTC_5x5_SRGB_BLOCK: - case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT: return {5, 5, 16}; + case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK: return {5, 5, 16}; case VK_FORMAT_ASTC_6x5_UNORM_BLOCK: case VK_FORMAT_ASTC_6x5_SRGB_BLOCK: - case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT: return {6, 5, 16}; + case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK: return {6, 5, 16}; case VK_FORMAT_ASTC_6x6_UNORM_BLOCK: case VK_FORMAT_ASTC_6x6_SRGB_BLOCK: - case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT: return {6, 6, 16}; + case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK: return {6, 6, 16}; case VK_FORMAT_ASTC_8x5_UNORM_BLOCK: case VK_FORMAT_ASTC_8x5_SRGB_BLOCK: - case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT: return {8, 5, 16}; + case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK: return {8, 5, 16}; case VK_FORMAT_ASTC_8x6_UNORM_BLOCK: case VK_FORMAT_ASTC_8x6_SRGB_BLOCK: - case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT: return {8, 6, 16}; + case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK: return {8, 6, 16}; case VK_FORMAT_ASTC_8x8_UNORM_BLOCK: case VK_FORMAT_ASTC_8x8_SRGB_BLOCK: - case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT: return {8, 8, 16}; + case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK: return {8, 8, 16}; case VK_FORMAT_ASTC_10x5_UNORM_BLOCK: case VK_FORMAT_ASTC_10x5_SRGB_BLOCK: - case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT: return {10, 5, 16}; + case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK: return {10, 5, 16}; case VK_FORMAT_ASTC_10x6_UNORM_BLOCK: case VK_FORMAT_ASTC_10x6_SRGB_BLOCK: - case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT: return {10, 6, 16}; + case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK: return {10, 6, 16}; case VK_FORMAT_ASTC_10x8_UNORM_BLOCK: case VK_FORMAT_ASTC_10x8_SRGB_BLOCK: - case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT: return {10, 8, 16}; + case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK: return {10, 8, 16}; case VK_FORMAT_ASTC_10x10_UNORM_BLOCK: case VK_FORMAT_ASTC_10x10_SRGB_BLOCK: - case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT: return {10, 10, 16}; + case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK: return {10, 10, 16}; case VK_FORMAT_ASTC_12x10_UNORM_BLOCK: case VK_FORMAT_ASTC_12x10_SRGB_BLOCK: - case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT: return {12, 10, 16}; + case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK: return {12, 10, 16}; case VK_FORMAT_ASTC_12x12_UNORM_BLOCK: case VK_FORMAT_ASTC_12x12_SRGB_BLOCK: - case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT: return {12, 12, 16}; + case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK: return {12, 12, 16}; case VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG: case VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG: @@ -1655,7 +1655,7 @@ BlockShape GetBlockShape(VkFormat Format, uint32_t plane) case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: return {1, 1, 1}; case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM: case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: if(plane == 0) { return {1, 1, 1}; @@ -1708,9 +1708,9 @@ BlockShape GetBlockShape(VkFormat Format, uint32_t plane) case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: if(plane == 0) { return {1, 1, 2}; @@ -1810,8 +1810,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_R4G4_UNORM_PACK8: ret.type = ResourceFormatType::R4G4; break; case VK_FORMAT_R4G4B4A4_UNORM_PACK16: case VK_FORMAT_B4G4R4A4_UNORM_PACK16: - case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT: - case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT: ret.type = ResourceFormatType::R4G4B4A4; break; + case VK_FORMAT_A4R4G4B4_UNORM_PACK16: + case VK_FORMAT_A4B4G4R4_UNORM_PACK16: ret.type = ResourceFormatType::R4G4B4A4; break; case VK_FORMAT_A2B10G10R10_UNORM_PACK32: case VK_FORMAT_A2R10G10B10_UNORM_PACK32: case VK_FORMAT_A2B10G10R10_SNORM_PACK32: @@ -1889,20 +1889,20 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_ASTC_12x10_SRGB_BLOCK: case VK_FORMAT_ASTC_12x12_UNORM_BLOCK: case VK_FORMAT_ASTC_12x12_SRGB_BLOCK: - case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT: ret.type = ResourceFormatType::ASTC; break; + case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK: ret.type = ResourceFormatType::ASTC; break; case VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG: case VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG: case VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG: @@ -1918,7 +1918,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM: case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM: case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: ret.type = ResourceFormatType::YUV8; break; + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: ret.type = ResourceFormatType::YUV8; break; case VK_FORMAT_R10X6_UNORM_PACK16: case VK_FORMAT_R10X6G10X6_UNORM_2PACK16: case VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16: @@ -1929,7 +1929,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: ret.type = ResourceFormatType::YUV10; break; case VK_FORMAT_R12X4_UNORM_PACK16: @@ -1942,7 +1942,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: ret.type = ResourceFormatType::YUV12; break; case VK_FORMAT_G16B16G16R16_422_UNORM: @@ -1952,13 +1952,13 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: ret.type = ResourceFormatType::YUV16; break; + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: ret.type = ResourceFormatType::YUV16; break; default: break; } switch(fmt) { - case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT: + case VK_FORMAT_A4R4G4B4_UNORM_PACK16: case VK_FORMAT_R4G4B4A4_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16: case VK_FORMAT_R5G5B5A1_UNORM_PACK16: @@ -2096,7 +2096,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM: case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM: case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: case VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16: case VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16: case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16: @@ -2104,7 +2104,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: case VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16: case VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16: case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16: @@ -2112,7 +2112,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: case VK_FORMAT_G16B16G16R16_422_UNORM: case VK_FORMAT_B16G16R16G16_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM: @@ -2120,8 +2120,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: ret.compCount = 3; break; - case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT: + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: ret.compCount = 3; break; + case VK_FORMAT_A4R4G4B4_UNORM_PACK16: case VK_FORMAT_R4G4B4A4_UNORM_PACK16: case VK_FORMAT_R5G5B5A1_UNORM_PACK16: case VK_FORMAT_R8G8B8A8_UNORM: @@ -2162,7 +2162,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK: case VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK: case VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK: - case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT: + case VK_FORMAT_A4B4G4R4_UNORM_PACK16: case VK_FORMAT_B4G4R4A4_UNORM_PACK16: case VK_FORMAT_B5G5R5A1_UNORM_PACK16: case VK_FORMAT_A1R5G5B5_UNORM_PACK16: @@ -2216,20 +2216,20 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_ASTC_12x10_SRGB_BLOCK: case VK_FORMAT_ASTC_12x12_UNORM_BLOCK: case VK_FORMAT_ASTC_12x12_SRGB_BLOCK: - case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT: ret.compCount = 4; break; + case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK: ret.compCount = 4; break; case VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG: case VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG: case VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG: @@ -2246,8 +2246,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) { case VK_FORMAT_R4G4_UNORM_PACK8: case VK_FORMAT_R4G4B4A4_UNORM_PACK16: - case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT: - case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT: + case VK_FORMAT_A4R4G4B4_UNORM_PACK16: + case VK_FORMAT_A4B4G4R4_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16: case VK_FORMAT_R5G5B5A1_UNORM_PACK16: case VK_FORMAT_R8_UNORM: @@ -2427,20 +2427,20 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_R32G32B32A32_SFLOAT: case VK_FORMAT_B10G11R11_UFLOAT_PACK32: case VK_FORMAT_E5B9G9R9_UFLOAT_PACK32: - case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK: case VK_FORMAT_R64_SFLOAT: case VK_FORMAT_R64G64_SFLOAT: case VK_FORMAT_R64G64B64_SFLOAT: @@ -2459,7 +2459,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM: case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM: case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: case VK_FORMAT_R10X6_UNORM_PACK16: case VK_FORMAT_R10X6G10X6_UNORM_2PACK16: case VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16: @@ -2470,7 +2470,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: case VK_FORMAT_R12X4_UNORM_PACK16: case VK_FORMAT_R12X4G12X4_UNORM_2PACK16: case VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16: @@ -2481,7 +2481,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: case VK_FORMAT_G16B16G16R16_422_UNORM: case VK_FORMAT_B16G16R16G16_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM: @@ -2489,7 +2489,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: ret.compType = CompType::UNorm; break; + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: ret.compType = CompType::UNorm; break; case VK_FORMAT_UNDEFINED: case VK_FORMAT_MAX_ENUM: ret.compType = CompType::Typeless; break; } @@ -2602,8 +2602,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_R64G64B64_SFLOAT: case VK_FORMAT_R64G64B64A64_SFLOAT: ret.compByteWidth = 8; break; case VK_FORMAT_R4G4_UNORM_PACK8: - case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT: - case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT: + case VK_FORMAT_A4R4G4B4_UNORM_PACK16: + case VK_FORMAT_A4B4G4R4_UNORM_PACK16: case VK_FORMAT_R4G4B4A4_UNORM_PACK16: case VK_FORMAT_B4G4R4A4_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16: @@ -2682,20 +2682,20 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_ASTC_12x10_SRGB_BLOCK: case VK_FORMAT_ASTC_12x12_UNORM_BLOCK: case VK_FORMAT_ASTC_12x12_SRGB_BLOCK: - case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT: - case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT: + case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK: + case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK: case VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG: case VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG: case VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG: @@ -2711,7 +2711,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM: case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM: case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: ret.compByteWidth = 1; break; + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: ret.compByteWidth = 1; break; case VK_FORMAT_R10X6_UNORM_PACK16: case VK_FORMAT_R10X6G10X6_UNORM_2PACK16: case VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16: @@ -2722,7 +2722,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: case VK_FORMAT_R12X4_UNORM_PACK16: case VK_FORMAT_R12X4G12X4_UNORM_2PACK16: case VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16: @@ -2733,7 +2733,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: case VK_FORMAT_G16B16G16R16_422_UNORM: case VK_FORMAT_B16G16R16G16_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM: @@ -2741,7 +2741,7 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: ret.compByteWidth = 2; break; + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: ret.compByteWidth = 2; break; case VK_FORMAT_UNDEFINED: case VK_FORMAT_MAX_ENUM: ret.compByteWidth = 1; break; } @@ -2777,13 +2777,13 @@ ResourceFormat MakeResourceFormat(VkFormat fmt) case VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: ret.SetYUVSubsampling(422); break; case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: case VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: case VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: case VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: case VK_FORMAT_R10X6_UNORM_PACK16: case VK_FORMAT_R10X6G10X6_UNORM_2PACK16: case VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16: @@ -2906,7 +2906,7 @@ VkFormat MakeVkFormat(ResourceFormat fmt) if(planeCount == 3) return VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM; else if(planeCount == 2) - return VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT; + return VK_FORMAT_G8_B8R8_2PLANE_444_UNORM; return VK_FORMAT_UNDEFINED; } @@ -2960,7 +2960,7 @@ VkFormat MakeVkFormat(ResourceFormat fmt) if(planeCount == 3) return VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16; else if(planeCount == 2) - return VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT; + return VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16; return VK_FORMAT_UNDEFINED; } else if(subsampling == 422) @@ -3014,7 +3014,7 @@ VkFormat MakeVkFormat(ResourceFormat fmt) if(planeCount == 3) return VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16; else if(planeCount == 2) - return VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT; + return VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16; return VK_FORMAT_UNDEFINED; } else if(subsampling == 422) @@ -3049,7 +3049,7 @@ VkFormat MakeVkFormat(ResourceFormat fmt) if(planeCount == 3) return VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM; else if(planeCount == 2) - return VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT; + return VK_FORMAT_G16_B16R16_2PLANE_444_UNORM; return VK_FORMAT_UNDEFINED; } else if(subsampling == 422) @@ -3552,9 +3552,9 @@ RenderPassInfo::RenderPassInfo(const VkRenderPassCreateInfo2 &ci) indexRemapTable[i] = a; // VK_KHR_separate_depth_stencil_layouts - VkAttachmentDescriptionStencilLayoutKHR *separateStencil = - (VkAttachmentDescriptionStencilLayoutKHR *)FindNextStruct( - &ci.pAttachments[i], VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR); + VkAttachmentDescriptionStencilLayout *separateStencil = + (VkAttachmentDescriptionStencilLayout *)FindNextStruct( + &ci.pAttachments[i], VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT); if(separateStencil) { @@ -3668,10 +3668,9 @@ RenderPassInfo::RenderPassInfo(const VkRenderPassCreateInfo2 &ci) if(IsStencilFormat(ci.pAttachments[index].format)) { // VK_KHR_separate_depth_stencil_layouts - VkAttachmentDescriptionStencilLayoutKHR *separateStencil = - (VkAttachmentDescriptionStencilLayoutKHR *)FindNextStruct( - &ci.pAttachments[index], - VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR); + VkAttachmentDescriptionStencilLayout *separateStencil = + (VkAttachmentDescriptionStencilLayout *)FindNextStruct( + &ci.pAttachments[index], VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT); if(separateStencil) { @@ -4474,7 +4473,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM, VK_FORMAT_G8_B8R8_2PLANE_422_UNORM, VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM, - VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT, + VK_FORMAT_G8_B8R8_2PLANE_444_UNORM, VK_FORMAT_R10X6_UNORM_PACK16, VK_FORMAT_R10X6G10X6_UNORM_2PACK16, VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16, @@ -4485,7 +4484,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16, VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16, VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16, - VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT, + VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16, VK_FORMAT_R12X4_UNORM_PACK16, VK_FORMAT_R12X4G12X4_UNORM_2PACK16, VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, @@ -4496,7 +4495,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16, VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16, VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16, - VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT, + VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16, VK_FORMAT_G16B16G16R16_422_UNORM, VK_FORMAT_B16G16R16G16_422_UNORM, VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, @@ -4504,7 +4503,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, VK_FORMAT_G16_B16R16_2PLANE_422_UNORM, VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, - VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT, + VK_FORMAT_G16_B16R16_2PLANE_444_UNORM, VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG, VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG, VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG, @@ -4513,20 +4512,20 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG, VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG, VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG, - VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT, - VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT, + VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK, + VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK, + VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK, + VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK, + VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK, }; SECTION("Only VK_FORMAT_UNDEFINED is ResourceFormatType::Undefined") @@ -4551,7 +4550,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") // astc and pvrtc are not properly supported, collapse to a single type if((f >= VK_FORMAT_ASTC_4x4_UNORM_BLOCK && f <= VK_FORMAT_ASTC_12x12_SRGB_BLOCK) || - (f >= VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT && f <= VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT)) + (f >= VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK && f <= VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK)) { CHECK(fmt.type == ResourceFormatType::ASTC); continue; @@ -4724,7 +4723,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") 1152, // VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM (4:2:2 8-bit 3-plane) 1152, // VK_FORMAT_G8_B8R8_2PLANE_422_UNORM (4:2:2 8-bit 2-plane) 1728, // VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM (4:4:4 8-bit 3-plane) - 1728, // VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT (4:4:4 8-bit 2-plane) + 1728, // VK_FORMAT_G8_B8R8_2PLANE_444_UNORM (4:4:4 8-bit 2-plane) 1152, // VK_FORMAT_R10X6_UNORM_PACK16 (4:4:4 10-bit packed) 2304, // VK_FORMAT_R10X6G10X6_UNORM_2PACK16 (4:4:4 10-bit packed) 4608, // VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16 (4:4:4 10-bit packed) @@ -4735,7 +4734,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") 2304, // VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16 (4:2:2 10-bit 3-plane) 2304, // VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16 (4:2:2 10-bit 2-plane) 3456, // VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16 (4:4:4 10-bit 3-plane) - 3456, // VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT (4:4:4 10-bit 2-plane) + 3456, // VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16 (4:4:4 10-bit 2-plane) 1152, // VK_FORMAT_R12X4_UNORM_PACK16 (4:4:4 12-bit packed) 2304, // VK_FORMAT_R12X4G12X4_UNORM_2PACK16 (4:4:4 12-bit packed) 4608, // VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16 (4:4:4 12-bit packed) @@ -4746,7 +4745,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") 2304, // VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16 (4:2:2 12-bit 3-plane) 2304, // VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16 (4:2:2 12-bit 2-plane) 3456, // VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16 (4:4:4 12-bit 3-plane) - 3456, // VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT (4:4:4 12-bit 2-plane) + 3456, // VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16 (4:4:4 12-bit 2-plane) 2304, // VK_FORMAT_G16B16G16R16_422_UNORM (4:2:2 16-bit packed) 2304, // VK_FORMAT_B16G16R16G16_422_UNORM (4:2:2 16-bit packed) 1728, // VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM (4:2:0 16-bit 3-plane) @@ -4754,7 +4753,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") 2304, // VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM (4:2:2 16-bit 3-plane) 2304, // VK_FORMAT_G16_B16R16_2PLANE_422_UNORM (4:2:2 16-bit 2-plane) 3456, // VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM (4:4:4 16-bit 3-plane) - 3456, // VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT (4:4:4 16-bit 2-plane) + 3456, // VK_FORMAT_G16_B16R16_2PLANE_444_UNORM (4:4:4 16-bit 2-plane) }; int i = 0; @@ -4766,7 +4765,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM, VK_FORMAT_G8_B8R8_2PLANE_422_UNORM, VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM, - VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT, + VK_FORMAT_G8_B8R8_2PLANE_444_UNORM, VK_FORMAT_R10X6_UNORM_PACK16, VK_FORMAT_R10X6G10X6_UNORM_2PACK16, VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16, @@ -4777,7 +4776,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16, VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16, VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16, - VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT, + VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16, VK_FORMAT_R12X4_UNORM_PACK16, VK_FORMAT_R12X4G12X4_UNORM_2PACK16, VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, @@ -4788,7 +4787,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16, VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16, VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16, - VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT, + VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16, VK_FORMAT_G16B16G16R16_422_UNORM, VK_FORMAT_B16G16R16G16_422_UNORM, VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, @@ -4796,7 +4795,7 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, VK_FORMAT_G16_B16R16_2PLANE_422_UNORM, VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, - VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT, + VK_FORMAT_G16_B16R16_2PLANE_444_UNORM, }) { INFO("Format is " << ToStr(f)); @@ -4815,25 +4814,25 @@ TEST_CASE("Vulkan formats", "[format][vulkan]") {VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM, {576, 288, 288}}, {VK_FORMAT_G8_B8R8_2PLANE_422_UNORM, {576, 576}}, {VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM, {576, 576, 576}}, - {VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT, {576, 1152}}, + {VK_FORMAT_G8_B8R8_2PLANE_444_UNORM, {576, 1152}}, {VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16, {1152, 288, 288}}, {VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16, {1152, 576}}, {VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16, {1152, 576, 576}}, {VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16, {1152, 1152}}, {VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16, {1152, 1152, 1152}}, - {VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT, {1152, 2304}}, + {VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16, {1152, 2304}}, {VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16, {1152, 288, 288}}, {VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16, {1152, 576}}, {VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16, {1152, 576, 576}}, {VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16, {1152, 1152}}, {VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16, {1152, 1152, 1152}}, - {VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT, {1152, 2304}}, + {VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16, {1152, 2304}}, {VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM, {1152, 288, 288}}, {VK_FORMAT_G16_B16R16_2PLANE_420_UNORM, {1152, 576}}, {VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, {1152, 576, 576}}, {VK_FORMAT_G16_B16R16_2PLANE_422_UNORM, {1152, 1152}}, {VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, {1152, 1152, 1152}}, - {VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT, {1152, 2304}}, + {VK_FORMAT_G16_B16R16_2PLANE_444_UNORM, {1152, 2304}}, }; for(rdcpair > e : tests) diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp index f731affeb..0ee85e5e5 100644 --- a/renderdoc/driver/vulkan/vk_serialise.cpp +++ b/renderdoc/driver/vulkan/vk_serialise.cpp @@ -94,9 +94,9 @@ DECL_VKFLAG_EMPTY(VkMemoryMap); DECL_VKFLAG(VkMemoryProperty); DECL_VKFLAG(VkPeerMemoryFeature); DECL_VKFLAG(VkPipelineCacheCreate); -DECL_VKFLAG_EMPTY(VkPipelineColorBlendStateCreate); +DECL_VKFLAG(VkPipelineColorBlendStateCreate); DECL_VKFLAG(VkPipelineCreate); -DECL_VKFLAG_EMPTY(VkPipelineDepthStencilStateCreate); +DECL_VKFLAG(VkPipelineDepthStencilStateCreate); DECL_VKFLAG_EMPTY(VkPipelineDynamicStateCreate); DECL_VKFLAG_EMPTY(VkPipelineInputAssemblyStateCreate); DECL_VKFLAG_EMPTY(VkPipelineLayoutCreate); @@ -152,18 +152,18 @@ DECL_VKFLAG_EMPTY_EXT(VkPipelineDiscardRectangleStateCreate, EXT); DECL_VKFLAG_EMPTY_EXT(VkPipelineRasterizationConservativeStateCreate, EXT); DECL_VKFLAG_EMPTY_EXT(VkPipelineRasterizationStateStreamCreate, EXT); DECL_VKFLAG_EMPTY_EXT(VkPipelineViewportSwizzleStateCreate, NV); -DECL_VKFLAG_EXT(VkPrivateDataSlotCreate, EXT); +DECL_VKFLAG(VkPrivateDataSlotCreate); DECL_VKFLAG_EXT(VkSurfaceCounter, EXT); DECL_VKFLAG_EXT(VkSurfaceTransform, KHR); DECL_VKFLAG_EXT(VkSwapchainCreate, KHR); DECL_VKFLAG_EMPTY_EXT(VkValidationCacheCreate, EXT); DECL_VKFLAG_EMPTY_EXT(VkPipelineRasterizationDepthClipStateCreate, EXT); -DECL_VKFLAG_EXT(VkToolPurpose, EXT); -DECL_VKFLAG_EXT(VkSubmit, KHR); -DECL_VKFLAG_EXT(VkPipelineStage, 2KHR); -DECL_VKFLAG_EXT(VkAccess, 2KHR); -DECL_VKFLAG_EXT(VkFormatFeature, 2KHR); -DECL_VKFLAG_EXT(VkRendering, KHR); +DECL_VKFLAG(VkToolPurpose); +DECL_VKFLAG(VkSubmit); +DECL_VKFLAG_EXT(VkPipelineStage, 2); +DECL_VKFLAG_EXT(VkAccess, 2); +DECL_VKFLAG_EXT(VkFormatFeature, 2); +DECL_VKFLAG(VkRendering); // serialise a member as flags - cast to the Bits enum for serialisation so the stringification // picks up the bitfield and doesn't treat it as uint32_t. Then we rename the type back to the base @@ -525,6 +525,12 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES, \ VkPhysicalDeviceVulkan12Properties) \ \ + /* Vulkan 1.3 only, no extension */ \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES, \ + VkPhysicalDeviceVulkan13Features) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES, \ + VkPhysicalDeviceVulkan13Properties) \ + \ /* VK_AMD_device_coherent_memory */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD, \ VkPhysicalDeviceCoherentMemoryFeaturesAMD) \ @@ -672,16 +678,6 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT, \ VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT) \ \ - /* VK_EXT_global_priority */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT, \ - VkDeviceQueueGlobalPriorityCreateInfoEXT) \ - \ - /* VK_EXT_global_priority_query */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT, \ - VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT, \ - VkQueueFamilyGlobalPriorityPropertiesEXT) \ - \ /* VK_EXT_hdr_metadata */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_HDR_METADATA_EXT, VkHdrMetadataEXT) \ \ @@ -690,22 +686,22 @@ SERIALISE_VK_HANDLES(); VkPhysicalDeviceHostQueryResetFeatures) \ \ /* VK_EXT_image_robustness */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT, \ - VkPhysicalDeviceImageRobustnessFeaturesEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES, \ + VkPhysicalDeviceImageRobustnessFeatures) \ \ /* VK_EXT_index_type_uint8 */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT, \ VkPhysicalDeviceIndexTypeUint8FeaturesEXT) \ \ /* VK_EXT_inline_uniform_block */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT, \ - VkPhysicalDeviceInlineUniformBlockFeaturesEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT, \ - VkPhysicalDeviceInlineUniformBlockPropertiesEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT, \ - VkWriteDescriptorSetInlineUniformBlockEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT, \ - VkDescriptorPoolInlineUniformBlockCreateInfoEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES, \ + VkPhysicalDeviceInlineUniformBlockFeatures) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES, \ + VkPhysicalDeviceInlineUniformBlockProperties) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK, \ + VkWriteDescriptorSetInlineUniformBlock) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO, \ + VkDescriptorPoolInlineUniformBlockCreateInfo) \ \ /* VK_EXT_line_rasterization */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT, \ @@ -729,19 +725,18 @@ SERIALISE_VK_HANDLES(); VkPhysicalDevicePCIBusInfoPropertiesEXT) \ \ /* VK_EXT_pipeline_creation_cache_control */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT, \ - VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES, \ + VkPhysicalDevicePipelineCreationCacheControlFeatures) \ \ /* VK_EXT_pipeline_creation_feedback */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT, \ - VkPipelineCreationFeedbackCreateInfoEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO, \ + VkPipelineCreationFeedbackCreateInfo) \ \ /* VK_EXT_private_data */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT, \ - VkPhysicalDevicePrivateDataFeaturesEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT, \ - VkDevicePrivateDataCreateInfoEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT, VkPrivateDataSlotCreateInfoEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES, \ + VkPhysicalDevicePrivateDataFeatures) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO, VkDevicePrivateDataCreateInfo) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO, VkPrivateDataSlotCreateInfo) \ \ /* VK_EXT_rgba10x6_formats */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT, \ @@ -782,8 +777,8 @@ SERIALISE_VK_HANDLES(); VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT) \ \ /* VK_EXT_shader_demote_to_helper_invocation */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT, \ - VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES, \ + VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures) \ \ /* VK_EXT_shader_image_atomic_int64 */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT, \ @@ -793,26 +788,25 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO, VkImageStencilUsageCreateInfo) \ \ /* VK_EXT_subgroup_size_control */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT, \ - VkPhysicalDeviceSubgroupSizeControlFeaturesEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT, \ - VkPhysicalDeviceSubgroupSizeControlPropertiesEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT, \ - VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES, \ + VkPhysicalDeviceSubgroupSizeControlFeatures) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES, \ + VkPhysicalDeviceSubgroupSizeControlProperties) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO, \ + VkPipelineShaderStageRequiredSubgroupSizeCreateInfo) \ \ /* VK_EXT_texel_buffer_alignment */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT, \ VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT, \ - VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES, \ + VkPhysicalDeviceTexelBufferAlignmentProperties) \ \ /* VK_EXT_texture_compression_astc_hdr */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT, \ - VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES, \ + VkPhysicalDeviceTextureCompressionASTCHDRFeatures) \ \ /* VK_EXT_tooling_info */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT, \ - VkPhysicalDeviceToolPropertiesEXT) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES, VkPhysicalDeviceToolProperties) \ \ /* VK_EXT_transform_feedback */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT, \ @@ -884,17 +878,17 @@ SERIALISE_VK_HANDLES(); VkDeviceMemoryOpaqueCaptureAddressInfo) \ \ /* VK_KHR_copy_commands2 */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR, VkBlitImageInfo2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR, VkBufferCopy2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR, VkBufferImageCopy2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR, VkCopyBufferInfo2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR, VkCopyBufferToImageInfo2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR, VkCopyImageInfo2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR, VkCopyImageToBufferInfo2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR, VkImageBlit2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR, VkImageCopy2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR, VkImageResolve2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR, VkResolveImageInfo2KHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2, VkBlitImageInfo2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, VkBufferCopy2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2, VkBufferImageCopy2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2, VkCopyBufferInfo2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2, VkCopyBufferToImageInfo2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2, VkCopyImageInfo2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_BUFFER_COPY_2, VkCopyImageToBufferInfo2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_COPY_2, VkImageBlit2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_BLIT_2, VkImageCopy2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2, VkImageResolve2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2, VkResolveImageInfo2) \ \ /* VK_KHR_create_renderpass2 */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2, VkAttachmentDescription2) \ @@ -951,14 +945,13 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES, VkPhysicalDeviceDriverProperties) \ \ /* VK_KHR_dynamic_rendering */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR, VkRenderingAttachmentInfoKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_RENDERING_INFO_KHR, VkRenderingInfoKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR, \ - VkPipelineRenderingCreateInfoKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR, \ - VkPhysicalDeviceDynamicRenderingFeaturesKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR, \ - VkCommandBufferInheritanceRenderingInfoKHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO, VkRenderingAttachmentInfo) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_RENDERING_INFO, VkRenderingInfo) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO, VkPipelineRenderingCreateInfo) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES, \ + VkPhysicalDeviceDynamicRenderingFeatures) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO, \ + VkCommandBufferInheritanceRenderingInfo) \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT, \ VkRenderingFragmentDensityMapAttachmentInfoEXT) \ \ @@ -1001,7 +994,7 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR, VkSemaphoreGetFdInfoKHR) \ \ /* VK_KHR_format_feature_flags2 */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR, VkFormatProperties3KHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3, VkFormatProperties3) \ \ /* VK_KHR_get_display_properties2 */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_DISPLAY_PROPERTIES_2_KHR, VkDisplayProperties2KHR) \ @@ -1038,6 +1031,16 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR, VkSurfaceCapabilities2KHR) \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR, VkSurfaceFormat2KHR) \ \ + /* VK_KHR_global_priority (promoted from VK_EXT_global_priority) */ \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR, \ + VkDeviceQueueGlobalPriorityCreateInfoKHR) \ + \ + /* VK_KHR_global_priority (promoted from VK_EXT_global_priority_query) */ \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR, \ + VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR, \ + VkQueueFamilyGlobalPriorityPropertiesKHR) \ + \ /* VK_KHR_image_format_list */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO, VkImageFormatListCreateInfo) \ \ @@ -1067,14 +1070,12 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT, VkDescriptorSetLayoutSupport) \ \ /* VK_KHR_maintenance4 */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR, \ - VkPhysicalDeviceMaintenance4FeaturesKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR, \ - VkPhysicalDeviceMaintenance4PropertiesKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR, \ - VkDeviceBufferMemoryRequirementsKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR, \ - VkDeviceImageMemoryRequirementsKHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES, \ + VkPhysicalDeviceMaintenance4Features) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES, \ + VkPhysicalDeviceMaintenance4Properties) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS, VkDeviceBufferMemoryRequirements) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS, VkDeviceImageMemoryRequirements) \ \ /* VK_KHR_multiview */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO, VkRenderPassMultiviewCreateInfo) \ @@ -1157,10 +1158,10 @@ SERIALISE_VK_HANDLES(); VkPhysicalDeviceFloatControlsProperties) \ \ /* VK_KHR_shader_integer_dot_product */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR, \ - VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR, \ - VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES, \ + VkPhysicalDeviceShaderIntegerDotProductFeatures) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES, \ + VkPhysicalDeviceShaderIntegerDotProductProperties) \ \ /* VK_KHR_shader_subgroup_extended_types */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, \ @@ -1171,8 +1172,8 @@ SERIALISE_VK_HANDLES(); VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR) \ \ /* VK_KHR_shader_terminate_invocation */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR, \ - VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES, \ + VkPhysicalDeviceShaderTerminateInvocationFeatures) \ \ /* VK_KHR_shared_presentable_image */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR, \ @@ -1188,15 +1189,15 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR, VkAcquireNextImageInfoKHR) \ \ /* VK_KHR_synchronization2 */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR, VkMemoryBarrier2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR, VkBufferMemoryBarrier2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR, VkImageMemoryBarrier2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR, VkDependencyInfoKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR, VkSubmitInfo2KHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR, VkSemaphoreSubmitInfoKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR, VkCommandBufferSubmitInfoKHR) \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR, \ - VkPhysicalDeviceSynchronization2FeaturesKHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_MEMORY_BARRIER_2, VkMemoryBarrier2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2, VkBufferMemoryBarrier2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2, VkImageMemoryBarrier2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEPENDENCY_INFO, VkDependencyInfo) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_SUBMIT_INFO_2, VkSubmitInfo2) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO, VkSemaphoreSubmitInfo) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO, VkCommandBufferSubmitInfo) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES, \ + VkPhysicalDeviceSynchronization2Features) \ \ /* VK_KHR_timeline_semaphore */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES, \ @@ -1225,8 +1226,8 @@ SERIALISE_VK_HANDLES(); VkPhysicalDeviceVulkanMemoryModelFeatures) \ \ /* VK_KHR_zero_initialize_workgroup_memory */ \ - PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR, \ - VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR) \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES, \ + VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures) \ \ /* VK_NV_compute_shader_derivatives */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV, \ @@ -1271,6 +1272,10 @@ SERIALISE_VK_HANDLES(); PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX) \ \ + /* VK_ARM_rasterization_order_attachment_access */ \ + PNEXT_UNSUPPORTED( \ + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM) \ + \ /* VK_AMD_memory_overallocation_behavior */ \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD) \ \ @@ -1292,6 +1297,10 @@ SERIALISE_VK_HANDLES(); PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT) \ \ + /* VK_EXT_depth_clip_control */ \ + PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT) \ + PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT) \ + \ /* VK_EXT_device_memory_report */ \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT) \ @@ -1313,6 +1322,10 @@ SERIALISE_VK_HANDLES(); PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_2_EXT) \ \ + /* VK_EXT_image_view_min_lod */ \ + PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT) \ + PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT) \ + \ /* VK_EXT_multi_draw */ \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT) \ @@ -1435,6 +1448,9 @@ SERIALISE_VK_HANDLES(); PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV) \ \ + /* VK_NV_linear_color_attachment */ \ + PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV) \ + \ /* VK_NVX_image_view_handle */ \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX) \ @@ -1507,6 +1523,11 @@ SERIALISE_VK_HANDLES(); /* Interaction with VK_KHR_dynamic_rendering */ \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX) \ \ + /* VK_QCOM_fragment_density_map_offset */ \ + PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM) \ + PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM) \ + PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM) \ + \ /* VK_QCOM_render_pass_transform */ \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM) \ @@ -3907,18 +3928,17 @@ void Deserialise(const VkPhysicalDeviceVulkanMemoryModelFeatures &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(shaderZeroInitializeWorkgroupMemory); } template <> -void Deserialise(const VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR &el) +void Deserialise(const VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures &el) { DeserialiseNext(el.pNext); } @@ -4124,6 +4144,95 @@ void Deserialise(const VkPhysicalDeviceVulkan12Properties &el) { DeserialiseNext(el.pNext); } + +template +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceVulkan13Features &el) +{ + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES); + SerialiseNext(ser, el.sType, el.pNext); + + SERIALISE_MEMBER(robustImageAccess); + SERIALISE_MEMBER(inlineUniformBlock); + SERIALISE_MEMBER(descriptorBindingInlineUniformBlockUpdateAfterBind); + SERIALISE_MEMBER(pipelineCreationCacheControl); + SERIALISE_MEMBER(privateData); + SERIALISE_MEMBER(shaderDemoteToHelperInvocation); + SERIALISE_MEMBER(shaderTerminateInvocation); + SERIALISE_MEMBER(subgroupSizeControl); + SERIALISE_MEMBER(computeFullSubgroups); + SERIALISE_MEMBER(synchronization2); + SERIALISE_MEMBER(textureCompressionASTC_HDR); + SERIALISE_MEMBER(shaderZeroInitializeWorkgroupMemory); + SERIALISE_MEMBER(dynamicRendering); + SERIALISE_MEMBER(shaderIntegerDotProduct); + SERIALISE_MEMBER(maintenance4); +} + +template <> +void Deserialise(const VkPhysicalDeviceVulkan13Features &el) +{ + DeserialiseNext(el.pNext); +} + +template +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceVulkan13Properties &el) +{ + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES); + SerialiseNext(ser, el.sType, el.pNext); + + SERIALISE_MEMBER(minSubgroupSize); + SERIALISE_MEMBER(maxSubgroupSize); + SERIALISE_MEMBER(maxComputeWorkgroupSubgroups); + SERIALISE_MEMBER_VKFLAGS(VkShaderStageFlags, requiredSubgroupSizeStages); + SERIALISE_MEMBER(maxInlineUniformBlockSize); + SERIALISE_MEMBER(maxPerStageDescriptorInlineUniformBlocks); + SERIALISE_MEMBER(maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks); + SERIALISE_MEMBER(maxDescriptorSetInlineUniformBlocks); + SERIALISE_MEMBER(maxDescriptorSetUpdateAfterBindInlineUniformBlocks); + SERIALISE_MEMBER(maxInlineUniformTotalSize); + SERIALISE_MEMBER(integerDotProduct8BitUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProduct8BitSignedAccelerated); + SERIALISE_MEMBER(integerDotProduct8BitMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProduct4x8BitPackedUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProduct4x8BitPackedSignedAccelerated); + SERIALISE_MEMBER(integerDotProduct4x8BitPackedMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProduct16BitUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProduct16BitSignedAccelerated); + SERIALISE_MEMBER(integerDotProduct16BitMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProduct32BitUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProduct32BitSignedAccelerated); + SERIALISE_MEMBER(integerDotProduct32BitMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProduct64BitUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProduct64BitSignedAccelerated); + SERIALISE_MEMBER(integerDotProduct64BitMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating8BitUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating8BitSignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating16BitUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating16BitSignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating32BitUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating32BitSignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating64BitUnsignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating64BitSignedAccelerated); + SERIALISE_MEMBER(integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated); + SERIALISE_MEMBER(storageTexelBufferOffsetAlignmentBytes); + SERIALISE_MEMBER(storageTexelBufferOffsetSingleTexelAlignment); + SERIALISE_MEMBER(uniformTexelBufferOffsetAlignmentBytes); + SERIALISE_MEMBER(uniformTexelBufferOffsetSingleTexelAlignment); + SERIALISE_MEMBER(maxBufferSize); +} + +template <> +void Deserialise(const VkPhysicalDeviceVulkan13Properties &el) +{ + DeserialiseNext(el.pNext); +} + template void DoSerialise(SerialiserType &ser, VkPhysicalDeviceUniformBufferStandardLayoutFeatures &el) { @@ -5097,57 +5206,56 @@ void Deserialise(const VkDescriptorSetLayoutSupport &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceMaintenance4PropertiesKHR &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceMaintenance4Properties &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(maxBufferSize); } template <> -void Deserialise(const VkPhysicalDeviceMaintenance4PropertiesKHR &el) +void Deserialise(const VkPhysicalDeviceMaintenance4Properties &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceMaintenance4FeaturesKHR &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceMaintenance4Features &el) { - RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(maintenance4); } template <> -void Deserialise(const VkPhysicalDeviceMaintenance4FeaturesKHR &el) +void Deserialise(const VkPhysicalDeviceMaintenance4Features &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkDeviceBufferMemoryRequirementsKHR &el) +void DoSerialise(SerialiserType &ser, VkDeviceBufferMemoryRequirements &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER_OPT(pCreateInfo); } template <> -void Deserialise(const VkDeviceBufferMemoryRequirementsKHR &el) +void Deserialise(const VkDeviceBufferMemoryRequirements &el) { DeserialiseNext(el.pNext); delete el.pCreateInfo; } template -void DoSerialise(SerialiserType &ser, VkDeviceImageMemoryRequirementsKHR &el) +void DoSerialise(SerialiserType &ser, VkDeviceImageMemoryRequirements &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER_OPT(pCreateInfo); @@ -5155,7 +5263,7 @@ void DoSerialise(SerialiserType &ser, VkDeviceImageMemoryRequirementsKHR &el) } template <> -void Deserialise(const VkDeviceImageMemoryRequirementsKHR &el) +void Deserialise(const VkDeviceImageMemoryRequirements &el) { DeserialiseNext(el.pNext); delete el.pCreateInfo; @@ -5484,18 +5592,17 @@ void Deserialise(const VkPhysicalDeviceMultiviewProperties &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDevicePipelineCreationCacheControlFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(pipelineCreationCacheControl); } template <> -void Deserialise(const VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT &el) +void Deserialise(const VkPhysicalDevicePipelineCreationCacheControlFeatures &el) { DeserialiseNext(el.pNext); } @@ -5800,17 +5907,17 @@ void Deserialise(const VkImageFormatListCreateInfo &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceImageRobustnessFeaturesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceImageRobustnessFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(robustImageAccess); } template <> -void Deserialise(const VkPhysicalDeviceImageRobustnessFeaturesEXT &el) +void Deserialise(const VkPhysicalDeviceImageRobustnessFeatures &el) { DeserialiseNext(el.pNext); } @@ -6305,10 +6412,10 @@ void Deserialise(const VkImageStencilUsageCreateInfo &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceSubgroupSizeControlFeaturesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceSubgroupSizeControlFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(subgroupSizeControl); @@ -6316,16 +6423,16 @@ void DoSerialise(SerialiserType &ser, VkPhysicalDeviceSubgroupSizeControlFeature } template <> -void Deserialise(const VkPhysicalDeviceSubgroupSizeControlFeaturesEXT &el) +void Deserialise(const VkPhysicalDeviceSubgroupSizeControlFeatures &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceSubgroupSizeControlPropertiesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceSubgroupSizeControlProperties &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(minSubgroupSize); @@ -6335,70 +6442,68 @@ void DoSerialise(SerialiserType &ser, VkPhysicalDeviceSubgroupSizeControlPropert } template <> -void Deserialise(const VkPhysicalDeviceSubgroupSizeControlPropertiesEXT &el) +void Deserialise(const VkPhysicalDeviceSubgroupSizeControlProperties &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT &el) +void DoSerialise(SerialiserType &ser, VkPipelineShaderStageRequiredSubgroupSizeCreateInfo &el) { RDCASSERT(ser.IsReading() || - el.sType == - VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT); + el.sType == VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(requiredSubgroupSize); } template <> -void Deserialise(const VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT &el) +void Deserialise(const VkPipelineShaderStageRequiredSubgroupSizeCreateInfo &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDevicePrivateDataFeaturesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDevicePrivateDataFeatures &el) { - RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(privateData); } template <> -void Deserialise(const VkPhysicalDevicePrivateDataFeaturesEXT &el) +void Deserialise(const VkPhysicalDevicePrivateDataFeatures &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkDevicePrivateDataCreateInfoEXT &el) +void DoSerialise(SerialiserType &ser, VkDevicePrivateDataCreateInfo &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(privateDataSlotRequestCount); } template <> -void Deserialise(const VkDevicePrivateDataCreateInfoEXT &el) +void Deserialise(const VkDevicePrivateDataCreateInfo &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPrivateDataSlotCreateInfoEXT &el) +void DoSerialise(SerialiserType &ser, VkPrivateDataSlotCreateInfo &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO); SerialiseNext(ser, el.sType, el.pNext); - SERIALISE_MEMBER_VKFLAGS(VkPrivateDataSlotCreateFlagsEXT, flags); + SERIALISE_MEMBER_VKFLAGS(VkPrivateDataSlotCreateFlags, flags); } template <> -void Deserialise(const VkPrivateDataSlotCreateInfoEXT &el) +void Deserialise(const VkPrivateDataSlotCreateInfo &el) { DeserialiseNext(el.pNext); } @@ -6497,18 +6602,17 @@ void Deserialise(const VkPhysicalDeviceTransformFeedbackPropertiesEXT &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(shaderDemoteToHelperInvocation); } template <> -void Deserialise(const VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT &el) +void Deserialise(const VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures &el) { DeserialiseNext(el.pNext); } @@ -6530,10 +6634,10 @@ void Deserialise(const VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceTexelBufferAlignmentProperties &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(storageTexelBufferOffsetAlignmentBytes); @@ -6543,42 +6647,42 @@ void DoSerialise(SerialiserType &ser, VkPhysicalDeviceTexelBufferAlignmentProper } template <> -void Deserialise(const VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT &el) +void Deserialise(const VkPhysicalDeviceTexelBufferAlignmentProperties &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceTextureCompressionASTCHDRFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(textureCompressionASTC_HDR); } template <> -void Deserialise(const VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT &el) +void Deserialise(const VkPhysicalDeviceTextureCompressionASTCHDRFeatures &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceToolPropertiesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceToolProperties &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(name); SERIALISE_MEMBER(version); - SERIALISE_MEMBER_VKFLAGS(VkToolPurposeFlagsEXT, purposes); + SERIALISE_MEMBER_VKFLAGS(VkToolPurposeFlags, purposes); SERIALISE_MEMBER(description); SERIALISE_MEMBER(layer); } template <> -void Deserialise(const VkPhysicalDeviceToolPropertiesEXT &el) +void Deserialise(const VkPhysicalDeviceToolProperties &el) { DeserialiseNext(el.pNext); } @@ -6618,9 +6722,9 @@ void Deserialise(const VkPipelineRasterizationStateStreamCreateInfoEXT &el) } template -void DoSerialise(SerialiserType &ser, VkBufferCopy2KHR &el) +void DoSerialise(SerialiserType &ser, VkBufferCopy2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_BUFFER_COPY_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcOffset); @@ -6629,15 +6733,15 @@ void DoSerialise(SerialiserType &ser, VkBufferCopy2KHR &el) } template <> -void Deserialise(const VkBufferCopy2KHR &el) +void Deserialise(const VkBufferCopy2 &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkCopyBufferInfo2KHR &el) +void DoSerialise(SerialiserType &ser, VkCopyBufferInfo2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcBuffer).Important(); @@ -6647,16 +6751,16 @@ void DoSerialise(SerialiserType &ser, VkCopyBufferInfo2KHR &el) } template <> -void Deserialise(const VkCopyBufferInfo2KHR &el) +void Deserialise(const VkCopyBufferInfo2 &el) { DeserialiseNext(el.pNext); delete[] el.pRegions; } template -void DoSerialise(SerialiserType &ser, VkImageCopy2KHR &el) +void DoSerialise(SerialiserType &ser, VkImageCopy2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_IMAGE_COPY_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcSubresource); @@ -6667,15 +6771,15 @@ void DoSerialise(SerialiserType &ser, VkImageCopy2KHR &el) } template <> -void Deserialise(const VkImageCopy2KHR &el) +void Deserialise(const VkImageCopy2 &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkCopyImageInfo2KHR &el) +void DoSerialise(SerialiserType &ser, VkCopyImageInfo2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcImage).Important(); @@ -6687,16 +6791,16 @@ void DoSerialise(SerialiserType &ser, VkCopyImageInfo2KHR &el) } template <> -void Deserialise(const VkCopyImageInfo2KHR &el) +void Deserialise(const VkCopyImageInfo2 &el) { DeserialiseNext(el.pNext); delete[] el.pRegions; } template -void DoSerialise(SerialiserType &ser, VkBufferImageCopy2KHR &el) +void DoSerialise(SerialiserType &ser, VkBufferImageCopy2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(bufferOffset); @@ -6708,15 +6812,15 @@ void DoSerialise(SerialiserType &ser, VkBufferImageCopy2KHR &el) } template <> -void Deserialise(const VkBufferImageCopy2KHR &el) +void Deserialise(const VkBufferImageCopy2 &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkCopyBufferToImageInfo2KHR &el) +void DoSerialise(SerialiserType &ser, VkCopyBufferToImageInfo2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcBuffer).Important(); @@ -6727,16 +6831,16 @@ void DoSerialise(SerialiserType &ser, VkCopyBufferToImageInfo2KHR &el) } template <> -void Deserialise(const VkCopyBufferToImageInfo2KHR &el) +void Deserialise(const VkCopyBufferToImageInfo2 &el) { DeserialiseNext(el.pNext); delete[] el.pRegions; } template -void DoSerialise(SerialiserType &ser, VkCopyImageToBufferInfo2KHR &el) +void DoSerialise(SerialiserType &ser, VkCopyImageToBufferInfo2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcImage); @@ -6747,16 +6851,16 @@ void DoSerialise(SerialiserType &ser, VkCopyImageToBufferInfo2KHR &el) } template <> -void Deserialise(const VkCopyImageToBufferInfo2KHR &el) +void Deserialise(const VkCopyImageToBufferInfo2 &el) { DeserialiseNext(el.pNext); delete[] el.pRegions; } template -void DoSerialise(SerialiserType &ser, VkImageBlit2KHR &el) +void DoSerialise(SerialiserType &ser, VkImageBlit2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_IMAGE_BLIT_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcSubresource); @@ -6766,15 +6870,15 @@ void DoSerialise(SerialiserType &ser, VkImageBlit2KHR &el) } template <> -void Deserialise(const VkImageBlit2KHR &el) +void Deserialise(const VkImageBlit2 &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkBlitImageInfo2KHR &el) +void DoSerialise(SerialiserType &ser, VkBlitImageInfo2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcImage).Important(); @@ -6787,16 +6891,16 @@ void DoSerialise(SerialiserType &ser, VkBlitImageInfo2KHR &el) } template <> -void Deserialise(const VkBlitImageInfo2KHR &el) +void Deserialise(const VkBlitImageInfo2 &el) { DeserialiseNext(el.pNext); delete[] el.pRegions; } template -void DoSerialise(SerialiserType &ser, VkImageResolve2KHR &el) +void DoSerialise(SerialiserType &ser, VkImageResolve2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcSubresource); @@ -6807,15 +6911,15 @@ void DoSerialise(SerialiserType &ser, VkImageResolve2KHR &el) } template <> -void Deserialise(const VkImageResolve2KHR &el) +void Deserialise(const VkImageResolve2 &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkResolveImageInfo2KHR &el) +void DoSerialise(SerialiserType &ser, VkResolveImageInfo2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(srcImage).Important(); @@ -6827,7 +6931,7 @@ void DoSerialise(SerialiserType &ser, VkResolveImageInfo2KHR &el) } template <> -void Deserialise(const VkResolveImageInfo2KHR &el) +void Deserialise(const VkResolveImageInfo2 &el) { DeserialiseNext(el.pNext); delete[] el.pRegions; @@ -7470,17 +7574,17 @@ void Deserialise(const VkPhysicalDeviceDriverProperties &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceDynamicRenderingFeaturesKHR &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceDynamicRenderingFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(dynamicRendering); } template <> -void Deserialise(const VkPhysicalDeviceDynamicRenderingFeaturesKHR &el) +void Deserialise(const VkPhysicalDeviceDynamicRenderingFeatures &el) { DeserialiseNext(el.pNext); } @@ -7503,10 +7607,10 @@ void Deserialise(const VkRenderingFragmentDensityMapAttachmentInfoEXT &el) } template -void DoSerialise(SerialiserType &ser, VkCommandBufferInheritanceRenderingInfoKHR &el) +void DoSerialise(SerialiserType &ser, VkCommandBufferInheritanceRenderingInfo &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR); + el.sType == VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(viewMask); @@ -7518,16 +7622,16 @@ void DoSerialise(SerialiserType &ser, VkCommandBufferInheritanceRenderingInfoKHR } template <> -void Deserialise(const VkCommandBufferInheritanceRenderingInfoKHR &el) +void Deserialise(const VkCommandBufferInheritanceRenderingInfo &el) { DeserialiseNext(el.pNext); delete[] el.pColorAttachmentFormats; } template -void DoSerialise(SerialiserType &ser, VkPipelineRenderingCreateInfoKHR &el) +void DoSerialise(SerialiserType &ser, VkPipelineRenderingCreateInfo &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(viewMask); @@ -7538,16 +7642,16 @@ void DoSerialise(SerialiserType &ser, VkPipelineRenderingCreateInfoKHR &el) } template <> -void Deserialise(const VkPipelineRenderingCreateInfoKHR &el) +void Deserialise(const VkPipelineRenderingCreateInfo &el) { DeserialiseNext(el.pNext); delete[] el.pColorAttachmentFormats; } template -void DoSerialise(SerialiserType &ser, VkRenderingAttachmentInfoKHR &el) +void DoSerialise(SerialiserType &ser, VkRenderingAttachmentInfo &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(imageView); @@ -7561,18 +7665,18 @@ void DoSerialise(SerialiserType &ser, VkRenderingAttachmentInfoKHR &el) } template <> -void Deserialise(const VkRenderingAttachmentInfoKHR &el) +void Deserialise(const VkRenderingAttachmentInfo &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkRenderingInfoKHR &el) +void DoSerialise(SerialiserType &ser, VkRenderingInfo &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_RENDERING_INFO_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_RENDERING_INFO); SerialiseNext(ser, el.sType, el.pNext); - SERIALISE_MEMBER_VKFLAGS(VkRenderingFlagsKHR, flags).Important(); + SERIALISE_MEMBER_VKFLAGS(VkRenderingFlags, flags).Important(); SERIALISE_MEMBER(renderArea); SERIALISE_MEMBER(layerCount); SERIALISE_MEMBER(viewMask); @@ -7583,7 +7687,7 @@ void DoSerialise(SerialiserType &ser, VkRenderingInfoKHR &el) } template <> -void Deserialise(const VkRenderingInfoKHR &el) +void Deserialise(const VkRenderingInfo &el) { DeserialiseNext(el.pNext); delete[] el.pColorAttachments; @@ -7868,17 +7972,16 @@ void Deserialise(const VkPipelineRasterizationDepthClipStateCreateInfoEXT &el) } template -void DoSerialise(SerialiserType &ser, VkPipelineCreationFeedbackEXT &el) +void DoSerialise(SerialiserType &ser, VkPipelineCreationFeedback &el) { SERIALISE_MEMBER(flags); SERIALISE_MEMBER(duration); } template -void DoSerialise(SerialiserType &ser, VkPipelineCreationFeedbackCreateInfoEXT &el) +void DoSerialise(SerialiserType &ser, VkPipelineCreationFeedbackCreateInfo &el) { - RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER_OPT(pPipelineCreationFeedback); @@ -7887,7 +7990,7 @@ void DoSerialise(SerialiserType &ser, VkPipelineCreationFeedbackCreateInfoEXT &e } template <> -void Deserialise(const VkPipelineCreationFeedbackCreateInfoEXT &el) +void Deserialise(const VkPipelineCreationFeedbackCreateInfo &el) { DeserialiseNext(el.pNext); delete el.pPipelineCreationFeedback; @@ -8108,42 +8211,42 @@ void Deserialise(const VkMemoryDedicatedAllocateInfo &el) } template -void DoSerialise(SerialiserType &ser, VkDeviceQueueGlobalPriorityCreateInfoEXT &el) +void DoSerialise(SerialiserType &ser, VkDeviceQueueGlobalPriorityCreateInfoKHR &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT); + el.sType == VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(globalPriority); } template <> -void Deserialise(const VkDeviceQueueGlobalPriorityCreateInfoEXT &el) +void Deserialise(const VkDeviceQueueGlobalPriorityCreateInfoKHR &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(globalPriorityQuery); } template <> -void Deserialise(const VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT &el) +void Deserialise(const VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkQueueFamilyGlobalPriorityPropertiesEXT &el) +void DoSerialise(SerialiserType &ser, VkQueueFamilyGlobalPriorityPropertiesKHR &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT); + el.sType == VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(priorityCount); @@ -8151,7 +8254,7 @@ void DoSerialise(SerialiserType &ser, VkQueueFamilyGlobalPriorityPropertiesEXT & } template <> -void Deserialise(const VkQueueFamilyGlobalPriorityPropertiesEXT &el) +void Deserialise(const VkQueueFamilyGlobalPriorityPropertiesKHR &el) { DeserialiseNext(el.pNext); } @@ -8190,10 +8293,10 @@ void Deserialise(const VkPhysicalDeviceIndexTypeUint8FeaturesEXT &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceInlineUniformBlockFeaturesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceInlineUniformBlockFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(inlineUniformBlock); @@ -8201,16 +8304,16 @@ void DoSerialise(SerialiserType &ser, VkPhysicalDeviceInlineUniformBlockFeatures } template <> -void Deserialise(const VkPhysicalDeviceInlineUniformBlockFeaturesEXT &el) +void Deserialise(const VkPhysicalDeviceInlineUniformBlockFeatures &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceInlineUniformBlockPropertiesEXT &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceInlineUniformBlockProperties &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(maxInlineUniformBlockSize); @@ -8221,16 +8324,16 @@ void DoSerialise(SerialiserType &ser, VkPhysicalDeviceInlineUniformBlockProperti } template <> -void Deserialise(const VkPhysicalDeviceInlineUniformBlockPropertiesEXT &el) +void Deserialise(const VkPhysicalDeviceInlineUniformBlockProperties &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkWriteDescriptorSetInlineUniformBlockEXT &el) +void DoSerialise(SerialiserType &ser, VkWriteDescriptorSetInlineUniformBlock &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT); + el.sType == VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(dataSize); @@ -8238,23 +8341,23 @@ void DoSerialise(SerialiserType &ser, VkWriteDescriptorSetInlineUniformBlockEXT } template <> -void Deserialise(const VkWriteDescriptorSetInlineUniformBlockEXT &el) +void Deserialise(const VkWriteDescriptorSetInlineUniformBlock &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkDescriptorPoolInlineUniformBlockCreateInfoEXT &el) +void DoSerialise(SerialiserType &ser, VkDescriptorPoolInlineUniformBlockCreateInfo &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT); + el.sType == VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(maxInlineUniformBlockBindings); } template <> -void Deserialise(const VkDescriptorPoolInlineUniformBlockCreateInfoEXT &el) +void Deserialise(const VkDescriptorPoolInlineUniformBlockCreateInfo &el) { DeserialiseNext(el.pNext); } @@ -8316,17 +8419,17 @@ void Deserialise(const VkPhysicalDeviceLineRasterizationPropertiesEXT &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderTerminateInvocationFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(shaderTerminateInvocation); } template <> -void Deserialise(const VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR &el) +void Deserialise(const VkPhysicalDeviceShaderTerminateInvocationFeatures &el) { DeserialiseNext(el.pNext); } @@ -8348,26 +8451,26 @@ void Deserialise(const VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures &el) } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderIntegerDotProductFeatures &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(shaderIntegerDotProduct); } template <> -void Deserialise(const VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR &el) +void Deserialise(const VkPhysicalDeviceShaderIntegerDotProductFeatures &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderIntegerDotProductProperties &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(integerDotProduct8BitUnsignedAccelerated); @@ -8403,7 +8506,7 @@ void DoSerialise(SerialiserType &ser, VkPhysicalDeviceShaderIntegerDotProductPro } template <> -void Deserialise(const VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR &el) +void Deserialise(const VkPhysicalDeviceShaderIntegerDotProductProperties &el) { DeserialiseNext(el.pNext); } @@ -8962,33 +9065,33 @@ void Deserialise(const VkDeviceGroupRenderPassBeginInfo &el) } template -void DoSerialise(SerialiserType &ser, VkMemoryBarrier2KHR &el) +void DoSerialise(SerialiserType &ser, VkMemoryBarrier2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_MEMORY_BARRIER_2); SerialiseNext(ser, el.sType, el.pNext); - SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2KHR, srcStageMask); - SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2KHR, srcAccessMask); - SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2KHR, dstStageMask); - SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2KHR, dstAccessMask); + SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2, srcStageMask); + SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2, srcAccessMask); + SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2, dstStageMask); + SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2, dstAccessMask); } template <> -void Deserialise(const VkMemoryBarrier2KHR &el) +void Deserialise(const VkMemoryBarrier2 &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkBufferMemoryBarrier2KHR &el) +void DoSerialise(SerialiserType &ser, VkBufferMemoryBarrier2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2); SerialiseNext(ser, el.sType, el.pNext); - SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2KHR, srcStageMask); - SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2KHR, srcAccessMask); - SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2KHR, dstStageMask); - SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2KHR, dstAccessMask); + SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2, srcStageMask); + SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2, srcAccessMask); + SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2, dstStageMask); + SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2, dstAccessMask); // serialise as signed because then QUEUE_FAMILY_IGNORED is -1 and queue // family index won't be legitimately larger than 2 billion SERIALISE_MEMBER_TYPED(int32_t, srcQueueFamilyIndex); @@ -8999,21 +9102,21 @@ void DoSerialise(SerialiserType &ser, VkBufferMemoryBarrier2KHR &el) } template <> -void Deserialise(const VkBufferMemoryBarrier2KHR &el) +void Deserialise(const VkBufferMemoryBarrier2 &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkImageMemoryBarrier2KHR &el) +void DoSerialise(SerialiserType &ser, VkImageMemoryBarrier2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2); SerialiseNext(ser, el.sType, el.pNext); - SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2KHR, srcStageMask); - SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2KHR, srcAccessMask); - SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2KHR, dstStageMask); - SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2KHR, dstAccessMask); + SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2, srcStageMask); + SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2, srcAccessMask); + SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2, dstStageMask); + SERIALISE_MEMBER_VKFLAGS(VkAccessFlags2, dstAccessMask); SERIALISE_MEMBER(oldLayout); SERIALISE_MEMBER(newLayout); // serialise as signed because then QUEUE_FAMILY_IGNORED is -1 and queue @@ -9025,49 +9128,49 @@ void DoSerialise(SerialiserType &ser, VkImageMemoryBarrier2KHR &el) } template <> -void Deserialise(const VkImageMemoryBarrier2KHR &el) +void Deserialise(const VkImageMemoryBarrier2 &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkPhysicalDeviceSynchronization2FeaturesKHR &el) +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceSynchronization2Features &el) { RDCASSERT(ser.IsReading() || - el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR); + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(synchronization2); } template <> -void Deserialise(const VkPhysicalDeviceSynchronization2FeaturesKHR &el) +void Deserialise(const VkPhysicalDeviceSynchronization2Features &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkSemaphoreSubmitInfoKHR &el) +void DoSerialise(SerialiserType &ser, VkSemaphoreSubmitInfo &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(semaphore); SERIALISE_MEMBER(value); - SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2KHR, stageMask); + SERIALISE_MEMBER_VKFLAGS(VkPipelineStageFlags2, stageMask); SERIALISE_MEMBER(deviceIndex); } template <> -void Deserialise(const VkSemaphoreSubmitInfoKHR &el) +void Deserialise(const VkSemaphoreSubmitInfo &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkCommandBufferSubmitInfoKHR &el) +void DoSerialise(SerialiserType &ser, VkCommandBufferSubmitInfo &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO); SerialiseNext(ser, el.sType, el.pNext); SERIALISE_MEMBER(commandBuffer).Important(); @@ -9075,18 +9178,18 @@ void DoSerialise(SerialiserType &ser, VkCommandBufferSubmitInfoKHR &el) } template <> -void Deserialise(const VkCommandBufferSubmitInfoKHR &el) +void Deserialise(const VkCommandBufferSubmitInfo &el) { DeserialiseNext(el.pNext); } template -void DoSerialise(SerialiserType &ser, VkSubmitInfo2KHR &el) +void DoSerialise(SerialiserType &ser, VkSubmitInfo2 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_SUBMIT_INFO_2); SerialiseNext(ser, el.sType, el.pNext); - SERIALISE_MEMBER_VKFLAGS(VkSubmitFlagsKHR, flags); + SERIALISE_MEMBER_VKFLAGS(VkSubmitFlags, flags); SERIALISE_MEMBER(waitSemaphoreInfoCount); SERIALISE_MEMBER_ARRAY(pWaitSemaphoreInfos, waitSemaphoreInfoCount); SERIALISE_MEMBER(commandBufferInfoCount); @@ -9096,7 +9199,7 @@ void DoSerialise(SerialiserType &ser, VkSubmitInfo2KHR &el) } template <> -void Deserialise(const VkSubmitInfo2KHR &el) +void Deserialise(const VkSubmitInfo2 &el) { DeserialiseNext(el.pNext); delete[] el.pWaitSemaphoreInfos; @@ -9105,9 +9208,9 @@ void Deserialise(const VkSubmitInfo2KHR &el) } template -void DoSerialise(SerialiserType &ser, VkDependencyInfoKHR &el) +void DoSerialise(SerialiserType &ser, VkDependencyInfo &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DEPENDENCY_INFO); SerialiseNext(ser, el.sType, el.pNext); // mark this as unimportant so even if somehow there are no barriers at all, we won't in-line all @@ -9129,7 +9232,7 @@ void DoSerialise(SerialiserType &ser, VkDependencyInfoKHR &el) } template <> -void Deserialise(const VkDependencyInfoKHR &el) +void Deserialise(const VkDependencyInfo &el) { DeserialiseNext(el.pNext); delete[] el.pMemoryBarriers; @@ -9486,14 +9589,14 @@ void Deserialise(const VkFormatProperties2 &el) } template -void DoSerialise(SerialiserType &ser, VkFormatProperties3KHR &el) +void DoSerialise(SerialiserType &ser, VkFormatProperties3 &el) { - RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR); + RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3); SerialiseNext(ser, el.sType, el.pNext); - SERIALISE_MEMBER_VKFLAGS(VkFormatFeatureFlags2KHR, linearTilingFeatures); - SERIALISE_MEMBER_VKFLAGS(VkFormatFeatureFlags2KHR, optimalTilingFeatures); - SERIALISE_MEMBER_VKFLAGS(VkFormatFeatureFlags2KHR, bufferFeatures); + SERIALISE_MEMBER_VKFLAGS(VkFormatFeatureFlags2, linearTilingFeatures); + SERIALISE_MEMBER_VKFLAGS(VkFormatFeatureFlags2, optimalTilingFeatures); + SERIALISE_MEMBER_VKFLAGS(VkFormatFeatureFlags2, bufferFeatures); } template <> @@ -9872,9 +9975,9 @@ INSTANTIATE_SERIALISE_TYPE(VkAcquireNextImageInfoKHR); INSTANTIATE_SERIALISE_TYPE(VkAcquireProfilingLockInfoKHR); INSTANTIATE_SERIALISE_TYPE(VkApplicationInfo); INSTANTIATE_SERIALISE_TYPE(VkAttachmentDescription2); -INSTANTIATE_SERIALISE_TYPE(VkAttachmentDescriptionStencilLayoutKHR); +INSTANTIATE_SERIALISE_TYPE(VkAttachmentDescriptionStencilLayout); INSTANTIATE_SERIALISE_TYPE(VkAttachmentReference2); -INSTANTIATE_SERIALISE_TYPE(VkAttachmentReferenceStencilLayoutKHR); +INSTANTIATE_SERIALISE_TYPE(VkAttachmentReferenceStencilLayout); INSTANTIATE_SERIALISE_TYPE(VkAttachmentSampleLocationsEXT); INSTANTIATE_SERIALISE_TYPE(VkBindBufferMemoryDeviceGroupInfo); INSTANTIATE_SERIALISE_TYPE(VkBindBufferMemoryInfo); @@ -9883,14 +9986,14 @@ INSTANTIATE_SERIALISE_TYPE(VkBindImageMemoryInfo); INSTANTIATE_SERIALISE_TYPE(VkBindImageMemorySwapchainInfoKHR); INSTANTIATE_SERIALISE_TYPE(VkBindImagePlaneMemoryInfo); INSTANTIATE_SERIALISE_TYPE(VkBindSparseInfo); -INSTANTIATE_SERIALISE_TYPE(VkBlitImageInfo2KHR); -INSTANTIATE_SERIALISE_TYPE(VkBufferCopy2KHR); +INSTANTIATE_SERIALISE_TYPE(VkBlitImageInfo2); +INSTANTIATE_SERIALISE_TYPE(VkBufferCopy2); INSTANTIATE_SERIALISE_TYPE(VkBufferCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkBufferDeviceAddressCreateInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkBufferDeviceAddressInfo); -INSTANTIATE_SERIALISE_TYPE(VkBufferImageCopy2KHR); +INSTANTIATE_SERIALISE_TYPE(VkBufferImageCopy2); INSTANTIATE_SERIALISE_TYPE(VkBufferMemoryBarrier); -INSTANTIATE_SERIALISE_TYPE(VkBufferMemoryBarrier2KHR); +INSTANTIATE_SERIALISE_TYPE(VkBufferMemoryBarrier2); INSTANTIATE_SERIALISE_TYPE(VkBufferMemoryRequirementsInfo2); INSTANTIATE_SERIALISE_TYPE(VkBufferOpaqueCaptureAddressCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkBufferViewCreateInfo); @@ -9898,17 +10001,17 @@ INSTANTIATE_SERIALISE_TYPE(VkCalibratedTimestampInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkCommandBufferAllocateInfo); INSTANTIATE_SERIALISE_TYPE(VkCommandBufferBeginInfo); INSTANTIATE_SERIALISE_TYPE(VkCommandBufferInheritanceConditionalRenderingInfoEXT); -INSTANTIATE_SERIALISE_TYPE(VkCommandBufferInheritanceRenderingInfoKHR); +INSTANTIATE_SERIALISE_TYPE(VkCommandBufferInheritanceRenderingInfo); INSTANTIATE_SERIALISE_TYPE(VkCommandBufferInheritanceInfo); -INSTANTIATE_SERIALISE_TYPE(VkCommandBufferSubmitInfoKHR); +INSTANTIATE_SERIALISE_TYPE(VkCommandBufferSubmitInfo); INSTANTIATE_SERIALISE_TYPE(VkCommandPoolCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkComputePipelineCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkConditionalRenderingBeginInfoEXT); -INSTANTIATE_SERIALISE_TYPE(VkCopyBufferInfo2KHR); -INSTANTIATE_SERIALISE_TYPE(VkCopyBufferToImageInfo2KHR); +INSTANTIATE_SERIALISE_TYPE(VkCopyBufferInfo2); +INSTANTIATE_SERIALISE_TYPE(VkCopyBufferToImageInfo2); INSTANTIATE_SERIALISE_TYPE(VkCopyDescriptorSet); -INSTANTIATE_SERIALISE_TYPE(VkCopyImageInfo2KHR); -INSTANTIATE_SERIALISE_TYPE(VkCopyImageToBufferInfo2KHR); +INSTANTIATE_SERIALISE_TYPE(VkCopyImageInfo2); +INSTANTIATE_SERIALISE_TYPE(VkCopyImageToBufferInfo2); INSTANTIATE_SERIALISE_TYPE(VkDebugMarkerMarkerInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkDebugMarkerObjectNameInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkDebugMarkerObjectTagInfoEXT); @@ -9921,7 +10024,7 @@ INSTANTIATE_SERIALISE_TYPE(VkDebugUtilsObjectTagInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkDedicatedAllocationBufferCreateInfoNV); INSTANTIATE_SERIALISE_TYPE(VkDedicatedAllocationImageCreateInfoNV); INSTANTIATE_SERIALISE_TYPE(VkDedicatedAllocationMemoryAllocateInfoNV); -INSTANTIATE_SERIALISE_TYPE(VkDependencyInfoKHR); +INSTANTIATE_SERIALISE_TYPE(VkDependencyInfo); INSTANTIATE_SERIALISE_TYPE(VkDescriptorPoolCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkDescriptorSetAllocateInfo); INSTANTIATE_SERIALISE_TYPE(VkDescriptorSetLayoutBindingFlagsCreateInfo) @@ -9930,7 +10033,7 @@ INSTANTIATE_SERIALISE_TYPE(VkDescriptorSetLayoutSupport); INSTANTIATE_SERIALISE_TYPE(VkDescriptorSetVariableDescriptorCountAllocateInfo) INSTANTIATE_SERIALISE_TYPE(VkDescriptorSetVariableDescriptorCountLayoutSupport) INSTANTIATE_SERIALISE_TYPE(VkDescriptorUpdateTemplateCreateInfo); -INSTANTIATE_SERIALISE_TYPE(VkDeviceBufferMemoryRequirementsKHR); +INSTANTIATE_SERIALISE_TYPE(VkDeviceBufferMemoryRequirements); INSTANTIATE_SERIALISE_TYPE(VkDeviceCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkDeviceEventInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkDeviceGroupBindSparseInfo); @@ -9941,11 +10044,11 @@ INSTANTIATE_SERIALISE_TYPE(VkDeviceGroupPresentInfoKHR); INSTANTIATE_SERIALISE_TYPE(VkDeviceGroupRenderPassBeginInfo); INSTANTIATE_SERIALISE_TYPE(VkDeviceGroupSubmitInfo); INSTANTIATE_SERIALISE_TYPE(VkDeviceGroupSwapchainCreateInfoKHR); -INSTANTIATE_SERIALISE_TYPE(VkDeviceImageMemoryRequirementsKHR); +INSTANTIATE_SERIALISE_TYPE(VkDeviceImageMemoryRequirements); INSTANTIATE_SERIALISE_TYPE(VkDeviceMemoryOpaqueCaptureAddressInfo); -INSTANTIATE_SERIALISE_TYPE(VkDevicePrivateDataCreateInfoEXT); +INSTANTIATE_SERIALISE_TYPE(VkDevicePrivateDataCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkDeviceQueueCreateInfo); -INSTANTIATE_SERIALISE_TYPE(VkDeviceQueueGlobalPriorityCreateInfoEXT); +INSTANTIATE_SERIALISE_TYPE(VkDeviceQueueGlobalPriorityCreateInfoKHR); INSTANTIATE_SERIALISE_TYPE(VkDeviceQueueInfo2); INSTANTIATE_SERIALISE_TYPE(VkDisplayEventInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkDisplayModeProperties2KHR); @@ -9978,16 +10081,16 @@ INSTANTIATE_SERIALISE_TYPE(VkFramebufferAttachmentsCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkFramebufferCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkGraphicsPipelineCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkHdrMetadataEXT); -INSTANTIATE_SERIALISE_TYPE(VkImageBlit2KHR); -INSTANTIATE_SERIALISE_TYPE(VkImageCopy2KHR); +INSTANTIATE_SERIALISE_TYPE(VkImageBlit2); +INSTANTIATE_SERIALISE_TYPE(VkImageCopy2); INSTANTIATE_SERIALISE_TYPE(VkImageCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkImageFormatListCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkImageFormatProperties2); INSTANTIATE_SERIALISE_TYPE(VkImageMemoryBarrier); -INSTANTIATE_SERIALISE_TYPE(VkImageMemoryBarrier2KHR); +INSTANTIATE_SERIALISE_TYPE(VkImageMemoryBarrier2); INSTANTIATE_SERIALISE_TYPE(VkImageMemoryRequirementsInfo2); INSTANTIATE_SERIALISE_TYPE(VkImagePlaneMemoryRequirementsInfo); -INSTANTIATE_SERIALISE_TYPE(VkImageResolve2KHR); +INSTANTIATE_SERIALISE_TYPE(VkImageResolve2); INSTANTIATE_SERIALISE_TYPE(VkImageSparseMemoryRequirementsInfo2); INSTANTIATE_SERIALISE_TYPE(VkImageStencilUsageCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkImageSwapchainCreateInfoKHR); @@ -10004,7 +10107,7 @@ INSTANTIATE_SERIALISE_TYPE(VkMappedMemoryRange); INSTANTIATE_SERIALISE_TYPE(VkMemoryAllocateFlagsInfo); INSTANTIATE_SERIALISE_TYPE(VkMemoryAllocateInfo); INSTANTIATE_SERIALISE_TYPE(VkMemoryBarrier); -INSTANTIATE_SERIALISE_TYPE(VkMemoryBarrier2KHR); +INSTANTIATE_SERIALISE_TYPE(VkMemoryBarrier2); INSTANTIATE_SERIALISE_TYPE(VkMemoryDedicatedAllocateInfo); INSTANTIATE_SERIALISE_TYPE(VkMemoryDedicatedRequirements); INSTANTIATE_SERIALISE_TYPE(VkMemoryFdPropertiesKHR); @@ -10036,7 +10139,7 @@ INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceDescriptorIndexingFeatures) INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceDescriptorIndexingProperties) INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceDiscardRectanglePropertiesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceDriverProperties); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceDynamicRenderingFeaturesKHR); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceDynamicRenderingFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceExtendedDynamicStateFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceExtendedDynamicState2FeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceExternalBufferInfo); @@ -10051,20 +10154,20 @@ INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceFragmentDensityMap2FeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceFragmentDensityMap2PropertiesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceGroupProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceHostQueryResetFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceIDProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceImageFormatInfo2); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceImagelessFramebufferFeatures); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceImageRobustnessFeaturesEXT); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceImageRobustnessFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceImageViewImageFormatInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceIndexTypeUint8FeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceLineRasterizationFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceLineRasterizationPropertiesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMaintenance3Properties); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMaintenance4FeaturesKHR); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMaintenance4PropertiesKHR); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMaintenance4Features); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMaintenance4Properties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMemoryBudgetPropertiesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMemoryPriorityFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMemoryProperties2); @@ -10073,10 +10176,10 @@ INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMultiviewProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePCIBusInfoPropertiesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePerformanceQueryFeaturesKHR); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePerformanceQueryPropertiesKHR); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePipelineCreationCacheControlFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePointClippingProperties); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePrivateDataFeaturesEXT); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePrivateDataFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePresentIdFeaturesKHR); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDevicePresentWaitFeaturesKHR); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceProperties2); @@ -10090,34 +10193,34 @@ INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSampleLocationsPropertiesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSamplerFilterMinmaxProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSamplerYcbcrConversionFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceScalarBlockLayoutFeatures); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderAtomicFloatFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderAtomicInt64Features); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderClockFeaturesKHR); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderCorePropertiesAMD); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderDrawParametersFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderFloat16Int8Features); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderImageFootprintFeaturesNV); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderIntegerDotProductFeatures); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderIntegerDotProductProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceShaderTerminateInvocationFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSparseImageFormatInfo2); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSubgroupProperties); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSubgroupSizeControlFeaturesEXT); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSubgroupSizeControlPropertiesEXT); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSubgroupSizeControlFeatures); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSubgroupSizeControlProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSurfaceInfo2KHR); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSynchronization2FeaturesKHR); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSynchronization2Features); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTexelBufferAlignmentProperties); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTextureCompressionASTCHDRFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTimelineSemaphoreFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTimelineSemaphoreProperties); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceToolPropertiesEXT); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceToolProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTransformFeedbackFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceTransformFeedbackPropertiesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceUniformBufferStandardLayoutFeatures); @@ -10129,15 +10232,17 @@ INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceVulkan11Features); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceVulkan11Properties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceVulkan12Features); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceVulkan12Properties); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceVulkan13Features); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceVulkan13Properties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceVulkanMemoryModelFeatures); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceYcbcrImageArraysFeaturesEXT); -INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures); INSTANTIATE_SERIALISE_TYPE(VkPipelineCacheCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineColorBlendStateCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineColorWriteCreateInfoEXT); -INSTANTIATE_SERIALISE_TYPE(VkPipelineCreationFeedbackCreateInfoEXT); +INSTANTIATE_SERIALISE_TYPE(VkPipelineCreationFeedbackCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineDepthStencilStateCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineDiscardRectangleStateCreateInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkPipelineDynamicStateCreateInfo); @@ -10154,10 +10259,10 @@ INSTANTIATE_SERIALISE_TYPE(VkPipelineRasterizationDepthClipStateCreateInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkPipelineRasterizationLineStateCreateInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkPipelineRasterizationStateCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineRasterizationStateStreamCreateInfoEXT); -INSTANTIATE_SERIALISE_TYPE(VkPipelineRenderingCreateInfoKHR); +INSTANTIATE_SERIALISE_TYPE(VkPipelineRenderingCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineSampleLocationsStateCreateInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkPipelineShaderStageCreateInfo); -INSTANTIATE_SERIALISE_TYPE(VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT); +INSTANTIATE_SERIALISE_TYPE(VkPipelineShaderStageRequiredSubgroupSizeCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineTessellationDomainOriginStateCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineTessellationStateCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkPipelineVertexInputDivisorStateCreateInfoEXT); @@ -10168,16 +10273,16 @@ INSTANTIATE_SERIALISE_TYPE(VkPresentInfoKHR); INSTANTIATE_SERIALISE_TYPE(VkPresentRegionsKHR); INSTANTIATE_SERIALISE_TYPE(VkPresentTimeGOOGLE); INSTANTIATE_SERIALISE_TYPE(VkPresentTimesInfoGOOGLE); -INSTANTIATE_SERIALISE_TYPE(VkPrivateDataSlotCreateInfoEXT); +INSTANTIATE_SERIALISE_TYPE(VkPrivateDataSlotCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkProtectedSubmitInfo); INSTANTIATE_SERIALISE_TYPE(VkQueryPoolCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkQueryPoolPerformanceCreateInfoKHR); -INSTANTIATE_SERIALISE_TYPE(VkQueueFamilyGlobalPriorityPropertiesEXT); +INSTANTIATE_SERIALISE_TYPE(VkQueueFamilyGlobalPriorityPropertiesKHR); INSTANTIATE_SERIALISE_TYPE(VkQueueFamilyProperties2); INSTANTIATE_SERIALISE_TYPE(VkRefreshCycleDurationGOOGLE); -INSTANTIATE_SERIALISE_TYPE(VkRenderingAttachmentInfoKHR); +INSTANTIATE_SERIALISE_TYPE(VkRenderingAttachmentInfo); INSTANTIATE_SERIALISE_TYPE(VkRenderingFragmentDensityMapAttachmentInfoEXT); -INSTANTIATE_SERIALISE_TYPE(VkRenderingInfoKHR); +INSTANTIATE_SERIALISE_TYPE(VkRenderingInfo); INSTANTIATE_SERIALISE_TYPE(VkRenderPassAttachmentBeginInfo); INSTANTIATE_SERIALISE_TYPE(VkRenderPassBeginInfo); INSTANTIATE_SERIALISE_TYPE(VkRenderPassCreateInfo); @@ -10186,7 +10291,7 @@ INSTANTIATE_SERIALISE_TYPE(VkRenderPassFragmentDensityMapCreateInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkRenderPassInputAttachmentAspectCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkRenderPassMultiviewCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkRenderPassSampleLocationsBeginInfoEXT); -INSTANTIATE_SERIALISE_TYPE(VkResolveImageInfo2KHR); +INSTANTIATE_SERIALISE_TYPE(VkResolveImageInfo2); INSTANTIATE_SERIALISE_TYPE(VkSampleLocationsInfoEXT); INSTANTIATE_SERIALISE_TYPE(VkSamplerCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkSamplerCustomBorderColorCreateInfoEXT); @@ -10197,7 +10302,7 @@ INSTANTIATE_SERIALISE_TYPE(VkSamplerYcbcrConversionInfo); INSTANTIATE_SERIALISE_TYPE(VkSemaphoreCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkSemaphoreGetFdInfoKHR); INSTANTIATE_SERIALISE_TYPE(VkSemaphoreSignalInfo); -INSTANTIATE_SERIALISE_TYPE(VkSemaphoreSubmitInfoKHR); +INSTANTIATE_SERIALISE_TYPE(VkSemaphoreSubmitInfo); INSTANTIATE_SERIALISE_TYPE(VkSemaphoreTypeCreateInfo); INSTANTIATE_SERIALISE_TYPE(VkSemaphoreWaitInfo); INSTANTIATE_SERIALISE_TYPE(VkShaderModuleCreateInfo); @@ -10206,7 +10311,7 @@ INSTANTIATE_SERIALISE_TYPE(VkSharedPresentSurfaceCapabilitiesKHR); INSTANTIATE_SERIALISE_TYPE(VkSparseImageFormatProperties2); INSTANTIATE_SERIALISE_TYPE(VkSparseImageMemoryRequirements2); INSTANTIATE_SERIALISE_TYPE(VkSubmitInfo); -INSTANTIATE_SERIALISE_TYPE(VkSubmitInfo2KHR); +INSTANTIATE_SERIALISE_TYPE(VkSubmitInfo2); INSTANTIATE_SERIALISE_TYPE(VkSubpassBeginInfo); INSTANTIATE_SERIALISE_TYPE(VkSubpassDependency2); INSTANTIATE_SERIALISE_TYPE(VkSubpassDescription2); @@ -10278,7 +10383,7 @@ INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMemoryProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceSparseProperties); INSTANTIATE_SERIALISE_TYPE(VkPipelineColorBlendAttachmentState); -INSTANTIATE_SERIALISE_TYPE(VkPipelineCreationFeedbackEXT); +INSTANTIATE_SERIALISE_TYPE(VkPipelineCreationFeedback); INSTANTIATE_SERIALISE_TYPE(VkPipelineExecutableStatisticValueKHR); INSTANTIATE_SERIALISE_TYPE(VkPresentRegionKHR); INSTANTIATE_SERIALISE_TYPE(VkPushConstantRange); @@ -10940,7 +11045,7 @@ void DoSerialise(SerialiserType &ser, VkAndroidHardwareBufferFormatProperties2AN SERIALISE_MEMBER(format); SERIALISE_MEMBER(externalFormat); - SERIALISE_MEMBER_VKFLAGS(VkFormatFeatureFlags2KHR, formatFeatures); + SERIALISE_MEMBER_VKFLAGS(VkFormatFeatureFlags2, formatFeatures); SERIALISE_MEMBER(samplerYcbcrConversionComponents); SERIALISE_MEMBER(suggestedYcbcrModel); SERIALISE_MEMBER(suggestedYcbcrRange); diff --git a/renderdoc/driver/vulkan/vk_shader_cache.cpp b/renderdoc/driver/vulkan/vk_shader_cache.cpp index ff1fb98f4..d0c4d9a2a 100644 --- a/renderdoc/driver/vulkan/vk_shader_cache.cpp +++ b/renderdoc/driver/vulkan/vk_shader_cache.cpp @@ -880,8 +880,8 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p }; static VkFormat colFormats[16] = {}; - static VkPipelineRenderingCreateInfoKHR dynRenderCreate = { - VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR, NULL, pipeInfo.viewMask, 0, colFormats, + static VkPipelineRenderingCreateInfo dynRenderCreate = { + VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO, NULL, pipeInfo.viewMask, 0, colFormats, }; if(pipeInfo.renderpass == ResourceId()) diff --git a/renderdoc/driver/vulkan/vk_shader_feedback.cpp b/renderdoc/driver/vulkan/vk_shader_feedback.cpp index bb4ad95de..050b7ee3d 100644 --- a/renderdoc/driver/vulkan/vk_shader_feedback.cpp +++ b/renderdoc/driver/vulkan/vk_shader_feedback.cpp @@ -1419,7 +1419,7 @@ void VulkanReplay::FetchShaderFeedback(uint32_t eventId) // only process array bindings if(bindData.descriptorCount > 1 && - bindData.descriptorType != VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + bindData.descriptorType != VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { key.binding = (uint32_t)binding; diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp index 5db3c28c4..49b562b4f 100644 --- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp +++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp @@ -274,7 +274,7 @@ public: } break; } - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: { // push directly into the buffer cache from the inline data BindpointIndex idx; diff --git a/renderdoc/driver/vulkan/vk_state.cpp b/renderdoc/driver/vulkan/vk_state.cpp index 928b4b149..2344e00ff 100644 --- a/renderdoc/driver/vulkan/vk_state.cpp +++ b/renderdoc/driver/vulkan/vk_state.cpp @@ -39,8 +39,8 @@ void VulkanRenderState::BeginRenderPassAndApplyState(WrappedVulkan *vk, VkComman { if(dynamicRendering.active) { - VkRenderingInfoKHR info = {}; - info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO_KHR; + VkRenderingInfo info = {}; + info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO; // for action callbacks that want to stop the renderpass, do something, then start it with // original state, we need to preserve the suspending flag instead of removing it. For other @@ -48,28 +48,28 @@ void VulkanRenderState::BeginRenderPassAndApplyState(WrappedVulkan *vk, VkComman // suspended pass if(obeySuspending) { - info.flags = dynamicRendering.flags & ~VK_RENDERING_RESUMING_BIT_KHR; + info.flags = dynamicRendering.flags & ~VK_RENDERING_RESUMING_BIT; } else { - info.flags = dynamicRendering.flags & - ~(VK_RENDERING_RESUMING_BIT_KHR | VK_RENDERING_SUSPENDING_BIT_KHR); + info.flags = + dynamicRendering.flags & ~(VK_RENDERING_RESUMING_BIT | VK_RENDERING_SUSPENDING_BIT); } info.layerCount = dynamicRendering.layerCount; info.renderArea = renderArea; info.viewMask = dynamicRendering.viewMask; - VkRenderingAttachmentInfoKHR depth = dynamicRendering.depth; + VkRenderingAttachmentInfo depth = dynamicRendering.depth; info.pDepthAttachment = &depth; if(depth.imageLayout == VK_IMAGE_LAYOUT_UNDEFINED) info.pDepthAttachment = NULL; - VkRenderingAttachmentInfoKHR stencil = dynamicRendering.depth; + VkRenderingAttachmentInfo stencil = dynamicRendering.depth; info.pStencilAttachment = &stencil; if(stencil.imageLayout == VK_IMAGE_LAYOUT_UNDEFINED) info.pStencilAttachment = NULL; - rdcarray color = dynamicRendering.color; + rdcarray color = dynamicRendering.color; info.colorAttachmentCount = (uint32_t)color.size(); info.pColorAttachments = color.data(); @@ -77,12 +77,12 @@ void VulkanRenderState::BeginRenderPassAndApplyState(WrappedVulkan *vk, VkComman // patch the load/store actions and unwrap for(uint32_t i = 0; i < (uint32_t)color.size() + 2; i++) { - VkRenderingAttachmentInfoKHR *att = (VkRenderingAttachmentInfoKHR *)info.pColorAttachments + i; + VkRenderingAttachmentInfo *att = (VkRenderingAttachmentInfo *)info.pColorAttachments + i; if(i == info.colorAttachmentCount) - att = (VkRenderingAttachmentInfoKHR *)info.pDepthAttachment; + att = (VkRenderingAttachmentInfo *)info.pDepthAttachment; else if(i == info.colorAttachmentCount + 1) - att = (VkRenderingAttachmentInfoKHR *)info.pStencilAttachment; + att = (VkRenderingAttachmentInfo *)info.pStencilAttachment; if(!att) continue; @@ -90,14 +90,14 @@ void VulkanRenderState::BeginRenderPassAndApplyState(WrappedVulkan *vk, VkComman if(att->loadOp != VK_ATTACHMENT_LOAD_OP_NONE_EXT) att->loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - if(att->storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(att->storeOp != VK_ATTACHMENT_STORE_OP_NONE) att->storeOp = VK_ATTACHMENT_STORE_OP_STORE; att->imageView = Unwrap(att->imageView); att->resolveImageView = Unwrap(att->resolveImageView); } - ObjDisp(cmd)->CmdBeginRenderingKHR(Unwrap(cmd), &info); + ObjDisp(cmd)->CmdBeginRendering(Unwrap(cmd), &info); } else { @@ -165,7 +165,7 @@ void VulkanRenderState::EndRenderPass(VkCommandBuffer cmd) if(dynamicRendering.active) { if(!dynamicRendering.suspended) - ObjDisp(cmd)->CmdEndRenderingKHR(Unwrap(cmd)); + ObjDisp(cmd)->CmdEndRendering(Unwrap(cmd)); } else { @@ -177,26 +177,26 @@ void VulkanRenderState::FinishSuspendedRenderPass(VkCommandBuffer cmd) { if(dynamicRendering.active && dynamicRendering.suspended) { - VkRenderingInfoKHR info = {}; - info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO_KHR; + VkRenderingInfo info = {}; + info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO; // still resume the existing pass, but don't suspend again after that - info.flags = dynamicRendering.flags & ~VK_RENDERING_SUSPENDING_BIT_KHR; + info.flags = dynamicRendering.flags & ~VK_RENDERING_SUSPENDING_BIT; info.layerCount = dynamicRendering.layerCount; info.renderArea = renderArea; info.viewMask = dynamicRendering.viewMask; - VkRenderingAttachmentInfoKHR depth = dynamicRendering.depth; + VkRenderingAttachmentInfo depth = dynamicRendering.depth; info.pDepthAttachment = &depth; if(depth.imageLayout == VK_IMAGE_LAYOUT_UNDEFINED) info.pDepthAttachment = NULL; - VkRenderingAttachmentInfoKHR stencil = dynamicRendering.depth; + VkRenderingAttachmentInfo stencil = dynamicRendering.depth; info.pStencilAttachment = &stencil; if(stencil.imageLayout == VK_IMAGE_LAYOUT_UNDEFINED) info.pStencilAttachment = NULL; - rdcarray color = dynamicRendering.color; + rdcarray color = dynamicRendering.color; info.colorAttachmentCount = (uint32_t)color.size(); info.pColorAttachments = color.data(); @@ -204,12 +204,12 @@ void VulkanRenderState::FinishSuspendedRenderPass(VkCommandBuffer cmd) // patch the load/store actions and unwrap for(uint32_t i = 0; i < (uint32_t)color.size() + 2; i++) { - VkRenderingAttachmentInfoKHR *att = (VkRenderingAttachmentInfoKHR *)info.pColorAttachments + i; + VkRenderingAttachmentInfo *att = (VkRenderingAttachmentInfo *)info.pColorAttachments + i; if(i == info.colorAttachmentCount) - att = (VkRenderingAttachmentInfoKHR *)info.pDepthAttachment; + att = (VkRenderingAttachmentInfo *)info.pDepthAttachment; else if(i == info.colorAttachmentCount + 1) - att = (VkRenderingAttachmentInfoKHR *)info.pStencilAttachment; + att = (VkRenderingAttachmentInfo *)info.pStencilAttachment; if(!att) continue; @@ -217,7 +217,7 @@ void VulkanRenderState::FinishSuspendedRenderPass(VkCommandBuffer cmd) if(att->loadOp != VK_ATTACHMENT_LOAD_OP_NONE_EXT) att->loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - if(att->storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(att->storeOp != VK_ATTACHMENT_STORE_OP_NONE) att->storeOp = VK_ATTACHMENT_STORE_OP_STORE; att->imageView = Unwrap(att->imageView); @@ -225,8 +225,8 @@ void VulkanRenderState::FinishSuspendedRenderPass(VkCommandBuffer cmd) } // do nothing, just resume and then end without suspending - ObjDisp(cmd)->CmdBeginRenderingKHR(Unwrap(cmd), &info); - ObjDisp(cmd)->CmdEndRenderingKHR(Unwrap(cmd)); + ObjDisp(cmd)->CmdBeginRendering(Unwrap(cmd), &info); + ObjDisp(cmd)->CmdEndRendering(Unwrap(cmd)); } } @@ -327,33 +327,33 @@ void VulkanRenderState::BindPipeline(WrappedVulkan *vk, VkCommandBuffer cmd, if(vk->ExtendedDynamicState()) { - if(!views.empty() && dynamicStates[VkDynamicViewportCountEXT]) + if(!views.empty() && dynamicStates[VkDynamicViewportCount]) ObjDisp(cmd)->CmdSetViewportWithCountEXT(Unwrap(cmd), (uint32_t)views.size(), views.data()); - if(!scissors.empty() && dynamicStates[VkDynamicScissorCountEXT]) + if(!scissors.empty() && dynamicStates[VkDynamicScissorCount]) ObjDisp(cmd)->CmdSetScissorWithCountEXT(Unwrap(cmd), (uint32_t)scissors.size(), scissors.data()); - if(dynamicStates[VkDynamicCullModeEXT]) + if(dynamicStates[VkDynamicCullMode]) ObjDisp(cmd)->CmdSetCullModeEXT(Unwrap(cmd), cullMode); - if(dynamicStates[VkDynamicFrontFaceEXT]) + if(dynamicStates[VkDynamicFrontFace]) ObjDisp(cmd)->CmdSetFrontFaceEXT(Unwrap(cmd), frontFace); - if(dynamicStates[VkDynamicPrimitiveTopologyEXT]) + if(dynamicStates[VkDynamicPrimitiveTopology]) ObjDisp(cmd)->CmdSetPrimitiveTopologyEXT(Unwrap(cmd), primitiveTopology); - if(dynamicStates[VkDynamicDepthBoundsTestEnableEXT]) + if(dynamicStates[VkDynamicDepthBoundsTestEnable]) ObjDisp(cmd)->CmdSetDepthBoundsTestEnableEXT(Unwrap(cmd), depthBoundsTestEnable); - if(dynamicStates[VkDynamicDepthTestEnableEXT]) + if(dynamicStates[VkDynamicDepthTestEnable]) ObjDisp(cmd)->CmdSetDepthTestEnableEXT(Unwrap(cmd), depthTestEnable); - if(dynamicStates[VkDynamicDepthWriteEnableEXT]) + if(dynamicStates[VkDynamicDepthWriteEnable]) ObjDisp(cmd)->CmdSetDepthWriteEnableEXT(Unwrap(cmd), depthWriteEnable); - if(dynamicStates[VkDynamicDepthCompareOpEXT]) + if(dynamicStates[VkDynamicDepthCompareOp]) ObjDisp(cmd)->CmdSetDepthCompareOpEXT(Unwrap(cmd), depthCompareOp); - if(dynamicStates[VkDynamicStencilTestEnableEXT]) + if(dynamicStates[VkDynamicStencilTestEnable]) ObjDisp(cmd)->CmdSetStencilTestEnableEXT(Unwrap(cmd), stencilTestEnable); - if(dynamicStates[VkDynamicStencilOpEXT]) + if(dynamicStates[VkDynamicStencilOp]) { ObjDisp(cmd)->CmdSetStencilOpEXT(Unwrap(cmd), VK_STENCIL_FACE_FRONT_BIT, front.failOp, front.passOp, front.depthFailOp, front.compareOp); @@ -364,15 +364,15 @@ void VulkanRenderState::BindPipeline(WrappedVulkan *vk, VkCommandBuffer cmd, if(vk->ExtendedDynamicState2()) { - if(dynamicStates[VkDynamicDepthBiasEnableEXT]) + if(dynamicStates[VkDynamicDepthBiasEnable]) ObjDisp(cmd)->CmdSetDepthBiasEnableEXT(Unwrap(cmd), depthBiasEnable); if(dynamicStates[VkDynamicLogicOpEXT]) ObjDisp(cmd)->CmdSetLogicOpEXT(Unwrap(cmd), logicOp); if(dynamicStates[VkDynamicControlPointsEXT]) ObjDisp(cmd)->CmdSetPatchControlPointsEXT(Unwrap(cmd), patchControlPoints); - if(dynamicStates[VkDynamicPrimRestartEXT]) + if(dynamicStates[VkDynamicPrimRestart]) ObjDisp(cmd)->CmdSetPrimitiveRestartEnableEXT(Unwrap(cmd), primRestartEnable); - if(dynamicStates[VkDynamicRastDiscardEXT]) + if(dynamicStates[VkDynamicRastDiscard]) ObjDisp(cmd)->CmdSetRasterizerDiscardEnableEXT(Unwrap(cmd), rastDiscardEnable); } @@ -447,7 +447,7 @@ void VulkanRenderState::BindPipeline(WrappedVulkan *vk, VkCommandBuffer cmd, } bool dynamicStride = - dynamicStates[VkDynamicVertexInputBindingStrideEXT] && vk->ExtendedDynamicState(); + dynamicStates[VkDynamicVertexInputBindingStride] && vk->ExtendedDynamicState(); for(size_t i = 0; i < vbuffers.size(); i++) { @@ -632,7 +632,7 @@ void VulkanRenderState::BindDescriptorSet(WrappedVulkan *vk, const DescSetLayout rdcarray allocImgWrites; rdcarray allocBufWrites; rdcarray allocBufViewWrites; - rdcarray allocInlineWrites; + rdcarray allocInlineWrites; const WrappedVulkan::DescriptorSetInfo &setInfo = vk->GetDebugManager()->GetDescSetInfo(descSet); @@ -687,11 +687,11 @@ void VulkanRenderState::BindDescriptorSet(WrappedVulkan *vk, const DescSetLayout push.pImageInfo = dst; allocImgWrites.push_back(dst); } - else if(push.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(push.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { - allocInlineWrites.push_back(new VkWriteDescriptorSetInlineUniformBlockEXT); - VkWriteDescriptorSetInlineUniformBlockEXT *inlineWrite = allocInlineWrites.back(); - inlineWrite->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT; + allocInlineWrites.push_back(new VkWriteDescriptorSetInlineUniformBlock); + VkWriteDescriptorSetInlineUniformBlock *inlineWrite = allocInlineWrites.back(); + inlineWrite->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK; inlineWrite->pNext = NULL; inlineWrite->dataSize = bind.descriptorCount; inlineWrite->pData = setInfo.data.inlineBytes.data() + slots[0].inlineOffset; @@ -772,7 +772,7 @@ void VulkanRenderState::BindDescriptorSet(WrappedVulkan *vk, const DescSetLayout delete[] a; for(VkBufferView *a : allocBufViewWrites) delete[] a; - for(VkWriteDescriptorSetInlineUniformBlockEXT *a : allocInlineWrites) + for(VkWriteDescriptorSetInlineUniformBlock *a : allocInlineWrites) delete a; } } diff --git a/renderdoc/driver/vulkan/vk_state.h b/renderdoc/driver/vulkan/vk_state.h index 3b7dc6248..98659a876 100644 --- a/renderdoc/driver/vulkan/vk_state.h +++ b/renderdoc/driver/vulkan/vk_state.h @@ -219,12 +219,12 @@ struct VulkanRenderState { bool active = false; bool suspended = false; - VkRenderingFlagsKHR flags = 0; + VkRenderingFlags flags = 0; uint32_t layerCount = 0; uint32_t viewMask = 0; - rdcarray color = {}; - VkRenderingAttachmentInfoKHR depth = {}; - VkRenderingAttachmentInfoKHR stencil = {}; + rdcarray color = {}; + VkRenderingAttachmentInfo depth = {}; + VkRenderingAttachmentInfo stencil = {}; VkImageView fragmentDensityView = VK_NULL_HANDLE; VkImageLayout fragmentDensityLayout = VK_IMAGE_LAYOUT_UNDEFINED; diff --git a/renderdoc/driver/vulkan/vk_stringise.cpp b/renderdoc/driver/vulkan/vk_stringise.cpp index 761fed950..d62ad67f8 100644 --- a/renderdoc/driver/vulkan/vk_stringise.cpp +++ b/renderdoc/driver/vulkan/vk_stringise.cpp @@ -172,41 +172,41 @@ rdcstr DoStringise(const VulkanChunk &el) STRINGISE_ENUM_CLASS(vkWaitSemaphores); STRINGISE_ENUM_CLASS(vkSignalSemaphore); STRINGISE_ENUM_CLASS(vkQueuePresentKHR); - STRINGISE_ENUM_CLASS(vkCmdSetCullModeEXT); - STRINGISE_ENUM_CLASS(vkCmdSetFrontFaceEXT); - STRINGISE_ENUM_CLASS(vkCmdSetPrimitiveTopologyEXT); - STRINGISE_ENUM_CLASS(vkCmdSetViewportWithCountEXT); - STRINGISE_ENUM_CLASS(vkCmdSetScissorWithCountEXT); - STRINGISE_ENUM_CLASS(vkCmdBindVertexBuffers2EXT); - STRINGISE_ENUM_CLASS(vkCmdSetDepthTestEnableEXT); - STRINGISE_ENUM_CLASS(vkCmdSetDepthWriteEnableEXT); - STRINGISE_ENUM_CLASS(vkCmdSetDepthCompareOpEXT); - STRINGISE_ENUM_CLASS(vkCmdSetDepthBoundsTestEnableEXT); - STRINGISE_ENUM_CLASS(vkCmdSetStencilTestEnableEXT); - STRINGISE_ENUM_CLASS(vkCmdSetStencilOpEXT); + STRINGISE_ENUM_CLASS(vkCmdSetCullMode); + STRINGISE_ENUM_CLASS(vkCmdSetFrontFace); + STRINGISE_ENUM_CLASS(vkCmdSetPrimitiveTopology); + STRINGISE_ENUM_CLASS(vkCmdSetViewportWithCount); + STRINGISE_ENUM_CLASS(vkCmdSetScissorWithCount); + STRINGISE_ENUM_CLASS(vkCmdBindVertexBuffers2); + STRINGISE_ENUM_CLASS(vkCmdSetDepthTestEnable); + STRINGISE_ENUM_CLASS(vkCmdSetDepthWriteEnable); + STRINGISE_ENUM_CLASS(vkCmdSetDepthCompareOp); + STRINGISE_ENUM_CLASS(vkCmdSetDepthBoundsTestEnable); + STRINGISE_ENUM_CLASS(vkCmdSetStencilTestEnable); + STRINGISE_ENUM_CLASS(vkCmdSetStencilOp); STRINGISE_ENUM_CLASS_NAMED(CoherentMapWrite, "Internal::Coherent Mapped Memory Write") - STRINGISE_ENUM_CLASS(vkCmdCopyBuffer2KHR); - STRINGISE_ENUM_CLASS(vkCmdCopyImage2KHR); - STRINGISE_ENUM_CLASS(vkCmdCopyBufferToImage2KHR); - STRINGISE_ENUM_CLASS(vkCmdCopyImageToBuffer2KHR); - STRINGISE_ENUM_CLASS(vkCmdBlitImage2KHR); - STRINGISE_ENUM_CLASS(vkCmdResolveImage2KHR); - STRINGISE_ENUM_CLASS(vkCmdSetEvent2KHR); - STRINGISE_ENUM_CLASS(vkCmdResetEvent2KHR); - STRINGISE_ENUM_CLASS(vkCmdWaitEvents2KHR); - STRINGISE_ENUM_CLASS(vkCmdPipelineBarrier2KHR); - STRINGISE_ENUM_CLASS(vkCmdWriteTimestamp2KHR); - STRINGISE_ENUM_CLASS(vkQueueSubmit2KHR); + STRINGISE_ENUM_CLASS(vkCmdCopyBuffer2); + STRINGISE_ENUM_CLASS(vkCmdCopyImage2); + STRINGISE_ENUM_CLASS(vkCmdCopyBufferToImage2); + STRINGISE_ENUM_CLASS(vkCmdCopyImageToBuffer2); + STRINGISE_ENUM_CLASS(vkCmdBlitImage2); + STRINGISE_ENUM_CLASS(vkCmdResolveImage2); + STRINGISE_ENUM_CLASS(vkCmdSetEvent2); + STRINGISE_ENUM_CLASS(vkCmdResetEvent2); + STRINGISE_ENUM_CLASS(vkCmdWaitEvents2); + STRINGISE_ENUM_CLASS(vkCmdPipelineBarrier2); + STRINGISE_ENUM_CLASS(vkCmdWriteTimestamp2); + STRINGISE_ENUM_CLASS(vkQueueSubmit2); STRINGISE_ENUM_CLASS(vkCmdWriteBufferMarker2AMD); STRINGISE_ENUM_CLASS(vkCmdSetColorWriteEnableEXT); - STRINGISE_ENUM_CLASS(vkCmdSetDepthBiasEnableEXT) + STRINGISE_ENUM_CLASS(vkCmdSetDepthBiasEnable) STRINGISE_ENUM_CLASS(vkCmdSetLogicOpEXT) STRINGISE_ENUM_CLASS(vkCmdSetPatchControlPointsEXT) - STRINGISE_ENUM_CLASS(vkCmdSetPrimitiveRestartEnableEXT) - STRINGISE_ENUM_CLASS(vkCmdSetRasterizerDiscardEnableEXT) + STRINGISE_ENUM_CLASS(vkCmdSetPrimitiveRestartEnable) + STRINGISE_ENUM_CLASS(vkCmdSetRasterizerDiscardEnable) STRINGISE_ENUM_CLASS(vkCmdSetVertexInputEXT) - STRINGISE_ENUM_CLASS(vkCmdBeginRenderingKHR) - STRINGISE_ENUM_CLASS(vkCmdEndRenderingKHR) + STRINGISE_ENUM_CLASS(vkCmdBeginRendering) + STRINGISE_ENUM_CLASS(vkCmdEndRendering) STRINGISE_ENUM_CLASS_NAMED(Max, "Max Chunk"); } END_ENUM_STRINGISE() @@ -299,7 +299,7 @@ rdcstr DoStringise(const VkPipelineCacheCreateFlagBits &el) { BEGIN_BITFIELD_STRINGISE(VkPipelineCacheCreateFlagBits); { - STRINGISE_BITFIELD_BIT(VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT); + STRINGISE_BITFIELD_BIT(VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT); } END_BITFIELD_STRINGISE(); } @@ -314,10 +314,10 @@ rdcstr DoStringise(const VkPipelineCreateFlagBits &el) STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_DERIVATIVE_BIT); STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT); STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_DISPATCH_BASE_BIT); - STRINGISE_BITFIELD_BIT( - VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR); - STRINGISE_BITFIELD_BIT( - VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT); + STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT); + STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT); + STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR); + STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT); STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR); STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR); STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR); @@ -330,8 +330,6 @@ rdcstr DoStringise(const VkPipelineCreateFlagBits &el) STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR); STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV); STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_LIBRARY_BIT_KHR); - STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT); - STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT); STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV); } END_BITFIELD_STRINGISE(); @@ -342,7 +340,7 @@ rdcstr DoStringise(const VkPipelineStageFlagBits &el) { BEGIN_BITFIELD_STRINGISE(VkPipelineStageFlagBits); { - STRINGISE_BITFIELD_VALUE(VK_PIPELINE_STAGE_NONE_KHR); + STRINGISE_BITFIELD_VALUE(VK_PIPELINE_STAGE_NONE); STRINGISE_BITFIELD_BIT(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); STRINGISE_BITFIELD_BIT(VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT); STRINGISE_BITFIELD_BIT(VK_PIPELINE_STAGE_VERTEX_INPUT_BIT); @@ -463,6 +461,7 @@ rdcstr DoStringise(const VkImageCreateFlagBits &el) STRINGISE_BITFIELD_BIT(VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV); STRINGISE_BITFIELD_BIT(VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT); STRINGISE_BITFIELD_BIT(VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT); + STRINGISE_BITFIELD_BIT(VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM); } END_BITFIELD_STRINGISE(); } @@ -639,6 +638,7 @@ rdcstr DoStringise(const VkImageAspectFlagBits &el) STRINGISE_BITFIELD_BIT(VK_IMAGE_ASPECT_PLANE_0_BIT); STRINGISE_BITFIELD_BIT(VK_IMAGE_ASPECT_PLANE_1_BIT); STRINGISE_BITFIELD_BIT(VK_IMAGE_ASPECT_PLANE_2_BIT); + STRINGISE_BITFIELD_BIT(VK_IMAGE_ASPECT_NONE_KHR); STRINGISE_BITFIELD_BIT(VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT); STRINGISE_BITFIELD_BIT(VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT); STRINGISE_BITFIELD_BIT(VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT); @@ -721,7 +721,7 @@ rdcstr DoStringise(const VkAccessFlagBits &el) { BEGIN_BITFIELD_STRINGISE(VkAccessFlagBits); { - STRINGISE_BITFIELD_VALUE(VK_ACCESS_NONE_KHR); + STRINGISE_BITFIELD_VALUE(VK_ACCESS_NONE); STRINGISE_BITFIELD_BIT(VK_ACCESS_INDIRECT_COMMAND_READ_BIT); STRINGISE_BITFIELD_BIT(VK_ACCESS_INDEX_READ_BIT); STRINGISE_BITFIELD_BIT(VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT); @@ -900,9 +900,9 @@ rdcstr DoStringise(const VkAcquireProfilingLockFlagBitsKHR &el) } template <> -rdcstr DoStringise(const VkPrivateDataSlotCreateFlagBitsEXT &el) +rdcstr DoStringise(const VkPrivateDataSlotCreateFlagBits &el) { - BEGIN_BITFIELD_STRINGISE(VkPrivateDataSlotCreateFlagBitsEXT); + BEGIN_BITFIELD_STRINGISE(VkPrivateDataSlotCreateFlagBits); { } END_BITFIELD_STRINGISE(); @@ -976,7 +976,7 @@ rdcstr DoStringise(const VkEventCreateFlagBits &el) { BEGIN_BITFIELD_STRINGISE(VkEventCreateFlagBits); { - STRINGISE_BITFIELD_BIT(VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR) + STRINGISE_BITFIELD_BIT(VK_EVENT_CREATE_DEVICE_ONLY_BIT) } END_BITFIELD_STRINGISE(); } @@ -1184,6 +1184,21 @@ rdcstr DoStringise(const VkDynamicState &el) STRINGISE_ENUM(VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK) STRINGISE_ENUM(VK_DYNAMIC_STATE_STENCIL_WRITE_MASK) STRINGISE_ENUM(VK_DYNAMIC_STATE_STENCIL_REFERENCE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_CULL_MODE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_FRONT_FACE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY) + STRINGISE_ENUM(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT) + STRINGISE_ENUM(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT) + STRINGISE_ENUM(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP) + STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_STENCIL_OP) + STRINGISE_ENUM(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE) + STRINGISE_ENUM(VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE) STRINGISE_ENUM(VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV) STRINGISE_ENUM(VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT) STRINGISE_ENUM(VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_EXT) @@ -1193,24 +1208,9 @@ rdcstr DoStringise(const VkDynamicState &el) STRINGISE_ENUM(VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_NV) STRINGISE_ENUM(VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR) STRINGISE_ENUM(VK_DYNAMIC_STATE_LINE_STIPPLE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_CULL_MODE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_FRONT_FACE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_STENCIL_OP_EXT) STRINGISE_ENUM(VK_DYNAMIC_STATE_VERTEX_INPUT_EXT) STRINGISE_ENUM(VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT) STRINGISE_ENUM(VK_DYNAMIC_STATE_LOGIC_OP_EXT) - STRINGISE_ENUM(VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT) STRINGISE_ENUM(VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT) } END_ENUM_STRINGISE(); @@ -1236,7 +1236,7 @@ rdcstr DoStringise(const VkAttachmentStoreOp &el) { STRINGISE_ENUM(VK_ATTACHMENT_STORE_OP_STORE) STRINGISE_ENUM(VK_ATTACHMENT_STORE_OP_DONT_CARE) - STRINGISE_ENUM(VK_ATTACHMENT_STORE_OP_NONE_KHR) + STRINGISE_ENUM(VK_ATTACHMENT_STORE_OP_NONE) } END_ENUM_STRINGISE(); } @@ -1390,7 +1390,7 @@ rdcstr DoStringise(const VkDescriptorType &el) STRINGISE_ENUM(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC) STRINGISE_ENUM(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC) STRINGISE_ENUM(VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT) - STRINGISE_ENUM(VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + STRINGISE_ENUM(VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) STRINGISE_ENUM(VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR) STRINGISE_ENUM(VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV) STRINGISE_ENUM(VK_DESCRIPTOR_TYPE_MUTABLE_VALVE) @@ -1486,12 +1486,12 @@ rdcstr DoStringise(const VkImageLayout &el) STRINGISE_ENUM(VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL) STRINGISE_ENUM(VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL) STRINGISE_ENUM(VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL) + STRINGISE_ENUM(VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL) + STRINGISE_ENUM(VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL) STRINGISE_ENUM(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR) STRINGISE_ENUM(VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR) STRINGISE_ENUM(VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR) STRINGISE_ENUM(VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT) - STRINGISE_ENUM(VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR) - STRINGISE_ENUM(VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR) } END_ENUM_STRINGISE(); } @@ -1665,6 +1665,58 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO) STRINGISE_ENUM(VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO) STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_MEMORY_BARRIER_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEPENDENCY_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_SUBMIT_INFO_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_BUFFER_COPY_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_COPY_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_BLIT_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDERING_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS) STRINGISE_ENUM(VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PRESENT_INFO_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR) @@ -1698,11 +1750,6 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_VIEW_HANDLE_INFO_NVX) STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_VIEW_ADDRESS_PROPERTIES_NVX) STRINGISE_ENUM(VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDERING_INFO_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD) @@ -1716,7 +1763,6 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR) @@ -1789,10 +1835,6 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID) STRINGISE_ENUM(VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID) STRINGISE_ENUM(VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_2_ANDROID) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT) @@ -1853,7 +1895,6 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_IMAGE_FORMAT_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT) @@ -1861,12 +1902,14 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD) STRINGISE_ENUM(VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV) @@ -1887,14 +1930,10 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_DISPLAY_NATIVE_HDR_SURFACE_CAPABILITIES_AMD) STRINGISE_ENUM(VK_STRUCTURE_TYPE_SWAPCHAIN_DISPLAY_NATIVE_HDR_CREATE_INFO_AMD) STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR) @@ -1910,7 +1949,6 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_NV) @@ -1941,7 +1979,6 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV) @@ -1952,10 +1989,7 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM) STRINGISE_ENUM(VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT) @@ -1969,24 +2003,11 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PRESENT_ID_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV) @@ -1997,20 +2018,9 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_DIRECTFB_SURFACE_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE) @@ -2019,8 +2029,9 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION_2_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRM_PROPERTIES_EXT) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR) STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA) STRINGISE_ENUM(VK_STRUCTURE_TYPE_MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA) STRINGISE_ENUM(VK_STRUCTURE_TYPE_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA) @@ -2046,17 +2057,17 @@ rdcstr DoStringise(const VkStructureType &el) STRINGISE_ENUM(VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT) STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR) - STRINGISE_ENUM(VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM) + STRINGISE_ENUM(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV) } END_ENUM_STRINGISE(); } @@ -2267,8 +2278,8 @@ rdcstr DoStringise(const VkFormat &el) STRINGISE_ENUM(VK_FORMAT_ASTC_12x10_SRGB_BLOCK) STRINGISE_ENUM(VK_FORMAT_ASTC_12x12_UNORM_BLOCK) STRINGISE_ENUM(VK_FORMAT_ASTC_12x12_SRGB_BLOCK) - STRINGISE_ENUM(VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT) - STRINGISE_ENUM(VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT) + STRINGISE_ENUM(VK_FORMAT_A4R4G4B4_UNORM_PACK16) + STRINGISE_ENUM(VK_FORMAT_A4B4G4R4_UNORM_PACK16) STRINGISE_ENUM(VK_FORMAT_G8B8G8R8_422_UNORM) STRINGISE_ENUM(VK_FORMAT_B8G8R8G8_422_UNORM) STRINGISE_ENUM(VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM) @@ -2311,24 +2322,24 @@ rdcstr DoStringise(const VkFormat &el) STRINGISE_ENUM(VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG) STRINGISE_ENUM(VK_FORMAT_PVRTC2_4BPP_UNORM_BLOCK_IMG) STRINGISE_ENUM(VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG) - STRINGISE_ENUM(VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT) - STRINGISE_ENUM(VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT) + STRINGISE_ENUM(VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK) + STRINGISE_ENUM(VK_FORMAT_G8_B8R8_2PLANE_444_UNORM) STRINGISE_ENUM(VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT) STRINGISE_ENUM(VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT) - STRINGISE_ENUM(VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT) + STRINGISE_ENUM(VK_FORMAT_G16_B16R16_2PLANE_444_UNORM) } END_ENUM_STRINGISE(); } @@ -2361,6 +2372,7 @@ rdcstr DoStringise(const VkResult &el) STRINGISE_ENUM(VK_ERROR_INVALID_EXTERNAL_HANDLE) STRINGISE_ENUM(VK_ERROR_FRAGMENTATION) STRINGISE_ENUM(VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS) + STRINGISE_ENUM(VK_PIPELINE_COMPILE_REQUIRED) STRINGISE_ENUM(VK_ERROR_SURFACE_LOST_KHR) STRINGISE_ENUM(VK_ERROR_NATIVE_WINDOW_IN_USE_KHR) STRINGISE_ENUM(VK_SUBOPTIMAL_KHR) @@ -2369,13 +2381,12 @@ rdcstr DoStringise(const VkResult &el) STRINGISE_ENUM(VK_ERROR_VALIDATION_FAILED_EXT) STRINGISE_ENUM(VK_ERROR_INVALID_SHADER_NV) STRINGISE_ENUM(VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT) - STRINGISE_ENUM(VK_ERROR_NOT_PERMITTED_EXT) + STRINGISE_ENUM(VK_ERROR_NOT_PERMITTED_KHR) STRINGISE_ENUM(VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT) STRINGISE_ENUM(VK_THREAD_IDLE_KHR) STRINGISE_ENUM(VK_THREAD_DONE_KHR) STRINGISE_ENUM(VK_OPERATION_DEFERRED_KHR) STRINGISE_ENUM(VK_OPERATION_NOT_DEFERRED_KHR) - STRINGISE_ENUM(VK_PIPELINE_COMPILE_REQUIRED_EXT) } END_ENUM_STRINGISE(); } @@ -2569,6 +2580,9 @@ rdcstr DoStringise(const VkSubpassDescriptionFlagBits &el) STRINGISE_BITFIELD_BIT(VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX) STRINGISE_BITFIELD_BIT(VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM) STRINGISE_BITFIELD_BIT(VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM) + STRINGISE_BITFIELD_BIT(VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_ARM) + STRINGISE_BITFIELD_BIT(VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM) + STRINGISE_BITFIELD_BIT(VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM) } END_BITFIELD_STRINGISE(); } @@ -2687,6 +2701,8 @@ rdcstr DoStringise(const VkDriverId &el) STRINGISE_ENUM(VK_DRIVER_ID_MESA_TURNIP) STRINGISE_ENUM(VK_DRIVER_ID_MESA_V3DV) STRINGISE_ENUM(VK_DRIVER_ID_MESA_PANVK) + STRINGISE_ENUM(VK_DRIVER_ID_SAMSUNG_PROPRIETARY) + STRINGISE_ENUM(VK_DRIVER_ID_MESA_VENUS) } END_ENUM_STRINGISE(); } @@ -2947,13 +2963,13 @@ rdcstr DoStringise(const VkSubgroupFeatureFlagBits &el) } template <> -rdcstr DoStringise(const VkPipelineCreationFeedbackFlagBitsEXT &el) +rdcstr DoStringise(const VkPipelineCreationFeedbackFlagBits &el) { - BEGIN_BITFIELD_STRINGISE(VkPipelineCreationFeedbackFlagBitsEXT); + BEGIN_BITFIELD_STRINGISE(VkPipelineCreationFeedbackFlagBits); { - STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT) - STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT_EXT) - STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT_EXT) + STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT) + STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT) + STRINGISE_BITFIELD_BIT(VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT) } END_BITFIELD_STRINGISE(); } @@ -2986,8 +3002,32 @@ rdcstr DoStringise(const VkPipelineShaderStageCreateFlagBits &el) { BEGIN_BITFIELD_STRINGISE(VkPipelineShaderStageCreateFlagBits); { - STRINGISE_BITFIELD_BIT(VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT); - STRINGISE_BITFIELD_BIT(VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT); + STRINGISE_BITFIELD_BIT(VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT); + STRINGISE_BITFIELD_BIT(VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT); + } + END_BITFIELD_STRINGISE(); +} + +template <> +rdcstr DoStringise(const VkPipelineDepthStencilStateCreateFlagBits &el) +{ + BEGIN_BITFIELD_STRINGISE(VkPipelineDepthStencilStateCreateFlagBits); + { + STRINGISE_BITFIELD_BIT( + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM); + STRINGISE_BITFIELD_BIT( + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM); + } + END_BITFIELD_STRINGISE(); +} + +template <> +rdcstr DoStringise(const VkPipelineColorBlendStateCreateFlagBits &el) +{ + BEGIN_BITFIELD_STRINGISE(VkPipelineColorBlendStateCreateFlagBits); + { + STRINGISE_BITFIELD_BIT( + VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_ARM); } END_BITFIELD_STRINGISE(); } @@ -3062,15 +3102,15 @@ rdcstr DoStringise(const VkSemaphoreWaitFlagBits &el) } template <> -rdcstr DoStringise(const VkToolPurposeFlagBitsEXT &el) +rdcstr DoStringise(const VkToolPurposeFlagBits &el) { - BEGIN_BITFIELD_STRINGISE(VkToolPurposeFlagBitsEXT); + BEGIN_BITFIELD_STRINGISE(VkToolPurposeFlagBits); { - STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_VALIDATION_BIT_EXT); - STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_PROFILING_BIT_EXT); - STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_TRACING_BIT_EXT); - STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT_EXT); - STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT_EXT); + STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_VALIDATION_BIT); + STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_PROFILING_BIT); + STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_TRACING_BIT); + STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT); + STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT); STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT); STRINGISE_BITFIELD_BIT(VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT); } @@ -3078,49 +3118,49 @@ rdcstr DoStringise(const VkToolPurposeFlagBitsEXT &el) } template <> -rdcstr DoStringise(const VkSubmitFlagBitsKHR &el) +rdcstr DoStringise(const VkSubmitFlagBits &el) { - BEGIN_BITFIELD_STRINGISE(VkSubmitFlagBitsKHR); + BEGIN_BITFIELD_STRINGISE(VkSubmitFlagBits); { - STRINGISE_BITFIELD_BIT(VK_SUBMIT_PROTECTED_BIT_KHR); + STRINGISE_BITFIELD_BIT(VK_SUBMIT_PROTECTED_BIT); } END_BITFIELD_STRINGISE(); } template <> -rdcstr DoStringise(const VkPipelineStageFlagBits2KHR &el) +rdcstr DoStringise(const VkPipelineStageFlagBits2 &el) { // need a special define here to add specific casting rules #define STRINGISE_BITFIELD_BIT64(a) STRINGISE_BITFIELD_BIT_NAMED((enumType)a, #a) - BEGIN_BITFIELD_STRINGISE(VkPipelineStageFlagBits2KHR); + BEGIN_BITFIELD_STRINGISE(VkPipelineStageFlagBits2); { - STRINGISE_BITFIELD_VALUE(VK_PIPELINE_STAGE_2_NONE_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_HOST_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_COPY_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_BLIT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR); + STRINGISE_BITFIELD_VALUE(VK_PIPELINE_STAGE_2_NONE); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TRANSFER_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_HOST_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_COPY_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_RESOLVE_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_BLIT_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_CLEAR_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT); + STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT); STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT); STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT); STRINGISE_BITFIELD_BIT64(VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV); @@ -3138,31 +3178,31 @@ rdcstr DoStringise(const VkPipelineStageFlagBits2KHR &el) } template <> -rdcstr DoStringise(const VkAccessFlagBits2KHR &el) +rdcstr DoStringise(const VkAccessFlagBits2 &el) { - BEGIN_BITFIELD_STRINGISE(VkAccessFlagBits2KHR); + BEGIN_BITFIELD_STRINGISE(VkAccessFlagBits2); { - STRINGISE_BITFIELD_VALUE(VK_ACCESS_2_NONE_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_INDEX_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_UNIFORM_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_WRITE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_TRANSFER_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_HOST_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_HOST_WRITE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_MEMORY_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_MEMORY_WRITE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR); + STRINGISE_BITFIELD_VALUE(VK_ACCESS_2_NONE); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_INDEX_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_UNIFORM_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_WRITE_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_TRANSFER_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_TRANSFER_WRITE_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_HOST_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_HOST_WRITE_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_MEMORY_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_MEMORY_WRITE_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_SAMPLED_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_STORAGE_READ_BIT); + STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT); STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT); STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT); STRINGISE_BITFIELD_BIT64(VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT); @@ -3182,55 +3222,56 @@ rdcstr DoStringise(const VkAccessFlagBits2KHR &el) } template <> -rdcstr DoStringise(const VkFormatFeatureFlagBits2KHR &el) +rdcstr DoStringise(const VkFormatFeatureFlagBits2 &el) { - BEGIN_BITFIELD_STRINGISE(VkFormatFeatureFlagBits2KHR); + BEGIN_BITFIELD_STRINGISE(VkFormatFeatureFlagBits2); { - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT_KHR); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_BLIT_SRC_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_BLIT_DST_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT); STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT); STRINGISE_BITFIELD_BIT64( - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR); + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT); STRINGISE_BITFIELD_BIT64( - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR); + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT); STRINGISE_BITFIELD_BIT64( - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR); - STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR); + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_DISJOINT_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT); STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR); STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT); STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR); + STRINGISE_BITFIELD_BIT64(VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV); } END_BITFIELD_STRINGISE(); } template <> -rdcstr DoStringise(const VkRenderingFlagBitsKHR &el) +rdcstr DoStringise(const VkRenderingFlagBits &el) { - BEGIN_BITFIELD_STRINGISE(VkRenderingFlagBitsKHR); + BEGIN_BITFIELD_STRINGISE(VkRenderingFlagBits); { - STRINGISE_BITFIELD_BIT(VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR); - STRINGISE_BITFIELD_BIT(VK_RENDERING_SUSPENDING_BIT_KHR); - STRINGISE_BITFIELD_BIT(VK_RENDERING_RESUMING_BIT_KHR); + STRINGISE_BITFIELD_BIT(VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT); + STRINGISE_BITFIELD_BIT(VK_RENDERING_SUSPENDING_BIT); + STRINGISE_BITFIELD_BIT(VK_RENDERING_RESUMING_BIT); } END_BITFIELD_STRINGISE(); } diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp index 199dafacd..b2ca3460a 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -48,7 +48,7 @@ static rdcstr ToHumanStr(const VkAttachmentStoreOp &el) { case VK_ATTACHMENT_STORE_OP_STORE: return "Store"; case VK_ATTACHMENT_STORE_OP_DONT_CARE: return "Don't Care"; - case VK_ATTACHMENT_STORE_OP_NONE_EXT: return "None"; + case VK_ATTACHMENT_STORE_OP_NONE: return "None"; } END_ENUM_STRINGISE(); } @@ -418,14 +418,14 @@ rdcstr WrappedVulkan::MakeRenderPassOpString(bool store) } // prepend suspend/resume info - if(!store && (dyn.flags & VK_RENDERING_RESUMING_BIT_KHR)) + if(!store && (dyn.flags & VK_RENDERING_RESUMING_BIT)) { if(opDesc.empty()) opDesc = "Resume"; else opDesc = "Resume, " + opDesc; } - else if(store && (dyn.flags & VK_RENDERING_SUSPENDING_BIT_KHR)) + else if(store && (dyn.flags & VK_RENDERING_SUSPENDING_BIT)) { if(opDesc.empty()) opDesc = "Suspend"; @@ -1348,22 +1348,22 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(SerialiserType &ser, VkCommandB // if we're not suspended, we were inside an active begin/end pair, so end it if(!suspended) { - ObjDisp(commandBuffer)->CmdEndRenderingKHR(Unwrap(commandBuffer)); + ObjDisp(commandBuffer)->CmdEndRendering(Unwrap(commandBuffer)); // now update the suspended state depending on what was declared when we began - suspended = (renderstate.dynamicRendering.flags & VK_RENDERING_SUSPENDING_BIT_KHR) != 0; + suspended = (renderstate.dynamicRendering.flags & VK_RENDERING_SUSPENDING_BIT) != 0; } // if we were suspended, or are now suspended after that end, do a quick resume & end if(suspended) { - VkRenderingInfoKHR info = {}; - info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO_KHR; + VkRenderingInfo info = {}; + info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO; // resume but don't suspend - end for real info.flags = renderstate.dynamicRendering.flags & - ~(VK_RENDERING_RESUMING_BIT_KHR | VK_RENDERING_SUSPENDING_BIT_KHR); - info.flags |= VK_RENDERING_RESUMING_BIT_KHR; + ~(VK_RENDERING_RESUMING_BIT | VK_RENDERING_SUSPENDING_BIT); + info.flags |= VK_RENDERING_RESUMING_BIT; info.layerCount = renderstate.dynamicRendering.layerCount; info.renderArea = renderstate.renderArea; @@ -1389,25 +1389,25 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(SerialiserType &ser, VkCommandB info.pNext = &fragmentDensity; byte *tempMem = GetTempMemory(GetNextPatchSize(&info)); - VkRenderingInfoKHR *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, &info); + VkRenderingInfo *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, &info); // do the same load/store patching as normal here too if(m_ReplayOptions.optimisation != ReplayOptimisationLevel::Fastest) { for(uint32_t i = 0; i < unwrappedInfo->colorAttachmentCount + 2; i++) { - VkRenderingAttachmentInfoKHR *att = - (VkRenderingAttachmentInfoKHR *)unwrappedInfo->pColorAttachments + i; + VkRenderingAttachmentInfo *att = + (VkRenderingAttachmentInfo *)unwrappedInfo->pColorAttachments + i; if(i == unwrappedInfo->colorAttachmentCount) - att = (VkRenderingAttachmentInfoKHR *)unwrappedInfo->pDepthAttachment; + att = (VkRenderingAttachmentInfo *)unwrappedInfo->pDepthAttachment; else if(i == unwrappedInfo->colorAttachmentCount + 1) - att = (VkRenderingAttachmentInfoKHR *)unwrappedInfo->pStencilAttachment; + att = (VkRenderingAttachmentInfo *)unwrappedInfo->pStencilAttachment; if(!att) continue; - if(att->storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(att->storeOp != VK_ATTACHMENT_STORE_OP_NONE) att->storeOp = VK_ATTACHMENT_STORE_OP_STORE; if(att->loadOp == VK_ATTACHMENT_LOAD_OP_DONT_CARE) @@ -1415,8 +1415,8 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(SerialiserType &ser, VkCommandB } } - ObjDisp(commandBuffer)->CmdBeginRenderingKHR(Unwrap(commandBuffer), unwrappedInfo); - ObjDisp(commandBuffer)->CmdEndRenderingKHR(Unwrap(commandBuffer)); + ObjDisp(commandBuffer)->CmdBeginRendering(Unwrap(commandBuffer), unwrappedInfo); + ObjDisp(commandBuffer)->CmdEndRendering(Unwrap(commandBuffer)); } } else @@ -2875,21 +2875,21 @@ bool WrappedVulkan::Serialise_vkCmdBindPipeline(SerialiserType &ser, VkCommandBu const VulkanCreationInfo::Pipeline &pipeInfo = m_CreationInfo.m_Pipeline[liveid]; if(!pipeInfo.dynamicStates[VkDynamicViewport] && - !pipeInfo.dynamicStates[VkDynamicViewportCountEXT]) + !pipeInfo.dynamicStates[VkDynamicViewportCount]) { renderstate.views = pipeInfo.viewports; } if(!pipeInfo.dynamicStates[VkDynamicScissor] && - !pipeInfo.dynamicStates[VkDynamicScissorCountEXT]) + !pipeInfo.dynamicStates[VkDynamicScissorCount]) { renderstate.scissors = pipeInfo.scissors; } - if(!pipeInfo.dynamicStates[VkDynamicViewportCountEXT]) + if(!pipeInfo.dynamicStates[VkDynamicViewportCount]) { renderstate.views.resize(RDCMIN(renderstate.views.size(), pipeInfo.viewports.size())); } - if(!pipeInfo.dynamicStates[VkDynamicScissorCountEXT]) + if(!pipeInfo.dynamicStates[VkDynamicScissorCount]) { renderstate.scissors.resize( RDCMIN(renderstate.scissors.size(), pipeInfo.scissors.size())); @@ -2944,39 +2944,39 @@ bool WrappedVulkan::Serialise_vkCmdBindPipeline(SerialiserType &ser, VkCommandBu renderstate.stippleFactor = pipeInfo.stippleFactor; renderstate.stipplePattern = pipeInfo.stipplePattern; } - if(!pipeInfo.dynamicStates[VkDynamicCullModeEXT]) + if(!pipeInfo.dynamicStates[VkDynamicCullMode]) { renderstate.cullMode = pipeInfo.cullMode; } - if(!pipeInfo.dynamicStates[VkDynamicFrontFaceEXT]) + if(!pipeInfo.dynamicStates[VkDynamicFrontFace]) { renderstate.frontFace = pipeInfo.frontFace; } - if(!pipeInfo.dynamicStates[VkDynamicPrimitiveTopologyEXT]) + if(!pipeInfo.dynamicStates[VkDynamicPrimitiveTopology]) { renderstate.primitiveTopology = pipeInfo.topology; } - if(!pipeInfo.dynamicStates[VkDynamicDepthTestEnableEXT]) + if(!pipeInfo.dynamicStates[VkDynamicDepthTestEnable]) { renderstate.depthTestEnable = pipeInfo.depthTestEnable; } - if(!pipeInfo.dynamicStates[VkDynamicDepthWriteEnableEXT]) + if(!pipeInfo.dynamicStates[VkDynamicDepthWriteEnable]) { renderstate.depthWriteEnable = pipeInfo.depthWriteEnable; } - if(!pipeInfo.dynamicStates[VkDynamicDepthCompareOpEXT]) + if(!pipeInfo.dynamicStates[VkDynamicDepthCompareOp]) { renderstate.depthCompareOp = pipeInfo.depthCompareOp; } - if(!pipeInfo.dynamicStates[VkDynamicDepthBoundsTestEnableEXT]) + if(!pipeInfo.dynamicStates[VkDynamicDepthBoundsTestEnable]) { renderstate.depthBoundsTestEnable = pipeInfo.depthBoundsEnable; } - if(!pipeInfo.dynamicStates[VkDynamicStencilTestEnableEXT]) + if(!pipeInfo.dynamicStates[VkDynamicStencilTestEnable]) { renderstate.stencilTestEnable = pipeInfo.stencilTestEnable; } - if(!pipeInfo.dynamicStates[VkDynamicStencilOpEXT]) + if(!pipeInfo.dynamicStates[VkDynamicStencilOp]) { renderstate.front.passOp = pipeInfo.front.passOp; renderstate.back.passOp = pipeInfo.back.passOp; @@ -2990,7 +2990,7 @@ bool WrappedVulkan::Serialise_vkCmdBindPipeline(SerialiserType &ser, VkCommandBu renderstate.front.compareOp = pipeInfo.front.compareOp; renderstate.back.compareOp = pipeInfo.back.compareOp; } - if(!pipeInfo.dynamicStates[VkDynamicVertexInputBindingStrideEXT]) + if(!pipeInfo.dynamicStates[VkDynamicVertexInputBindingStride]) { for(const VulkanCreationInfo::Pipeline::VertBinding &bind : pipeInfo.vertexBindings) { @@ -3004,7 +3004,7 @@ bool WrappedVulkan::Serialise_vkCmdBindPipeline(SerialiserType &ser, VkCommandBu for(size_t i = 0; i < renderstate.colorWriteEnable.size(); i++) renderstate.colorWriteEnable[i] = pipeInfo.attachments[i].channelWriteMask != 0; } - if(!pipeInfo.dynamicStates[VkDynamicDepthBiasEnableEXT]) + if(!pipeInfo.dynamicStates[VkDynamicDepthBiasEnable]) { renderstate.depthBiasEnable = pipeInfo.depthBiasEnable; } @@ -3016,11 +3016,11 @@ bool WrappedVulkan::Serialise_vkCmdBindPipeline(SerialiserType &ser, VkCommandBu { renderstate.patchControlPoints = pipeInfo.patchControlPoints; } - if(!pipeInfo.dynamicStates[VkDynamicPrimRestartEXT]) + if(!pipeInfo.dynamicStates[VkDynamicPrimRestart]) { renderstate.primRestartEnable = pipeInfo.primitiveRestartEnable; } - if(!pipeInfo.dynamicStates[VkDynamicRastDiscardEXT]) + if(!pipeInfo.dynamicStates[VkDynamicRastDiscard]) { renderstate.rastDiscardEnable = pipeInfo.rasterizerDiscardEnable; } @@ -3074,7 +3074,7 @@ bool WrappedVulkan::Serialise_vkCmdBindPipeline(SerialiserType &ser, VkCommandBu const VulkanCreationInfo::Pipeline &pipeInfo = m_CreationInfo.m_Pipeline[liveid]; - if(!pipeInfo.dynamicStates[VkDynamicPrimitiveTopologyEXT]) + if(!pipeInfo.dynamicStates[VkDynamicPrimitiveTopology]) { m_BakedCmdBufferInfo[m_LastCmdBufferID].state.primitiveTopology = pipeInfo.topology; } @@ -3331,7 +3331,7 @@ void WrappedVulkan::vkCmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32 } template -bool WrappedVulkan::Serialise_vkCmdBindVertexBuffers2EXT( +bool WrappedVulkan::Serialise_vkCmdBindVertexBuffers2( SerialiserType &ser, VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes, const VkDeviceSize *pStrides) @@ -3358,9 +3358,8 @@ bool WrappedVulkan::Serialise_vkCmdBindVertexBuffers2EXT( { commandBuffer = RerecordCmdBuf(m_LastCmdBufferID); ObjDisp(commandBuffer) - ->CmdBindVertexBuffers2EXT(Unwrap(commandBuffer), firstBinding, bindingCount, - UnwrapArray(pBuffers, bindingCount), pOffsets, pSizes, - pStrides); + ->CmdBindVertexBuffers2(Unwrap(commandBuffer), firstBinding, bindingCount, + UnwrapArray(pBuffers, bindingCount), pOffsets, pSizes, pStrides); { VulkanRenderState &renderstate = GetCmdRenderState(); @@ -3400,26 +3399,25 @@ bool WrappedVulkan::Serialise_vkCmdBindVertexBuffers2EXT( GetResID(pBuffers[i]); ObjDisp(commandBuffer) - ->CmdBindVertexBuffers2EXT(Unwrap(commandBuffer), firstBinding, bindingCount, - UnwrapArray(pBuffers, bindingCount), pOffsets, pSizes, pStrides); + ->CmdBindVertexBuffers2(Unwrap(commandBuffer), firstBinding, bindingCount, + UnwrapArray(pBuffers, bindingCount), pOffsets, pSizes, pStrides); } } return true; } -void WrappedVulkan::vkCmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, - uint32_t bindingCount, const VkBuffer *pBuffers, - const VkDeviceSize *pOffsets, - const VkDeviceSize *pSizes, - const VkDeviceSize *pStrides) +void WrappedVulkan::vkCmdBindVertexBuffers2(VkCommandBuffer commandBuffer, uint32_t firstBinding, + uint32_t bindingCount, const VkBuffer *pBuffers, + const VkDeviceSize *pOffsets, + const VkDeviceSize *pSizes, const VkDeviceSize *pStrides) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL(ObjDisp(commandBuffer) - ->CmdBindVertexBuffers2EXT( - Unwrap(commandBuffer), firstBinding, bindingCount, - UnwrapArray(pBuffers, bindingCount), pOffsets, pSizes, pStrides)); + ->CmdBindVertexBuffers2(Unwrap(commandBuffer), firstBinding, bindingCount, + UnwrapArray(pBuffers, bindingCount), pOffsets, + pSizes, pStrides)); if(IsCaptureMode(m_State)) { @@ -3427,9 +3425,9 @@ void WrappedVulkan::vkCmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, ui CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdBindVertexBuffers2EXT); - Serialise_vkCmdBindVertexBuffers2EXT(ser, commandBuffer, firstBinding, bindingCount, pBuffers, - pOffsets, pSizes, pStrides); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdBindVertexBuffers2); + Serialise_vkCmdBindVertexBuffers2(ser, commandBuffer, firstBinding, bindingCount, pBuffers, + pOffsets, pSizes, pStrides); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); for(uint32_t i = 0; i < bindingCount; i++) @@ -3940,9 +3938,9 @@ void WrappedVulkan::vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdPipelineBarrier2KHR(SerialiserType &ser, - VkCommandBuffer commandBuffer, - const VkDependencyInfoKHR *pDependencyInfo) +bool WrappedVulkan::Serialise_vkCmdPipelineBarrier2(SerialiserType &ser, + VkCommandBuffer commandBuffer, + const VkDependencyInfo *pDependencyInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_LOCAL(DependencyInfo, *pDependencyInfo).Important(); @@ -3951,8 +3949,8 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier2KHR(SerialiserType &ser, SERIALISE_CHECK_READ_ERRORS(); - rdcarray imgBarriers; - rdcarray bufBarriers; + rdcarray imgBarriers; + rdcarray bufBarriers; // it's possible for buffer or image to be NULL if it refers to a resource that is otherwise // not in the log (barriers do not mark resources referenced). If the resource in question does @@ -4001,7 +3999,7 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier2KHR(SerialiserType &ser, } } - VkDependencyInfoKHR UnwrappedDependencyInfo = DependencyInfo; + VkDependencyInfo UnwrappedDependencyInfo = DependencyInfo; UnwrappedDependencyInfo.pBufferMemoryBarriers = bufBarriers.data(); UnwrappedDependencyInfo.bufferMemoryBarrierCount = (uint32_t)bufBarriers.size(); @@ -4019,7 +4017,7 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier2KHR(SerialiserType &ser, { for(uint32_t i = 0; i < DependencyInfo.imageMemoryBarrierCount; i++) { - const VkImageMemoryBarrier2KHR &b = DependencyInfo.pImageMemoryBarriers[i]; + const VkImageMemoryBarrier2 &b = DependencyInfo.pImageMemoryBarriers[i]; if(b.image != VK_NULL_HANDLE && b.oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && b.newLayout != VK_IMAGE_LAYOUT_UNDEFINED) { @@ -4037,7 +4035,7 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier2KHR(SerialiserType &ser, (uint32_t)imgBarriers.size(), imgBarriers.data()); // now sanitise layouts before passing to vulkan - for(VkImageMemoryBarrier2KHR &barrier : imgBarriers) + for(VkImageMemoryBarrier2 &barrier : imgBarriers) { if(barrier.oldLayout == barrier.newLayout) { @@ -4059,14 +4057,14 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier2KHR(SerialiserType &ser, SanitiseReplayImageLayout(barrier.newLayout); } - ObjDisp(commandBuffer)->CmdPipelineBarrier2KHR(Unwrap(commandBuffer), &UnwrappedDependencyInfo); + ObjDisp(commandBuffer)->CmdPipelineBarrier2(Unwrap(commandBuffer), &UnwrappedDependencyInfo); if(IsActiveReplaying(m_State) && m_ReplayOptions.optimisation != ReplayOptimisationLevel::Fastest) { for(uint32_t i = 0; i < DependencyInfo.imageMemoryBarrierCount; i++) { - const VkImageMemoryBarrier2KHR &b = DependencyInfo.pImageMemoryBarriers[i]; + const VkImageMemoryBarrier2 &b = DependencyInfo.pImageMemoryBarriers[i]; if(b.image != VK_NULL_HANDLE && b.oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && b.newLayout != VK_IMAGE_LAYOUT_UNDEFINED) { @@ -4082,16 +4080,16 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier2KHR(SerialiserType &ser, return true; } -void WrappedVulkan::vkCmdPipelineBarrier2KHR(VkCommandBuffer commandBuffer, - const VkDependencyInfoKHR *pDependencyInfo) +void WrappedVulkan::vkCmdPipelineBarrier2(VkCommandBuffer commandBuffer, + const VkDependencyInfo *pDependencyInfo) { SCOPED_DBG_SINK(); byte *tempMem = GetTempMemory(GetNextPatchSize(pDependencyInfo)); - VkDependencyInfoKHR *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pDependencyInfo); + VkDependencyInfo *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pDependencyInfo); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdPipelineBarrier2KHR(Unwrap(commandBuffer), unwrappedInfo)); + ObjDisp(commandBuffer)->CmdPipelineBarrier2(Unwrap(commandBuffer), unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -4099,8 +4097,8 @@ void WrappedVulkan::vkCmdPipelineBarrier2KHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdPipelineBarrier2KHR); - Serialise_vkCmdPipelineBarrier2KHR(ser, commandBuffer, pDependencyInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdPipelineBarrier2); + Serialise_vkCmdPipelineBarrier2(ser, commandBuffer, pDependencyInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); @@ -4114,14 +4112,12 @@ void WrappedVulkan::vkCmdPipelineBarrier2KHR(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdWriteTimestamp2KHR(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, - VkQueryPool queryPool, uint32_t query) +bool WrappedVulkan::Serialise_vkCmdWriteTimestamp2(SerialiserType &ser, VkCommandBuffer commandBuffer, + VkPipelineStageFlags2 stage, + VkQueryPool queryPool, uint32_t query) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT_TYPED(VkPipelineStageFlagBits2KHR, stage) - .TypedAs("VkPipelineStageFlags2KHR"_lit); + SERIALISE_ELEMENT_TYPED(VkPipelineStageFlagBits2, stage).TypedAs("VkPipelineStageFlags2"_lit); SERIALISE_ELEMENT(queryPool).Important(); SERIALISE_ELEMENT(query).Important(); @@ -4143,23 +4139,20 @@ bool WrappedVulkan::Serialise_vkCmdWriteTimestamp2KHR(SerialiserType &ser, if(commandBuffer != VK_NULL_HANDLE) { - ObjDisp(commandBuffer) - ->CmdWriteTimestamp2KHR(Unwrap(commandBuffer), stage, Unwrap(queryPool), query); + ObjDisp(commandBuffer)->CmdWriteTimestamp2(Unwrap(commandBuffer), stage, Unwrap(queryPool), query); } } return true; } -void WrappedVulkan::vkCmdWriteTimestamp2KHR(VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, - uint32_t query) +void WrappedVulkan::vkCmdWriteTimestamp2(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, + VkQueryPool queryPool, uint32_t query) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer) - ->CmdWriteTimestamp2KHR(Unwrap(commandBuffer), stage, Unwrap(queryPool), query)); + ObjDisp(commandBuffer)->CmdWriteTimestamp2(Unwrap(commandBuffer), stage, Unwrap(queryPool), query)); if(IsCaptureMode(m_State)) { @@ -4167,8 +4160,8 @@ void WrappedVulkan::vkCmdWriteTimestamp2KHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdWriteTimestamp2KHR); - Serialise_vkCmdWriteTimestamp2KHR(ser, commandBuffer, stage, queryPool, query); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdWriteTimestamp2); + Serialise_vkCmdWriteTimestamp2(ser, commandBuffer, stage, queryPool, query); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); @@ -5075,11 +5068,11 @@ void WrappedVulkan::ApplyPushDescriptorWrites(VkPipelineBindPoint pipelineBindPo (*bind)[curIdx].imageInfo.SetFrom(writeDesc.pImageInfo[d], sampler, imageView); } } - else if(writeDesc.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(writeDesc.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { - VkWriteDescriptorSetInlineUniformBlockEXT *inlineWrite = - (VkWriteDescriptorSetInlineUniformBlockEXT *)FindNextStruct( - &writeDesc, VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT); + VkWriteDescriptorSetInlineUniformBlock *inlineWrite = + (VkWriteDescriptorSetInlineUniformBlock *)FindNextStruct( + &writeDesc, VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK); memcpy(inlineData.data() + (*bind)->inlineOffset + writeDesc.dstArrayElement, inlineWrite->pData, inlineWrite->dataSize); } @@ -5287,7 +5280,7 @@ void WrappedVulkan::vkCmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, imInfos[j].imageLayout = pDescriptorWrites[i].pImageInfo[j].imageLayout; } } - else if(pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // nothing to unwrap, the next chain contains the data which we can leave as-is } @@ -5358,7 +5351,7 @@ void WrappedVulkan::vkCmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, record->MarkResourceFrameReferenced(GetResID(write.pImageInfo[d].sampler), eFrameRef_Read); } - else if(write.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(write.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // no bindings in this type } @@ -5578,7 +5571,7 @@ void WrappedVulkan::vkCmdPushDescriptorSetWithTemplateKHR( } } } - else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // memcpy the data memcpy(dst, src, entry.descriptorCount); @@ -5706,13 +5699,12 @@ void WrappedVulkan::vkCmdWriteBufferMarkerAMD(VkCommandBuffer commandBuffer, template bool WrappedVulkan::Serialise_vkCmdWriteBufferMarker2AMD(SerialiserType &ser, VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, + VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) { SERIALISE_ELEMENT(commandBuffer); - SERIALISE_ELEMENT_TYPED(VkPipelineStageFlagBits2KHR, stage) - .TypedAs("VkPipelineStageFlags2KHR"_lit); + SERIALISE_ELEMENT_TYPED(VkPipelineStageFlagBits2, stage).TypedAs("VkPipelineStageFlags2"_lit); SERIALISE_ELEMENT(dstBuffer).Important(); SERIALISE_ELEMENT(dstOffset); SERIALISE_ELEMENT(marker).Important(); @@ -5745,7 +5737,7 @@ bool WrappedVulkan::Serialise_vkCmdWriteBufferMarker2AMD(SerialiserType &ser, } void WrappedVulkan::vkCmdWriteBufferMarker2AMD(VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, + VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) { SCOPED_DBG_SINK(); @@ -6646,9 +6638,8 @@ void WrappedVulkan::vkCmdSetVertexInputEXT( } template -bool WrappedVulkan::Serialise_vkCmdBeginRenderingKHR(SerialiserType &ser, - VkCommandBuffer commandBuffer, - const VkRenderingInfoKHR *pRenderingInfo) +bool WrappedVulkan::Serialise_vkCmdBeginRendering(SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkRenderingInfo *pRenderingInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_LOCAL(RenderingInfo, *pRenderingInfo).Named("pRenderingInfo"_lit).Important(); @@ -6662,7 +6653,7 @@ bool WrappedVulkan::Serialise_vkCmdBeginRenderingKHR(SerialiserType &ser, m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); byte *tempMem = GetTempMemory(GetNextPatchSize(pRenderingInfo)); - VkRenderingInfoKHR *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, &RenderingInfo); + VkRenderingInfo *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, &RenderingInfo); if(IsActiveReplaying(m_State)) { @@ -6720,9 +6711,9 @@ bool WrappedVulkan::Serialise_vkCmdBeginRenderingKHR(SerialiserType &ser, // only do discards when not resuming! if(m_ReplayOptions.optimisation != ReplayOptimisationLevel::Fastest && - (RenderingInfo.flags & VK_RENDERING_RESUMING_BIT_KHR) == 0) + (RenderingInfo.flags & VK_RENDERING_RESUMING_BIT) == 0) { - rdcarray dynAtts = renderstate.dynamicRendering.color; + rdcarray dynAtts = renderstate.dynamicRendering.color; dynAtts.push_back(renderstate.dynamicRendering.depth); size_t depthIdx = dynAtts.size() - 1; @@ -6781,18 +6772,18 @@ bool WrappedVulkan::Serialise_vkCmdBeginRenderingKHR(SerialiserType &ser, { for(uint32_t i = 0; i < unwrappedInfo->colorAttachmentCount + 2; i++) { - VkRenderingAttachmentInfoKHR *att = - (VkRenderingAttachmentInfoKHR *)unwrappedInfo->pColorAttachments + i; + VkRenderingAttachmentInfo *att = + (VkRenderingAttachmentInfo *)unwrappedInfo->pColorAttachments + i; if(i == unwrappedInfo->colorAttachmentCount) - att = (VkRenderingAttachmentInfoKHR *)unwrappedInfo->pDepthAttachment; + att = (VkRenderingAttachmentInfo *)unwrappedInfo->pDepthAttachment; else if(i == unwrappedInfo->colorAttachmentCount + 1) - att = (VkRenderingAttachmentInfoKHR *)unwrappedInfo->pStencilAttachment; + att = (VkRenderingAttachmentInfo *)unwrappedInfo->pStencilAttachment; if(!att) continue; - if(att->storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(att->storeOp != VK_ATTACHMENT_STORE_OP_NONE) att->storeOp = VK_ATTACHMENT_STORE_OP_STORE; if(att->loadOp == VK_ATTACHMENT_LOAD_OP_DONT_CARE) @@ -6800,18 +6791,18 @@ bool WrappedVulkan::Serialise_vkCmdBeginRenderingKHR(SerialiserType &ser, } } - ObjDisp(commandBuffer)->CmdBeginRenderingKHR(Unwrap(commandBuffer), unwrappedInfo); + ObjDisp(commandBuffer)->CmdBeginRendering(Unwrap(commandBuffer), unwrappedInfo); if(eventId && m_ActionCallback->PostMisc(eventId, drawFlags, commandBuffer)) { - // Do not call vkCmdBeginRenderingKHR again. + // Do not call vkCmdBeginRendering again. m_ActionCallback->PostRemisc(eventId, drawFlags, commandBuffer); } } } else { - ObjDisp(commandBuffer)->CmdBeginRenderingKHR(Unwrap(commandBuffer), unwrappedInfo); + ObjDisp(commandBuffer)->CmdBeginRendering(Unwrap(commandBuffer), unwrappedInfo); VulkanRenderState &renderstate = m_BakedCmdBufferInfo[m_LastCmdBufferID].state; @@ -6856,13 +6847,13 @@ bool WrappedVulkan::Serialise_vkCmdBeginRenderingKHR(SerialiserType &ser, for(size_t i = 0; i < renderstate.dynamicRendering.color.size() + 2; i++) { - VkRenderingAttachmentInfoKHR *att = - (VkRenderingAttachmentInfoKHR *)&renderstate.dynamicRendering.color[i]; + VkRenderingAttachmentInfo *att = + (VkRenderingAttachmentInfo *)&renderstate.dynamicRendering.color[i]; if(i == renderstate.dynamicRendering.color.size()) - att = (VkRenderingAttachmentInfoKHR *)&renderstate.dynamicRendering.depth; + att = (VkRenderingAttachmentInfo *)&renderstate.dynamicRendering.depth; else if(i == renderstate.dynamicRendering.color.size() + 1) - att = (VkRenderingAttachmentInfoKHR *)&renderstate.dynamicRendering.stencil; + att = (VkRenderingAttachmentInfo *)&renderstate.dynamicRendering.stencil; if(!att || att->imageView == VK_NULL_HANDLE) continue; @@ -6881,7 +6872,7 @@ bool WrappedVulkan::Serialise_vkCmdBeginRenderingKHR(SerialiserType &ser, AddEvent(); ActionDescription action; action.customName = - StringFormat::Fmt("vkCmdBeginRenderingKHR(%s)", MakeRenderPassOpString(false).c_str()); + StringFormat::Fmt("vkCmdBeginRendering(%s)", MakeRenderPassOpString(false).c_str()); action.flags |= ActionFlags::PassBoundary | ActionFlags::BeginPass; AddAction(action); @@ -6891,16 +6882,15 @@ bool WrappedVulkan::Serialise_vkCmdBeginRenderingKHR(SerialiserType &ser, return true; } -void WrappedVulkan::vkCmdBeginRenderingKHR(VkCommandBuffer commandBuffer, - const VkRenderingInfoKHR *pRenderingInfo) +void WrappedVulkan::vkCmdBeginRendering(VkCommandBuffer commandBuffer, + const VkRenderingInfo *pRenderingInfo) { SCOPED_DBG_SINK(); byte *tempMem = GetTempMemory(GetNextPatchSize(pRenderingInfo)); - VkRenderingInfoKHR *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pRenderingInfo); + VkRenderingInfo *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pRenderingInfo); - SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdBeginRenderingKHR(Unwrap(commandBuffer), unwrappedInfo)); + SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdBeginRendering(Unwrap(commandBuffer), unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -6908,14 +6898,14 @@ void WrappedVulkan::vkCmdBeginRenderingKHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdBeginRenderingKHR); - Serialise_vkCmdBeginRenderingKHR(ser, commandBuffer, pRenderingInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdBeginRendering); + Serialise_vkCmdBeginRendering(ser, commandBuffer, pRenderingInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); for(uint32_t i = 0; i < pRenderingInfo->colorAttachmentCount + 2; i++) { - const VkRenderingAttachmentInfoKHR *att = pRenderingInfo->pColorAttachments + i; + const VkRenderingAttachmentInfo *att = pRenderingInfo->pColorAttachments + i; if(i == pRenderingInfo->colorAttachmentCount) att = pRenderingInfo->pDepthAttachment; @@ -6964,7 +6954,7 @@ void WrappedVulkan::vkCmdBeginRenderingKHR(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdEndRenderingKHR(SerialiserType &ser, VkCommandBuffer commandBuffer) +bool WrappedVulkan::Serialise_vkCmdEndRendering(SerialiserType &ser, VkCommandBuffer commandBuffer) { SERIALISE_ELEMENT(commandBuffer); @@ -6984,7 +6974,7 @@ bool WrappedVulkan::Serialise_vkCmdEndRenderingKHR(SerialiserType &ser, VkComman VulkanRenderState &renderstate = GetCmdRenderState(); - bool suspending = (renderstate.dynamicRendering.flags & VK_RENDERING_SUSPENDING_BIT_KHR) != 0; + bool suspending = (renderstate.dynamicRendering.flags & VK_RENDERING_SUSPENDING_BIT) != 0; if(ShouldUpdateRenderState(m_LastCmdBufferID, true)) { @@ -6996,18 +6986,18 @@ bool WrappedVulkan::Serialise_vkCmdEndRenderingKHR(SerialiserType &ser, VkComman ActionFlags drawFlags = ActionFlags::PassBoundary | ActionFlags::EndPass; uint32_t eventId = HandlePreCallback(commandBuffer, drawFlags); - ObjDisp(commandBuffer)->CmdEndRenderingKHR(Unwrap(commandBuffer)); + ObjDisp(commandBuffer)->CmdEndRendering(Unwrap(commandBuffer)); if(eventId && m_ActionCallback->PostMisc(eventId, drawFlags, commandBuffer)) { - // Do not call vkCmdEndRenderingKHR again. + // Do not call vkCmdEndRendering again. m_ActionCallback->PostRemisc(eventId, drawFlags, commandBuffer); } // only do discards when not suspending! if(m_ReplayOptions.optimisation != ReplayOptimisationLevel::Fastest && !suspending) { - rdcarray dynAtts = renderstate.dynamicRendering.color; + rdcarray dynAtts = renderstate.dynamicRendering.color; dynAtts.push_back(renderstate.dynamicRendering.depth); size_t depthIdx = dynAtts.size() - 1; @@ -7069,7 +7059,7 @@ bool WrappedVulkan::Serialise_vkCmdEndRenderingKHR(SerialiserType &ser, VkComman } else { - ObjDisp(commandBuffer)->CmdEndRenderingKHR(Unwrap(commandBuffer)); + ObjDisp(commandBuffer)->CmdEndRendering(Unwrap(commandBuffer)); // fetch any queued indirect readbacks here for(const VkIndirectRecordData &indirectcopy : @@ -7086,9 +7076,9 @@ bool WrappedVulkan::Serialise_vkCmdEndRenderingKHR(SerialiserType &ser, VkComman VulkanRenderState::DynamicRendering &dyn = state.dynamicRendering; - bool suspending = (dyn.flags & VK_RENDERING_SUSPENDING_BIT_KHR) != 0; + bool suspending = (dyn.flags & VK_RENDERING_SUSPENDING_BIT) != 0; - rdcarray dynAtts = dyn.color; + rdcarray dynAtts = dyn.color; dynAtts.push_back(dyn.depth); // if stencil attachment is different, or only one is resolving, add the stencil attachment. @@ -7121,7 +7111,7 @@ bool WrappedVulkan::Serialise_vkCmdEndRenderingKHR(SerialiserType &ser, VkComman AddEvent(); ActionDescription action; action.customName = - StringFormat::Fmt("vkCmdEndRenderingKHR(%s)", MakeRenderPassOpString(true).c_str()); + StringFormat::Fmt("vkCmdEndRendering(%s)", MakeRenderPassOpString(true).c_str()); action.flags |= ActionFlags::PassBoundary | ActionFlags::EndPass; AddAction(action); @@ -7139,11 +7129,11 @@ bool WrappedVulkan::Serialise_vkCmdEndRenderingKHR(SerialiserType &ser, VkComman return true; } -void WrappedVulkan::vkCmdEndRenderingKHR(VkCommandBuffer commandBuffer) +void WrappedVulkan::vkCmdEndRendering(VkCommandBuffer commandBuffer) { SCOPED_DBG_SINK(); - SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdEndRenderingKHR(Unwrap(commandBuffer))); + SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdEndRendering(Unwrap(commandBuffer))); if(IsCaptureMode(m_State)) { @@ -7151,8 +7141,8 @@ void WrappedVulkan::vkCmdEndRenderingKHR(VkCommandBuffer commandBuffer) CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdEndRenderingKHR); - Serialise_vkCmdEndRenderingKHR(ser, commandBuffer); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdEndRendering); + Serialise_vkCmdEndRendering(ser, commandBuffer); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } @@ -7266,7 +7256,7 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdWriteBufferMarkerAMD, VkCommandBuffer VkDeviceSize dstOffset, uint32_t marker); INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdWriteBufferMarker2AMD, VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, + VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBeginDebugUtilsLabelEXT, VkCommandBuffer commandBuffer, @@ -7303,17 +7293,16 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBeginConditionalRenderingEXT, const VkConditionalRenderingBeginInfoEXT *pConditionalRenderingBegin); INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdEndConditionalRenderingEXT, VkCommandBuffer commandBuffer); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBindVertexBuffers2EXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBindVertexBuffers2, VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes, const VkDeviceSize *pStrides); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdPipelineBarrier2KHR, VkCommandBuffer commandBuffer, - const VkDependencyInfoKHR *pDependencyInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdPipelineBarrier2, VkCommandBuffer commandBuffer, + const VkDependencyInfo *pDependencyInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdWriteTimestamp2KHR, VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, - uint32_t query); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdWriteTimestamp2, VkCommandBuffer commandBuffer, + VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query); INSTANTIATE_FUNCTION_SERIALISED( void, vkCmdSetVertexInputEXT, VkCommandBuffer commandBuffer, @@ -7322,7 +7311,7 @@ INSTANTIATE_FUNCTION_SERIALISED( uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT *pVertexAttributeDescriptions); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBeginRenderingKHR, VkCommandBuffer commandBuffer, - const VkRenderingInfoKHR *pRenderingInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBeginRendering, VkCommandBuffer commandBuffer, + const VkRenderingInfo *pRenderingInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdEndRenderingKHR, VkCommandBuffer commandBuffer); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdEndRendering, VkCommandBuffer commandBuffer); diff --git a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp index 36a98aab0..58815adb0 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp @@ -109,7 +109,7 @@ VkWriteDescriptorSet WrappedVulkan::UnwrapInfo(const VkWriteDescriptorSet *write ret.dstSet = Unwrap(ret.dstSet); // nothing to unwrap for inline uniform block - if(ret.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(ret.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) return ret; RDCCOMPILE_ASSERT(sizeof(VkDescriptorBufferInfo) >= sizeof(VkDescriptorImageInfo), @@ -817,7 +817,7 @@ void WrappedVulkan::ReplayDescriptorSetWrite(VkDevice device, const VkWriteDescr valid &= (writeDesc.pBufferInfo[i].buffer != VK_NULL_HANDLE); break; } - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: break; + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: break; default: RDCERR("Unexpected descriptor type %d", writeDesc.descriptorType); } @@ -901,11 +901,11 @@ void WrappedVulkan::ReplayDescriptorSetWrite(VkDevice device, const VkWriteDescr (*bind)[curIdx].imageInfo.SetFrom(writeDesc.pImageInfo[d], sampler, imageView); } } - else if(writeDesc.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(writeDesc.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { - VkWriteDescriptorSetInlineUniformBlockEXT *inlineWrite = - (VkWriteDescriptorSetInlineUniformBlockEXT *)FindNextStruct( - &writeDesc, VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT); + VkWriteDescriptorSetInlineUniformBlock *inlineWrite = + (VkWriteDescriptorSetInlineUniformBlock *)FindNextStruct( + &writeDesc, VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK); memcpy(inlineData.data() + (*bind)->inlineOffset + writeDesc.dstArrayElement, inlineWrite->pData, inlineWrite->dataSize); } @@ -972,7 +972,7 @@ void WrappedVulkan::ReplayDescriptorSetCopy(VkDevice device, const VkCopyDescrip for(uint32_t d = 0; d < copyDesc.descriptorCount; d++, curSrcIdx++, curDstIdx++) { - if(layoutSrcBinding->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(layoutSrcBinding->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // inline uniform blocks are special, the descriptor count is a byte count. The layouts may // not match so inline offsets might not match, so we just copy the data and break. @@ -1144,7 +1144,7 @@ void WrappedVulkan::vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount, imInfos[j].imageLayout = pDescriptorWrites[i].pImageInfo[j].imageLayout; } } - else if(pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(pDescriptorWrites[i].descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // nothing to unwrap, the next chain contains the data which we can leave as-is } @@ -1331,11 +1331,11 @@ void WrappedVulkan::vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount, bind.imageInfo.SetFrom(descWrite.pImageInfo[d], sampler, imageView); } - else if(descWrite.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(descWrite.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { - VkWriteDescriptorSetInlineUniformBlockEXT *inlineWrite = - (VkWriteDescriptorSetInlineUniformBlockEXT *)FindNextStruct( - &descWrite, VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT); + VkWriteDescriptorSetInlineUniformBlock *inlineWrite = + (VkWriteDescriptorSetInlineUniformBlock *)FindNextStruct( + &descWrite, VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK); memcpy(inlineData.data() + (*binding)->inlineOffset + descWrite.dstArrayElement, inlineWrite->pData, inlineWrite->dataSize); @@ -1385,7 +1385,7 @@ void WrappedVulkan::vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount, for(uint32_t d = 0; d < pDescriptorCopies[i].descriptorCount; d++, curSrcIdx++, curDstIdx++) { - if(srclayoutBinding->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + if(srclayoutBinding->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // inline uniform blocks are special, the descriptor count is a byte count. The layouts // may not match so inline offsets might not match, so we just copy the data and break. @@ -1617,7 +1617,7 @@ void WrappedVulkan::vkUpdateDescriptorSetWithTemplate( src += entry.stride; } } - else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { // memcpy the data memcpy(dst, src, entry.descriptorCount); @@ -1748,7 +1748,7 @@ void WrappedVulkan::vkUpdateDescriptorSetWithTemplate( bind.imageInfo.SetFrom(srcInfo, sampler, imageView); } - else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { memcpy(inlineData.data() + bind.inlineOffset + entry.dstArrayElement, src, entry.descriptorCount); diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 92d61fad8..4d342e012 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -1601,14 +1601,14 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi RDCLOG("Creating replay device from physical device %u", physicalDeviceIndex); - rdcarray queuePriorities; + rdcarray queuePriorities; for(uint32_t i = 0; i < CreateInfo.queueCreateInfoCount; i++) { - VkDeviceQueueGlobalPriorityCreateInfoEXT *queuePrio = - (VkDeviceQueueGlobalPriorityCreateInfoEXT *)FindNextStruct( + VkDeviceQueueGlobalPriorityCreateInfoKHR *queuePrio = + (VkDeviceQueueGlobalPriorityCreateInfoKHR *)FindNextStruct( &CreateInfo.pQueueCreateInfos[i], - VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT); + VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR); if(queuePrio) queuePriorities.push_back(queuePrio); @@ -2054,14 +2054,21 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi // remove structs from extensions that we have stripped but may still be referenced here, // to ensure we don't pass structs for disabled extensions. - if(RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT) || - RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT)) + bool private_data = false; + private_data |= RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO); + private_data |= + RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES); + if(private_data) { RDCLOG("Removed VK_EXT_private_data structs from vkCreateDevice pNext chain"); } - if(RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR) || - RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR)) + bool present_id = false; + present_id |= + RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR); + present_id |= + RemoveNextStruct(&createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR); + if(present_id) { RDCLOG("Removed VK_KHR_present_id/wait structs from vkCreateDevice pNext chain"); } @@ -2257,6 +2264,27 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceVulkan13Features, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES); + { + CHECK_PHYS_EXT_FEATURE(robustImageAccess); + CHECK_PHYS_EXT_FEATURE(inlineUniformBlock); + CHECK_PHYS_EXT_FEATURE(descriptorBindingInlineUniformBlockUpdateAfterBind); + CHECK_PHYS_EXT_FEATURE(pipelineCreationCacheControl); + CHECK_PHYS_EXT_FEATURE(privateData); + CHECK_PHYS_EXT_FEATURE(shaderDemoteToHelperInvocation); + CHECK_PHYS_EXT_FEATURE(shaderTerminateInvocation); + CHECK_PHYS_EXT_FEATURE(subgroupSizeControl); + CHECK_PHYS_EXT_FEATURE(computeFullSubgroups); + CHECK_PHYS_EXT_FEATURE(synchronization2); + CHECK_PHYS_EXT_FEATURE(textureCompressionASTC_HDR); + CHECK_PHYS_EXT_FEATURE(shaderZeroInitializeWorkgroupMemory); + CHECK_PHYS_EXT_FEATURE(dynamicRendering); + CHECK_PHYS_EXT_FEATURE(shaderIntegerDotProduct); + CHECK_PHYS_EXT_FEATURE(maintenance4); + } + END_PHYS_EXT_CHECK(); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDevice8BitStorageFeatures, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES); { @@ -2496,8 +2524,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi END_PHYS_EXT_CHECK(); BEGIN_PHYS_EXT_CHECK( - VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT); + VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES); { CHECK_PHYS_EXT_FEATURE(shaderDemoteToHelperInvocation); } @@ -2524,8 +2552,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceSubgroupSizeControlFeaturesEXT, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceSubgroupSizeControlFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES); { CHECK_PHYS_EXT_FEATURE(subgroupSizeControl); CHECK_PHYS_EXT_FEATURE(computeFullSubgroups); @@ -2603,9 +2631,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK( - VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES); { CHECK_PHYS_EXT_FEATURE(separateDepthStencilLayouts); @@ -2621,8 +2648,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceInlineUniformBlockFeaturesEXT, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceInlineUniformBlockFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES); { CHECK_PHYS_EXT_FEATURE(inlineUniformBlock); CHECK_PHYS_EXT_FEATURE(descriptorBindingInlineUniformBlockUpdateAfterBind); @@ -2649,8 +2676,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi END_PHYS_EXT_CHECK(); BEGIN_PHYS_EXT_CHECK( - VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT); + VkPhysicalDevicePipelineCreationCacheControlFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES); { CHECK_PHYS_EXT_FEATURE(pipelineCreationCacheControl); } @@ -2673,16 +2700,15 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK( - VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceShaderTerminateInvocationFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES); { CHECK_PHYS_EXT_FEATURE(shaderTerminateInvocation); } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceImageRobustnessFeaturesEXT, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceImageRobustnessFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES); { CHECK_PHYS_EXT_FEATURE(robustImageAccess); } @@ -2715,8 +2741,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi END_PHYS_EXT_CHECK(); BEGIN_PHYS_EXT_CHECK( - VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR); + VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES); { CHECK_PHYS_EXT_FEATURE(shaderZeroInitializeWorkgroupMemory); } @@ -2733,22 +2759,22 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceSynchronization2FeaturesKHR, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceSynchronization2Features, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES); { CHECK_PHYS_EXT_FEATURE(synchronization2); } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceMaintenance4FeaturesKHR, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceMaintenance4Features, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES); { CHECK_PHYS_EXT_FEATURE(maintenance4); } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceShaderIntegerDotProductFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES); { CHECK_PHYS_EXT_FEATURE(shaderIntegerDotProduct); } @@ -2794,8 +2820,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR); { CHECK_PHYS_EXT_FEATURE(globalPriorityQuery); } @@ -2830,8 +2856,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceDynamicRenderingFeaturesKHR, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceDynamicRenderingFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES); { CHECK_PHYS_EXT_FEATURE(dynamicRendering); } @@ -2845,9 +2871,8 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } END_PHYS_EXT_CHECK(); - BEGIN_PHYS_EXT_CHECK( - VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT); + BEGIN_PHYS_EXT_CHECK(VkPhysicalDeviceTextureCompressionASTCHDRFeatures, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES); { CHECK_PHYS_EXT_FEATURE(textureCompressionASTC_HDR); } @@ -3318,7 +3343,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi { RDCWARN("Failed to create logical device: %s. Reducing queue priorities", ToStr(vkr).c_str()); - for(VkDeviceQueueGlobalPriorityCreateInfoEXT *q : queuePriorities) + for(VkDeviceQueueGlobalPriorityCreateInfoKHR *q : queuePriorities) { // medium is considered the default if no priority is set otherwise if(q->globalPriority > VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT) @@ -3750,9 +3775,9 @@ VkResult WrappedVulkan::vkCreateDevice(VkPhysicalDevice physicalDevice, // check features that we care about at capture time - const VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR *separateDepthStencilFeatures = - (const VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR *)FindNextStruct( - &createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR); + const VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *separateDepthStencilFeatures = + (const VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *)FindNextStruct( + &createInfo, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES); if(separateDepthStencilFeatures) m_SeparateDepthStencil |= (separateDepthStencilFeatures->separateDepthStencilLayouts != VK_FALSE); diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp index b25c221b0..cca3f9a06 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp @@ -3514,8 +3514,8 @@ void WrappedVulkan::vkCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdCopyBuffer2KHR(SerialiserType &ser, VkCommandBuffer commandBuffer, - const VkCopyBufferInfo2KHR *pCopyBufferInfo) +bool WrappedVulkan::Serialise_vkCmdCopyBuffer2(SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkCopyBufferInfo2 *pCopyBufferInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_LOCAL(CopyInfo, *pCopyBufferInfo).Important(); @@ -3526,13 +3526,13 @@ bool WrappedVulkan::Serialise_vkCmdCopyBuffer2KHR(SerialiserType &ser, VkCommand if(IsReplayingAndReading()) { - VkCopyBufferInfo2KHR unwrappedInfo = CopyInfo; + VkCopyBufferInfo2 unwrappedInfo = CopyInfo; unwrappedInfo.srcBuffer = Unwrap(unwrappedInfo.srcBuffer); unwrappedInfo.dstBuffer = Unwrap(unwrappedInfo.dstBuffer); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkCopyBufferInfo2KHR", tempMem, (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkCopyBufferInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); @@ -3544,11 +3544,11 @@ bool WrappedVulkan::Serialise_vkCmdCopyBuffer2KHR(SerialiserType &ser, VkCommand uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::Copy); - ObjDisp(commandBuffer)->CmdCopyBuffer2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyBuffer2(Unwrap(commandBuffer), &unwrappedInfo); if(eventId && m_ActionCallback->PostMisc(eventId, ActionFlags::Copy, commandBuffer)) { - ObjDisp(commandBuffer)->CmdCopyBuffer2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyBuffer2(Unwrap(commandBuffer), &unwrappedInfo); m_ActionCallback->PostRemisc(eventId, ActionFlags::Copy, commandBuffer); } @@ -3556,7 +3556,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyBuffer2KHR(SerialiserType &ser, VkCommand } else { - ObjDisp(commandBuffer)->CmdCopyBuffer2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyBuffer2(Unwrap(commandBuffer), &unwrappedInfo); { AddEvent(); @@ -3598,21 +3598,20 @@ bool WrappedVulkan::Serialise_vkCmdCopyBuffer2KHR(SerialiserType &ser, VkCommand return true; } -void WrappedVulkan::vkCmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, - const VkCopyBufferInfo2KHR *pCopyBufferInfo) +void WrappedVulkan::vkCmdCopyBuffer2(VkCommandBuffer commandBuffer, + const VkCopyBufferInfo2 *pCopyBufferInfo) { SCOPED_DBG_SINK(); - VkCopyBufferInfo2KHR unwrappedInfo = *pCopyBufferInfo; + VkCopyBufferInfo2 unwrappedInfo = *pCopyBufferInfo; unwrappedInfo.srcBuffer = Unwrap(unwrappedInfo.srcBuffer); unwrappedInfo.dstBuffer = Unwrap(unwrappedInfo.dstBuffer); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkCopyBufferInfo2KHR", tempMem, (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkCopyBufferInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); - SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdCopyBuffer2KHR(Unwrap(commandBuffer), &unwrappedInfo)); + SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdCopyBuffer2(Unwrap(commandBuffer), &unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -3621,8 +3620,8 @@ void WrappedVulkan::vkCmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); ser.SetActionChunk(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdCopyBuffer2KHR); - Serialise_vkCmdCopyBuffer2KHR(ser, commandBuffer, pCopyBufferInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdCopyBuffer2); + Serialise_vkCmdCopyBuffer2(ser, commandBuffer, pCopyBufferInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); @@ -3639,8 +3638,8 @@ void WrappedVulkan::vkCmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdCopyImage2KHR(SerialiserType &ser, VkCommandBuffer commandBuffer, - const VkCopyImageInfo2KHR *pCopyImageInfo) +bool WrappedVulkan::Serialise_vkCmdCopyImage2(SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkCopyImageInfo2 *pCopyImageInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_LOCAL(CopyInfo, *pCopyImageInfo).Important(); @@ -3651,13 +3650,13 @@ bool WrappedVulkan::Serialise_vkCmdCopyImage2KHR(SerialiserType &ser, VkCommandB if(IsReplayingAndReading()) { - VkCopyImageInfo2KHR unwrappedInfo = CopyInfo; + VkCopyImageInfo2 unwrappedInfo = CopyInfo; unwrappedInfo.srcImage = Unwrap(unwrappedInfo.srcImage); unwrappedInfo.dstImage = Unwrap(unwrappedInfo.dstImage); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkCopyImageInfo2KHR", tempMem, (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkCopyImageInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); @@ -3669,11 +3668,11 @@ bool WrappedVulkan::Serialise_vkCmdCopyImage2KHR(SerialiserType &ser, VkCommandB uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::Copy); - ObjDisp(commandBuffer)->CmdCopyImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyImage2(Unwrap(commandBuffer), &unwrappedInfo); if(eventId && m_ActionCallback->PostMisc(eventId, ActionFlags::Copy, commandBuffer)) { - ObjDisp(commandBuffer)->CmdCopyImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyImage2(Unwrap(commandBuffer), &unwrappedInfo); m_ActionCallback->PostRemisc(eventId, ActionFlags::Copy, commandBuffer); } @@ -3681,7 +3680,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyImage2KHR(SerialiserType &ser, VkCommandB } else { - ObjDisp(commandBuffer)->CmdCopyImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyImage2(Unwrap(commandBuffer), &unwrappedInfo); { AddEvent(); @@ -3723,20 +3722,20 @@ bool WrappedVulkan::Serialise_vkCmdCopyImage2KHR(SerialiserType &ser, VkCommandB return true; } -void WrappedVulkan::vkCmdCopyImage2KHR(VkCommandBuffer commandBuffer, - const VkCopyImageInfo2KHR *pCopyImageInfo) +void WrappedVulkan::vkCmdCopyImage2(VkCommandBuffer commandBuffer, + const VkCopyImageInfo2 *pCopyImageInfo) { SCOPED_DBG_SINK(); - VkCopyImageInfo2KHR unwrappedInfo = *pCopyImageInfo; + VkCopyImageInfo2 unwrappedInfo = *pCopyImageInfo; unwrappedInfo.srcImage = Unwrap(unwrappedInfo.srcImage); unwrappedInfo.dstImage = Unwrap(unwrappedInfo.dstImage); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkCopyImageInfo2KHR", tempMem, (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkCopyImageInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); - SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdCopyImage2KHR(Unwrap(commandBuffer), &unwrappedInfo)); + SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdCopyImage2(Unwrap(commandBuffer), &unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -3745,14 +3744,14 @@ void WrappedVulkan::vkCmdCopyImage2KHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); ser.SetActionChunk(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdCopyImage2KHR); - Serialise_vkCmdCopyImage2KHR(ser, commandBuffer, pCopyImageInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdCopyImage2); + Serialise_vkCmdCopyImage2(ser, commandBuffer, pCopyImageInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); for(uint32_t i = 0; i < pCopyImageInfo->regionCount; i++) { - const VkImageCopy2KHR ®ion = pCopyImageInfo->pRegions[i]; + const VkImageCopy2 ®ion = pCopyImageInfo->pRegions[i]; ImageRange srcRange(region.srcSubresource); srcRange.offset = region.srcOffset; @@ -3770,9 +3769,9 @@ void WrappedVulkan::vkCmdCopyImage2KHR(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage2KHR( +bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage2( SerialiserType &ser, VkCommandBuffer commandBuffer, - const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo) + const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_LOCAL(CopyInfo, *pCopyBufferToImageInfo); @@ -3783,13 +3782,13 @@ bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage2KHR( if(IsReplayingAndReading()) { - VkCopyBufferToImageInfo2KHR unwrappedInfo = CopyInfo; + VkCopyBufferToImageInfo2 unwrappedInfo = CopyInfo; unwrappedInfo.srcBuffer = Unwrap(unwrappedInfo.srcBuffer); unwrappedInfo.dstImage = Unwrap(unwrappedInfo.dstImage); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkCopyBufferToImageInfo2KHR", tempMem, + UnwrapNextChain(m_State, "VkCopyBufferToImageInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); @@ -3802,11 +3801,11 @@ bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage2KHR( uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::Copy); - ObjDisp(commandBuffer)->CmdCopyBufferToImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyBufferToImage2(Unwrap(commandBuffer), &unwrappedInfo); if(eventId && m_ActionCallback->PostMisc(eventId, ActionFlags::Copy, commandBuffer)) { - ObjDisp(commandBuffer)->CmdCopyBufferToImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyBufferToImage2(Unwrap(commandBuffer), &unwrappedInfo); m_ActionCallback->PostRemisc(eventId, ActionFlags::Copy, commandBuffer); } @@ -3814,7 +3813,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage2KHR( } else { - ObjDisp(commandBuffer)->CmdCopyBufferToImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyBufferToImage2(Unwrap(commandBuffer), &unwrappedInfo); { AddEvent(); @@ -3851,22 +3850,21 @@ bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage2KHR( return true; } -void WrappedVulkan::vkCmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, - const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo) +void WrappedVulkan::vkCmdCopyBufferToImage2(VkCommandBuffer commandBuffer, + const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) { SCOPED_DBG_SINK(); - VkCopyBufferToImageInfo2KHR unwrappedInfo = *pCopyBufferToImageInfo; + VkCopyBufferToImageInfo2 unwrappedInfo = *pCopyBufferToImageInfo; unwrappedInfo.srcBuffer = Unwrap(unwrappedInfo.srcBuffer); unwrappedInfo.dstImage = Unwrap(unwrappedInfo.dstImage); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkCopyBufferToImageInfo2KHR", tempMem, - (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkCopyBufferToImageInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdCopyBufferToImage2KHR(Unwrap(commandBuffer), &unwrappedInfo)); + ObjDisp(commandBuffer)->CmdCopyBufferToImage2(Unwrap(commandBuffer), &unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -3875,12 +3873,12 @@ void WrappedVulkan::vkCmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); ser.SetActionChunk(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdCopyBufferToImage2KHR); - Serialise_vkCmdCopyBufferToImage2KHR(ser, commandBuffer, pCopyBufferToImageInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdCopyBufferToImage2); + Serialise_vkCmdCopyBufferToImage2(ser, commandBuffer, pCopyBufferToImageInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); - // downcast the VkBufferImageCopy2KHR to VkBufferImageCopy for ease of use, as we don't need + // downcast the VkBufferImageCopy2 to VkBufferImageCopy for ease of use, as we don't need // anything in the next chains here // we're done with temp memory above so we can reuse here @@ -3903,9 +3901,9 @@ void WrappedVulkan::vkCmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdCopyImageToBuffer2KHR( +bool WrappedVulkan::Serialise_vkCmdCopyImageToBuffer2( SerialiserType &ser, VkCommandBuffer commandBuffer, - const VkCopyImageToBufferInfo2KHR *pCopyImageToBufferInfo) + const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_LOCAL(CopyInfo, *pCopyImageToBufferInfo).Important(); @@ -3916,13 +3914,13 @@ bool WrappedVulkan::Serialise_vkCmdCopyImageToBuffer2KHR( if(IsReplayingAndReading()) { - VkCopyImageToBufferInfo2KHR unwrappedInfo = CopyInfo; + VkCopyImageToBufferInfo2 unwrappedInfo = CopyInfo; unwrappedInfo.srcImage = Unwrap(unwrappedInfo.srcImage); unwrappedInfo.dstBuffer = Unwrap(unwrappedInfo.dstBuffer); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkCopyImageToBufferInfo2KHR", tempMem, + UnwrapNextChain(m_State, "VkCopyImageToBufferInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); @@ -3935,11 +3933,11 @@ bool WrappedVulkan::Serialise_vkCmdCopyImageToBuffer2KHR( uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::Copy); - ObjDisp(commandBuffer)->CmdCopyImageToBuffer2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyImageToBuffer2(Unwrap(commandBuffer), &unwrappedInfo); if(eventId && m_ActionCallback->PostMisc(eventId, ActionFlags::Copy, commandBuffer)) { - ObjDisp(commandBuffer)->CmdCopyImageToBuffer2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyImageToBuffer2(Unwrap(commandBuffer), &unwrappedInfo); m_ActionCallback->PostRemisc(eventId, ActionFlags::Copy, commandBuffer); } @@ -3947,7 +3945,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyImageToBuffer2KHR( } else { - ObjDisp(commandBuffer)->CmdCopyImageToBuffer2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdCopyImageToBuffer2(Unwrap(commandBuffer), &unwrappedInfo); { AddEvent(); @@ -3984,22 +3982,21 @@ bool WrappedVulkan::Serialise_vkCmdCopyImageToBuffer2KHR( return true; } -void WrappedVulkan::vkCmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, - const VkCopyImageToBufferInfo2KHR *pCopyImageToBufferInfo) +void WrappedVulkan::vkCmdCopyImageToBuffer2(VkCommandBuffer commandBuffer, + const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo) { SCOPED_DBG_SINK(); - VkCopyImageToBufferInfo2KHR unwrappedInfo = *pCopyImageToBufferInfo; + VkCopyImageToBufferInfo2 unwrappedInfo = *pCopyImageToBufferInfo; unwrappedInfo.srcImage = Unwrap(unwrappedInfo.srcImage); unwrappedInfo.dstBuffer = Unwrap(unwrappedInfo.dstBuffer); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkCopyImageToBufferInfo2KHR", tempMem, - (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkCopyImageToBufferInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdCopyImageToBuffer2KHR(Unwrap(commandBuffer), &unwrappedInfo)); + ObjDisp(commandBuffer)->CmdCopyImageToBuffer2(Unwrap(commandBuffer), &unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -4008,12 +4005,12 @@ void WrappedVulkan::vkCmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); ser.SetActionChunk(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdCopyImageToBuffer2KHR); - Serialise_vkCmdCopyImageToBuffer2KHR(ser, commandBuffer, pCopyImageToBufferInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdCopyImageToBuffer2); + Serialise_vkCmdCopyImageToBuffer2(ser, commandBuffer, pCopyImageToBufferInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); - // downcast the VkBufferImageCopy2KHR to VkBufferImageCopy for ease of use, as we don't need + // downcast the VkBufferImageCopy2 to VkBufferImageCopy for ease of use, as we don't need // anything in the next chains here // we're done with temp memory above so we can reuse here @@ -4036,8 +4033,8 @@ void WrappedVulkan::vkCmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdBlitImage2KHR(SerialiserType &ser, VkCommandBuffer commandBuffer, - const VkBlitImageInfo2KHR *pBlitImageInfo) +bool WrappedVulkan::Serialise_vkCmdBlitImage2(SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkBlitImageInfo2 *pBlitImageInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_LOCAL(BlitInfo, *pBlitImageInfo).Important(); @@ -4048,13 +4045,13 @@ bool WrappedVulkan::Serialise_vkCmdBlitImage2KHR(SerialiserType &ser, VkCommandB if(IsReplayingAndReading()) { - VkBlitImageInfo2KHR unwrappedInfo = BlitInfo; + VkBlitImageInfo2 unwrappedInfo = BlitInfo; unwrappedInfo.srcImage = Unwrap(unwrappedInfo.srcImage); unwrappedInfo.dstImage = Unwrap(unwrappedInfo.dstImage); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkBlitImageInfo2KHR", tempMem, (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkBlitImageInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); @@ -4066,11 +4063,11 @@ bool WrappedVulkan::Serialise_vkCmdBlitImage2KHR(SerialiserType &ser, VkCommandB uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::Resolve); - ObjDisp(commandBuffer)->CmdBlitImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdBlitImage2(Unwrap(commandBuffer), &unwrappedInfo); if(eventId && m_ActionCallback->PostMisc(eventId, ActionFlags::Resolve, commandBuffer)) { - ObjDisp(commandBuffer)->CmdBlitImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdBlitImage2(Unwrap(commandBuffer), &unwrappedInfo); m_ActionCallback->PostRemisc(eventId, ActionFlags::Resolve, commandBuffer); } @@ -4078,7 +4075,7 @@ bool WrappedVulkan::Serialise_vkCmdBlitImage2KHR(SerialiserType &ser, VkCommandB } else { - ObjDisp(commandBuffer)->CmdBlitImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdBlitImage2(Unwrap(commandBuffer), &unwrappedInfo); { AddEvent(); @@ -4120,20 +4117,20 @@ bool WrappedVulkan::Serialise_vkCmdBlitImage2KHR(SerialiserType &ser, VkCommandB return true; } -void WrappedVulkan::vkCmdBlitImage2KHR(VkCommandBuffer commandBuffer, - const VkBlitImageInfo2KHR *pBlitImageInfo) +void WrappedVulkan::vkCmdBlitImage2(VkCommandBuffer commandBuffer, + const VkBlitImageInfo2 *pBlitImageInfo) { SCOPED_DBG_SINK(); - VkBlitImageInfo2KHR unwrappedInfo = *pBlitImageInfo; + VkBlitImageInfo2 unwrappedInfo = *pBlitImageInfo; unwrappedInfo.srcImage = Unwrap(unwrappedInfo.srcImage); unwrappedInfo.dstImage = Unwrap(unwrappedInfo.dstImage); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkBlitImageInfo2KHR", tempMem, (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkBlitImageInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); - SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdBlitImage2KHR(Unwrap(commandBuffer), &unwrappedInfo)); + SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdBlitImage2(Unwrap(commandBuffer), &unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -4142,14 +4139,14 @@ void WrappedVulkan::vkCmdBlitImage2KHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); ser.SetActionChunk(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdBlitImage2KHR); - Serialise_vkCmdBlitImage2KHR(ser, commandBuffer, pBlitImageInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdBlitImage2); + Serialise_vkCmdBlitImage2(ser, commandBuffer, pBlitImageInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); for(uint32_t i = 0; i < pBlitImageInfo->regionCount; i++) { - const VkImageBlit2KHR ®ion = pBlitImageInfo->pRegions[i]; + const VkImageBlit2 ®ion = pBlitImageInfo->pRegions[i]; ImageRange srcRange(region.srcSubresource); srcRange.offset = {RDCMIN(region.srcOffsets[0].x, region.srcOffsets[1].x), @@ -4177,9 +4174,8 @@ void WrappedVulkan::vkCmdBlitImage2KHR(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdResolveImage2KHR(SerialiserType &ser, - VkCommandBuffer commandBuffer, - const VkResolveImageInfo2KHR *pResolveImageInfo) +bool WrappedVulkan::Serialise_vkCmdResolveImage2(SerialiserType &ser, VkCommandBuffer commandBuffer, + const VkResolveImageInfo2 *pResolveImageInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_LOCAL(ResolveInfo, *pResolveImageInfo).Important(); @@ -4190,13 +4186,13 @@ bool WrappedVulkan::Serialise_vkCmdResolveImage2KHR(SerialiserType &ser, if(IsReplayingAndReading()) { - VkResolveImageInfo2KHR unwrappedInfo = ResolveInfo; + VkResolveImageInfo2 unwrappedInfo = ResolveInfo; unwrappedInfo.srcImage = Unwrap(unwrappedInfo.srcImage); unwrappedInfo.dstImage = Unwrap(unwrappedInfo.dstImage); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkResolveImageInfo2KHR", tempMem, (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkResolveImageInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); @@ -4208,11 +4204,11 @@ bool WrappedVulkan::Serialise_vkCmdResolveImage2KHR(SerialiserType &ser, uint32_t eventId = HandlePreCallback(commandBuffer, ActionFlags::Resolve); - ObjDisp(commandBuffer)->CmdResolveImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdResolveImage2(Unwrap(commandBuffer), &unwrappedInfo); if(eventId && m_ActionCallback->PostMisc(eventId, ActionFlags::Resolve, commandBuffer)) { - ObjDisp(commandBuffer)->CmdResolveImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdResolveImage2(Unwrap(commandBuffer), &unwrappedInfo); m_ActionCallback->PostRemisc(eventId, ActionFlags::Resolve, commandBuffer); } @@ -4220,7 +4216,7 @@ bool WrappedVulkan::Serialise_vkCmdResolveImage2KHR(SerialiserType &ser, } else { - ObjDisp(commandBuffer)->CmdResolveImage2KHR(Unwrap(commandBuffer), &unwrappedInfo); + ObjDisp(commandBuffer)->CmdResolveImage2(Unwrap(commandBuffer), &unwrappedInfo); { AddEvent(); @@ -4262,21 +4258,20 @@ bool WrappedVulkan::Serialise_vkCmdResolveImage2KHR(SerialiserType &ser, return true; } -void WrappedVulkan::vkCmdResolveImage2KHR(VkCommandBuffer commandBuffer, - const VkResolveImageInfo2KHR *pResolveImageInfo) +void WrappedVulkan::vkCmdResolveImage2(VkCommandBuffer commandBuffer, + const VkResolveImageInfo2 *pResolveImageInfo) { SCOPED_DBG_SINK(); - VkResolveImageInfo2KHR unwrappedInfo = *pResolveImageInfo; + VkResolveImageInfo2 unwrappedInfo = *pResolveImageInfo; unwrappedInfo.srcImage = Unwrap(unwrappedInfo.srcImage); unwrappedInfo.dstImage = Unwrap(unwrappedInfo.dstImage); byte *tempMem = GetTempMemory(GetNextPatchSize(unwrappedInfo.pNext)); - UnwrapNextChain(m_State, "VkResolveImageInfo2KHR", tempMem, (VkBaseInStructure *)&unwrappedInfo); + UnwrapNextChain(m_State, "VkResolveImageInfo2", tempMem, (VkBaseInStructure *)&unwrappedInfo); - SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdResolveImage2KHR(Unwrap(commandBuffer), &unwrappedInfo)); + SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdResolveImage2(Unwrap(commandBuffer), &unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -4285,14 +4280,14 @@ void WrappedVulkan::vkCmdResolveImage2KHR(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); ser.SetActionChunk(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdResolveImage2KHR); - Serialise_vkCmdResolveImage2KHR(ser, commandBuffer, pResolveImageInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdResolveImage2); + Serialise_vkCmdResolveImage2(ser, commandBuffer, pResolveImageInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); for(uint32_t i = 0; i < pResolveImageInfo->regionCount; i++) { - const VkImageResolve2KHR ®ion = pResolveImageInfo->pRegions[i]; + const VkImageResolve2 ®ion = pResolveImageInfo->pRegions[i]; ImageRange srcRange(region.srcSubresource); srcRange.offset = region.srcOffset; @@ -4394,15 +4389,15 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdDrawIndirectByteCountEXT, VkCommandBu uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyBuffer2KHR, VkCommandBuffer commandBuffer, - const VkCopyBufferInfo2KHR *pCopyBufferInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyImage2KHR, VkCommandBuffer commandBuffer, - const VkCopyImageInfo2KHR *pCopyImageInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyBufferToImage2KHR, VkCommandBuffer commandBuffer, - const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyImageToBuffer2KHR, VkCommandBuffer commandBuffer, - const VkCopyImageToBufferInfo2KHR *pCopyImageToBufferInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBlitImage2KHR, VkCommandBuffer commandBuffer, - const VkBlitImageInfo2KHR *pBlitImageInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdResolveImage2KHR, VkCommandBuffer commandBuffer, - const VkResolveImageInfo2KHR *pResolveImageInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyBuffer2, VkCommandBuffer commandBuffer, + const VkCopyBufferInfo2 *pCopyBufferInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyImage2, VkCommandBuffer commandBuffer, + const VkCopyImageInfo2 *pCopyImageInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyBufferToImage2, VkCommandBuffer commandBuffer, + const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdCopyImageToBuffer2, VkCommandBuffer commandBuffer, + const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBlitImage2, VkCommandBuffer commandBuffer, + const VkBlitImageInfo2 *pBlitImageInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdResolveImage2, VkCommandBuffer commandBuffer, + const VkResolveImageInfo2 *pResolveImageInfo); diff --git a/renderdoc/driver/vulkan/wrappers/vk_dynamic_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_dynamic_funcs.cpp index 7f6d470ca..2ff7d633e 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_dynamic_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_dynamic_funcs.cpp @@ -94,10 +94,10 @@ void WrappedVulkan::vkCmdSetViewport(VkCommandBuffer commandBuffer, uint32_t fir } template -bool WrappedVulkan::Serialise_vkCmdSetViewportWithCountEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - uint32_t viewportCount, - const VkViewport *pViewports) +bool WrappedVulkan::Serialise_vkCmdSetViewportWithCount(SerialiserType &ser, + VkCommandBuffer commandBuffer, + uint32_t viewportCount, + const VkViewport *pViewports) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(viewportCount); @@ -129,20 +129,19 @@ bool WrappedVulkan::Serialise_vkCmdSetViewportWithCountEXT(SerialiserType &ser, } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetViewportWithCountEXT(Unwrap(commandBuffer), viewportCount, pViewports); + ObjDisp(commandBuffer)->CmdSetViewportWithCount(Unwrap(commandBuffer), viewportCount, pViewports); } return true; } -void WrappedVulkan::vkCmdSetViewportWithCountEXT(VkCommandBuffer commandBuffer, - uint32_t viewportCount, const VkViewport *pViewports) +void WrappedVulkan::vkCmdSetViewportWithCount(VkCommandBuffer commandBuffer, uint32_t viewportCount, + const VkViewport *pViewports) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer) - ->CmdSetViewportWithCountEXT(Unwrap(commandBuffer), viewportCount, pViewports)); + ObjDisp(commandBuffer)->CmdSetViewportWithCount(Unwrap(commandBuffer), viewportCount, pViewports)); if(IsCaptureMode(m_State)) { @@ -150,8 +149,8 @@ void WrappedVulkan::vkCmdSetViewportWithCountEXT(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetViewportWithCountEXT); - Serialise_vkCmdSetViewportWithCountEXT(ser, commandBuffer, viewportCount, pViewports); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetViewportWithCount); + Serialise_vkCmdSetViewportWithCount(ser, commandBuffer, viewportCount, pViewports); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } @@ -226,10 +225,10 @@ void WrappedVulkan::vkCmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firs } template -bool WrappedVulkan::Serialise_vkCmdSetScissorWithCountEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - uint32_t scissorCount, - const VkRect2D *pScissors) +bool WrappedVulkan::Serialise_vkCmdSetScissorWithCount(SerialiserType &ser, + VkCommandBuffer commandBuffer, + uint32_t scissorCount, + const VkRect2D *pScissors) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(scissorCount); @@ -261,19 +260,19 @@ bool WrappedVulkan::Serialise_vkCmdSetScissorWithCountEXT(SerialiserType &ser, } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetScissorWithCountEXT(Unwrap(commandBuffer), scissorCount, pScissors); + ObjDisp(commandBuffer)->CmdSetScissorWithCount(Unwrap(commandBuffer), scissorCount, pScissors); } return true; } -void WrappedVulkan::vkCmdSetScissorWithCountEXT(VkCommandBuffer commandBuffer, - uint32_t scissorCount, const VkRect2D *pScissors) +void WrappedVulkan::vkCmdSetScissorWithCount(VkCommandBuffer commandBuffer, uint32_t scissorCount, + const VkRect2D *pScissors) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdSetScissorWithCountEXT(Unwrap(commandBuffer), scissorCount, pScissors)); + ObjDisp(commandBuffer)->CmdSetScissorWithCount(Unwrap(commandBuffer), scissorCount, pScissors)); if(IsCaptureMode(m_State)) { @@ -281,8 +280,8 @@ void WrappedVulkan::vkCmdSetScissorWithCountEXT(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetScissorWithCountEXT); - Serialise_vkCmdSetScissorWithCountEXT(ser, commandBuffer, scissorCount, pScissors); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetScissorWithCount); + Serialise_vkCmdSetScissorWithCount(ser, commandBuffer, scissorCount, pScissors); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } @@ -945,8 +944,8 @@ void WrappedVulkan::vkCmdSetLineStippleEXT(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdSetCullModeEXT(SerialiserType &ser, VkCommandBuffer commandBuffer, - VkCullModeFlags cullMode) +bool WrappedVulkan::Serialise_vkCmdSetCullMode(SerialiserType &ser, VkCommandBuffer commandBuffer, + VkCullModeFlags cullMode) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_TYPED(VkCullModeFlagBits, cullMode).Important(); @@ -977,17 +976,17 @@ bool WrappedVulkan::Serialise_vkCmdSetCullModeEXT(SerialiserType &ser, VkCommand } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetCullModeEXT(Unwrap(commandBuffer), cullMode); + ObjDisp(commandBuffer)->CmdSetCullMode(Unwrap(commandBuffer), cullMode); } return true; } -void WrappedVulkan::vkCmdSetCullModeEXT(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) +void WrappedVulkan::vkCmdSetCullMode(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) { SCOPED_DBG_SINK(); - SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdSetCullModeEXT(Unwrap(commandBuffer), cullMode)); + SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdSetCullMode(Unwrap(commandBuffer), cullMode)); if(IsCaptureMode(m_State)) { @@ -995,16 +994,16 @@ void WrappedVulkan::vkCmdSetCullModeEXT(VkCommandBuffer commandBuffer, VkCullMod CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetCullModeEXT); - Serialise_vkCmdSetCullModeEXT(ser, commandBuffer, cullMode); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetCullMode); + Serialise_vkCmdSetCullMode(ser, commandBuffer, cullMode); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetFrontFaceEXT(SerialiserType &ser, VkCommandBuffer commandBuffer, - VkFrontFace frontFace) +bool WrappedVulkan::Serialise_vkCmdSetFrontFace(SerialiserType &ser, VkCommandBuffer commandBuffer, + VkFrontFace frontFace) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(frontFace).Important(); @@ -1035,17 +1034,17 @@ bool WrappedVulkan::Serialise_vkCmdSetFrontFaceEXT(SerialiserType &ser, VkComman } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetFrontFaceEXT(Unwrap(commandBuffer), frontFace); + ObjDisp(commandBuffer)->CmdSetFrontFace(Unwrap(commandBuffer), frontFace); } return true; } -void WrappedVulkan::vkCmdSetFrontFaceEXT(VkCommandBuffer commandBuffer, VkFrontFace frontFace) +void WrappedVulkan::vkCmdSetFrontFace(VkCommandBuffer commandBuffer, VkFrontFace frontFace) { SCOPED_DBG_SINK(); - SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdSetFrontFaceEXT(Unwrap(commandBuffer), frontFace)); + SERIALISE_TIME_CALL(ObjDisp(commandBuffer)->CmdSetFrontFace(Unwrap(commandBuffer), frontFace)); if(IsCaptureMode(m_State)) { @@ -1053,17 +1052,17 @@ void WrappedVulkan::vkCmdSetFrontFaceEXT(VkCommandBuffer commandBuffer, VkFrontF CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetFrontFaceEXT); - Serialise_vkCmdSetFrontFaceEXT(ser, commandBuffer, frontFace); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetFrontFace); + Serialise_vkCmdSetFrontFace(ser, commandBuffer, frontFace); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetPrimitiveTopologyEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkPrimitiveTopology primitiveTopology) +bool WrappedVulkan::Serialise_vkCmdSetPrimitiveTopology(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkPrimitiveTopology primitiveTopology) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(primitiveTopology).Important(); @@ -1098,19 +1097,19 @@ bool WrappedVulkan::Serialise_vkCmdSetPrimitiveTopologyEXT(SerialiserType &ser, } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetPrimitiveTopologyEXT(Unwrap(commandBuffer), primitiveTopology); + ObjDisp(commandBuffer)->CmdSetPrimitiveTopology(Unwrap(commandBuffer), primitiveTopology); } return true; } -void WrappedVulkan::vkCmdSetPrimitiveTopologyEXT(VkCommandBuffer commandBuffer, - VkPrimitiveTopology primitiveTopology) +void WrappedVulkan::vkCmdSetPrimitiveTopology(VkCommandBuffer commandBuffer, + VkPrimitiveTopology primitiveTopology) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdSetPrimitiveTopologyEXT(Unwrap(commandBuffer), primitiveTopology)); + ObjDisp(commandBuffer)->CmdSetPrimitiveTopology(Unwrap(commandBuffer), primitiveTopology)); if(IsCaptureMode(m_State)) { @@ -1118,17 +1117,17 @@ void WrappedVulkan::vkCmdSetPrimitiveTopologyEXT(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetPrimitiveTopologyEXT); - Serialise_vkCmdSetPrimitiveTopologyEXT(ser, commandBuffer, primitiveTopology); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetPrimitiveTopology); + Serialise_vkCmdSetPrimitiveTopology(ser, commandBuffer, primitiveTopology); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetDepthTestEnableEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkBool32 depthTestEnable) +bool WrappedVulkan::Serialise_vkCmdSetDepthTestEnable(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkBool32 depthTestEnable) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(depthTestEnable).Important(); @@ -1159,18 +1158,18 @@ bool WrappedVulkan::Serialise_vkCmdSetDepthTestEnableEXT(SerialiserType &ser, } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetDepthTestEnableEXT(Unwrap(commandBuffer), depthTestEnable); + ObjDisp(commandBuffer)->CmdSetDepthTestEnable(Unwrap(commandBuffer), depthTestEnable); } return true; } -void WrappedVulkan::vkCmdSetDepthTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthTestEnable) +void WrappedVulkan::vkCmdSetDepthTestEnable(VkCommandBuffer commandBuffer, VkBool32 depthTestEnable) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdSetDepthTestEnableEXT(Unwrap(commandBuffer), depthTestEnable)); + ObjDisp(commandBuffer)->CmdSetDepthTestEnable(Unwrap(commandBuffer), depthTestEnable)); if(IsCaptureMode(m_State)) { @@ -1178,17 +1177,17 @@ void WrappedVulkan::vkCmdSetDepthTestEnableEXT(VkCommandBuffer commandBuffer, Vk CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthTestEnableEXT); - Serialise_vkCmdSetDepthTestEnableEXT(ser, commandBuffer, depthTestEnable); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthTestEnable); + Serialise_vkCmdSetDepthTestEnable(ser, commandBuffer, depthTestEnable); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetDepthWriteEnableEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkBool32 depthWriteEnable) +bool WrappedVulkan::Serialise_vkCmdSetDepthWriteEnable(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkBool32 depthWriteEnable) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(depthWriteEnable).Important(); @@ -1219,19 +1218,18 @@ bool WrappedVulkan::Serialise_vkCmdSetDepthWriteEnableEXT(SerialiserType &ser, } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetDepthWriteEnableEXT(Unwrap(commandBuffer), depthWriteEnable); + ObjDisp(commandBuffer)->CmdSetDepthWriteEnable(Unwrap(commandBuffer), depthWriteEnable); } return true; } -void WrappedVulkan::vkCmdSetDepthWriteEnableEXT(VkCommandBuffer commandBuffer, - VkBool32 depthWriteEnable) +void WrappedVulkan::vkCmdSetDepthWriteEnable(VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdSetDepthWriteEnableEXT(Unwrap(commandBuffer), depthWriteEnable)); + ObjDisp(commandBuffer)->CmdSetDepthWriteEnable(Unwrap(commandBuffer), depthWriteEnable)); if(IsCaptureMode(m_State)) { @@ -1239,17 +1237,17 @@ void WrappedVulkan::vkCmdSetDepthWriteEnableEXT(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthWriteEnableEXT); - Serialise_vkCmdSetDepthWriteEnableEXT(ser, commandBuffer, depthWriteEnable); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthWriteEnable); + Serialise_vkCmdSetDepthWriteEnable(ser, commandBuffer, depthWriteEnable); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetDepthCompareOpEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkCompareOp depthCompareOp) +bool WrappedVulkan::Serialise_vkCmdSetDepthCompareOp(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkCompareOp depthCompareOp) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(depthCompareOp).Important(); @@ -1280,19 +1278,18 @@ bool WrappedVulkan::Serialise_vkCmdSetDepthCompareOpEXT(SerialiserType &ser, } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetDepthCompareOpEXT(Unwrap(commandBuffer), depthCompareOp); + ObjDisp(commandBuffer)->CmdSetDepthCompareOp(Unwrap(commandBuffer), depthCompareOp); } return true; } -void WrappedVulkan::vkCmdSetDepthCompareOpEXT(VkCommandBuffer commandBuffer, - VkCompareOp depthCompareOp) +void WrappedVulkan::vkCmdSetDepthCompareOp(VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdSetDepthCompareOpEXT(Unwrap(commandBuffer), depthCompareOp)); + ObjDisp(commandBuffer)->CmdSetDepthCompareOp(Unwrap(commandBuffer), depthCompareOp)); if(IsCaptureMode(m_State)) { @@ -1300,17 +1297,17 @@ void WrappedVulkan::vkCmdSetDepthCompareOpEXT(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthCompareOpEXT); - Serialise_vkCmdSetDepthCompareOpEXT(ser, commandBuffer, depthCompareOp); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthCompareOp); + Serialise_vkCmdSetDepthCompareOp(ser, commandBuffer, depthCompareOp); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetDepthBoundsTestEnableEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkBool32 depthBoundsTestEnable) +bool WrappedVulkan::Serialise_vkCmdSetDepthBoundsTestEnable(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkBool32 depthBoundsTestEnable) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(depthBoundsTestEnable).Important(); @@ -1341,20 +1338,19 @@ bool WrappedVulkan::Serialise_vkCmdSetDepthBoundsTestEnableEXT(SerialiserType &s } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetDepthBoundsTestEnableEXT(Unwrap(commandBuffer), depthBoundsTestEnable); + ObjDisp(commandBuffer)->CmdSetDepthBoundsTestEnable(Unwrap(commandBuffer), depthBoundsTestEnable); } return true; } -void WrappedVulkan::vkCmdSetDepthBoundsTestEnableEXT(VkCommandBuffer commandBuffer, - VkBool32 depthBoundsTestEnable) +void WrappedVulkan::vkCmdSetDepthBoundsTestEnable(VkCommandBuffer commandBuffer, + VkBool32 depthBoundsTestEnable) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer) - ->CmdSetDepthBoundsTestEnableEXT(Unwrap(commandBuffer), depthBoundsTestEnable)); + ObjDisp(commandBuffer)->CmdSetDepthBoundsTestEnable(Unwrap(commandBuffer), depthBoundsTestEnable)); if(IsCaptureMode(m_State)) { @@ -1362,17 +1358,17 @@ void WrappedVulkan::vkCmdSetDepthBoundsTestEnableEXT(VkCommandBuffer commandBuff CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthBoundsTestEnableEXT); - Serialise_vkCmdSetDepthBoundsTestEnableEXT(ser, commandBuffer, depthBoundsTestEnable); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthBoundsTestEnable); + Serialise_vkCmdSetDepthBoundsTestEnable(ser, commandBuffer, depthBoundsTestEnable); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetStencilTestEnableEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkBool32 stencilTestEnable) +bool WrappedVulkan::Serialise_vkCmdSetStencilTestEnable(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkBool32 stencilTestEnable) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(stencilTestEnable).Important(); @@ -1403,19 +1399,19 @@ bool WrappedVulkan::Serialise_vkCmdSetStencilTestEnableEXT(SerialiserType &ser, } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetStencilTestEnableEXT(Unwrap(commandBuffer), stencilTestEnable); + ObjDisp(commandBuffer)->CmdSetStencilTestEnable(Unwrap(commandBuffer), stencilTestEnable); } return true; } -void WrappedVulkan::vkCmdSetStencilTestEnableEXT(VkCommandBuffer commandBuffer, - VkBool32 stencilTestEnable) +void WrappedVulkan::vkCmdSetStencilTestEnable(VkCommandBuffer commandBuffer, + VkBool32 stencilTestEnable) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdSetStencilTestEnableEXT(Unwrap(commandBuffer), stencilTestEnable)); + ObjDisp(commandBuffer)->CmdSetStencilTestEnable(Unwrap(commandBuffer), stencilTestEnable)); if(IsCaptureMode(m_State)) { @@ -1423,18 +1419,18 @@ void WrappedVulkan::vkCmdSetStencilTestEnableEXT(VkCommandBuffer commandBuffer, CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetStencilTestEnableEXT); - Serialise_vkCmdSetStencilTestEnableEXT(ser, commandBuffer, stencilTestEnable); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetStencilTestEnable); + Serialise_vkCmdSetStencilTestEnable(ser, commandBuffer, stencilTestEnable); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetStencilOpEXT(SerialiserType &ser, VkCommandBuffer commandBuffer, - VkStencilFaceFlags faceMask, VkStencilOp failOp, - VkStencilOp passOp, VkStencilOp depthFailOp, - VkCompareOp compareOp) +bool WrappedVulkan::Serialise_vkCmdSetStencilOp(SerialiserType &ser, VkCommandBuffer commandBuffer, + VkStencilFaceFlags faceMask, VkStencilOp failOp, + VkStencilOp passOp, VkStencilOp depthFailOp, + VkCompareOp compareOp) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT_TYPED(VkStencilFaceFlagBits, faceMask).Important(); @@ -1483,22 +1479,21 @@ bool WrappedVulkan::Serialise_vkCmdSetStencilOpEXT(SerialiserType &ser, VkComman if(commandBuffer != VK_NULL_HANDLE) ObjDisp(commandBuffer) - ->CmdSetStencilOpEXT(Unwrap(commandBuffer), faceMask, failOp, passOp, depthFailOp, - compareOp); + ->CmdSetStencilOp(Unwrap(commandBuffer), faceMask, failOp, passOp, depthFailOp, compareOp); } return true; } -void WrappedVulkan::vkCmdSetStencilOpEXT(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, - VkStencilOp failOp, VkStencilOp passOp, - VkStencilOp depthFailOp, VkCompareOp compareOp) +void WrappedVulkan::vkCmdSetStencilOp(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, + VkStencilOp failOp, VkStencilOp passOp, + VkStencilOp depthFailOp, VkCompareOp compareOp) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL(ObjDisp(commandBuffer) - ->CmdSetStencilOpEXT(Unwrap(commandBuffer), faceMask, failOp, passOp, - depthFailOp, compareOp)); + ->CmdSetStencilOp(Unwrap(commandBuffer), faceMask, failOp, passOp, + depthFailOp, compareOp)); if(IsCaptureMode(m_State)) { @@ -1506,9 +1501,8 @@ void WrappedVulkan::vkCmdSetStencilOpEXT(VkCommandBuffer commandBuffer, VkStenci CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetStencilOpEXT); - Serialise_vkCmdSetStencilOpEXT(ser, commandBuffer, faceMask, failOp, passOp, depthFailOp, - compareOp); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetStencilOp); + Serialise_vkCmdSetStencilOp(ser, commandBuffer, faceMask, failOp, passOp, depthFailOp, compareOp); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } @@ -1581,9 +1575,9 @@ void WrappedVulkan::vkCmdSetColorWriteEnableEXT(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdSetDepthBiasEnableEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkBool32 depthBiasEnable) +bool WrappedVulkan::Serialise_vkCmdSetDepthBiasEnable(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkBool32 depthBiasEnable) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(depthBiasEnable).Important(); @@ -1614,18 +1608,18 @@ bool WrappedVulkan::Serialise_vkCmdSetDepthBiasEnableEXT(SerialiserType &ser, } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetDepthBiasEnableEXT(Unwrap(commandBuffer), depthBiasEnable); + ObjDisp(commandBuffer)->CmdSetDepthBiasEnable(Unwrap(commandBuffer), depthBiasEnable); } return true; } -void WrappedVulkan::vkCmdSetDepthBiasEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable) +void WrappedVulkan::vkCmdSetDepthBiasEnable(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdSetDepthBiasEnableEXT(Unwrap(commandBuffer), depthBiasEnable)); + ObjDisp(commandBuffer)->CmdSetDepthBiasEnable(Unwrap(commandBuffer), depthBiasEnable)); if(IsCaptureMode(m_State)) { @@ -1633,8 +1627,8 @@ void WrappedVulkan::vkCmdSetDepthBiasEnableEXT(VkCommandBuffer commandBuffer, Vk CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthBiasEnableEXT); - Serialise_vkCmdSetDepthBiasEnableEXT(ser, commandBuffer, depthBiasEnable); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetDepthBiasEnable); + Serialise_vkCmdSetDepthBiasEnable(ser, commandBuffer, depthBiasEnable); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } @@ -1760,9 +1754,9 @@ void WrappedVulkan::vkCmdSetPatchControlPointsEXT(VkCommandBuffer commandBuffer, } template -bool WrappedVulkan::Serialise_vkCmdSetPrimitiveRestartEnableEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkBool32 primitiveRestartEnable) +bool WrappedVulkan::Serialise_vkCmdSetPrimitiveRestartEnable(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkBool32 primitiveRestartEnable) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(primitiveRestartEnable).Important(); @@ -1793,21 +1787,20 @@ bool WrappedVulkan::Serialise_vkCmdSetPrimitiveRestartEnableEXT(SerialiserType & } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer) - ->CmdSetPrimitiveRestartEnableEXT(Unwrap(commandBuffer), primitiveRestartEnable); + ObjDisp(commandBuffer)->CmdSetPrimitiveRestartEnable(Unwrap(commandBuffer), primitiveRestartEnable); } return true; } -void WrappedVulkan::vkCmdSetPrimitiveRestartEnableEXT(VkCommandBuffer commandBuffer, - VkBool32 primitiveRestartEnable) +void WrappedVulkan::vkCmdSetPrimitiveRestartEnable(VkCommandBuffer commandBuffer, + VkBool32 primitiveRestartEnable) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( ObjDisp(commandBuffer) - ->CmdSetPrimitiveRestartEnableEXT(Unwrap(commandBuffer), primitiveRestartEnable)); + ->CmdSetPrimitiveRestartEnable(Unwrap(commandBuffer), primitiveRestartEnable)); if(IsCaptureMode(m_State)) { @@ -1815,17 +1808,17 @@ void WrappedVulkan::vkCmdSetPrimitiveRestartEnableEXT(VkCommandBuffer commandBuf CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetPrimitiveRestartEnableEXT); - Serialise_vkCmdSetPrimitiveRestartEnableEXT(ser, commandBuffer, primitiveRestartEnable); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetPrimitiveRestartEnable); + Serialise_vkCmdSetPrimitiveRestartEnable(ser, commandBuffer, primitiveRestartEnable); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } } template -bool WrappedVulkan::Serialise_vkCmdSetRasterizerDiscardEnableEXT(SerialiserType &ser, - VkCommandBuffer commandBuffer, - VkBool32 rasterizerDiscardEnable) +bool WrappedVulkan::Serialise_vkCmdSetRasterizerDiscardEnable(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkBool32 rasterizerDiscardEnable) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(rasterizerDiscardEnable).Important(); @@ -1857,20 +1850,20 @@ bool WrappedVulkan::Serialise_vkCmdSetRasterizerDiscardEnableEXT(SerialiserType if(commandBuffer != VK_NULL_HANDLE) ObjDisp(commandBuffer) - ->CmdSetRasterizerDiscardEnableEXT(Unwrap(commandBuffer), rasterizerDiscardEnable); + ->CmdSetRasterizerDiscardEnable(Unwrap(commandBuffer), rasterizerDiscardEnable); } return true; } -void WrappedVulkan::vkCmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBuffer, - VkBool32 rasterizerDiscardEnable) +void WrappedVulkan::vkCmdSetRasterizerDiscardEnable(VkCommandBuffer commandBuffer, + VkBool32 rasterizerDiscardEnable) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( ObjDisp(commandBuffer) - ->CmdSetRasterizerDiscardEnableEXT(Unwrap(commandBuffer), rasterizerDiscardEnable)); + ->CmdSetRasterizerDiscardEnable(Unwrap(commandBuffer), rasterizerDiscardEnable)); if(IsCaptureMode(m_State)) { @@ -1878,8 +1871,8 @@ void WrappedVulkan::vkCmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBu CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetRasterizerDiscardEnableEXT); - Serialise_vkCmdSetRasterizerDiscardEnableEXT(ser, commandBuffer, rasterizerDiscardEnable); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetRasterizerDiscardEnable); + Serialise_vkCmdSetRasterizerDiscardEnable(ser, commandBuffer, rasterizerDiscardEnable); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); } @@ -1925,50 +1918,50 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDiscardRectangleEXT, VkCommandBuff INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetLineStippleEXT, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetCullModeEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetCullMode, VkCommandBuffer commandBuffer, VkCullModeFlags cullMode); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetFrontFaceEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetFrontFace, VkCommandBuffer commandBuffer, VkFrontFace frontFace); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetPrimitiveTopologyEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetPrimitiveTopology, VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetViewportWithCountEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetViewportWithCount, VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport *pViewports); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetScissorWithCountEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetScissorWithCount, VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D *pScissors); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthTestEnableEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthTestEnable, VkCommandBuffer commandBuffer, VkBool32 depthTestEnable); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthWriteEnableEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthWriteEnable, VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthCompareOpEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthCompareOp, VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthBoundsTestEnableEXT, - VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthBoundsTestEnable, VkCommandBuffer commandBuffer, + VkBool32 depthBoundsTestEnable); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetStencilTestEnableEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetStencilTestEnable, VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetStencilOpEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetStencilOp, VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp); INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetColorWriteEnableEXT, VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32 *pColorWriteEnables); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthBiasEnableEXT, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetDepthBiasEnable, VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable); INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetLogicOpEXT, VkCommandBuffer commandBuffer, VkLogicOp logicOp); INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetPatchControlPointsEXT, VkCommandBuffer commandBuffer, uint32_t patchControlPoints); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetPrimitiveRestartEnableEXT, - VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetRasterizerDiscardEnableEXT, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetPrimitiveRestartEnable, VkCommandBuffer commandBuffer, + VkBool32 primitiveRestartEnable); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetRasterizerDiscardEnable, VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable); diff --git a/renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp index 207385484..c9eecc811 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp @@ -281,12 +281,12 @@ void WrappedVulkan::vkGetImageSparseMemoryRequirements( pSparseMemoryRequirements); } -void WrappedVulkan::vkGetDeviceBufferMemoryRequirementsKHR( - VkDevice device, const VkDeviceBufferMemoryRequirementsKHR *pInfo, - VkMemoryRequirements2 *pMemoryRequirements) +void WrappedVulkan::vkGetDeviceBufferMemoryRequirements(VkDevice device, + const VkDeviceBufferMemoryRequirements *pInfo, + VkMemoryRequirements2 *pMemoryRequirements) { byte *tempMem = GetTempMemory(GetNextPatchSize(pInfo)); - VkDeviceBufferMemoryRequirementsKHR *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pInfo); + VkDeviceBufferMemoryRequirements *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pInfo); VkBufferCreateInfo *info = (VkBufferCreateInfo *)unwrappedInfo->pCreateInfo; @@ -297,8 +297,8 @@ void WrappedVulkan::vkGetDeviceBufferMemoryRequirementsKHR( if(IsCaptureMode(m_State) && (info->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT)) info->flags |= VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT; - ObjDisp(device)->GetDeviceBufferMemoryRequirementsKHR(Unwrap(device), unwrappedInfo, - pMemoryRequirements); + ObjDisp(device)->GetDeviceBufferMemoryRequirements(Unwrap(device), unwrappedInfo, + pMemoryRequirements); // if the buffer is external, create a non-external and return the worst case memory requirements // so that the memory allocated is sufficient for us on replay when the buffer is non-external @@ -315,8 +315,8 @@ void WrappedVulkan::vkGetDeviceBufferMemoryRequirementsKHR( VkMemoryRequirements2 nonExternalReq = {}; nonExternalReq.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; - ObjDisp(device)->GetDeviceBufferMemoryRequirementsKHR(Unwrap(device), unwrappedInfo, - &nonExternalReq); + ObjDisp(device)->GetDeviceBufferMemoryRequirements(Unwrap(device), unwrappedInfo, + &nonExternalReq); pMemoryRequirements->memoryRequirements.size = RDCMAX(pMemoryRequirements->memoryRequirements.size, nonExternalReq.memoryRequirements.size); @@ -339,9 +339,9 @@ void WrappedVulkan::vkGetDeviceBufferMemoryRequirementsKHR( } } -void WrappedVulkan::vkGetDeviceImageMemoryRequirementsKHR( - VkDevice device, const VkDeviceImageMemoryRequirementsKHR *pInfo, - VkMemoryRequirements2 *pMemoryRequirements) +void WrappedVulkan::vkGetDeviceImageMemoryRequirements(VkDevice device, + const VkDeviceImageMemoryRequirements *pInfo, + VkMemoryRequirements2 *pMemoryRequirements) { size_t tempMemSize = GetNextPatchSize(pInfo); @@ -357,7 +357,7 @@ void WrappedVulkan::vkGetDeviceImageMemoryRequirementsKHR( } byte *tempMem = GetTempMemory(tempMemSize); - VkDeviceImageMemoryRequirementsKHR *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pInfo); + VkDeviceImageMemoryRequirements *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pInfo); VkImageCreateInfo *info = (VkImageCreateInfo *)unwrappedInfo->pCreateInfo; @@ -456,8 +456,8 @@ void WrappedVulkan::vkGetDeviceImageMemoryRequirementsKHR( } } - ObjDisp(device)->GetDeviceImageMemoryRequirementsKHR(Unwrap(device), unwrappedInfo, - pMemoryRequirements); + ObjDisp(device)->GetDeviceImageMemoryRequirements(Unwrap(device), unwrappedInfo, + pMemoryRequirements); // if the image is external, create a non-external and return the worst case memory requirements // so that the memory allocated is sufficient for us on replay when the image is non-external @@ -474,8 +474,7 @@ void WrappedVulkan::vkGetDeviceImageMemoryRequirementsKHR( VkMemoryRequirements2 nonExternalReq = {}; nonExternalReq.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; - ObjDisp(device)->GetDeviceImageMemoryRequirementsKHR(Unwrap(device), unwrappedInfo, - &nonExternalReq); + ObjDisp(device)->GetDeviceImageMemoryRequirements(Unwrap(device), unwrappedInfo, &nonExternalReq); pMemoryRequirements->memoryRequirements.size = RDCMAX(pMemoryRequirements->memoryRequirements.size, nonExternalReq.memoryRequirements.size); @@ -498,15 +497,15 @@ void WrappedVulkan::vkGetDeviceImageMemoryRequirementsKHR( } } -void WrappedVulkan::vkGetDeviceImageSparseMemoryRequirementsKHR( - VkDevice device, const VkDeviceImageMemoryRequirementsKHR *pInfo, +void WrappedVulkan::vkGetDeviceImageSparseMemoryRequirements( + VkDevice device, const VkDeviceImageMemoryRequirements *pInfo, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements) { byte *tempMem = GetTempMemory(GetNextPatchSize(pInfo)); - VkDeviceImageMemoryRequirementsKHR *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pInfo); + VkDeviceImageMemoryRequirements *unwrappedInfo = UnwrapStructAndChain(m_State, tempMem, pInfo); - ObjDisp(device)->GetDeviceImageSparseMemoryRequirementsKHR( + ObjDisp(device)->GetDeviceImageSparseMemoryRequirements( Unwrap(device), unwrappedInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements); } @@ -976,16 +975,16 @@ uint64_t WrappedVulkan::vkGetDeviceMemoryOpaqueCaptureAddress( return ObjDisp(device)->GetDeviceMemoryOpaqueCaptureAddress(Unwrap(device), &unwrappedInfo); } -VkResult WrappedVulkan::vkGetPhysicalDeviceToolPropertiesEXT( - VkPhysicalDevice physicalDevice, uint32_t *pToolCount, - VkPhysicalDeviceToolPropertiesEXT *pToolProperties) +VkResult WrappedVulkan::vkGetPhysicalDeviceToolProperties(VkPhysicalDevice physicalDevice, + uint32_t *pToolCount, + VkPhysicalDeviceToolProperties *pToolProperties) { // check how many tools are downstream. The function pointer will be NULL if no-one else supports // this extension except us. uint32_t downstreamCount = 0; - if(ObjDisp(physicalDevice)->GetPhysicalDeviceToolPropertiesEXT != NULL) + if(ObjDisp(physicalDevice)->GetPhysicalDeviceToolProperties != NULL) ObjDisp(physicalDevice) - ->GetPhysicalDeviceToolPropertiesEXT(Unwrap(physicalDevice), &downstreamCount, NULL); + ->GetPhysicalDeviceToolProperties(Unwrap(physicalDevice), &downstreamCount, NULL); // if we're just enumerating, pToolProperties is NULL, so set the tool count and return if(pToolCount && pToolProperties == NULL) @@ -1003,14 +1002,13 @@ VkResult WrappedVulkan::vkGetPhysicalDeviceToolPropertiesEXT( VkResult vkr = VK_SUCCESS; - if(ObjDisp(physicalDevice)->GetPhysicalDeviceToolPropertiesEXT != NULL) + if(ObjDisp(physicalDevice)->GetPhysicalDeviceToolProperties != NULL) { // call downstream to populate the array (up to what's available) // this writes up to availableCount properties into pToolProperties, and sets the number written // in pToolCount vkr = ObjDisp(physicalDevice) - ->GetPhysicalDeviceToolPropertiesEXT(Unwrap(physicalDevice), pToolCount, - pToolProperties); + ->GetPhysicalDeviceToolProperties(Unwrap(physicalDevice), pToolCount, pToolProperties); } else { @@ -1025,24 +1023,24 @@ VkResult WrappedVulkan::vkGetPhysicalDeviceToolPropertiesEXT( // otherwise we write our own properties in after any downstream properties, then increment // pToolCount - VkPhysicalDeviceToolPropertiesEXT &props = *(pToolProperties + *pToolCount); + VkPhysicalDeviceToolProperties &props = *(pToolProperties + *pToolCount); const rdcstr name = "RenderDoc"_lit; const rdcstr version = StringFormat::Fmt( "%s (%s)", FULL_VERSION_STRING, GitVersionHash[0] == 'N' ? "Unknown revision" : GitVersionHash); const rdcstr description = "Debugging capture layer for RenderDoc"_lit; - RDCASSERTMSG("Name is too long for VkPhysicalDeviceToolPropertiesEXT", + RDCASSERTMSG("Name is too long for VkPhysicalDeviceToolProperties", name.length() < sizeof(props.name)); - RDCASSERTMSG("Version is too long for VkPhysicalDeviceToolPropertiesEXT", + RDCASSERTMSG("Version is too long for VkPhysicalDeviceToolProperties", version.length() < sizeof(props.version)); - RDCASSERTMSG("Description is too long for VkPhysicalDeviceToolPropertiesEXT", + RDCASSERTMSG("Description is too long for VkPhysicalDeviceToolProperties", description.length() < sizeof(props.description)); memcpy(props.name, name.c_str(), name.length() + 1); memcpy(props.version, version.c_str(), version.length() + 1); - props.purposes = VK_TOOL_PURPOSE_TRACING_BIT_EXT | VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT | - VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT_EXT; + props.purposes = VK_TOOL_PURPOSE_TRACING_BIT | VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT | + VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT; memcpy(props.description, description.c_str(), description.length() + 1); // do not tell people about the layer RDCEraseEl(props.layer); diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp index fd565ea4f..6a3192fcb 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp @@ -29,17 +29,16 @@ static void PatchSeparateStencil(VkAttachmentDescription &att, const VkAttachmen { } -static void PatchSeparateStencil(VkAttachmentDescription2KHR &att, - const VkAttachmentReference2KHR *ref) +static void PatchSeparateStencil(VkAttachmentDescription2 &att, const VkAttachmentReference2 *ref) { // VK_KHR_separate_depth_stencil_layouts - const VkAttachmentReferenceStencilLayoutKHR *separateStencilRef = - (const VkAttachmentReferenceStencilLayoutKHR *)FindNextStruct( - ref, VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR); + const VkAttachmentReferenceStencilLayout *separateStencilRef = + (const VkAttachmentReferenceStencilLayout *)FindNextStruct( + ref, VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT); - VkAttachmentDescriptionStencilLayoutKHR *separateStencilAtt = - (VkAttachmentDescriptionStencilLayoutKHR *)FindNextStruct( - &att, VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR); + VkAttachmentDescriptionStencilLayout *separateStencilAtt = + (VkAttachmentDescriptionStencilLayout *)FindNextStruct( + &att, VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT); if(separateStencilRef && separateStencilAtt) { @@ -955,9 +954,9 @@ bool WrappedVulkan::Serialise_vkCreateRenderPass(SerialiserType &ser, VkDevice d VkAttachmentDescription *att = (VkAttachmentDescription *)CreateInfo.pAttachments; for(uint32_t i = 0; i < CreateInfo.attachmentCount; i++) { - if(att[i].storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(att[i].storeOp != VK_ATTACHMENT_STORE_OP_NONE) att[i].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - if(att[i].stencilStoreOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(att[i].stencilStoreOp != VK_ATTACHMENT_STORE_OP_NONE) att[i].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; if(m_ReplayOptions.optimisation != ReplayOptimisationLevel::Fastest) @@ -1213,9 +1212,9 @@ bool WrappedVulkan::Serialise_vkCreateRenderPass2(SerialiserType &ser, VkDevice VkAttachmentDescription2 *att = (VkAttachmentDescription2 *)CreateInfo.pAttachments; for(uint32_t i = 0; i < CreateInfo.attachmentCount; i++) { - if(att[i].storeOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(att[i].storeOp != VK_ATTACHMENT_STORE_OP_NONE) att[i].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - if(att[i].stencilStoreOp != VK_ATTACHMENT_STORE_OP_NONE_EXT) + if(att[i].stencilStoreOp != VK_ATTACHMENT_STORE_OP_NONE) att[i].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; if(att[i].loadOp == VK_ATTACHMENT_LOAD_OP_DONT_CARE) @@ -1228,9 +1227,9 @@ bool WrappedVulkan::Serialise_vkCreateRenderPass2(SerialiserType &ser, VkDevice SanitiseNewImageLayout(att[i].finalLayout); // VK_KHR_separate_depth_stencil_layouts - VkAttachmentDescriptionStencilLayoutKHR *separateStencil = - (VkAttachmentDescriptionStencilLayoutKHR *)FindNextStruct( - &att[i], VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR); + VkAttachmentDescriptionStencilLayout *separateStencil = + (VkAttachmentDescriptionStencilLayout *)FindNextStruct( + &att[i], VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT); if(separateStencil) { @@ -1953,7 +1952,7 @@ static ObjData GetObjData(VkObjectType objType, uint64_t object) } // private data slots are not wrapped - case VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT: + case VK_OBJECT_TYPE_PRIVATE_DATA_SLOT: ret.unwrapped = object; break; @@ -2344,40 +2343,39 @@ void WrappedVulkan::vkReleaseProfilingLockKHR(VkDevice device) ObjDisp(device)->ReleaseProfilingLockKHR(Unwrap(device)); } -VkResult WrappedVulkan::vkCreatePrivateDataSlotEXT(VkDevice device, - const VkPrivateDataSlotCreateInfoEXT *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkPrivateDataSlotEXT *pPrivateDataSlot) +VkResult WrappedVulkan::vkCreatePrivateDataSlot(VkDevice device, + const VkPrivateDataSlotCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkPrivateDataSlot *pPrivateDataSlot) { // don't even wrap the slot, keep it unwrapped since we don't care about it - return ObjDisp(device)->CreatePrivateDataSlotEXT(Unwrap(device), pCreateInfo, pAllocator, - pPrivateDataSlot); + return ObjDisp(device)->CreatePrivateDataSlot(Unwrap(device), pCreateInfo, pAllocator, + pPrivateDataSlot); } -void WrappedVulkan::vkDestroyPrivateDataSlotEXT(VkDevice device, VkPrivateDataSlotEXT privateDataSlot, - const VkAllocationCallbacks *pAllocator) +void WrappedVulkan::vkDestroyPrivateDataSlot(VkDevice device, VkPrivateDataSlot privateDataSlot, + const VkAllocationCallbacks *pAllocator) { - return ObjDisp(device)->DestroyPrivateDataSlotEXT(Unwrap(device), privateDataSlot, pAllocator); + return ObjDisp(device)->DestroyPrivateDataSlot(Unwrap(device), privateDataSlot, pAllocator); } -VkResult WrappedVulkan::vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, - uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, uint64_t data) +VkResult WrappedVulkan::vkSetPrivateData(VkDevice device, VkObjectType objectType, + uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, + uint64_t data) { ObjData objdata = GetObjData(objectType, objectHandle); - return ObjDisp(device)->SetPrivateDataEXT(Unwrap(device), objectType, objdata.unwrapped, - privateDataSlot, data); + return ObjDisp(device)->SetPrivateData(Unwrap(device), objectType, objdata.unwrapped, + privateDataSlot, data); } -void WrappedVulkan::vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, - uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, - uint64_t *pData) +void WrappedVulkan::vkGetPrivateData(VkDevice device, VkObjectType objectType, uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, uint64_t *pData) { ObjData objdata = GetObjData(objectType, objectHandle); - return ObjDisp(device)->GetPrivateDataEXT(Unwrap(device), objectType, objdata.unwrapped, - privateDataSlot, pData); + return ObjDisp(device)->GetPrivateData(Unwrap(device), objectType, objdata.unwrapped, + privateDataSlot, pData); } INSTANTIATE_FUNCTION_SERIALISED(VkResult, vkCreateSampler, VkDevice device, diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp index 96e5a12fd..217e1e409 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp @@ -173,7 +173,7 @@ void WrappedVulkan::vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, } } -void WrappedVulkan::DoSubmit(VkQueue queue, VkSubmitInfo2KHR submitInfo) +void WrappedVulkan::DoSubmit(VkQueue queue, VkSubmitInfo2 submitInfo) { // don't submit any semaphores submitInfo.waitSemaphoreInfoCount = 0; @@ -186,12 +186,12 @@ void WrappedVulkan::DoSubmit(VkQueue queue, VkSubmitInfo2KHR submitInfo) // if we have KHR_sync2 this is easy! unwrap, add our submit chain, and do it byte *tempMem = GetTempMemory(GetNextPatchSize(&submitInfo)); - VkSubmitInfo2KHR *unwrapped = UnwrapStructAndChain(m_State, tempMem, &submitInfo); + VkSubmitInfo2 *unwrapped = UnwrapStructAndChain(m_State, tempMem, &submitInfo); AppendNextStruct(*unwrapped, m_SubmitChain); // don't submit the fence, since we have nothing to wait on it being signalled, and we // might not have it correctly in the unsignalled state. - ObjDisp(queue)->QueueSubmit2KHR(Unwrap(queue), 1, unwrapped, VK_NULL_HANDLE); + ObjDisp(queue)->QueueSubmit2(Unwrap(queue), 1, unwrapped, VK_NULL_HANDLE); } else { @@ -208,7 +208,7 @@ void WrappedVulkan::DoSubmit(VkQueue queue, VkSubmitInfo2KHR submitInfo) // represent in this decomposed version RDCASSERTEQUAL((void *)submitInfo.pNext, (void *)NULL); - if(submitInfo.flags & VK_SUBMIT_PROTECTED_BIT_KHR) + if(submitInfo.flags & VK_SUBMIT_PROTECTED_BIT) { // we created the protected structure with the flag as TRUE since otherwise we just don't // chain it on at all @@ -248,7 +248,7 @@ void WrappedVulkan::DoSubmit(VkQueue queue, VkSubmitInfo2KHR submitInfo) } } -void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2KHR submitInfo, rdcstr basename) +void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2 submitInfo, rdcstr basename) { if(IsLoading(m_State)) { @@ -395,11 +395,11 @@ void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2KHR submitInfo uint32_t eid = startEID; - rdcarray rerecordedCmds; + rdcarray rerecordedCmds; for(uint32_t c = 0; c < submitInfo.commandBufferInfoCount; c++) { - VkCommandBufferSubmitInfoKHR info = submitInfo.pCommandBufferInfos[c]; + VkCommandBufferSubmitInfo info = submitInfo.pCommandBufferInfos[c]; ResourceId cmdId = GetResourceManager()->GetOriginalID(GetResID(info.commandBuffer)); // account for the virtual vkBeginCommandBuffer label at the start of the events here @@ -964,7 +964,7 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue, // skip empty bindings if(bind.descriptorType == VK_DESCRIPTOR_TYPE_MAX_ENUM || - bind.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + bind.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) continue; uint32_t count = bind.descriptorCount; @@ -1220,16 +1220,16 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(SerialiserType &ser, VkQueue queue, m_ActionUses.insert(drawit - m_ActionUses.begin(), use); } - rdcarray cmds; + rdcarray cmds; for(uint32_t sub = 0; sub < submitCount; sub++) { - // make a fake VkSubmitInfo2KHR. If KHR_synchronization2 isn't supported this may then decay + // make a fake VkSubmitInfo2. If KHR_synchronization2 isn't supported this may then decay // back down into separate structs but it keeps a lot of the processing the same in both paths // and it's easier to promote this then decay if necessary (knowing no unsupported features // will be used) - VkSubmitInfo2KHR submitInfo = {}; - submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR; + VkSubmitInfo2 submitInfo = {}; + submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO_2; const VkProtectedSubmitInfo *prot = (const VkProtectedSubmitInfo *)FindNextStruct( &pSubmits[sub], VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO); @@ -1239,8 +1239,8 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(SerialiserType &ser, VkQueue queue, cmds.resize(pSubmits[sub].commandBufferCount); for(uint32_t c = 0; c < pSubmits[sub].commandBufferCount; c++) { - VkCommandBufferSubmitInfoKHR &cmd = cmds[c]; - cmd.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR; + VkCommandBufferSubmitInfo &cmd = cmds[c]; + cmd.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO; cmd.commandBuffer = pSubmits[sub].pCommandBuffers[c]; if(group && c < group->commandBufferCount) @@ -1251,7 +1251,7 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(SerialiserType &ser, VkQueue queue, submitInfo.pCommandBufferInfos = cmds.data(); if(prot && prot->protectedSubmit) - submitInfo.flags |= VK_SUBMIT_PROTECTED_BIT_KHR; + submitInfo.flags |= VK_SUBMIT_PROTECTED_BIT; // don't replay any semaphores, this means we don't have to care about // VkD3D12FenceSubmitInfoKHR or VkTimelineSemaphoreSubmitInfo. @@ -1381,9 +1381,8 @@ VkResult WrappedVulkan::vkQueueSubmit(VkQueue queue, uint32_t submitCount, } template -bool WrappedVulkan::Serialise_vkQueueSubmit2KHR(SerialiserType &ser, VkQueue queue, - uint32_t submitCount, - const VkSubmitInfo2KHR *pSubmits, VkFence fence) +bool WrappedVulkan::Serialise_vkQueueSubmit2(SerialiserType &ser, VkQueue queue, uint32_t submitCount, + const VkSubmitInfo2 *pSubmits, VkFence fence) { SERIALISE_ELEMENT(queue); SERIALISE_ELEMENT(submitCount); @@ -1429,8 +1428,7 @@ bool WrappedVulkan::Serialise_vkQueueSubmit2KHR(SerialiserType &ser, VkQueue que for(uint32_t sub = 0; sub < submitCount; sub++) { - rdcstr basename = - StringFormat::Fmt("vkQueueSubmit2KHR(%u)", pSubmits[sub].commandBufferInfoCount); + rdcstr basename = StringFormat::Fmt("vkQueueSubmit2(%u)", pSubmits[sub].commandBufferInfoCount); ReplayQueueSubmit(queue, pSubmits[sub], basename); } @@ -1439,8 +1437,8 @@ bool WrappedVulkan::Serialise_vkQueueSubmit2KHR(SerialiserType &ser, VkQueue que return true; } -VkResult WrappedVulkan::vkQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, - const VkSubmitInfo2KHR *pSubmits, VkFence fence) +VkResult WrappedVulkan::vkQueueSubmit2(VkQueue queue, uint32_t submitCount, + const VkSubmitInfo2 *pSubmits, VkFence fence) { SCOPED_DBG_SINK(); @@ -1494,7 +1492,7 @@ VkResult WrappedVulkan::vkQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, CaptureQueueSubmit(queue, commandBuffers, fence); - size_t tempmemSize = sizeof(VkSubmitInfo2KHR) * submitCount; + size_t tempmemSize = sizeof(VkSubmitInfo2) * submitCount; // because we pass the base struct this will calculate the patch size including it for(uint32_t i = 0; i < submitCount; i++) @@ -1502,14 +1500,14 @@ VkResult WrappedVulkan::vkQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, byte *memory = GetTempMemory(tempmemSize); - VkSubmitInfo2KHR *unwrappedSubmits = (VkSubmitInfo2KHR *)memory; - memory += sizeof(VkSubmitInfo2KHR) * submitCount; + VkSubmitInfo2 *unwrappedSubmits = (VkSubmitInfo2 *)memory; + memory += sizeof(VkSubmitInfo2) * submitCount; for(uint32_t i = 0; i < submitCount; i++) unwrappedSubmits[i] = *UnwrapStructAndChain(m_State, memory, &pSubmits[i]); - SERIALISE_TIME_CALL(ret = ObjDisp(queue)->QueueSubmit2KHR(Unwrap(queue), submitCount, - unwrappedSubmits, Unwrap(fence))); + SERIALISE_TIME_CALL(ret = ObjDisp(queue)->QueueSubmit2(Unwrap(queue), submitCount, + unwrappedSubmits, Unwrap(fence))); if(capframe) { @@ -1517,8 +1515,8 @@ VkResult WrappedVulkan::vkQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, CACHE_THREAD_SERIALISER(); ser.SetActionChunk(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkQueueSubmit2KHR); - Serialise_vkQueueSubmit2KHR(ser, queue, submitCount, pSubmits, fence); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkQueueSubmit2); + Serialise_vkQueueSubmit2(ser, queue, submitCount, pSubmits, fence); m_FrameCaptureRecord->AddChunk(scope.Get()); } @@ -2184,5 +2182,5 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkQueueInsertDebugUtilsLabelEXT, VkQueue q INSTANTIATE_FUNCTION_SERIALISED(void, vkGetDeviceQueue2, VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue); -INSTANTIATE_FUNCTION_SERIALISED(VkResult, vkQueueSubmit2KHR, VkQueue queue, uint32_t submitCount, - const VkSubmitInfo2KHR *pSubmits, VkFence fence); +INSTANTIATE_FUNCTION_SERIALISED(VkResult, vkQueueSubmit2, VkQueue queue, uint32_t submitCount, + const VkSubmitInfo2 *pSubmits, VkFence fence); diff --git a/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp index 3772367a0..26eebaf93 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp @@ -431,7 +431,7 @@ bool WrappedVulkan::Serialise_vkCreateGraphicsPipelines( // don't fail when a compile is required because we don't currently replay caches so this will // always happen. This still allows application to use this flag at runtime where it will be // valid - CreateInfo.flags &= ~VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT; + CreateInfo.flags &= ~VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT; VkGraphicsPipelineCreateInfo *unwrapped = UnwrapInfos(&CreateInfo, 1); VkResult ret = ObjDisp(device)->CreateGraphicsPipelines(Unwrap(device), Unwrap(pipelineCache), @@ -525,7 +525,7 @@ VkResult WrappedVulkan::vkCreateGraphicsPipelines(VkDevice device, VkPipelineCac ret = ObjDisp(device)->CreateGraphicsPipelines(Unwrap(device), Unwrap(pipelineCache), count, unwrapped, pAllocator, pPipelines)); - if(ret == VK_SUCCESS || ret == VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT) + if(ret == VK_SUCCESS || ret == VK_PIPELINE_COMPILE_REQUIRED) { for(uint32_t i = 0; i < count; i++) { diff --git a/renderdoc/driver/vulkan/wrappers/vk_sync_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_sync_funcs.cpp index 4e27f830f..2208b9976 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_sync_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_sync_funcs.cpp @@ -1146,9 +1146,8 @@ VkResult WrappedVulkan::vkSignalSemaphore(VkDevice device, const VkSemaphoreSign } template -bool WrappedVulkan::Serialise_vkCmdSetEvent2KHR(SerialiserType &ser, VkCommandBuffer commandBuffer, - VkEvent event, - const VkDependencyInfoKHR *pDependencyInfo) +bool WrappedVulkan::Serialise_vkCmdSetEvent2(SerialiserType &ser, VkCommandBuffer commandBuffer, + VkEvent event, const VkDependencyInfo *pDependencyInfo) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(event).Important(); @@ -1173,29 +1172,29 @@ bool WrappedVulkan::Serialise_vkCmdSetEvent2KHR(SerialiserType &ser, VkCommandBu } if(commandBuffer != VK_NULL_HANDLE) - ObjDisp(commandBuffer)->CmdSetEvent2KHR(Unwrap(commandBuffer), Unwrap(event), &DependencyInfo); + ObjDisp(commandBuffer)->CmdSetEvent2(Unwrap(commandBuffer), Unwrap(event), &DependencyInfo); } return true; } -void WrappedVulkan::vkCmdSetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent event, - const VkDependencyInfoKHR *pDependencyInfo) +void WrappedVulkan::vkCmdSetEvent2(VkCommandBuffer commandBuffer, VkEvent event, + const VkDependencyInfo *pDependencyInfo) { SCOPED_DBG_SINK(); - VkDependencyInfoKHR unwrappedInfo = *pDependencyInfo; + VkDependencyInfo unwrappedInfo = *pDependencyInfo; byte *tempMem = GetTempMemory(GetNextPatchSize(&unwrappedInfo)); { VkBaseInStructure dummy = {}; dummy.pNext = (const VkBaseInStructure *)&unwrappedInfo; - UnwrapNextChain(m_State, "VkDependencyInfoKHR", tempMem, &dummy); + UnwrapNextChain(m_State, "VkDependencyInfo", tempMem, &dummy); } SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdSetEvent2KHR(Unwrap(commandBuffer), Unwrap(event), &unwrappedInfo)); + ObjDisp(commandBuffer)->CmdSetEvent2(Unwrap(commandBuffer), Unwrap(event), &unwrappedInfo)); if(IsCaptureMode(m_State)) { @@ -1203,8 +1202,8 @@ void WrappedVulkan::vkCmdSetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent eve CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetEvent2KHR); - Serialise_vkCmdSetEvent2KHR(ser, commandBuffer, event, pDependencyInfo); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdSetEvent2); + Serialise_vkCmdSetEvent2(ser, commandBuffer, event, pDependencyInfo); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); record->MarkResourceFrameReferenced(GetResID(event), eFrameRef_Read); @@ -1212,13 +1211,12 @@ void WrappedVulkan::vkCmdSetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent eve } template -bool WrappedVulkan::Serialise_vkCmdResetEvent2KHR(SerialiserType &ser, VkCommandBuffer commandBuffer, - VkEvent event, VkPipelineStageFlags2KHR stageMask) +bool WrappedVulkan::Serialise_vkCmdResetEvent2(SerialiserType &ser, VkCommandBuffer commandBuffer, + VkEvent event, VkPipelineStageFlags2 stageMask) { SERIALISE_ELEMENT(commandBuffer); SERIALISE_ELEMENT(event).Important(); - SERIALISE_ELEMENT_TYPED(VkPipelineStageFlagBits2KHR, stageMask) - .TypedAs("VkPipelineStageFlags2KHR"_lit); + SERIALISE_ELEMENT_TYPED(VkPipelineStageFlagBits2, stageMask).TypedAs("VkPipelineStageFlags2"_lit); Serialise_DebugMessages(ser); @@ -1240,20 +1238,20 @@ bool WrappedVulkan::Serialise_vkCmdResetEvent2KHR(SerialiserType &ser, VkCommand if(commandBuffer != VK_NULL_HANDLE) { - // ObjDisp(commandBuffer)->CmdResetEvent2KHR(Unwrap(commandBuffer), Unwrap(event), stageMask); + // ObjDisp(commandBuffer)->CmdResetEvent2(Unwrap(commandBuffer), Unwrap(event), stageMask); } } return true; } -void WrappedVulkan::vkCmdResetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent event, - VkPipelineStageFlags2KHR stageMask) +void WrappedVulkan::vkCmdResetEvent2(VkCommandBuffer commandBuffer, VkEvent event, + VkPipelineStageFlags2 stageMask) { SCOPED_DBG_SINK(); SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdResetEvent2KHR(Unwrap(commandBuffer), Unwrap(event), stageMask)); + ObjDisp(commandBuffer)->CmdResetEvent2(Unwrap(commandBuffer), Unwrap(event), stageMask)); if(IsCaptureMode(m_State)) { @@ -1261,8 +1259,8 @@ void WrappedVulkan::vkCmdResetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent e CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdResetEvent2KHR); - Serialise_vkCmdResetEvent2KHR(ser, commandBuffer, event, stageMask); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdResetEvent2); + Serialise_vkCmdResetEvent2(ser, commandBuffer, event, stageMask); record->AddChunk(scope.Get(&record->cmdInfo->alloc)); record->MarkResourceFrameReferenced(GetResID(event), eFrameRef_Read); @@ -1270,9 +1268,9 @@ void WrappedVulkan::vkCmdResetEvent2KHR(VkCommandBuffer commandBuffer, VkEvent e } template -bool WrappedVulkan::Serialise_vkCmdWaitEvents2KHR(SerialiserType &ser, VkCommandBuffer commandBuffer, - uint32_t eventCount, const VkEvent *pEvents, - const VkDependencyInfoKHR *pDependencyInfos) +bool WrappedVulkan::Serialise_vkCmdWaitEvents2(SerialiserType &ser, VkCommandBuffer commandBuffer, + uint32_t eventCount, const VkEvent *pEvents, + const VkDependencyInfo *pDependencyInfos) { SERIALISE_ELEMENT(commandBuffer); @@ -1292,15 +1290,15 @@ bool WrappedVulkan::Serialise_vkCmdWaitEvents2KHR(SerialiserType &ser, VkCommand { m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); - rdcarray imgBarriers; - rdcarray bufBarriers; + rdcarray imgBarriers; + rdcarray bufBarriers; for(uint32_t evIdx = 0; evIdx < eventCount; evIdx++) { imgBarriers.clear(); bufBarriers.clear(); - const VkDependencyInfoKHR &depInfo = pDependencyInfos[evIdx]; + const VkDependencyInfo &depInfo = pDependencyInfos[evIdx]; for(uint32_t i = 0; i < depInfo.bufferMemoryBarrierCount; i++) { @@ -1338,7 +1336,7 @@ bool WrappedVulkan::Serialise_vkCmdWaitEvents2KHR(SerialiserType &ser, VkCommand ObjDisp(commandBuffer)->ResetEvent(Unwrap(GetDev()), ev); - VkDependencyInfoKHR UnwrappedDependencyInfo = depInfo; + VkDependencyInfo UnwrappedDependencyInfo = depInfo; UnwrappedDependencyInfo.pBufferMemoryBarriers = bufBarriers.data(); UnwrappedDependencyInfo.bufferMemoryBarrierCount = (uint32_t)bufBarriers.size(); @@ -1363,7 +1361,7 @@ bool WrappedVulkan::Serialise_vkCmdWaitEvents2KHR(SerialiserType &ser, VkCommand for(uint32_t i = 0; i < depInfo.imageMemoryBarrierCount; i++) { - const VkImageMemoryBarrier2KHR &b = depInfo.pImageMemoryBarriers[i]; + const VkImageMemoryBarrier2 &b = depInfo.pImageMemoryBarriers[i]; if(b.image != VK_NULL_HANDLE && b.oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && b.newLayout != VK_IMAGE_LAYOUT_UNDEFINED) { @@ -1381,7 +1379,7 @@ bool WrappedVulkan::Serialise_vkCmdWaitEvents2KHR(SerialiserType &ser, VkCommand if(commandBuffer != VK_NULL_HANDLE) { // now sanitise layouts before passing to vulkan - for(VkImageMemoryBarrier2KHR &barrier : imgBarriers) + for(VkImageMemoryBarrier2 &barrier : imgBarriers) { if(barrier.oldLayout == barrier.newLayout) { @@ -1403,14 +1401,14 @@ bool WrappedVulkan::Serialise_vkCmdWaitEvents2KHR(SerialiserType &ser, VkCommand SanitiseReplayImageLayout(barrier.newLayout); } - ObjDisp(commandBuffer)->CmdSetEvent2KHR(Unwrap(commandBuffer), ev, &UnwrappedDependencyInfo); - ObjDisp(commandBuffer)->CmdWaitEvents2KHR(Unwrap(commandBuffer), 1, &ev, &UnwrappedDependencyInfo); + ObjDisp(commandBuffer)->CmdSetEvent2(Unwrap(commandBuffer), ev, &UnwrappedDependencyInfo); + ObjDisp(commandBuffer)->CmdWaitEvents2(Unwrap(commandBuffer), 1, &ev, &UnwrappedDependencyInfo); if(m_ReplayOptions.optimisation != ReplayOptimisationLevel::Fastest) { for(uint32_t i = 0; i < depInfo.imageMemoryBarrierCount; i++) { - const VkImageMemoryBarrier2KHR &b = depInfo.pImageMemoryBarriers[i]; + const VkImageMemoryBarrier2 &b = depInfo.pImageMemoryBarriers[i]; if(b.image != VK_NULL_HANDLE && b.oldLayout == VK_IMAGE_LAYOUT_UNDEFINED && b.newLayout != VK_IMAGE_LAYOUT_UNDEFINED) { @@ -1427,21 +1425,20 @@ bool WrappedVulkan::Serialise_vkCmdWaitEvents2KHR(SerialiserType &ser, VkCommand return true; } -void WrappedVulkan::vkCmdWaitEvents2KHR(VkCommandBuffer commandBuffer, uint32_t eventCount, - const VkEvent *pEvents, - const VkDependencyInfoKHR *pDependencyInfos) +void WrappedVulkan::vkCmdWaitEvents2(VkCommandBuffer commandBuffer, uint32_t eventCount, + const VkEvent *pEvents, const VkDependencyInfo *pDependencyInfos) { { - size_t memSize = sizeof(VkEvent) * eventCount + sizeof(VkDependencyInfoKHR) * eventCount; + size_t memSize = sizeof(VkEvent) * eventCount + sizeof(VkDependencyInfo) * eventCount; - // because we pass in the base struct, this includes the size for the VkDependencyInfoKHR itself + // because we pass in the base struct, this includes the size for the VkDependencyInfo itself for(uint32_t i = 0; i < eventCount; i++) memSize += GetNextPatchSize((const void *)&pDependencyInfos[i]); byte *tempMem = GetTempMemory(memSize); VkEvent *ev = (VkEvent *)tempMem; - VkDependencyInfoKHR *depInfo = (VkDependencyInfoKHR *)(ev + eventCount); + VkDependencyInfo *depInfo = (VkDependencyInfo *)(ev + eventCount); tempMem = (byte *)(depInfo + eventCount); for(uint32_t i = 0; i < eventCount; i++) @@ -1451,7 +1448,7 @@ void WrappedVulkan::vkCmdWaitEvents2KHR(VkCommandBuffer commandBuffer, uint32_t } SERIALISE_TIME_CALL( - ObjDisp(commandBuffer)->CmdWaitEvents2KHR(Unwrap(commandBuffer), eventCount, ev, depInfo)); + ObjDisp(commandBuffer)->CmdWaitEvents2(Unwrap(commandBuffer), eventCount, ev, depInfo)); } if(IsCaptureMode(m_State)) @@ -1460,8 +1457,8 @@ void WrappedVulkan::vkCmdWaitEvents2KHR(VkCommandBuffer commandBuffer, uint32_t CACHE_THREAD_SERIALISER(); - SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdWaitEvents2KHR); - Serialise_vkCmdWaitEvents2KHR(ser, commandBuffer, eventCount, pEvents, pDependencyInfos); + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdWaitEvents2); + Serialise_vkCmdWaitEvents2(ser, commandBuffer, eventCount, pEvents, pDependencyInfos); for(uint32_t i = 0; i < eventCount; i++) { @@ -1567,12 +1564,12 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkWaitSemaphores, VkDevice device, INSTANTIATE_FUNCTION_SERIALISED(void, vkSignalSemaphore, VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetEvent2KHR, VkCommandBuffer commandBuffer, - VkEvent event, const VkDependencyInfoKHR *pDependencyInfo); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdSetEvent2, VkCommandBuffer commandBuffer, VkEvent event, + const VkDependencyInfo *pDependencyInfo); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdResetEvent2KHR, VkCommandBuffer commandBuffer, - VkEvent event, VkPipelineStageFlags2KHR stageMask); +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdResetEvent2, VkCommandBuffer commandBuffer, + VkEvent event, VkPipelineStageFlags2 stageMask); -INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdWaitEvents2KHR, VkCommandBuffer commandBuffer, +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdWaitEvents2, VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, - const VkDependencyInfoKHR *pDependencyInfos); + const VkDependencyInfo *pDependencyInfos);