diff --git a/framework/core/hpp_instance.cpp b/framework/core/hpp_instance.cpp index a9a7e7beaf..ae24095a34 100644 --- a/framework/core/hpp_instance.cpp +++ b/framework/core/hpp_instance.cpp @@ -35,35 +35,36 @@ namespace vkb namespace { #ifdef USE_VALIDATION_LAYERS -VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type, - const VkDebugUtilsMessengerCallbackDataEXT *callback_data, - void *user_data) +VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT message_severity, + vk::DebugUtilsMessageTypeFlagsEXT message_type, + const vk::DebugUtilsMessengerCallbackDataEXT *callback_data, + void *user_data) { // Log debug message - if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) + if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning) { LOGW("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage); } - else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) + else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError) { LOGE("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage); } return VK_FALSE; } -static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT /*type*/, - uint64_t /*object*/, size_t /*location*/, int32_t /*message_code*/, - const char *layer_prefix, const char *message, void * /*user_data*/) +static VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_callback(vk::DebugReportFlagsEXT flags, vk::DebugReportObjectTypeEXT /*type*/, + uint64_t /*object*/, size_t /*location*/, int32_t /*message_code*/, + const char *layer_prefix, const char *message, void * /*user_data*/) { - if (flags & VK_DEBUG_REPORT_ERROR_BIT_EXT) + if (flags & vk::DebugReportFlagBitsEXT::eError) { LOGE("{}: {}", layer_prefix, message); } - else if (flags & VK_DEBUG_REPORT_WARNING_BIT_EXT) + else if (flags & vk::DebugReportFlagBitsEXT::eWarning) { LOGW("{}: {}", layer_prefix, message); } - else if (flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT) + else if (flags & vk::DebugReportFlagBitsEXT::ePerformanceWarning) { LOGW("{}: {}", layer_prefix, message); } diff --git a/framework/vulkan_sample.h b/framework/vulkan_sample.h index 873b7a68a9..32d20c393c 100644 --- a/framework/vulkan_sample.h +++ b/framework/vulkan_sample.h @@ -1026,9 +1026,9 @@ inline bool VulkanSample::prepare(const ApplicationOptions &options // initialize C++-Bindings default dispatcher, first step #if defined(_HPP_VULKAN_LIBRARY) - static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY); + static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY); #else - static vk::DynamicLoader dl; + static vk::detail::DynamicLoader dl; #endif VULKAN_HPP_DEFAULT_DISPATCHER.init(dl.getProcAddress("vkGetInstanceProcAddr")); diff --git a/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp b/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp index ec7e967ad2..8737f17f86 100644 --- a/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp +++ b/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp @@ -382,9 +382,9 @@ vk::ImageView HPPHelloTriangle::create_image_view(vk::Image image) vk::Instance HPPHelloTriangle::create_instance(std::vector const &required_instance_extensions, std::vector const &required_validation_layers) { #if defined(_HPP_VULKAN_LIBRARY) - static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY); + static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY); #else - static vk::DynamicLoader dl; + static vk::detail::DynamicLoader dl; #endif PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = dl.getProcAddress("vkGetInstanceProcAddr"); VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr); diff --git a/samples/tooling/profiles/vulkan_profiles.hpp b/samples/tooling/profiles/vulkan_profiles.hpp index b8658164e0..cdd3a2a1b8 100644 --- a/samples/tooling/profiles/vulkan_profiles.hpp +++ b/samples/tooling/profiles/vulkan_profiles.hpp @@ -1,7 +1,7 @@ /* - * Copyright (C) 2021-2024 Valve Corporation - * Copyright (C) 2021-2024 LunarG, Inc. + * Copyright (C) 2021-2025 Valve Corporation + * Copyright (C) 2021-2025 LunarG, Inc. * * Licensed under the Apache License, Version 2.0 (the "License") * you may not use this file except in compliance with the License. @@ -12170,7 +12170,6 @@ struct FeaturesChain { #ifdef VK_USE_PLATFORM_ANDROID_KHR VkPhysicalDeviceExternalFormatResolveFeaturesANDROID physicalDeviceExternalFormatResolveFeaturesANDROID{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID, nullptr }; #endif - VkPhysicalDeviceCudaKernelLaunchFeaturesNV physicalDeviceCudaKernelLaunchFeaturesNV{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV, nullptr }; VkPhysicalDeviceSchedulingControlsFeaturesARM physicalDeviceSchedulingControlsFeaturesARM{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM, nullptr }; VkPhysicalDeviceRelaxedLineRasterizationFeaturesIMG physicalDeviceRelaxedLineRasterizationFeaturesIMG{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RELAXED_LINE_RASTERIZATION_FEATURES_IMG, nullptr }; VkPhysicalDeviceRenderPassStripedFeaturesARM physicalDeviceRenderPassStripedFeaturesARM{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM, nullptr }; @@ -12382,7 +12381,6 @@ struct FeaturesChain { #ifdef VK_USE_PLATFORM_ANDROID_KHR this->structureSize.insert({ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FORMAT_RESOLVE_FEATURES_ANDROID, size() }); #endif - this->structureSize.insert({ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUDA_KERNEL_LAUNCH_FEATURES_NV, size() }); this->structureSize.insert({ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCHEDULING_CONTROLS_FEATURES_ARM, size() }); this->structureSize.insert({ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RELAXED_LINE_RASTERIZATION_FEATURES_IMG, size() }); this->structureSize.insert({ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM, size() }); @@ -12775,8 +12773,6 @@ struct FeaturesChain { physicalDeviceExternalFormatResolveFeaturesANDROID.pNext = pNext; pNext = &physicalDeviceExternalFormatResolveFeaturesANDROID; #endif - physicalDeviceCudaKernelLaunchFeaturesNV.pNext = pNext; - pNext = &physicalDeviceCudaKernelLaunchFeaturesNV; physicalDeviceSchedulingControlsFeaturesARM.pNext = pNext; pNext = &physicalDeviceSchedulingControlsFeaturesARM; physicalDeviceRelaxedLineRasterizationFeaturesIMG.pNext = pNext; diff --git a/third_party/volk b/third_party/volk index 01986ac85f..e3e9ea8391 160000 --- a/third_party/volk +++ b/third_party/volk @@ -1 +1 @@ -Subproject commit 01986ac85fa2e5c70df09aeae9c907e27c5d50b2 +Subproject commit e3e9ea83916b7dfecb10cbc33814f1dcce80ed32 diff --git a/third_party/vulkan b/third_party/vulkan index d91597a82f..78c359741d 160000 --- a/third_party/vulkan +++ b/third_party/vulkan @@ -1 +1 @@ -Subproject commit d91597a82f881d473887b560a03a7edf2720b72c +Subproject commit 78c359741d855213e8685278eb81bb62599f8e56