From a9bee4cbb2fcb6dc38ef2424711225f8abb2d941 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Tue, 17 May 2022 08:44:30 -0700 Subject: build: Update to header 1.3.214 - Update known-good - Generate source --- build-android/vulkan-headers_revision_android | 2 +- icd/generated/mock_icd.cpp | 1 + icd/generated/mock_icd.h | 4 +++- icd/generated/vk_typemap_helper.h | 9 +++++++++ scripts/generate_vulkan_wrapper.py | 6 +++++- scripts/known_good.json | 4 ++-- vulkaninfo/generated/vulkaninfo.hpp | 14 ++++++++++++++ 7 files changed, 35 insertions(+), 5 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index ef9fb668..c56b96f8 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.213 +v1.3.214 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 2078b58f..5e5fc870 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -5358,6 +5358,7 @@ static VKAPI_ATTR void VKAPI_CALL GetPrivateDataEXT( + static VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV( VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 14bd1cd0..11f21218 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -284,10 +284,11 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_private_data", 1}, {"VK_EXT_pipeline_creation_cache_control", 3}, {"VK_KHR_video_encode_queue", 5}, - {"VK_NV_device_diagnostics_config", 1}, + {"VK_NV_device_diagnostics_config", 2}, {"VK_QCOM_render_pass_store_ops", 2}, {"VK_KHR_synchronization2", 1}, {"VK_EXT_graphics_pipeline_library", 1}, + {"VK_AMD_shader_early_and_late_fragment_tests", 1}, {"VK_KHR_shader_subgroup_uniform_control_flow", 1}, {"VK_KHR_zero_initialize_workgroup_memory", 1}, {"VK_NV_fragment_shading_rate_enums", 1}, @@ -3324,6 +3325,7 @@ static VKAPI_ATTR void VKAPI_CALL GetPrivateDataEXT( + static VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV( VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 0d583bf6..0d4a5c1f 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -5174,6 +5174,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_FEATURES_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT Type; +}; + // Map type VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV; diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index cbd942d1..26124396 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1174,7 +1174,7 @@ VK_EXT_private_data = Extension(name='VK_EXT_private_data', version=1, guard=Non VK_EXT_pipeline_creation_cache_control = Extension(name='VK_EXT_pipeline_creation_cache_control', version=3, guard=None, commands=[ ]) -VK_NV_device_diagnostics_config = Extension(name='VK_NV_device_diagnostics_config', version=1, guard=None, commands=[ +VK_NV_device_diagnostics_config = Extension(name='VK_NV_device_diagnostics_config', version=2, guard=None, commands=[ ]) VK_QCOM_render_pass_store_ops = Extension(name='VK_QCOM_render_pass_store_ops', version=2, guard=None, commands=[ @@ -1183,6 +1183,9 @@ VK_QCOM_render_pass_store_ops = Extension(name='VK_QCOM_render_pass_store_ops', VK_EXT_graphics_pipeline_library = Extension(name='VK_EXT_graphics_pipeline_library', version=1, guard=None, commands=[ ]) +VK_AMD_shader_early_and_late_fragment_tests = Extension(name='VK_AMD_shader_early_and_late_fragment_tests', version=1, guard=None, commands=[ +]) + VK_NV_fragment_shading_rate_enums = Extension(name='VK_NV_fragment_shading_rate_enums', version=1, guard=None, commands=[ Command(name='vkCmdSetFragmentShadingRateEnumNV', dispatch='VkCommandBuffer'), ]) @@ -1716,6 +1719,7 @@ extensions = [ VK_NV_device_diagnostics_config, VK_QCOM_render_pass_store_ops, VK_EXT_graphics_pipeline_library, + VK_AMD_shader_early_and_late_fragment_tests, VK_NV_fragment_shading_rate_enums, VK_NV_ray_tracing_motion_blur, VK_EXT_ycbcr_2plane_444_formats, diff --git a/scripts/known_good.json b/scripts/known_good.json index 7379a244..38e7a43b 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.213" + "commit" : "v1.3.214" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.3.213", + "commit" : "v1.3.214", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index be0bfc55..0be05b64 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -2242,6 +2242,11 @@ void DumpVkPhysicalDeviceShaderDrawParametersFeatures(Printer &p, std::string na p.SetMinKeyWidth(20); p.PrintKeyBool("shaderDrawParameters", static_cast(obj.shaderDrawParameters)); } +void DumpVkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT &obj) { + ObjectWrapper object{p, name}; + p.SetMinKeyWidth(31); + p.PrintKeyBool("shaderEarlyAndLateFragmentTests", static_cast(obj.shaderEarlyAndLateFragmentTests)); +} void DumpVkPhysicalDeviceShaderFloat16Int8Features(Printer &p, std::string name, const VkPhysicalDeviceShaderFloat16Int8Features &obj) { ObjectWrapper object{p, name}; p.SetMinKeyWidth(13); @@ -3027,6 +3032,7 @@ struct phys_device_features2_chain { VkPhysicalDeviceShaderClockFeaturesKHR PhysicalDeviceShaderClockFeaturesKHR{}; VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures PhysicalDeviceShaderDemoteToHelperInvocationFeatures{}; VkPhysicalDeviceShaderDrawParametersFeatures PhysicalDeviceShaderDrawParametersFeatures{}; + VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT{}; VkPhysicalDeviceShaderFloat16Int8Features PhysicalDeviceShaderFloat16Int8Features{}; VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT PhysicalDeviceShaderImageAtomicInt64FeaturesEXT{}; VkPhysicalDeviceShaderIntegerDotProductFeatures PhysicalDeviceShaderIntegerDotProductFeatures{}; @@ -3122,6 +3128,7 @@ struct phys_device_features2_chain { PhysicalDeviceShaderClockFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR; PhysicalDeviceShaderDemoteToHelperInvocationFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES; PhysicalDeviceShaderDrawParametersFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES; + PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_FEATURES_EXT; PhysicalDeviceShaderFloat16Int8Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES; PhysicalDeviceShaderImageAtomicInt64FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT; PhysicalDeviceShaderIntegerDotProductFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES; @@ -3216,6 +3223,7 @@ struct phys_device_features2_chain { chain_members.push_back(reinterpret_cast(&PhysicalDeviceShaderClockFeaturesKHR)); chain_members.push_back(reinterpret_cast(&PhysicalDeviceShaderDemoteToHelperInvocationFeatures)); chain_members.push_back(reinterpret_cast(&PhysicalDeviceShaderDrawParametersFeatures)); + chain_members.push_back(reinterpret_cast(&PhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT)); chain_members.push_back(reinterpret_cast(&PhysicalDeviceShaderFloat16Int8Features)); chain_members.push_back(reinterpret_cast(&PhysicalDeviceShaderImageAtomicInt64FeaturesEXT)); chain_members.push_back(reinterpret_cast(&PhysicalDeviceShaderIntegerDotProductFeatures)); @@ -4093,6 +4101,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place) DumpVkPhysicalDeviceShaderDrawParametersFeatures(p, gpu.api_version.minor >= 1 ?"VkPhysicalDeviceShaderDrawParametersFeatures":"VkPhysicalDeviceShaderDrawParameterFeatures", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_FEATURES_EXT && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_AMD_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_EXTENSION_NAME))) { + VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT* props = (VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT*)structure; + DumpVkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT(p, "VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME) || gpu.api_version.minor >= 2)) { -- cgit v1.2.3