diff options
| author | Mike Schuchardt <mikes@lunarg.com> | 2023-02-16 08:14:20 -0800 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2023-02-20 14:12:31 -0800 |
| commit | c3bd023b6f945b5edd0ade0bc6714ca3321bb0e3 (patch) | |
| tree | da22645786d52e8f76f2614fcdcc82e858946339 | |
| parent | 33f41f56840b063ba99f025c68af69eabc06d568 (diff) | |
| download | usermoji-c3bd023b6f945b5edd0ade0bc6714ca3321bb0e3.tar.xz | |
build: Update to header 1.3.241
- Update known-good
- Tweak generate_vulkan_wrapper.py to ignore sci header
- Generate source
| -rw-r--r-- | build-android/vulkan-headers_revision_android | 2 | ||||
| -rw-r--r-- | common/vulkan_wrapper.cpp | 3 | ||||
| -rw-r--r-- | icd/generated/mock_icd.cpp | 26 | ||||
| -rw-r--r-- | icd/generated/mock_icd.h | 33 | ||||
| -rw-r--r-- | icd/generated/vk_typemap_helper.h | 45 | ||||
| -rw-r--r-- | scripts/common_codegen.py | 1 | ||||
| -rwxr-xr-x | scripts/generate_vulkan_wrapper.py | 23 | ||||
| -rw-r--r-- | scripts/known_good.json | 4 | ||||
| -rw-r--r-- | vulkaninfo/generated/vulkaninfo.hpp | 14 |
9 files changed, 143 insertions, 8 deletions
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 683d15dd..bbc54d85 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.240 +v1.3.241 diff --git a/common/vulkan_wrapper.cpp b/common/vulkan_wrapper.cpp index b45b8431..56614d4e 100644 --- a/common/vulkan_wrapper.cpp +++ b/common/vulkan_wrapper.cpp @@ -958,6 +958,8 @@ PFN_vkGetSwapchainCounterEXT vkGetSwapchainCounterEXT; PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE; PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE; PFN_vkCmdSetDiscardRectangleEXT vkCmdSetDiscardRectangleEXT; +PFN_vkCmdSetDiscardRectangleEnableEXT vkCmdSetDiscardRectangleEnableEXT; +PFN_vkCmdSetDiscardRectangleModeEXT vkCmdSetDiscardRectangleModeEXT; PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT; PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT; PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT; @@ -1000,6 +1002,7 @@ PFN_vkGetCalibratedTimestampsEXT vkGetCalibratedTimestampsEXT; PFN_vkCmdDrawMeshTasksNV vkCmdDrawMeshTasksNV; PFN_vkCmdDrawMeshTasksIndirectNV vkCmdDrawMeshTasksIndirectNV; PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV; +PFN_vkCmdSetExclusiveScissorEnableNV vkCmdSetExclusiveScissorEnableNV; PFN_vkCmdSetExclusiveScissorNV vkCmdSetExclusiveScissorNV; PFN_vkCmdSetCheckpointNV vkCmdSetCheckpointNV; PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV; diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 2be22cb5..8cb67132 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -4483,6 +4483,20 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleEXT( //Not a CREATE or DESTROY function } +static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleEnableEXT( + VkCommandBuffer commandBuffer, + VkBool32 discardRectangleEnable) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleModeEXT( + VkCommandBuffer commandBuffer, + VkDiscardRectangleModeEXT discardRectangleMode) +{ +//Not a CREATE or DESTROY function +} + @@ -4987,6 +5001,15 @@ static VKAPI_ATTR void VKAPI_CALL CmdDrawMeshTasksIndirectCountNV( +static VKAPI_ATTR void VKAPI_CALL CmdSetExclusiveScissorEnableNV( + VkCommandBuffer commandBuffer, + uint32_t firstExclusiveScissor, + uint32_t exclusiveScissorCount, + const VkBool32* pExclusiveScissorEnables) +{ +//Not a CREATE or DESTROY function +} + static VKAPI_ATTR void VKAPI_CALL CmdSetExclusiveScissorNV( VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, @@ -6082,6 +6105,8 @@ static VKAPI_ATTR void VKAPI_CALL SetDeviceMemoryPriorityEXT( } + + static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutHostMappingInfoVALVE( VkDevice device, const VkDescriptorSetBindingReferenceVALVE* pBindingReference, @@ -6477,6 +6502,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetDynamicRenderingTilePropertiesQCOM( + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index b8db35d6..9eeb7567 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -87,6 +87,7 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map = {"VK_QNX_screen_surface", 1}, {"VK_KHR_portability_enumeration", 1}, {"VK_GOOGLE_surfaceless_query", 2}, + {"VK_EXT_application_parameters", 1}, {"VK_LUNARG_direct_driver_loading", 1}, }; // Map of device extension name to version @@ -120,6 +121,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_KHR_dynamic_rendering", 1}, {"VK_AMD_shader_image_load_store_lod", 1}, {"VK_NV_corner_sampled_image", 2}, + {"VK_NV_private_vendor_info", 2}, {"VK_KHR_multiview", 1}, {"VK_IMG_format_pvrtc", 1}, {"VK_NV_external_memory", 1}, @@ -154,7 +156,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_NV_viewport_array2", 1}, {"VK_NVX_multiview_per_view_attributes", 1}, {"VK_NV_viewport_swizzle", 1}, - {"VK_EXT_discard_rectangles", 1}, + {"VK_EXT_discard_rectangles", 2}, {"VK_EXT_conservative_rasterization", 1}, {"VK_EXT_depth_clip_enable", 1}, {"VK_EXT_hdr_metadata", 2}, @@ -228,7 +230,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_NV_mesh_shader", 1}, {"VK_NV_fragment_shader_barycentric", 1}, {"VK_NV_shader_image_footprint", 2}, - {"VK_NV_scissor_exclusive", 1}, + {"VK_NV_scissor_exclusive", 2}, {"VK_NV_device_diagnostic_checkpoints", 2}, {"VK_KHR_timeline_semaphore", 2}, {"VK_INTEL_shader_integer_functions2", 1}, @@ -291,6 +293,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_KHR_video_encode_queue", 7}, {"VK_NV_device_diagnostics_config", 2}, {"VK_QCOM_render_pass_store_ops", 2}, + {"VK_KHR_object_refresh", 1}, {"VK_EXT_metal_objects", 1}, {"VK_KHR_synchronization2", 1}, {"VK_EXT_descriptor_buffer", 1}, @@ -329,6 +332,8 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_HUAWEI_invocation_mask", 1}, {"VK_NV_external_memory_rdma", 1}, {"VK_EXT_pipeline_properties", 1}, + {"VK_NV_external_sci_sync", 2}, + {"VK_NV_external_memory_sci_buf", 2}, {"VK_EXT_multisampled_render_to_single_sampled", 1}, {"VK_EXT_extended_dynamic_state2", 1}, {"VK_EXT_color_write_enable", 1}, @@ -344,6 +349,8 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_EXT_border_color_swizzle", 1}, {"VK_EXT_pageable_device_local_memory", 1}, {"VK_KHR_maintenance4", 2}, + {"VK_ARM_shader_core_properties", 1}, + {"VK_EXT_image_sliced_view_of_3d", 1}, {"VK_VALVE_descriptor_set_host_mapping", 1}, {"VK_EXT_depth_clamp_zero_one", 1}, {"VK_EXT_non_seamless_cube_map", 1}, @@ -363,10 +370,12 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_QCOM_tile_properties", 1}, {"VK_SEC_amigo_profiling", 1}, {"VK_QCOM_multiview_per_view_viewports", 1}, + {"VK_NV_external_sci_sync2", 1}, {"VK_NV_ray_tracing_invocation_reorder", 1}, {"VK_EXT_mutable_descriptor_type", 1}, {"VK_ARM_shader_core_builtins", 2}, {"VK_EXT_pipeline_library_group_handles", 1}, + {"VK_QCOM_multiview_per_view_render_areas", 1}, }; @@ -2716,6 +2725,14 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleEXT( uint32_t discardRectangleCount, const VkRect2D* pDiscardRectangles); +static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleEnableEXT( + VkCommandBuffer commandBuffer, + VkBool32 discardRectangleEnable); + +static VKAPI_ATTR void VKAPI_CALL CmdSetDiscardRectangleModeEXT( + VkCommandBuffer commandBuffer, + VkDiscardRectangleModeEXT discardRectangleMode); + @@ -3045,6 +3062,12 @@ static VKAPI_ATTR void VKAPI_CALL CmdDrawMeshTasksIndirectCountNV( +static VKAPI_ATTR void VKAPI_CALL CmdSetExclusiveScissorEnableNV( + VkCommandBuffer commandBuffer, + uint32_t firstExclusiveScissor, + uint32_t exclusiveScissorCount, + const VkBool32* pExclusiveScissorEnables); + static VKAPI_ATTR void VKAPI_CALL CmdSetExclusiveScissorNV( VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, @@ -3741,6 +3764,8 @@ static VKAPI_ATTR void VKAPI_CALL SetDeviceMemoryPriorityEXT( float priority); + + static VKAPI_ATTR void VKAPI_CALL GetDescriptorSetLayoutHostMappingInfoVALVE( VkDevice device, const VkDescriptorSetBindingReferenceVALVE* pBindingReference, @@ -3988,6 +4013,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetDynamicRenderingTilePropertiesQCOM( + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, @@ -4590,6 +4616,8 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = { {"vkGetRefreshCycleDurationGOOGLE", (void*)GetRefreshCycleDurationGOOGLE}, {"vkGetPastPresentationTimingGOOGLE", (void*)GetPastPresentationTimingGOOGLE}, {"vkCmdSetDiscardRectangleEXT", (void*)CmdSetDiscardRectangleEXT}, + {"vkCmdSetDiscardRectangleEnableEXT", (void*)CmdSetDiscardRectangleEnableEXT}, + {"vkCmdSetDiscardRectangleModeEXT", (void*)CmdSetDiscardRectangleModeEXT}, {"vkSetHdrMetadataEXT", (void*)SetHdrMetadataEXT}, #ifdef VK_USE_PLATFORM_IOS_MVK {"vkCreateIOSSurfaceMVK", (void*)CreateIOSSurfaceMVK}, @@ -4644,6 +4672,7 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = { {"vkCmdDrawMeshTasksNV", (void*)CmdDrawMeshTasksNV}, {"vkCmdDrawMeshTasksIndirectNV", (void*)CmdDrawMeshTasksIndirectNV}, {"vkCmdDrawMeshTasksIndirectCountNV", (void*)CmdDrawMeshTasksIndirectCountNV}, + {"vkCmdSetExclusiveScissorEnableNV", (void*)CmdSetExclusiveScissorEnableNV}, {"vkCmdSetExclusiveScissorNV", (void*)CmdSetExclusiveScissorNV}, {"vkCmdSetCheckpointNV", (void*)CmdSetCheckpointNV}, {"vkGetQueueCheckpointDataNV", (void*)GetQueueCheckpointDataNV}, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index e751b974..b34ffafb 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -6322,6 +6322,33 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE typedef VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT Type; }; +// Map type VkPhysicalDeviceShaderCorePropertiesARM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM +template <> struct LvlTypeMap<VkPhysicalDeviceShaderCorePropertiesARM> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_ARM> { + typedef VkPhysicalDeviceShaderCorePropertiesARM Type; +}; + +// Map type VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT +template <> struct LvlTypeMap<VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT> { + typedef VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT Type; +}; + +// Map type VkImageViewSlicedCreateInfoEXT to id VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT +template <> struct LvlTypeMap<VkImageViewSlicedCreateInfoEXT> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMAGE_VIEW_SLICED_CREATE_INFO_EXT> { + typedef VkImageViewSlicedCreateInfoEXT Type; +}; + // Map type VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE template <> struct LvlTypeMap<VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE> { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE; @@ -6754,6 +6781,24 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRAR typedef VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT Type; }; +// Map type VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM +template <> struct LvlTypeMap<VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM> { + typedef VkPhysicalDeviceMultiviewPerViewRenderAreasFeaturesQCOM Type; +}; + +// Map type VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM to id VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM +template <> struct LvlTypeMap<VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM> { + typedef VkMultiviewPerViewRenderAreasRenderPassBeginInfoQCOM Type; +}; + // Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR template <> struct LvlTypeMap<VkAccelerationStructureGeometryTrianglesDataKHR> { static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR; diff --git a/scripts/common_codegen.py b/scripts/common_codegen.py index 5ba9a57e..9539db25 100644 --- a/scripts/common_codegen.py +++ b/scripts/common_codegen.py @@ -60,6 +60,7 @@ platform_dict = { 'provisional' : 'VK_ENABLE_BETA_EXTENSIONS', 'directfb' : 'VK_USE_PLATFORM_DIRECTFB_EXT', 'screen' : 'VK_USE_PLATFORM_SCREEN_QNX', + 'sci' : 'VK_USE_PLATFORM_SCI', } # diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 6f0ccb72..11d575cd 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -851,8 +851,10 @@ VK_NVX_multiview_per_view_attributes = Extension(name='VK_NVX_multiview_per_view VK_NV_viewport_swizzle = Extension(name='VK_NV_viewport_swizzle', version=1, guard=None, commands=[ ]) -VK_EXT_discard_rectangles = Extension(name='VK_EXT_discard_rectangles', version=1, guard=None, commands=[ +VK_EXT_discard_rectangles = Extension(name='VK_EXT_discard_rectangles', version=2, guard=None, commands=[ Command(name='vkCmdSetDiscardRectangleEXT', dispatch='VkCommandBuffer'), + Command(name='vkCmdSetDiscardRectangleEnableEXT', dispatch='VkCommandBuffer'), + Command(name='vkCmdSetDiscardRectangleModeEXT', dispatch='VkCommandBuffer'), ]) VK_EXT_conservative_rasterization = Extension(name='VK_EXT_conservative_rasterization', version=1, guard=None, commands=[ @@ -1026,7 +1028,8 @@ VK_NV_fragment_shader_barycentric = Extension(name='VK_NV_fragment_shader_baryce VK_NV_shader_image_footprint = Extension(name='VK_NV_shader_image_footprint', version=2, guard=None, commands=[ ]) -VK_NV_scissor_exclusive = Extension(name='VK_NV_scissor_exclusive', version=1, guard=None, commands=[ +VK_NV_scissor_exclusive = Extension(name='VK_NV_scissor_exclusive', version=2, guard=None, commands=[ + Command(name='vkCmdSetExclusiveScissorEnableNV', dispatch='VkCommandBuffer'), Command(name='vkCmdSetExclusiveScissorNV', dispatch='VkCommandBuffer'), ]) @@ -1380,6 +1383,12 @@ VK_EXT_pageable_device_local_memory = Extension(name='VK_EXT_pageable_device_loc Command(name='vkSetDeviceMemoryPriorityEXT', dispatch='VkDevice'), ]) +VK_ARM_shader_core_properties = Extension(name='VK_ARM_shader_core_properties', version=1, guard=None, commands=[ +]) + +VK_EXT_image_sliced_view_of_3d = Extension(name='VK_EXT_image_sliced_view_of_3d', version=1, guard=None, commands=[ +]) + VK_VALVE_descriptor_set_host_mapping = Extension(name='VK_VALVE_descriptor_set_host_mapping', version=1, guard=None, commands=[ Command(name='vkGetDescriptorSetLayoutHostMappingInfoVALVE', dispatch='VkDevice'), Command(name='vkGetDescriptorSetHostMappingVALVE', dispatch='VkDevice'), @@ -1501,6 +1510,9 @@ VK_ARM_shader_core_builtins = Extension(name='VK_ARM_shader_core_builtins', vers VK_EXT_pipeline_library_group_handles = Extension(name='VK_EXT_pipeline_library_group_handles', version=1, guard=None, commands=[ ]) +VK_QCOM_multiview_per_view_render_areas = Extension(name='VK_QCOM_multiview_per_view_render_areas', version=1, guard=None, commands=[ +]) + VK_KHR_acceleration_structure = Extension(name='VK_KHR_acceleration_structure', version=13, guard=None, commands=[ Command(name='vkCreateAccelerationStructureKHR', dispatch='VkDevice'), Command(name='vkDestroyAccelerationStructureKHR', dispatch='VkDevice'), @@ -1941,6 +1953,8 @@ extensions = [ VK_HUAWEI_cluster_culling_shader, VK_EXT_border_color_swizzle, VK_EXT_pageable_device_local_memory, + VK_ARM_shader_core_properties, + VK_EXT_image_sliced_view_of_3d, VK_VALVE_descriptor_set_host_mapping, VK_EXT_depth_clamp_zero_one, VK_EXT_non_seamless_cube_map, @@ -1966,6 +1980,7 @@ extensions = [ VK_EXT_mutable_descriptor_type, VK_ARM_shader_core_builtins, VK_EXT_pipeline_library_group_handles, + VK_QCOM_multiview_per_view_render_areas, VK_KHR_acceleration_structure, VK_KHR_ray_tracing_pipeline, VK_KHR_ray_query, @@ -2192,7 +2207,9 @@ def parse_vulkan_h(filename): if line.startswith("#include \"vulkan_"): # Extract the filename and parse it. Must be local to script file (no path). - extensions.extend(parse_subheader(line[10:].replace('"', ''), ext_guard)) + filename = line[10:].replace('"', '') + if filename != "vulkan_sci.h": + extensions.extend(parse_subheader(filename, ext_guard)) elif line.startswith("#ifdef VK_USE_PLATFORM") or line.startswith('#ifdef VK_ENABLE_BETA_EXTENSIONS'): guard_begin = line.find(" ") + 1 ext_guard = line[guard_begin:] diff --git a/scripts/known_good.json b/scripts/known_good.json index 2159fe55..d90763ab 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit": "v1.3.240" + "commit": "v1.3.241" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit": "v1.3.240", + "commit": "v1.3.241", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 8a4dd026..3a3412eb 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -1841,6 +1841,11 @@ void DumpVkPhysicalDeviceImageRobustnessFeatures(Printer &p, std::string name, c p.SetMinKeyWidth(17); p.PrintKeyBool("robustImageAccess", static_cast<bool>(obj.robustImageAccess)); } +void DumpVkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT &obj) { + ObjectWrapper object{p, name}; + p.SetMinKeyWidth(19); + p.PrintKeyBool("imageSlicedViewOf3D", static_cast<bool>(obj.imageSlicedViewOf3D)); +} void DumpVkPhysicalDeviceImageViewMinLodFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceImageViewMinLodFeaturesEXT &obj) { ObjectWrapper object{p, name}; p.SetMinKeyWidth(6); @@ -3233,6 +3238,7 @@ struct phys_device_features2_chain { VkPhysicalDeviceImageCompressionControlFeaturesEXT PhysicalDeviceImageCompressionControlFeaturesEXT{}; VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT{}; VkPhysicalDeviceImageRobustnessFeatures PhysicalDeviceImageRobustnessFeatures{}; + VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT PhysicalDeviceImageSlicedViewOf3DFeaturesEXT{}; VkPhysicalDeviceImageViewMinLodFeaturesEXT PhysicalDeviceImageViewMinLodFeaturesEXT{}; VkPhysicalDeviceImagelessFramebufferFeatures PhysicalDeviceImagelessFramebufferFeatures{}; VkPhysicalDeviceIndexTypeUint8FeaturesEXT PhysicalDeviceIndexTypeUint8FeaturesEXT{}; @@ -3347,6 +3353,7 @@ struct phys_device_features2_chain { PhysicalDeviceImageCompressionControlFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_FEATURES_EXT; PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_FEATURES_EXT; PhysicalDeviceImageRobustnessFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES; + PhysicalDeviceImageSlicedViewOf3DFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT; PhysicalDeviceImageViewMinLodFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT; PhysicalDeviceImagelessFramebufferFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES; PhysicalDeviceIndexTypeUint8FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT; @@ -3460,6 +3467,7 @@ struct phys_device_features2_chain { chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageCompressionControlFeaturesEXT)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageCompressionControlSwapchainFeaturesEXT)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageRobustnessFeatures)); + chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageSlicedViewOf3DFeaturesEXT)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImageViewMinLodFeaturesEXT)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceImagelessFramebufferFeatures)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceIndexTypeUint8FeaturesEXT)); @@ -4209,6 +4217,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place) DumpVkPhysicalDeviceImageRobustnessFeatures(p, gpu.api_version.minor >= 3 ?"VkPhysicalDeviceImageRobustnessFeatures":"VkPhysicalDeviceImageRobustnessFeaturesEXT", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_SLICED_VIEW_OF_3D_FEATURES_EXT && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_IMAGE_SLICED_VIEW_OF_3D_EXTENSION_NAME))) { + VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT* props = (VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT*)structure; + DumpVkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT(p, "VkPhysicalDeviceImageSlicedViewOf3DFeaturesEXT", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME))) { VkPhysicalDeviceImageViewMinLodFeaturesEXT* props = (VkPhysicalDeviceImageViewMinLodFeaturesEXT*)structure; |
