diff options
| author | Mike Schuchardt <mikes@lunarg.com> | 2023-04-27 10:25:57 -0700 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2023-04-27 11:36:25 -0700 |
| commit | e8cfca418ac42b35d696c48595fb7a82a4822355 (patch) | |
| tree | 29f5b75a81004c2f984d16a97515a97a28187ad5 | |
| parent | df10a2759b4b60d59b735882217a749d8e5be660 (diff) | |
| download | usermoji-e8cfca418ac42b35d696c48595fb7a82a4822355.tar.xz | |
build: Update to header 1.3.249
- Update known-good
- Generate source
| -rw-r--r-- | build-android/vulkan-headers_revision_android | 2 | ||||
| -rw-r--r-- | icd/generated/mock_icd.cpp | 1 | ||||
| -rw-r--r-- | icd/generated/mock_icd.h | 2 | ||||
| -rw-r--r-- | icd/generated/vk_typemap_helper.h | 9 | ||||
| -rwxr-xr-x | scripts/generate_vulkan_wrapper.py | 4 | ||||
| -rw-r--r-- | scripts/known_good.json | 4 | ||||
| -rw-r--r-- | vulkaninfo/generated/vulkaninfo.hpp | 14 |
7 files changed, 33 insertions, 3 deletions
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 8213fce1..56628d75 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.248 +v1.3.249 diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index dca59bf0..f281fcf0 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -4102,6 +4102,7 @@ static VKAPI_ATTR void VKAPI_CALL GetDeviceImageSparseMemoryRequirementsKHR( } + static VKAPI_ATTR VkResult VKAPI_CALL CreateDebugReportCallbackEXT( VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index c8806fe5..d900390a 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -371,6 +371,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_NV_optical_flow", 1}, {"VK_EXT_legacy_dithering", 1}, {"VK_EXT_pipeline_protected_access", 1}, + {"VK_KHR_ray_tracing_position_fetch", 1}, {"VK_EXT_shader_object", 1}, {"VK_QCOM_tile_properties", 1}, {"VK_SEC_amigo_profiling", 1}, @@ -2431,6 +2432,7 @@ static VKAPI_ATTR void VKAPI_CALL GetDeviceImageSparseMemoryRequirementsKHR( VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); + static VKAPI_ATTR VkResult VKAPI_CALL CreateDebugReportCallbackEXT( VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 4fc33283..2d03609d 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -3149,6 +3149,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAI typedef VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR Type; }; +// Map type VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR +template <> struct LvlTypeMap<VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR> { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR; +}; + +template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR> { + typedef VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR Type; +}; + // Map type VkDebugReportCallbackCreateInfoEXT to id VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT template <> struct LvlTypeMap<VkDebugReportCallbackCreateInfoEXT> { static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT; diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index a2ce7820..974501b2 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -697,6 +697,9 @@ VK_KHR_maintenance4 = Extension(name='VK_KHR_maintenance4', version=2, guard=Non Command(name='vkGetDeviceImageSparseMemoryRequirementsKHR', dispatch='VkDevice'), ]) +VK_KHR_ray_tracing_position_fetch = Extension(name='VK_KHR_ray_tracing_position_fetch', version=1, guard=None, commands=[ +]) + VK_EXT_debug_report = Extension(name='VK_EXT_debug_report', version=10, guard=None, commands=[ Command(name='vkCreateDebugReportCallbackEXT', dispatch='VkInstance'), Command(name='vkDestroyDebugReportCallbackEXT', dispatch='VkInstance'), @@ -1802,6 +1805,7 @@ extensions = [ VK_KHR_ray_tracing_maintenance1, VK_KHR_portability_enumeration, VK_KHR_maintenance4, + VK_KHR_ray_tracing_position_fetch, VK_EXT_debug_report, VK_NV_glsl_shader, VK_EXT_depth_range_unrestricted, diff --git a/scripts/known_good.json b/scripts/known_good.json index e9d5ff3c..b50cfd2c 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.248" + "commit": "v1.3.249" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit": "v1.3.248", + "commit": "v1.3.249", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 6993a13f..1be9b64c 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -2444,6 +2444,11 @@ void DumpVkPhysicalDeviceRayTracingPipelinePropertiesKHR(Printer &p, std::string p.PrintKeyValue("shaderGroupHandleAlignment", obj.shaderGroupHandleAlignment); p.PrintKeyValue("maxRayHitAttributeSize", obj.maxRayHitAttributeSize); } +void DumpVkPhysicalDeviceRayTracingPositionFetchFeaturesKHR(Printer &p, std::string name, const VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR &obj) { + ObjectWrapper object{p, name}; + p.SetMinKeyWidth(23); + p.PrintKeyBool("rayTracingPositionFetch", static_cast<bool>(obj.rayTracingPositionFetch)); +} void DumpVkPhysicalDeviceRobustness2FeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceRobustness2FeaturesEXT &obj) { ObjectWrapper object{p, name}; p.SetMinKeyWidth(19); @@ -3395,6 +3400,7 @@ struct phys_device_features2_chain { VkPhysicalDeviceRayQueryFeaturesKHR PhysicalDeviceRayQueryFeaturesKHR{}; VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR PhysicalDeviceRayTracingMaintenance1FeaturesKHR{}; VkPhysicalDeviceRayTracingPipelineFeaturesKHR PhysicalDeviceRayTracingPipelineFeaturesKHR{}; + VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR PhysicalDeviceRayTracingPositionFetchFeaturesKHR{}; VkPhysicalDeviceRobustness2FeaturesEXT PhysicalDeviceRobustness2FeaturesEXT{}; VkPhysicalDeviceSamplerYcbcrConversionFeatures PhysicalDeviceSamplerYcbcrConversionFeatures{}; VkPhysicalDeviceScalarBlockLayoutFeatures PhysicalDeviceScalarBlockLayoutFeatures{}; @@ -3512,6 +3518,7 @@ struct phys_device_features2_chain { PhysicalDeviceRayQueryFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR; PhysicalDeviceRayTracingMaintenance1FeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR; PhysicalDeviceRayTracingPipelineFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR; + PhysicalDeviceRayTracingPositionFetchFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR; PhysicalDeviceRobustness2FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT; PhysicalDeviceSamplerYcbcrConversionFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES; PhysicalDeviceScalarBlockLayoutFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES; @@ -3628,6 +3635,7 @@ struct phys_device_features2_chain { chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRayQueryFeaturesKHR)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRayTracingMaintenance1FeaturesKHR)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRayTracingPipelineFeaturesKHR)); + chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRayTracingPositionFetchFeaturesKHR)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceRobustness2FeaturesEXT)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceSamplerYcbcrConversionFeatures)); chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceScalarBlockLayoutFeatures)); @@ -4583,6 +4591,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place) DumpVkPhysicalDeviceRayTracingPipelineFeaturesKHR(p, "VkPhysicalDeviceRayTracingPipelineFeaturesKHR", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_RAY_TRACING_POSITION_FETCH_EXTENSION_NAME))) { + VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR* props = (VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR*)structure; + DumpVkPhysicalDeviceRayTracingPositionFetchFeaturesKHR(p, "VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_ROBUSTNESS_2_EXTENSION_NAME))) { VkPhysicalDeviceRobustness2FeaturesEXT* props = (VkPhysicalDeviceRobustness2FeaturesEXT*)structure; |
