From af23df842d168923f515f2307feaa7495b78e7cc Mon Sep 17 00:00:00 2001 From: trigger <5994581+cipherxof@users.noreply.github.com> Date: Sat, 1 Mar 2025 01:45:03 -0800 Subject: [PATCH 001/529] PPU: Report encrypted modules with KLIC in main file, opportunistic compilation at exit-spawn (#16743) --- rpcs3/Emu/Cell/PPUThread.cpp | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 63835db35f..90241016e6 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -4275,9 +4275,30 @@ extern void ppu_precompile(std::vector& dir_queue, std::vector(&Emu.klic[0])); + + if (src) + { + ppu_log.error("Possible missed KLIC for precompilation of '%s', please report to developers.", path); + + // Ignore executables larger than 500KB to prevent a long pause on exitspawn + if (src.size() >= 500000) + { + g_progr_ftotal_bits -= file_size; + + continue; + } + } + } + if (!src) { ppu_log.notice("Failed to decrypt '%s'", path); + + g_progr_ftotal_bits -= file_size; + continue; } @@ -4459,9 +4480,22 @@ extern void ppu_precompile(std::vector& dir_queue, std::vector(&Emu.klic[0])); + + if (src) + { + ppu_log.error("Possible missed KLIC for precompilation of '%s', please report to developers.", path); + } + } + if (!src) { ppu_log.notice("Failed to decrypt '%s'", path); + + g_progr_ftotal_bits -= file_size; + continue; } From aca1cdf0b65d22bc21bb00c4e87be5c7b91983a7 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 1 Mar 2025 14:03:26 +0300 Subject: [PATCH 002/529] vk: Refactor instance management header --- rpcs3/Emu/CMakeLists.txt | 1 + rpcs3/Emu/RSX/VK/VKGSRender.h | 2 +- rpcs3/Emu/RSX/VK/vkutils/device.cpp | 2 +- rpcs3/Emu/RSX/VK/vkutils/instance.cpp | 412 +++++++++++++++++++++++ rpcs3/Emu/RSX/VK/vkutils/instance.h | 64 ++++ rpcs3/Emu/RSX/VK/vkutils/instance.hpp | 457 -------------------------- rpcs3/VKGSRender.vcxproj | 3 +- rpcs3/VKGSRender.vcxproj.filters | 5 +- rpcs3/rpcs3qt/render_creator.cpp | 2 +- 9 files changed, 486 insertions(+), 462 deletions(-) create mode 100644 rpcs3/Emu/RSX/VK/vkutils/instance.cpp create mode 100644 rpcs3/Emu/RSX/VK/vkutils/instance.h delete mode 100644 rpcs3/Emu/RSX/VK/vkutils/instance.hpp diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index a6ae618ea6..9a7c617e9e 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -597,6 +597,7 @@ if(TARGET 3rdparty_vulkan) RSX/VK/vkutils/descriptors.cpp RSX/VK/vkutils/image.cpp RSX/VK/vkutils/image_helpers.cpp + RSX/VK/vkutils/instance.cpp RSX/VK/vkutils/scratch.cpp RSX/VK/vkutils/sync.cpp RSX/VK/vkutils/memory.cpp diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index 028aa6b178..f81b602cbf 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -4,7 +4,7 @@ #include "vkutils/descriptors.h" #include "vkutils/data_heap.h" -#include "vkutils/instance.hpp" +#include "vkutils/instance.h" #include "vkutils/sync.h" #include "vkutils/swapchain.hpp" diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/Emu/RSX/VK/vkutils/device.cpp index 207c1155c3..5391e1308e 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/device.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/device.cpp @@ -1,5 +1,5 @@ #include "device.h" -#include "instance.hpp" +#include "instance.h" #include "util/logs.hpp" #include "Emu/system_config.h" diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp new file mode 100644 index 0000000000..76cd29243f --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp @@ -0,0 +1,412 @@ +#include "stdafx.h" +#include "instance.h" + +namespace vk +{ + // Supported extensions + supported_extensions::supported_extensions(enumeration_class _class, const char* layer_name, VkPhysicalDevice pdev) + { + u32 count; + if (_class == enumeration_class::instance) + { + if (vkEnumerateInstanceExtensionProperties(layer_name, &count, nullptr) != VK_SUCCESS) + return; + } + else + { + ensure(pdev); + if (vkEnumerateDeviceExtensionProperties(pdev, layer_name, &count, nullptr) != VK_SUCCESS) + return; + } + + m_vk_exts.resize(count); + if (_class == enumeration_class::instance) + { + vkEnumerateInstanceExtensionProperties(layer_name, &count, m_vk_exts.data()); + } + else + { + vkEnumerateDeviceExtensionProperties(pdev, layer_name, &count, m_vk_exts.data()); + } + } + + bool supported_extensions::is_supported(std::string_view ext) const + { + return std::any_of(m_vk_exts.cbegin(), m_vk_exts.cend(), [&](const VkExtensionProperties& p) { return p.extensionName == ext; }); + } + + // Instance + instance::~instance() + { + if (m_instance) + { + destroy(); + } + } + + void instance::destroy() + { + if (!m_instance) return; + + if (m_debugger) + { + _vkDestroyDebugReportCallback(m_instance, m_debugger, nullptr); + m_debugger = nullptr; + } + + if (m_surface) + { + vkDestroySurfaceKHR(m_instance, m_surface, nullptr); + m_surface = VK_NULL_HANDLE; + } + + vkDestroyInstance(m_instance, nullptr); + m_instance = VK_NULL_HANDLE; + } + + void instance::enable_debugging() + { + if (!g_cfg.video.debug_output) return; + + PFN_vkDebugReportCallbackEXT callback = vk::dbgFunc; + + _vkCreateDebugReportCallback = reinterpret_cast(vkGetInstanceProcAddr(m_instance, "vkCreateDebugReportCallbackEXT")); + _vkDestroyDebugReportCallback = reinterpret_cast(vkGetInstanceProcAddr(m_instance, "vkDestroyDebugReportCallbackEXT")); + + VkDebugReportCallbackCreateInfoEXT dbgCreateInfo = {}; + dbgCreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; + dbgCreateInfo.pfnCallback = callback; + dbgCreateInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; + + CHECK_RESULT(_vkCreateDebugReportCallback(m_instance, &dbgCreateInfo, NULL, &m_debugger)); + } + +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wold-style-cast" +#endif + bool instance::create(const char* app_name, bool fast) + { + // Initialize a vulkan instance + VkApplicationInfo app = {}; + + app.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; + app.pApplicationName = app_name; + app.applicationVersion = 0; + app.pEngineName = app_name; + app.engineVersion = 0; + app.apiVersion = VK_API_VERSION_1_0; + + // Set up instance information + + std::vector extensions; + std::vector layers; + const void* next_info = nullptr; + +#ifdef __APPLE__ + // Declare MVK variables here to ensure the lifetime within the entire scope + const VkBool32 setting_true = VK_TRUE; + const int32_t setting_fast_math = g_cfg.video.disable_msl_fast_math.get() ? MVK_CONFIG_FAST_MATH_NEVER : MVK_CONFIG_FAST_MATH_ON_DEMAND; + + std::vector mvk_settings; + VkLayerSettingsCreateInfoEXT mvk_layer_settings_create_info{}; +#endif + + if (!fast) + { + extensions_loaded = true; + supported_extensions support(supported_extensions::instance); + + extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME); + if (support.is_supported(VK_EXT_DEBUG_REPORT_EXTENSION_NAME)) + { + extensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME); + } + + if (support.is_supported(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) + { + extensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); + } + +#ifdef __APPLE__ + if (support.is_supported(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME)) + { + extensions.push_back(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME); + layers.push_back(kMVKMoltenVKDriverLayerName); + + mvk_settings.push_back(VkLayerSettingEXT{ kMVKMoltenVKDriverLayerName, "MVK_CONFIG_RESUME_LOST_DEVICE", VK_LAYER_SETTING_TYPE_BOOL32_EXT, 1, &setting_true }); + mvk_settings.push_back(VkLayerSettingEXT{ kMVKMoltenVKDriverLayerName, "MVK_CONFIG_FAST_MATH_ENABLED", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &setting_fast_math }); + + mvk_layer_settings_create_info.sType = VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT; + mvk_layer_settings_create_info.pNext = next_info; + mvk_layer_settings_create_info.settingCount = static_cast(mvk_settings.size()); + mvk_layer_settings_create_info.pSettings = mvk_settings.data(); + + next_info = &mvk_layer_settings_create_info; + } +#endif + + if (support.is_supported(VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME)) + { + extensions.push_back(VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME); + } + + if (support.is_supported(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME)) + { + extensions.push_back(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME); + } + + if (g_cfg.video.renderdoc_compatiblity && support.is_supported(VK_EXT_DEBUG_UTILS_EXTENSION_NAME)) + { + extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME); + } + +#ifdef _WIN32 + extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); +#elif defined(__APPLE__) + extensions.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME); +#else + bool found_surface_ext = false; +#ifdef HAVE_X11 + if (support.is_supported(VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) + { + extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); + found_surface_ext = true; + } +#endif +#ifdef VK_USE_PLATFORM_WAYLAND_KHR + if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME)) + { + extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME); + found_surface_ext = true; + } +#endif //(WAYLAND) + if (!found_surface_ext) + { + rsx_log.error("Could not find a supported Vulkan surface extension"); + return 0; + } +#endif //(WIN32, __APPLE__) + if (g_cfg.video.debug_output) + layers.push_back("VK_LAYER_KHRONOS_validation"); + } + + VkInstanceCreateInfo instance_info = {}; + instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_info.pApplicationInfo = &app; + instance_info.enabledLayerCount = static_cast(layers.size()); + instance_info.ppEnabledLayerNames = layers.data(); + instance_info.enabledExtensionCount = fast ? 0 : static_cast(extensions.size()); + instance_info.ppEnabledExtensionNames = fast ? nullptr : extensions.data(); + instance_info.pNext = next_info; + + if (VkResult result = vkCreateInstance(&instance_info, nullptr, &m_instance); result != VK_SUCCESS) + { + if (result == VK_ERROR_LAYER_NOT_PRESENT) + { + rsx_log.fatal("Could not initialize layer VK_LAYER_KHRONOS_validation"); + } + + return false; + } + + return true; + } +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + void instance::bind() + { + // Register some global states + if (m_debugger) + { + _vkDestroyDebugReportCallback(m_instance, m_debugger, nullptr); + m_debugger = nullptr; + } + + enable_debugging(); + } + + std::vector& instance::enumerate_devices() + { + u32 num_gpus; + // This may fail on unsupported drivers, so just assume no devices + if (vkEnumeratePhysicalDevices(m_instance, &num_gpus, nullptr) != VK_SUCCESS) + return gpus; + + if (gpus.size() != num_gpus) + { + std::vector pdevs(num_gpus); + gpus.resize(num_gpus); + + CHECK_RESULT(vkEnumeratePhysicalDevices(m_instance, &num_gpus, pdevs.data())); + + for (u32 i = 0; i < num_gpus; ++i) + gpus[i].create(m_instance, pdevs[i], extensions_loaded); + } + + return gpus; + } + + swapchain_base* instance::create_swapchain(display_handle_t window_handle, vk::physical_device& dev) + { + bool force_wm_reporting_off = false; +#ifdef _WIN32 + HINSTANCE hInstance = NULL; + + VkWin32SurfaceCreateInfoKHR createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; + createInfo.hinstance = hInstance; + createInfo.hwnd = window_handle; + + CHECK_RESULT(vkCreateWin32SurfaceKHR(m_instance, &createInfo, NULL, &m_surface)); + +#elif defined(__APPLE__) + VkMacOSSurfaceCreateInfoMVK createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; + createInfo.pView = window_handle; + + CHECK_RESULT(vkCreateMacOSSurfaceMVK(m_instance, &createInfo, NULL, &m_surface)); +#else + + std::visit([&](auto&& p) + { + using T = std::decay_t; + +#ifdef HAVE_X11 + if constexpr (std::is_same_v>) + { + VkXlibSurfaceCreateInfoKHR createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; + createInfo.dpy = p.first; + createInfo.window = p.second; + CHECK_RESULT(vkCreateXlibSurfaceKHR(this->m_instance, &createInfo, nullptr, &m_surface)); + } + else +#endif +#ifdef HAVE_WAYLAND + if constexpr (std::is_same_v>) + { + VkWaylandSurfaceCreateInfoKHR createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR; + createInfo.display = p.first; + createInfo.surface = p.second; + CHECK_RESULT(vkCreateWaylandSurfaceKHR(this->m_instance, &createInfo, nullptr, &m_surface)); + force_wm_reporting_off = true; + } + else +#endif + { + static_assert(std::conditional_t::value, "Unhandled window_handle type in std::variant"); + } + }, window_handle); +#endif + + u32 device_queues = dev.get_queue_count(); + std::vector supports_present(device_queues, VK_FALSE); + bool present_possible = true; + + for (u32 index = 0; index < device_queues; index++) + { + vkGetPhysicalDeviceSurfaceSupportKHR(dev, index, m_surface, &supports_present[index]); + } + + u32 graphics_queue_idx = -1; + u32 present_queue_idx = -1; + u32 transfer_queue_idx = -1; + + auto test_queue_family = [&](u32 index, u32 desired_flags) + { + if (const auto flags = dev.get_queue_properties(index).queueFlags; + (flags & desired_flags) == desired_flags) + { + return true; + } + + return false; + }; + + for (u32 i = 0; i < device_queues; ++i) + { + // 1. Test for a present queue possibly one that also supports present + if (present_queue_idx == umax && supports_present[i]) + { + present_queue_idx = i; + if (test_queue_family(i, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) + { + graphics_queue_idx = i; + } + } + // 2. Check for graphics support + else if (graphics_queue_idx == umax && test_queue_family(i, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) + { + graphics_queue_idx = i; + if (supports_present[i]) + { + present_queue_idx = i; + } + } + // 3. Check if transfer + compute is available + else if (transfer_queue_idx == umax && test_queue_family(i, VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT)) + { + transfer_queue_idx = i; + } + } + + if (graphics_queue_idx == umax) + { + rsx_log.fatal("Failed to find a suitable graphics queue"); + return nullptr; + } + + if (graphics_queue_idx != present_queue_idx) + { + // Separate graphics and present, use headless fallback + present_possible = false; + } + + if (!present_possible) + { + //Native(sw) swapchain + rsx_log.error("It is not possible for the currently selected GPU to present to the window (Likely caused by NVIDIA driver running the current display)"); + rsx_log.warning("Falling back to software present support (native windowing API)"); + auto swapchain = new swapchain_NATIVE(dev, -1, graphics_queue_idx, transfer_queue_idx); + swapchain->create(window_handle); + return swapchain; + } + + // Get the list of VkFormat's that are supported: + u32 formatCount; + CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, nullptr)); + + std::vector surfFormats(formatCount); + CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, surfFormats.data())); + + VkFormat format; + VkColorSpaceKHR color_space; + + if (formatCount == 1 && surfFormats[0].format == VK_FORMAT_UNDEFINED) + { + format = VK_FORMAT_B8G8R8A8_UNORM; + } + else + { + if (!formatCount) fmt::throw_exception("Format count is zero!"); + format = surfFormats[0].format; + + //Prefer BGRA8_UNORM to avoid sRGB compression (RADV) + for (auto& surface_format : surfFormats) + { + if (surface_format.format == VK_FORMAT_B8G8R8A8_UNORM) + { + format = VK_FORMAT_B8G8R8A8_UNORM; + break; + } + } + } + + color_space = surfFormats[0].colorSpace; + + return new swapchain_WSI(dev, present_queue_idx, graphics_queue_idx, transfer_queue_idx, format, m_surface, color_space, force_wm_reporting_off); + } +} diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.h b/rpcs3/Emu/RSX/VK/vkutils/instance.h new file mode 100644 index 0000000000..b4b87b1a76 --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/instance.h @@ -0,0 +1,64 @@ +#pragma once + +#include "../VulkanAPI.h" +#include "swapchain.h" + +#include +#include + +#ifdef __APPLE__ +#include +#include +#endif + +namespace vk +{ + class supported_extensions + { + private: + std::vector m_vk_exts; + + public: + enum enumeration_class + { + instance = 0, + device = 1 + }; + + supported_extensions(enumeration_class _class, const char* layer_name = nullptr, VkPhysicalDevice pdev = VK_NULL_HANDLE); + + bool is_supported(std::string_view ext) const; + }; + + class instance + { + private: + std::vector gpus; + VkInstance m_instance = VK_NULL_HANDLE; + VkSurfaceKHR m_surface = VK_NULL_HANDLE; + + PFN_vkDestroyDebugReportCallbackEXT _vkDestroyDebugReportCallback = nullptr; + PFN_vkCreateDebugReportCallbackEXT _vkCreateDebugReportCallback = nullptr; + VkDebugReportCallbackEXT m_debugger = nullptr; + + bool extensions_loaded = false; + + public: + + instance() = default; + + ~instance(); + + void destroy(); + + void enable_debugging(); + + bool create(const char* app_name, bool fast = false); + + void bind(); + + std::vector& enumerate_devices(); + + swapchain_base* create_swapchain(display_handle_t window_handle, vk::physical_device& dev); + }; +} diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.hpp b/rpcs3/Emu/RSX/VK/vkutils/instance.hpp deleted file mode 100644 index 19ae72f9e0..0000000000 --- a/rpcs3/Emu/RSX/VK/vkutils/instance.hpp +++ /dev/null @@ -1,457 +0,0 @@ -#pragma once - -#include "../VulkanAPI.h" -#include "swapchain.hpp" - -#include -#include - -#ifdef __APPLE__ -#include -#include -#endif - -namespace vk -{ - class supported_extensions - { - private: - std::vector m_vk_exts; - - public: - enum enumeration_class - { - instance = 0, - device = 1 - }; - - supported_extensions(enumeration_class _class, const char* layer_name = nullptr, VkPhysicalDevice pdev = VK_NULL_HANDLE) - { - u32 count; - if (_class == enumeration_class::instance) - { - if (vkEnumerateInstanceExtensionProperties(layer_name, &count, nullptr) != VK_SUCCESS) - return; - } - else - { - ensure(pdev); - if (vkEnumerateDeviceExtensionProperties(pdev, layer_name, &count, nullptr) != VK_SUCCESS) - return; - } - - m_vk_exts.resize(count); - if (_class == enumeration_class::instance) - { - vkEnumerateInstanceExtensionProperties(layer_name, &count, m_vk_exts.data()); - } - else - { - vkEnumerateDeviceExtensionProperties(pdev, layer_name, &count, m_vk_exts.data()); - } - } - - bool is_supported(std::string_view ext) - { - return std::any_of(m_vk_exts.cbegin(), m_vk_exts.cend(), [&](const VkExtensionProperties& p) { return p.extensionName == ext; }); - } - }; - - class instance - { - private: - std::vector gpus; - VkInstance m_instance = VK_NULL_HANDLE; - VkSurfaceKHR m_surface = VK_NULL_HANDLE; - - PFN_vkDestroyDebugReportCallbackEXT _vkDestroyDebugReportCallback = nullptr; - PFN_vkCreateDebugReportCallbackEXT _vkCreateDebugReportCallback = nullptr; - VkDebugReportCallbackEXT m_debugger = nullptr; - - bool extensions_loaded = false; - - public: - - instance() = default; - - ~instance() - { - if (m_instance) - { - destroy(); - } - } - - void destroy() - { - if (!m_instance) return; - - if (m_debugger) - { - _vkDestroyDebugReportCallback(m_instance, m_debugger, nullptr); - m_debugger = nullptr; - } - - if (m_surface) - { - vkDestroySurfaceKHR(m_instance, m_surface, nullptr); - m_surface = VK_NULL_HANDLE; - } - - vkDestroyInstance(m_instance, nullptr); - m_instance = VK_NULL_HANDLE; - } - - void enable_debugging() - { - if (!g_cfg.video.debug_output) return; - - PFN_vkDebugReportCallbackEXT callback = vk::dbgFunc; - - _vkCreateDebugReportCallback = reinterpret_cast(vkGetInstanceProcAddr(m_instance, "vkCreateDebugReportCallbackEXT")); - _vkDestroyDebugReportCallback = reinterpret_cast(vkGetInstanceProcAddr(m_instance, "vkDestroyDebugReportCallbackEXT")); - - VkDebugReportCallbackCreateInfoEXT dbgCreateInfo = {}; - dbgCreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; - dbgCreateInfo.pfnCallback = callback; - dbgCreateInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; - - CHECK_RESULT(_vkCreateDebugReportCallback(m_instance, &dbgCreateInfo, NULL, &m_debugger)); - } -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wold-style-cast" -#endif - bool create(const char* app_name, bool fast = false) - { - // Initialize a vulkan instance - VkApplicationInfo app = {}; - - app.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; - app.pApplicationName = app_name; - app.applicationVersion = 0; - app.pEngineName = app_name; - app.engineVersion = 0; - app.apiVersion = VK_API_VERSION_1_0; - - // Set up instance information - - std::vector extensions; - std::vector layers; - const void* next_info = nullptr; - -#ifdef __APPLE__ - // Declare MVK variables here to ensure the lifetime within the entire scope - const VkBool32 setting_true = VK_TRUE; - const int32_t setting_fast_math = g_cfg.video.disable_msl_fast_math.get() ? MVK_CONFIG_FAST_MATH_NEVER : MVK_CONFIG_FAST_MATH_ON_DEMAND; - - std::vector mvk_settings; - VkLayerSettingsCreateInfoEXT mvk_layer_settings_create_info{}; -#endif - - if (!fast) - { - extensions_loaded = true; - supported_extensions support(supported_extensions::instance); - - extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME); - if (support.is_supported(VK_EXT_DEBUG_REPORT_EXTENSION_NAME)) - { - extensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME); - } - - if (support.is_supported(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) - { - extensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); - } - -#ifdef __APPLE__ - if (support.is_supported(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME)) - { - extensions.push_back(VK_EXT_LAYER_SETTINGS_EXTENSION_NAME); - layers.push_back(kMVKMoltenVKDriverLayerName); - - mvk_settings.push_back(VkLayerSettingEXT{ kMVKMoltenVKDriverLayerName, "MVK_CONFIG_RESUME_LOST_DEVICE", VK_LAYER_SETTING_TYPE_BOOL32_EXT, 1, &setting_true }); - mvk_settings.push_back(VkLayerSettingEXT{ kMVKMoltenVKDriverLayerName, "MVK_CONFIG_FAST_MATH_ENABLED", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &setting_fast_math }); - - mvk_layer_settings_create_info.sType = VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT; - mvk_layer_settings_create_info.pNext = next_info; - mvk_layer_settings_create_info.settingCount = static_cast(mvk_settings.size()); - mvk_layer_settings_create_info.pSettings = mvk_settings.data(); - - next_info = &mvk_layer_settings_create_info; - } -#endif - - if (support.is_supported(VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME)) - { - extensions.push_back(VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME); - } - - if (support.is_supported(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME)) - { - extensions.push_back(VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME); - } - - if (g_cfg.video.renderdoc_compatiblity && support.is_supported(VK_EXT_DEBUG_UTILS_EXTENSION_NAME)) - { - extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME); - } - -#ifdef _WIN32 - extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); -#elif defined(__APPLE__) - extensions.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME); -#else - bool found_surface_ext = false; -#ifdef HAVE_X11 - if (support.is_supported(VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) - { - extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME); - found_surface_ext = true; - } -#endif -#ifdef VK_USE_PLATFORM_WAYLAND_KHR - if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME)) - { - extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME); - found_surface_ext = true; - } -#endif //(WAYLAND) - if (!found_surface_ext) - { - rsx_log.error("Could not find a supported Vulkan surface extension"); - return 0; - } -#endif //(WIN32, __APPLE__) - if (g_cfg.video.debug_output) - layers.push_back("VK_LAYER_KHRONOS_validation"); - } - - VkInstanceCreateInfo instance_info = {}; - instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_info.pApplicationInfo = &app; - instance_info.enabledLayerCount = static_cast(layers.size()); - instance_info.ppEnabledLayerNames = layers.data(); - instance_info.enabledExtensionCount = fast ? 0 : static_cast(extensions.size()); - instance_info.ppEnabledExtensionNames = fast ? nullptr : extensions.data(); - instance_info.pNext = next_info; - - if (VkResult result = vkCreateInstance(&instance_info, nullptr, &m_instance); result != VK_SUCCESS) - { - if (result == VK_ERROR_LAYER_NOT_PRESENT) - { - rsx_log.fatal("Could not initialize layer VK_LAYER_KHRONOS_validation"); - } - - return false; - } - - return true; - } -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - void bind() - { - // Register some global states - if (m_debugger) - { - _vkDestroyDebugReportCallback(m_instance, m_debugger, nullptr); - m_debugger = nullptr; - } - - enable_debugging(); - } - - std::vector& enumerate_devices() - { - u32 num_gpus; - // This may fail on unsupported drivers, so just assume no devices - if (vkEnumeratePhysicalDevices(m_instance, &num_gpus, nullptr) != VK_SUCCESS) - return gpus; - - if (gpus.size() != num_gpus) - { - std::vector pdevs(num_gpus); - gpus.resize(num_gpus); - - CHECK_RESULT(vkEnumeratePhysicalDevices(m_instance, &num_gpus, pdevs.data())); - - for (u32 i = 0; i < num_gpus; ++i) - gpus[i].create(m_instance, pdevs[i], extensions_loaded); - } - - return gpus; - } - - swapchain_base* create_swapchain(display_handle_t window_handle, vk::physical_device& dev) - { - bool force_wm_reporting_off = false; -#ifdef _WIN32 - using swapchain_NATIVE = swapchain_WIN32; - HINSTANCE hInstance = NULL; - - VkWin32SurfaceCreateInfoKHR createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; - createInfo.hinstance = hInstance; - createInfo.hwnd = window_handle; - - CHECK_RESULT(vkCreateWin32SurfaceKHR(m_instance, &createInfo, NULL, &m_surface)); - -#elif defined(__APPLE__) - using swapchain_NATIVE = swapchain_MacOS; - VkMacOSSurfaceCreateInfoMVK createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; - createInfo.pView = window_handle; - - CHECK_RESULT(vkCreateMacOSSurfaceMVK(m_instance, &createInfo, NULL, &m_surface)); -#else -#ifdef HAVE_X11 - using swapchain_NATIVE = swapchain_X11; -#else - using swapchain_NATIVE = swapchain_Wayland; -#endif - - std::visit([&](auto&& p) - { - using T = std::decay_t; - -#ifdef HAVE_X11 - if constexpr (std::is_same_v>) - { - VkXlibSurfaceCreateInfoKHR createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; - createInfo.dpy = p.first; - createInfo.window = p.second; - CHECK_RESULT(vkCreateXlibSurfaceKHR(this->m_instance, &createInfo, nullptr, &m_surface)); - } - else -#endif -#ifdef HAVE_WAYLAND - if constexpr (std::is_same_v>) - { - VkWaylandSurfaceCreateInfoKHR createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR; - createInfo.display = p.first; - createInfo.surface = p.second; - CHECK_RESULT(vkCreateWaylandSurfaceKHR(this->m_instance, &createInfo, nullptr, &m_surface)); - force_wm_reporting_off = true; - } - else -#endif - { - static_assert(std::conditional_t::value, "Unhandled window_handle type in std::variant"); - } - }, window_handle); -#endif - - u32 device_queues = dev.get_queue_count(); - std::vector supports_present(device_queues, VK_FALSE); - bool present_possible = true; - - for (u32 index = 0; index < device_queues; index++) - { - vkGetPhysicalDeviceSurfaceSupportKHR(dev, index, m_surface, &supports_present[index]); - } - - u32 graphics_queue_idx = -1; - u32 present_queue_idx = -1; - u32 transfer_queue_idx = -1; - - auto test_queue_family = [&](u32 index, u32 desired_flags) - { - if (const auto flags = dev.get_queue_properties(index).queueFlags; - (flags & desired_flags) == desired_flags) - { - return true; - } - - return false; - }; - - for (u32 i = 0; i < device_queues; ++i) - { - // 1. Test for a present queue possibly one that also supports present - if (present_queue_idx == umax && supports_present[i]) - { - present_queue_idx = i; - if (test_queue_family(i, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) - { - graphics_queue_idx = i; - } - } - // 2. Check for graphics support - else if (graphics_queue_idx == umax && test_queue_family(i, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) - { - graphics_queue_idx = i; - if (supports_present[i]) - { - present_queue_idx = i; - } - } - // 3. Check if transfer + compute is available - else if (transfer_queue_idx == umax && test_queue_family(i, VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT)) - { - transfer_queue_idx = i; - } - } - - if (graphics_queue_idx == umax) - { - rsx_log.fatal("Failed to find a suitable graphics queue"); - return nullptr; - } - - if (graphics_queue_idx != present_queue_idx) - { - // Separate graphics and present, use headless fallback - present_possible = false; - } - - if (!present_possible) - { - //Native(sw) swapchain - rsx_log.error("It is not possible for the currently selected GPU to present to the window (Likely caused by NVIDIA driver running the current display)"); - rsx_log.warning("Falling back to software present support (native windowing API)"); - auto swapchain = new swapchain_NATIVE(dev, -1, graphics_queue_idx, transfer_queue_idx); - swapchain->create(window_handle); - return swapchain; - } - - // Get the list of VkFormat's that are supported: - u32 formatCount; - CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, nullptr)); - - std::vector surfFormats(formatCount); - CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, surfFormats.data())); - - VkFormat format; - VkColorSpaceKHR color_space; - - if (formatCount == 1 && surfFormats[0].format == VK_FORMAT_UNDEFINED) - { - format = VK_FORMAT_B8G8R8A8_UNORM; - } - else - { - if (!formatCount) fmt::throw_exception("Format count is zero!"); - format = surfFormats[0].format; - - //Prefer BGRA8_UNORM to avoid sRGB compression (RADV) - for (auto& surface_format : surfFormats) - { - if (surface_format.format == VK_FORMAT_B8G8R8A8_UNORM) - { - format = VK_FORMAT_B8G8R8A8_UNORM; - break; - } - } - } - - color_space = surfFormats[0].colorSpace; - - return new swapchain_WSI(dev, present_queue_idx, graphics_queue_idx, transfer_queue_idx, format, m_surface, color_space, force_wm_reporting_off); - } - }; -} diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj index 868ff9ad66..2c7d66e702 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -58,7 +58,7 @@ - + @@ -94,6 +94,7 @@ + diff --git a/rpcs3/VKGSRender.vcxproj.filters b/rpcs3/VKGSRender.vcxproj.filters index 153a21a9b0..6af8e388bb 100644 --- a/rpcs3/VKGSRender.vcxproj.filters +++ b/rpcs3/VKGSRender.vcxproj.filters @@ -73,6 +73,9 @@ upscalers\fsr1 + + vkutils + @@ -124,7 +127,7 @@ vkutils - + vkutils diff --git a/rpcs3/rpcs3qt/render_creator.cpp b/rpcs3/rpcs3qt/render_creator.cpp index b85336bf8b..ef425366b3 100644 --- a/rpcs3/rpcs3qt/render_creator.cpp +++ b/rpcs3/rpcs3qt/render_creator.cpp @@ -5,7 +5,7 @@ #include "Utilities/Thread.h" #if defined(HAVE_VULKAN) -#include "Emu/RSX/VK/vkutils/instance.hpp" +#include "Emu/RSX/VK/vkutils/instance.h" #endif #include From 8b2e792d31157b38e9cadba4c3f0f9ccf79154b8 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 1 Mar 2025 14:06:56 +0300 Subject: [PATCH 003/529] vk: Refactor swapchain into separate platform headers --- rpcs3/Emu/CMakeLists.txt | 1 + rpcs3/Emu/RSX/VK/VKGSRender.h | 2 +- rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp | 354 ++++++++ rpcs3/Emu/RSX/VK/vkutils/swapchain.h | 11 + rpcs3/Emu/RSX/VK/vkutils/swapchain.hpp | 786 ------------------ .../Emu/RSX/VK/vkutils/swapchain_android.hpp | 57 ++ rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h | 200 +++++ rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp | 56 ++ rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp | 161 ++++ rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp | 98 +++ rpcs3/VKGSRender.vcxproj | 8 +- rpcs3/VKGSRender.vcxproj.filters | 20 +- 12 files changed, 965 insertions(+), 789 deletions(-) create mode 100644 rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp create mode 100644 rpcs3/Emu/RSX/VK/vkutils/swapchain.h delete mode 100644 rpcs3/Emu/RSX/VK/vkutils/swapchain.hpp create mode 100644 rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp create mode 100644 rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h create mode 100644 rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp create mode 100644 rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp create mode 100644 rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index 9a7c617e9e..562dd29476 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -600,6 +600,7 @@ if(TARGET 3rdparty_vulkan) RSX/VK/vkutils/instance.cpp RSX/VK/vkutils/scratch.cpp RSX/VK/vkutils/sync.cpp + RSX/VK/vkutils/swapchain.cpp RSX/VK/vkutils/memory.cpp RSX/VK/vkutils/device.cpp RSX/VK/vkutils/sampler.cpp diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index f81b602cbf..eaf9cc4a44 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -6,7 +6,7 @@ #include "vkutils/data_heap.h" #include "vkutils/instance.h" #include "vkutils/sync.h" -#include "vkutils/swapchain.hpp" +#include "vkutils/swapchain.h" #include "VKGSRenderTypes.hpp" #include "VKTextureCache.h" diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp new file mode 100644 index 0000000000..a296e393e2 --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp @@ -0,0 +1,354 @@ +#include "stdafx.h" +#include "swapchain.h" + +namespace vk +{ + // Swapchain image RPCS3 + swapchain_image_RPCS3::swapchain_image_RPCS3(render_device& dev, const memory_type_mapping& memory_map, u32 width, u32 height) + :image(dev, memory_map.device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_TYPE_2D, VK_FORMAT_B8G8R8A8_UNORM, width, height, 1, 1, 1, + VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_TILING_OPTIMAL, + VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, VMM_ALLOCATION_POOL_SWAPCHAIN) + { + m_width = width; + m_height = height; + current_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; + + m_dma_buffer = std::make_unique(dev, m_width * m_height * 4, memory_map.host_visible_coherent, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0, VMM_ALLOCATION_POOL_SWAPCHAIN); + } + + void swapchain_image_RPCS3::do_dma_transfer(command_buffer& cmd) + { + VkBufferImageCopy copyRegion = {}; + copyRegion.bufferOffset = 0; + copyRegion.bufferRowLength = m_width; + copyRegion.bufferImageHeight = m_height; + copyRegion.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }; + copyRegion.imageOffset = {}; + copyRegion.imageExtent = { m_width, m_height, 1 }; + + change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); + vkCmdCopyImageToBuffer(cmd, value, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, m_dma_buffer->value, 1, ©Region); + change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); + } + + u32 swapchain_image_RPCS3::get_required_memory_size() const + { + return m_width * m_height * 4; + } + + void* swapchain_image_RPCS3::get_pixels() + { + return m_dma_buffer->map(0, VK_WHOLE_SIZE); + } + + void swapchain_image_RPCS3::free_pixels() + { + m_dma_buffer->unmap(); + } + + // swapchain BASE + swapchain_base::swapchain_base(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format) + { + dev.create(gpu, graphics_queue, present_queue, transfer_queue); + m_surface_format = format; + } + + // NATIVE swapchain base + VkResult native_swapchain_base::acquire_next_swapchain_image(VkSemaphore /*semaphore*/, u64 /*timeout*/, u32* result) + { + u32 index = 0; + for (auto& p : swapchain_images) + { + if (!p.first) + { + p.first = true; + *result = index; + return VK_SUCCESS; + } + + ++index; + } + + return VK_NOT_READY; + } + + void native_swapchain_base::init_swapchain_images(render_device& dev, u32 preferred_count) + { + swapchain_images.resize(preferred_count); + for (auto& img : swapchain_images) + { + img.second = std::make_unique(dev, dev.get_memory_mapping(), m_width, m_height); + img.first = false; + } + } + + // WSI implementation + void swapchain_WSI::init_swapchain_images(render_device& dev, u32 /*preferred_count*/) + { + u32 nb_swap_images = 0; + _vkGetSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, nullptr); + + if (!nb_swap_images) fmt::throw_exception("Driver returned 0 images for swapchain"); + + std::vector vk_images; + vk_images.resize(nb_swap_images); + _vkGetSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, vk_images.data()); + + swapchain_images.resize(nb_swap_images); + for (u32 i = 0; i < nb_swap_images; ++i) + { + swapchain_images[i].value = vk_images[i]; + } + } + + swapchain_WSI::swapchain_WSI(vk::physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format, VkSurfaceKHR surface, VkColorSpaceKHR color_space, bool force_wm_reporting_off) + : WSI_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) + { + _vkCreateSwapchainKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkCreateSwapchainKHR")); + _vkDestroySwapchainKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkDestroySwapchainKHR")); + _vkGetSwapchainImagesKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkGetSwapchainImagesKHR")); + _vkAcquireNextImageKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkAcquireNextImageKHR")); + _vkQueuePresentKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkQueuePresentKHR")); + + m_surface = surface; + m_color_space = color_space; + + if (!force_wm_reporting_off) + { + switch (gpu.get_driver_vendor()) + { + case driver_vendor::AMD: + case driver_vendor::INTEL: + case driver_vendor::RADV: + case driver_vendor::MVK: + break; + case driver_vendor::ANV: + case driver_vendor::NVIDIA: + m_wm_reports_flag = true; + break; + default: + break; + } + } + } + + void swapchain_WSI::destroy(bool) + { + if (VkDevice pdev = dev) + { + if (m_vk_swapchain) + { + _vkDestroySwapchainKHR(pdev, m_vk_swapchain, nullptr); + } + + dev.destroy(); + } + } + + std::pair swapchain_WSI::init_surface_capabilities() + { +#ifdef _WIN32 + if (g_cfg.video.vk.exclusive_fullscreen_mode != vk_exclusive_fs_mode::unspecified && dev.get_surface_capabilities_2_support()) + { + HMONITOR hmonitor = MonitorFromWindow(window_handle, MONITOR_DEFAULTTOPRIMARY); + if (hmonitor) + { + VkSurfaceCapabilities2KHR pSurfaceCapabilities = {}; + pSurfaceCapabilities.sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR; + + VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo = {}; + pSurfaceInfo.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR; + pSurfaceInfo.surface = m_surface; + + VkSurfaceCapabilitiesFullScreenExclusiveEXT full_screen_exclusive_capabilities = {}; + VkSurfaceFullScreenExclusiveWin32InfoEXT full_screen_exclusive_win32_info = {}; + full_screen_exclusive_capabilities.sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT; + + pSurfaceCapabilities.pNext = &full_screen_exclusive_capabilities; + + full_screen_exclusive_win32_info.sType = VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT; + full_screen_exclusive_win32_info.hmonitor = hmonitor; + + pSurfaceInfo.pNext = &full_screen_exclusive_win32_info; + + auto getPhysicalDeviceSurfaceCapabilities2KHR = reinterpret_cast( + vkGetInstanceProcAddr(dev.gpu(), "vkGetPhysicalDeviceSurfaceCapabilities2KHR") + ); + ensure(getPhysicalDeviceSurfaceCapabilities2KHR); + CHECK_RESULT(getPhysicalDeviceSurfaceCapabilities2KHR(dev.gpu(), &pSurfaceInfo, &pSurfaceCapabilities)); + + return { pSurfaceCapabilities.surfaceCapabilities, !!full_screen_exclusive_capabilities.fullScreenExclusiveSupported }; + } + else + { + rsx_log.warning("Swapchain: failed to get monitor for the window"); + } + } +#endif + VkSurfaceCapabilitiesKHR surface_descriptors = {}; + CHECK_RESULT(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(dev.gpu(), m_surface, &surface_descriptors)); + return { surface_descriptors, false }; + } + + bool swapchain_WSI::init() + { + if (dev.get_present_queue() == VK_NULL_HANDLE) + { + rsx_log.error("Cannot create WSI swapchain without a present queue"); + return false; + } + + VkSwapchainKHR old_swapchain = m_vk_swapchain; + vk::physical_device& gpu = const_cast(dev.gpu()); + + auto [surface_descriptors, should_specify_exclusive_full_screen_mode] = init_surface_capabilities(); + + if (surface_descriptors.maxImageExtent.width < m_width || + surface_descriptors.maxImageExtent.height < m_height) + { + rsx_log.error("Swapchain: Swapchain creation failed because dimensions cannot fit. Max = %d, %d, Requested = %d, %d", + surface_descriptors.maxImageExtent.width, surface_descriptors.maxImageExtent.height, m_width, m_height); + + return false; + } + + if (surface_descriptors.currentExtent.width != umax) + { + if (surface_descriptors.currentExtent.width == 0 || surface_descriptors.currentExtent.height == 0) + { + rsx_log.warning("Swapchain: Current surface extent is a null region. Is the window minimized?"); + return false; + } + + m_width = surface_descriptors.currentExtent.width; + m_height = surface_descriptors.currentExtent.height; + } + + u32 nb_available_modes = 0; + CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, nullptr)); + + std::vector present_modes(nb_available_modes); + CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, present_modes.data())); + + VkPresentModeKHR swapchain_present_mode = VK_PRESENT_MODE_FIFO_KHR; + std::vector preferred_modes; + + if (!g_cfg.video.vk.force_fifo) + { + // List of preferred modes in decreasing desirability + // NOTE: Always picks "triple-buffered vsync" types if possible + if (!g_cfg.video.vsync) + { + preferred_modes = { VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR, VK_PRESENT_MODE_FIFO_RELAXED_KHR }; + } + } + + bool mode_found = false; + for (VkPresentModeKHR preferred_mode : preferred_modes) + { + //Search for this mode in supported modes + for (VkPresentModeKHR mode : present_modes) + { + if (mode == preferred_mode) + { + swapchain_present_mode = mode; + mode_found = true; + break; + } + } + + if (mode_found) + break; + } + + rsx_log.notice("Swapchain: present mode %d in use.", static_cast(swapchain_present_mode)); + + u32 nb_swap_images = surface_descriptors.minImageCount + 1; + if (surface_descriptors.maxImageCount > 0) + { + //Try to negotiate for a triple buffer setup + //In cases where the front-buffer isnt available for present, its better to have a spare surface + nb_swap_images = std::max(surface_descriptors.minImageCount + 2u, 3u); + + if (nb_swap_images > surface_descriptors.maxImageCount) + { + // Application must settle for fewer images than desired: + nb_swap_images = surface_descriptors.maxImageCount; + } + } + + VkSurfaceTransformFlagBitsKHR pre_transform = surface_descriptors.currentTransform; + if (surface_descriptors.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) + pre_transform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR; + + VkSwapchainCreateInfoKHR swap_info = {}; + swap_info.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; + swap_info.surface = m_surface; + swap_info.minImageCount = nb_swap_images; + swap_info.imageFormat = m_surface_format; + swap_info.imageColorSpace = m_color_space; + + swap_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT; + swap_info.preTransform = pre_transform; + swap_info.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; + swap_info.imageArrayLayers = 1; + swap_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; + swap_info.presentMode = swapchain_present_mode; + swap_info.oldSwapchain = old_swapchain; + swap_info.clipped = true; + + swap_info.imageExtent.width = std::max(m_width, surface_descriptors.minImageExtent.width); + swap_info.imageExtent.height = std::max(m_height, surface_descriptors.minImageExtent.height); + +#ifdef _WIN32 + VkSurfaceFullScreenExclusiveInfoEXT full_screen_exclusive_info = {}; + if (should_specify_exclusive_full_screen_mode) + { + vk_exclusive_fs_mode fs_mode = g_cfg.video.vk.exclusive_fullscreen_mode; + ensure(fs_mode == vk_exclusive_fs_mode::enable || fs_mode == vk_exclusive_fs_mode::disable); + + full_screen_exclusive_info.sType = VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT; + full_screen_exclusive_info.fullScreenExclusive = + fs_mode == vk_exclusive_fs_mode::enable ? VK_FULL_SCREEN_EXCLUSIVE_ALLOWED_EXT : VK_FULL_SCREEN_EXCLUSIVE_DISALLOWED_EXT; + + swap_info.pNext = &full_screen_exclusive_info; + } + + rsx_log.notice("Swapchain: requesting full screen exclusive mode %d.", static_cast(full_screen_exclusive_info.fullScreenExclusive)); +#endif + + _vkCreateSwapchainKHR(dev, &swap_info, nullptr, &m_vk_swapchain); + + if (old_swapchain) + { + if (!swapchain_images.empty()) + { + swapchain_images.clear(); + } + + _vkDestroySwapchainKHR(dev, old_swapchain, nullptr); + } + + init_swapchain_images(dev); + return true; + } + + VkResult swapchain_WSI::present(VkSemaphore semaphore, u32 image) + { + VkPresentInfoKHR present = {}; + present.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; + present.pNext = nullptr; + present.swapchainCount = 1; + present.pSwapchains = &m_vk_swapchain; + present.pImageIndices = ℑ + + if (semaphore != VK_NULL_HANDLE) + { + present.waitSemaphoreCount = 1; + present.pWaitSemaphores = &semaphore; + } + + return _vkQueuePresentKHR(dev.get_present_queue(), &present); + } +} diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.h b/rpcs3/Emu/RSX/VK/vkutils/swapchain.h new file mode 100644 index 0000000000..f5128fc487 --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain.h @@ -0,0 +1,11 @@ +#pragma once + +#if defined (_WIN32) +#include "swapchain_win32.hpp" +#elif defined (ANDROID) +#include "swapchain_android.hpp" +#elif defined (__APPLE__) +#include "swapchain_macos.hpp" +#else // Both linux and BSD families +#include "swapchain_unix.hpp" +#endif diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain.hpp deleted file mode 100644 index bca489d8d8..0000000000 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain.hpp +++ /dev/null @@ -1,786 +0,0 @@ -#pragma once - -#ifdef HAVE_X11 -#include -#endif - -#include "../../display.h" -#include "../VulkanAPI.h" -#include "image.h" - -#include - -namespace vk -{ - struct swapchain_image_WSI - { - VkImage value = VK_NULL_HANDLE; - }; - - class swapchain_image_RPCS3 : public image - { - std::unique_ptr m_dma_buffer; - u32 m_width = 0; - u32 m_height = 0; - - public: - swapchain_image_RPCS3(render_device& dev, const memory_type_mapping& memory_map, u32 width, u32 height) - :image(dev, memory_map.device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_TYPE_2D, VK_FORMAT_B8G8R8A8_UNORM, width, height, 1, 1, 1, - VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_TILING_OPTIMAL, - VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, VMM_ALLOCATION_POOL_SWAPCHAIN) - { - m_width = width; - m_height = height; - current_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; - - m_dma_buffer = std::make_unique(dev, m_width * m_height * 4, memory_map.host_visible_coherent, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0, VMM_ALLOCATION_POOL_SWAPCHAIN); - } - - void do_dma_transfer(command_buffer& cmd) - { - VkBufferImageCopy copyRegion = {}; - copyRegion.bufferOffset = 0; - copyRegion.bufferRowLength = m_width; - copyRegion.bufferImageHeight = m_height; - copyRegion.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }; - copyRegion.imageOffset = {}; - copyRegion.imageExtent = { m_width, m_height, 1 }; - - change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); - vkCmdCopyImageToBuffer(cmd, value, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, m_dma_buffer->value, 1, ©Region); - change_layout(cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); - } - - u32 get_required_memory_size() const - { - return m_width * m_height * 4; - } - - void* get_pixels() - { - return m_dma_buffer->map(0, VK_WHOLE_SIZE); - } - - void free_pixels() - { - m_dma_buffer->unmap(); - } - }; - - class swapchain_base - { - protected: - render_device dev; - - display_handle_t window_handle{}; - u32 m_width = 0; - u32 m_height = 0; - VkFormat m_surface_format = VK_FORMAT_B8G8R8A8_UNORM; - - virtual void init_swapchain_images(render_device& dev, u32 count) = 0; - - public: - swapchain_base(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - { - dev.create(gpu, graphics_queue, present_queue, transfer_queue); - m_surface_format = format; - } - - virtual ~swapchain_base() = default; - - virtual void create(display_handle_t& handle) = 0; - virtual void destroy(bool full = true) = 0; - virtual bool init() = 0; - - virtual u32 get_swap_image_count() const = 0; - virtual VkImage get_image(u32 index) = 0; - virtual VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) = 0; - virtual void end_frame(command_buffer& cmd, u32 index) = 0; - virtual VkResult present(VkSemaphore semaphore, u32 index) = 0; - virtual VkImageLayout get_optimal_present_layout() = 0; - - virtual bool supports_automatic_wm_reports() const - { - return false; - } - - bool init(u32 w, u32 h) - { - m_width = w; - m_height = h; - return init(); - } - - const vk::render_device& get_device() - { - return dev; - } - - VkFormat get_surface_format() - { - return m_surface_format; - } - - bool is_headless() const - { - return (dev.get_present_queue() == VK_NULL_HANDLE); - } - }; - - template - class abstract_swapchain_impl : public swapchain_base - { - protected: - std::vector swapchain_images; - - public: - abstract_swapchain_impl(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - : swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - {} - - ~abstract_swapchain_impl() override = default; - - u32 get_swap_image_count() const override - { - return ::size32(swapchain_images); - } - - using swapchain_base::init; - }; - - using native_swapchain_base = abstract_swapchain_impl>>; - using WSI_swapchain_base = abstract_swapchain_impl; - - #ifdef _WIN32 - - class swapchain_WIN32 : public native_swapchain_base - { - HDC hDstDC = NULL; - HDC hSrcDC = NULL; - HBITMAP hDIB = NULL; - LPVOID hPtr = NULL; - - public: - swapchain_WIN32(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - {} - - ~swapchain_WIN32() {} - - bool init() override - { - if (hDIB || hSrcDC) - destroy(false); - - RECT rect; - GetClientRect(window_handle, &rect); - m_width = rect.right - rect.left; - m_height = rect.bottom - rect.top; - - if (m_width == 0 || m_height == 0) - { - rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); - return false; - } - - BITMAPINFO bitmap = {}; - bitmap.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bitmap.bmiHeader.biWidth = m_width; - bitmap.bmiHeader.biHeight = m_height * -1; - bitmap.bmiHeader.biPlanes = 1; - bitmap.bmiHeader.biBitCount = 32; - bitmap.bmiHeader.biCompression = BI_RGB; - - hSrcDC = CreateCompatibleDC(hDstDC); - hDIB = CreateDIBSection(hSrcDC, &bitmap, DIB_RGB_COLORS, &hPtr, NULL, 0); - SelectObject(hSrcDC, hDIB); - init_swapchain_images(dev, 3); - return true; - } - - void create(display_handle_t& handle) override - { - window_handle = handle; - hDstDC = GetDC(handle); - } - - void destroy(bool full = true) override - { - DeleteObject(hDIB); - DeleteDC(hSrcDC); - hDIB = NULL; - hSrcDC = NULL; - - swapchain_images.clear(); - - if (full) - { - ReleaseDC(window_handle, hDstDC); - hDstDC = NULL; - - dev.destroy(); - } - } - - VkResult present(VkSemaphore /*semaphore*/, u32 image) override - { - auto& src = swapchain_images[image]; - GdiFlush(); - - if (hSrcDC) - { - memcpy(hPtr, src.second->get_pixels(), src.second->get_required_memory_size()); - BitBlt(hDstDC, 0, 0, m_width, m_height, hSrcDC, 0, 0, SRCCOPY); - src.second->free_pixels(); - } - - src.first = false; - return VK_SUCCESS; - } - #elif defined(__APPLE__) - - class swapchain_MacOS : public native_swapchain_base - { - void* nsView = nullptr; - - public: - swapchain_MacOS(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - {} - - ~swapchain_MacOS() {} - - bool init() override - { - //TODO: get from `nsView` - m_width = 0; - m_height = 0; - - if (m_width == 0 || m_height == 0) - { - rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); - return false; - } - - init_swapchain_images(dev, 3); - return true; - } - - void create(display_handle_t& window_handle) override - { - nsView = window_handle; - } - - void destroy(bool full = true) override - { - swapchain_images.clear(); - - if (full) - dev.destroy(); - } - - VkResult present(VkSemaphore /*semaphore*/, u32 /*index*/) override - { - fmt::throw_exception("Native macOS swapchain is not implemented yet!"); - } - #elif defined(HAVE_X11) - - class swapchain_X11 : public native_swapchain_base - { - Display* display = nullptr; - Window window = 0; - XImage* pixmap = nullptr; - GC gc = nullptr; - int bit_depth = 24; - - public: - swapchain_X11(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - {} - - ~swapchain_X11() override = default; - - bool init() override - { - if (pixmap) - destroy(false); - - Window root; - int x, y; - u32 w = 0, h = 0, border, depth; - - if (XGetGeometry(display, window, &root, &x, &y, &w, &h, &border, &depth)) - { - m_width = w; - m_height = h; - bit_depth = depth; - } - - if (m_width == 0 || m_height == 0) - { - rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); - return false; - } - - XVisualInfo visual{}; - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wold-style-cast" - if (!XMatchVisualInfo(display, DefaultScreen(display), bit_depth, TrueColor, &visual)) - #pragma GCC diagnostic pop - { - rsx_log.error("Could not find matching visual info!"); - return false; - } - - pixmap = XCreateImage(display, visual.visual, visual.depth, ZPixmap, 0, nullptr, m_width, m_height, 32, 0); - init_swapchain_images(dev, 3); - return true; - } - - void create(display_handle_t& window_handle) override - { - std::visit([&](auto&& p) - { - using T = std::decay_t; - if constexpr (std::is_same_v>) - { - display = p.first; - window = p.second; - } - }, window_handle); - - if (display == NULL) - { - rsx_log.fatal("Could not create virtual display on this window protocol (Wayland?)"); - return; - } - - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wold-style-cast" - gc = DefaultGC(display, DefaultScreen(display)); - #pragma GCC diagnostic pop - } - - void destroy(bool full = true) override - { - pixmap->data = nullptr; - XDestroyImage(pixmap); - pixmap = NULL; - - swapchain_images.clear(); - - if (full) - dev.destroy(); - } - - VkResult present(VkSemaphore /*semaphore*/, u32 index) override - { - auto& src = swapchain_images[index]; - if (pixmap) - { - pixmap->data = static_cast(src.second->get_pixels()); - - XPutImage(display, window, gc, pixmap, 0, 0, 0, 0, m_width, m_height); - XFlush(display); - - src.second->free_pixels(); - } - - //Release reference - src.first = false; - return VK_SUCCESS; - } - #else - - class swapchain_Wayland : public native_swapchain_base - { - - public: - swapchain_Wayland(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - {} - - ~swapchain_Wayland() {} - - bool init() override - { - fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); - } - - void create(display_handle_t& window_handle) override - { - fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); - } - - void destroy(bool full = true) override - { - fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); - } - - VkResult present(VkSemaphore /*semaphore*/, u32 index) override - { - fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); - } - #endif - - VkResult acquire_next_swapchain_image(VkSemaphore /*semaphore*/, u64 /*timeout*/, u32* result) override - { - u32 index = 0; - for (auto& p : swapchain_images) - { - if (!p.first) - { - p.first = true; - *result = index; - return VK_SUCCESS; - } - - ++index; - } - - return VK_NOT_READY; - } - - void end_frame(command_buffer& cmd, u32 index) override - { - swapchain_images[index].second->do_dma_transfer(cmd); - } - - VkImage get_image(u32 index) override - { - return swapchain_images[index].second->value; - } - - VkImageLayout get_optimal_present_layout() override - { - return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; - } - - protected: - void init_swapchain_images(render_device& dev, u32 preferred_count) override - { - swapchain_images.resize(preferred_count); - for (auto& img : swapchain_images) - { - img.second = std::make_unique(dev, dev.get_memory_mapping(), m_width, m_height); - img.first = false; - } - } - }; - - class swapchain_WSI : public WSI_swapchain_base - { - VkSurfaceKHR m_surface = VK_NULL_HANDLE; - VkColorSpaceKHR m_color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; - VkSwapchainKHR m_vk_swapchain = nullptr; - - PFN_vkCreateSwapchainKHR _vkCreateSwapchainKHR = nullptr; - PFN_vkDestroySwapchainKHR _vkDestroySwapchainKHR = nullptr; - PFN_vkGetSwapchainImagesKHR _vkGetSwapchainImagesKHR = nullptr; - PFN_vkAcquireNextImageKHR _vkAcquireNextImageKHR = nullptr; - PFN_vkQueuePresentKHR _vkQueuePresentKHR = nullptr; - - bool m_wm_reports_flag = false; - - protected: - void init_swapchain_images(render_device& dev, u32 /*preferred_count*/ = 0) override - { - u32 nb_swap_images = 0; - _vkGetSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, nullptr); - - if (!nb_swap_images) fmt::throw_exception("Driver returned 0 images for swapchain"); - - std::vector vk_images; - vk_images.resize(nb_swap_images); - _vkGetSwapchainImagesKHR(dev, m_vk_swapchain, &nb_swap_images, vk_images.data()); - - swapchain_images.resize(nb_swap_images); - for (u32 i = 0; i < nb_swap_images; ++i) - { - swapchain_images[i].value = vk_images[i]; - } - } - - public: - swapchain_WSI(vk::physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format, VkSurfaceKHR surface, VkColorSpaceKHR color_space, bool force_wm_reporting_off) - : WSI_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - { - _vkCreateSwapchainKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkCreateSwapchainKHR")); - _vkDestroySwapchainKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkDestroySwapchainKHR")); - _vkGetSwapchainImagesKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkGetSwapchainImagesKHR")); - _vkAcquireNextImageKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkAcquireNextImageKHR")); - _vkQueuePresentKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkQueuePresentKHR")); - - m_surface = surface; - m_color_space = color_space; - - if (!force_wm_reporting_off) - { - switch (gpu.get_driver_vendor()) - { - case driver_vendor::AMD: - case driver_vendor::INTEL: - case driver_vendor::RADV: - case driver_vendor::MVK: - break; - case driver_vendor::ANV: - case driver_vendor::NVIDIA: - m_wm_reports_flag = true; - break; - default: - break; - } - } - } - - ~swapchain_WSI() override = default; - - void create(display_handle_t&) override - {} - - void destroy(bool = true) override - { - if (VkDevice pdev = dev) - { - if (m_vk_swapchain) - { - _vkDestroySwapchainKHR(pdev, m_vk_swapchain, nullptr); - } - - dev.destroy(); - } - } - - std::pair init_surface_capabilities() - { -#ifdef _WIN32 - if (g_cfg.video.vk.exclusive_fullscreen_mode != vk_exclusive_fs_mode::unspecified && dev.get_surface_capabilities_2_support()) - { - HMONITOR hmonitor = MonitorFromWindow(window_handle, MONITOR_DEFAULTTOPRIMARY); - if (hmonitor) - { - VkSurfaceCapabilities2KHR pSurfaceCapabilities = {}; - pSurfaceCapabilities.sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR; - - VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo = {}; - pSurfaceInfo.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR; - pSurfaceInfo.surface = m_surface; - - VkSurfaceCapabilitiesFullScreenExclusiveEXT full_screen_exclusive_capabilities = {}; - VkSurfaceFullScreenExclusiveWin32InfoEXT full_screen_exclusive_win32_info = {}; - full_screen_exclusive_capabilities.sType = VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT; - - pSurfaceCapabilities.pNext = &full_screen_exclusive_capabilities; - - full_screen_exclusive_win32_info.sType = VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT; - full_screen_exclusive_win32_info.hmonitor = hmonitor; - - pSurfaceInfo.pNext = &full_screen_exclusive_win32_info; - - auto getPhysicalDeviceSurfaceCapabilities2KHR = reinterpret_cast( - vkGetInstanceProcAddr(dev.gpu(), "vkGetPhysicalDeviceSurfaceCapabilities2KHR") - ); - ensure(getPhysicalDeviceSurfaceCapabilities2KHR); - CHECK_RESULT(getPhysicalDeviceSurfaceCapabilities2KHR(dev.gpu(), &pSurfaceInfo, &pSurfaceCapabilities)); - - return { pSurfaceCapabilities.surfaceCapabilities, !!full_screen_exclusive_capabilities.fullScreenExclusiveSupported }; - } - else - { - rsx_log.warning("Swapchain: failed to get monitor for the window"); - } - } -#endif - VkSurfaceCapabilitiesKHR surface_descriptors = {}; - CHECK_RESULT(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(dev.gpu(), m_surface, &surface_descriptors)); - return { surface_descriptors, false }; - } - - using WSI_swapchain_base::init; - bool init() override - { - if (dev.get_present_queue() == VK_NULL_HANDLE) - { - rsx_log.error("Cannot create WSI swapchain without a present queue"); - return false; - } - - VkSwapchainKHR old_swapchain = m_vk_swapchain; - vk::physical_device& gpu = const_cast(dev.gpu()); - - auto [surface_descriptors, should_specify_exclusive_full_screen_mode] = init_surface_capabilities(); - - if (surface_descriptors.maxImageExtent.width < m_width || - surface_descriptors.maxImageExtent.height < m_height) - { - rsx_log.error("Swapchain: Swapchain creation failed because dimensions cannot fit. Max = %d, %d, Requested = %d, %d", - surface_descriptors.maxImageExtent.width, surface_descriptors.maxImageExtent.height, m_width, m_height); - - return false; - } - - if (surface_descriptors.currentExtent.width != umax) - { - if (surface_descriptors.currentExtent.width == 0 || surface_descriptors.currentExtent.height == 0) - { - rsx_log.warning("Swapchain: Current surface extent is a null region. Is the window minimized?"); - return false; - } - - m_width = surface_descriptors.currentExtent.width; - m_height = surface_descriptors.currentExtent.height; - } - - u32 nb_available_modes = 0; - CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, nullptr)); - - std::vector present_modes(nb_available_modes); - CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, present_modes.data())); - - VkPresentModeKHR swapchain_present_mode = VK_PRESENT_MODE_FIFO_KHR; - std::vector preferred_modes; - - if (!g_cfg.video.vk.force_fifo) - { - // List of preferred modes in decreasing desirability - // NOTE: Always picks "triple-buffered vsync" types if possible - if (!g_cfg.video.vsync) - { - preferred_modes = { VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR, VK_PRESENT_MODE_FIFO_RELAXED_KHR }; - } - } - - bool mode_found = false; - for (VkPresentModeKHR preferred_mode : preferred_modes) - { - //Search for this mode in supported modes - for (VkPresentModeKHR mode : present_modes) - { - if (mode == preferred_mode) - { - swapchain_present_mode = mode; - mode_found = true; - break; - } - } - - if (mode_found) - break; - } - - rsx_log.notice("Swapchain: present mode %d in use.", static_cast(swapchain_present_mode)); - - u32 nb_swap_images = surface_descriptors.minImageCount + 1; - if (surface_descriptors.maxImageCount > 0) - { - //Try to negotiate for a triple buffer setup - //In cases where the front-buffer isnt available for present, its better to have a spare surface - nb_swap_images = std::max(surface_descriptors.minImageCount + 2u, 3u); - - if (nb_swap_images > surface_descriptors.maxImageCount) - { - // Application must settle for fewer images than desired: - nb_swap_images = surface_descriptors.maxImageCount; - } - } - - VkSurfaceTransformFlagBitsKHR pre_transform = surface_descriptors.currentTransform; - if (surface_descriptors.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) - pre_transform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR; - - VkSwapchainCreateInfoKHR swap_info = {}; - swap_info.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; - swap_info.surface = m_surface; - swap_info.minImageCount = nb_swap_images; - swap_info.imageFormat = m_surface_format; - swap_info.imageColorSpace = m_color_space; - - swap_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT; - swap_info.preTransform = pre_transform; - swap_info.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; - swap_info.imageArrayLayers = 1; - swap_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; - swap_info.presentMode = swapchain_present_mode; - swap_info.oldSwapchain = old_swapchain; - swap_info.clipped = true; - - swap_info.imageExtent.width = std::max(m_width, surface_descriptors.minImageExtent.width); - swap_info.imageExtent.height = std::max(m_height, surface_descriptors.minImageExtent.height); - - #ifdef _WIN32 - VkSurfaceFullScreenExclusiveInfoEXT full_screen_exclusive_info = {}; - if (should_specify_exclusive_full_screen_mode) - { - vk_exclusive_fs_mode fs_mode = g_cfg.video.vk.exclusive_fullscreen_mode; - ensure(fs_mode == vk_exclusive_fs_mode::enable || fs_mode == vk_exclusive_fs_mode::disable); - - full_screen_exclusive_info.sType = VK_STRUCTURE_TYPE_SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT; - full_screen_exclusive_info.fullScreenExclusive = - fs_mode == vk_exclusive_fs_mode::enable ? VK_FULL_SCREEN_EXCLUSIVE_ALLOWED_EXT : VK_FULL_SCREEN_EXCLUSIVE_DISALLOWED_EXT; - - swap_info.pNext = &full_screen_exclusive_info; - } - - rsx_log.notice("Swapchain: requesting full screen exclusive mode %d.", static_cast(full_screen_exclusive_info.fullScreenExclusive)); - #endif - - _vkCreateSwapchainKHR(dev, &swap_info, nullptr, &m_vk_swapchain); - - if (old_swapchain) - { - if (!swapchain_images.empty()) - { - swapchain_images.clear(); - } - - _vkDestroySwapchainKHR(dev, old_swapchain, nullptr); - } - - init_swapchain_images(dev); - return true; - } - - bool supports_automatic_wm_reports() const override - { - return m_wm_reports_flag; - } - - VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) override - { - return vkAcquireNextImageKHR(dev, m_vk_swapchain, timeout, semaphore, VK_NULL_HANDLE, result); - } - - void end_frame(command_buffer& /*cmd*/, u32 /*index*/) override - { - } - - VkResult present(VkSemaphore semaphore, u32 image) override - { - VkPresentInfoKHR present = {}; - present.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; - present.pNext = nullptr; - present.swapchainCount = 1; - present.pSwapchains = &m_vk_swapchain; - present.pImageIndices = ℑ - - if (semaphore != VK_NULL_HANDLE) - { - present.waitSemaphoreCount = 1; - present.pWaitSemaphores = &semaphore; - } - - return _vkQueuePresentKHR(dev.get_present_queue(), &present); - } - - VkImage get_image(u32 index) override - { - return swapchain_images[index].value; - } - - VkImageLayout get_optimal_present_layout() override - { - return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; - } - }; -} diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp new file mode 100644 index 0000000000..a4d8b613de --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp @@ -0,0 +1,57 @@ +#pragma once + +#include "swapchain_core.h" + +namespace vk +{ +#if defined(ANDROID) + class swapchain_ANDROID : public native_swapchain_base + { + void* surface_handle = nullptr; // FIXME: No idea what the android native surface is called + + public: + swapchain_ANDROID(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) + {} + + ~swapchain_ANDROID() {} + + bool init() override + { + //TODO: get from `surface` + m_width = 0; + m_height = 0; + + if (m_width == 0 || m_height == 0) + { + rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); + return false; + } + + init_swapchain_images(dev, 3); + return true; + } + + void create(display_handle_t& window_handle) override + { + surface_handle = window_handle; + } + + void destroy(bool full = true) override + { + swapchain_images.clear(); + + if (full) + dev.destroy(); + } + + VkResult present(VkSemaphore /*semaphore*/, u32 /*index*/) override + { + fmt::throw_exception("Native macOS swapchain is not implemented yet!"); + } + }; + + using swapchain_NATIVE = swapchain_ANDROID; +#endif +} + diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h b/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h new file mode 100644 index 0000000000..bb0f3db3c0 --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h @@ -0,0 +1,200 @@ +#pragma once + +#ifdef HAVE_X11 +#include +#endif + +#include "../../display.h" +#include "../VulkanAPI.h" +#include "image.h" + +#include + +namespace vk +{ + struct swapchain_image_WSI + { + VkImage value = VK_NULL_HANDLE; + }; + + class swapchain_image_RPCS3 : public image + { + std::unique_ptr m_dma_buffer; + u32 m_width = 0; + u32 m_height = 0; + + public: + swapchain_image_RPCS3(render_device& dev, const memory_type_mapping& memory_map, u32 width, u32 height); + + void do_dma_transfer(command_buffer& cmd); + + u32 get_required_memory_size() const; + + void* get_pixels(); + + void free_pixels(); + }; + + class swapchain_base + { + protected: + render_device dev; + + display_handle_t window_handle{}; + u32 m_width = 0; + u32 m_height = 0; + VkFormat m_surface_format = VK_FORMAT_B8G8R8A8_UNORM; + + virtual void init_swapchain_images(render_device& dev, u32 count) = 0; + + public: + swapchain_base(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM); + + virtual ~swapchain_base() = default; + + virtual void create(display_handle_t& handle) = 0; + virtual void destroy(bool full = true) = 0; + virtual bool init() = 0; + + virtual u32 get_swap_image_count() const = 0; + virtual VkImage get_image(u32 index) = 0; + virtual VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) = 0; + virtual void end_frame(command_buffer& cmd, u32 index) = 0; + virtual VkResult present(VkSemaphore semaphore, u32 index) = 0; + virtual VkImageLayout get_optimal_present_layout() const = 0; + + virtual bool supports_automatic_wm_reports() const + { + return false; + } + + bool init(u32 w, u32 h) + { + m_width = w; + m_height = h; + return init(); + } + + const vk::render_device& get_device() + { + return dev; + } + + VkFormat get_surface_format() const + { + return m_surface_format; + } + + bool is_headless() const + { + return (dev.get_present_queue() == VK_NULL_HANDLE); + } + }; + + template + class abstract_swapchain_impl : public swapchain_base + { + protected: + std::vector swapchain_images; + + public: + abstract_swapchain_impl(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + : swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) + {} + + ~abstract_swapchain_impl() override = default; + + u32 get_swap_image_count() const override + { + return ::size32(swapchain_images); + } + + using swapchain_base::init; + }; + + using WSI_swapchain_base = abstract_swapchain_impl; + + class native_swapchain_base : public abstract_swapchain_impl>> + { + public: + using abstract_swapchain_impl::abstract_swapchain_impl; + + VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) override; + + void end_frame(command_buffer& cmd, u32 index) override + { + swapchain_images[index].second->do_dma_transfer(cmd); + } + + VkImage get_image(u32 index) override + { + return swapchain_images[index].second->value; + } + + VkImageLayout get_optimal_present_layout() const override + { + return VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; + } + + protected: + void init_swapchain_images(render_device& dev, u32 preferred_count) override; + }; + + class swapchain_WSI : public WSI_swapchain_base + { + VkSurfaceKHR m_surface = VK_NULL_HANDLE; + VkColorSpaceKHR m_color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; + VkSwapchainKHR m_vk_swapchain = nullptr; + + PFN_vkCreateSwapchainKHR _vkCreateSwapchainKHR = nullptr; + PFN_vkDestroySwapchainKHR _vkDestroySwapchainKHR = nullptr; + PFN_vkGetSwapchainImagesKHR _vkGetSwapchainImagesKHR = nullptr; + PFN_vkAcquireNextImageKHR _vkAcquireNextImageKHR = nullptr; + PFN_vkQueuePresentKHR _vkQueuePresentKHR = nullptr; + + bool m_wm_reports_flag = false; + + protected: + void init_swapchain_images(render_device& dev, u32 preferred_count = 0) override; + + public: + swapchain_WSI(vk::physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format, VkSurfaceKHR surface, VkColorSpaceKHR color_space, bool force_wm_reporting_off); + + ~swapchain_WSI() override = default; + + void create(display_handle_t&) override + {} + + void destroy(bool = true) override; + + std::pair init_surface_capabilities(); + + using WSI_swapchain_base::init; + bool init() override; + + bool supports_automatic_wm_reports() const override + { + return m_wm_reports_flag; + } + + VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) override + { + return vkAcquireNextImageKHR(dev, m_vk_swapchain, timeout, semaphore, VK_NULL_HANDLE, result); + } + + void end_frame(command_buffer& /*cmd*/, u32 /*index*/) override + {} + + VkResult present(VkSemaphore semaphore, u32 image) override; + + VkImage get_image(u32 index) override + { + return swapchain_images[index].value; + } + + VkImageLayout get_optimal_present_layout() const override + { + return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + } + }; +} diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp new file mode 100644 index 0000000000..a9daf7718d --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp @@ -0,0 +1,56 @@ +#pragma once + +#include "swapchain_core.h" + +namespace vk +{ +#if defined(__APPLE__) + class swapchain_MacOS : public native_swapchain_base + { + void* nsView = nullptr; + + public: + swapchain_MacOS(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) + {} + + ~swapchain_MacOS() {} + + bool init() override + { + //TODO: get from `nsView` + m_width = 0; + m_height = 0; + + if (m_width == 0 || m_height == 0) + { + rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); + return false; + } + + init_swapchain_images(dev, 3); + return true; + } + + void create(display_handle_t& window_handle) override + { + nsView = window_handle; + } + + void destroy(bool full = true) override + { + swapchain_images.clear(); + + if (full) + dev.destroy(); + } + + VkResult present(VkSemaphore /*semaphore*/, u32 /*index*/) override + { + fmt::throw_exception("Native macOS swapchain is not implemented yet!"); + } + }; + + using swapchain_NATIVE = swapchain_MacOS; +#endif +} diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp new file mode 100644 index 0000000000..c9d005045a --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp @@ -0,0 +1,161 @@ +#pragma once + +#include "swapchain_core.h" + +#ifdef HAVE_X11 +#include +#endif + +namespace vk +{ +#if defined(HAVE_X11) + + class swapchain_X11 : public native_swapchain_base + { + Display* display = nullptr; + Window window = 0; + XImage* pixmap = nullptr; + GC gc = nullptr; + int bit_depth = 24; + + public: + swapchain_X11(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) + {} + + ~swapchain_X11() override = default; + + bool init() override + { + if (pixmap) + destroy(false); + + Window root; + int x, y; + u32 w = 0, h = 0, border, depth; + + if (XGetGeometry(display, window, &root, &x, &y, &w, &h, &border, &depth)) + { + m_width = w; + m_height = h; + bit_depth = depth; + } + + if (m_width == 0 || m_height == 0) + { + rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); + return false; + } + + XVisualInfo visual{}; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" + if (!XMatchVisualInfo(display, DefaultScreen(display), bit_depth, TrueColor, &visual)) +#pragma GCC diagnostic pop + { + rsx_log.error("Could not find matching visual info!"); + return false; + } + + pixmap = XCreateImage(display, visual.visual, visual.depth, ZPixmap, 0, nullptr, m_width, m_height, 32, 0); + init_swapchain_images(dev, 3); + return true; + } + + void create(display_handle_t& window_handle) override + { + std::visit([&](auto&& p) + { + using T = std::decay_t; + if constexpr (std::is_same_v>) + { + display = p.first; + window = p.second; + } + }, window_handle); + + if (display == NULL) + { + rsx_log.fatal("Could not create virtual display on this window protocol (Wayland?)"); + return; + } + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" + gc = DefaultGC(display, DefaultScreen(display)); +#pragma GCC diagnostic pop + } + + void destroy(bool full = true) override + { + pixmap->data = nullptr; + XDestroyImage(pixmap); + pixmap = NULL; + + swapchain_images.clear(); + + if (full) + dev.destroy(); + } + + VkResult present(VkSemaphore /*semaphore*/, u32 index) override + { + auto& src = swapchain_images[index]; + if (pixmap) + { + pixmap->data = static_cast(src.second->get_pixels()); + + XPutImage(display, window, gc, pixmap, 0, 0, 0, 0, m_width, m_height); + XFlush(display); + + src.second->free_pixels(); + } + + //Release reference + src.first = false; + return VK_SUCCESS; + } + }; + + using swapchain_NATIVE = swapchain_X11; + +#endif + +#if defined(HAVE_WAYLAND) + + class swapchain_Wayland : public native_swapchain_base + { + public: + swapchain_Wayland(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) + {} + + ~swapchain_Wayland() {} + + bool init() override + { + fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); + } + + void create(display_handle_t& window_handle) override + { + fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); + } + + void destroy(bool full = true) override + { + fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); + } + + VkResult present(VkSemaphore /*semaphore*/, u32 index) override + { + fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); + } + }; + +#ifndef HAVE_X11 + using swapchain_NATIVE = swapchain_Wayland; +#endif + +#endif +} diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp new file mode 100644 index 0000000000..005a09d988 --- /dev/null +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp @@ -0,0 +1,98 @@ +#pragma once + +#include "swapchain_core.h" + +namespace vk +{ +#if defined(_WIN32) + class swapchain_WIN32 : public native_swapchain_base + { + HDC hDstDC = NULL; + HDC hSrcDC = NULL; + HBITMAP hDIB = NULL; + LPVOID hPtr = NULL; + + public: + swapchain_WIN32(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) + {} + + ~swapchain_WIN32() {} + + bool init() override + { + if (hDIB || hSrcDC) + destroy(false); + + RECT rect; + GetClientRect(window_handle, &rect); + m_width = rect.right - rect.left; + m_height = rect.bottom - rect.top; + + if (m_width == 0 || m_height == 0) + { + rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); + return false; + } + + BITMAPINFO bitmap = {}; + bitmap.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmap.bmiHeader.biWidth = m_width; + bitmap.bmiHeader.biHeight = m_height * -1; + bitmap.bmiHeader.biPlanes = 1; + bitmap.bmiHeader.biBitCount = 32; + bitmap.bmiHeader.biCompression = BI_RGB; + + hSrcDC = CreateCompatibleDC(hDstDC); + hDIB = CreateDIBSection(hSrcDC, &bitmap, DIB_RGB_COLORS, &hPtr, NULL, 0); + SelectObject(hSrcDC, hDIB); + init_swapchain_images(dev, 3); + return true; + } + + void create(display_handle_t& handle) override + { + window_handle = handle; + hDstDC = GetDC(handle); + } + + void destroy(bool full = true) override + { + DeleteObject(hDIB); + DeleteDC(hSrcDC); + hDIB = NULL; + hSrcDC = NULL; + + swapchain_images.clear(); + + if (full) + { + ReleaseDC(window_handle, hDstDC); + hDstDC = NULL; + + dev.destroy(); + } + } + + VkResult present(VkSemaphore /*semaphore*/, u32 image) override + { + auto& src = swapchain_images[image]; + GdiFlush(); + + if (hSrcDC) + { + memcpy(hPtr, src.second->get_pixels(), src.second->get_required_memory_size()); + BitBlt(hDstDC, 0, 0, m_width, m_height, hSrcDC, 0, 0, SRCCOPY); + src.second->free_pixels(); + } + + src.first = false; + return VK_SUCCESS; + } + }; + + using swapchain_NATIVE = swapchain_WIN32; + + +#endif +} diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj index 2c7d66e702..fb5c517adc 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -49,7 +49,12 @@ - + + + + + + @@ -96,6 +101,7 @@ + diff --git a/rpcs3/VKGSRender.vcxproj.filters b/rpcs3/VKGSRender.vcxproj.filters index 6af8e388bb..d9adc1939e 100644 --- a/rpcs3/VKGSRender.vcxproj.filters +++ b/rpcs3/VKGSRender.vcxproj.filters @@ -76,6 +76,9 @@ vkutils + + vkutils + @@ -142,7 +145,7 @@ vkutils - + vkutils @@ -178,6 +181,21 @@ vkutils + + vkutils + + + vkutils + + + vkutils + + + vkutils + + + vkutils + From 602fe1564103ffcf749b766ab8c88dfd6762775f Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 1 Mar 2025 14:20:51 +0300 Subject: [PATCH 004/529] vk/swapchain: Move platform-specific code to appropriate headers --- rpcs3/Emu/RSX/VK/vkutils/instance.cpp | 51 +------------------ .../Emu/RSX/VK/vkutils/swapchain_android.hpp | 7 +++ rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp | 12 +++++ rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp | 40 +++++++++++++++ rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp | 12 +++++ 5 files changed, 72 insertions(+), 50 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp index 76cd29243f..d28b90b338 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp @@ -251,56 +251,7 @@ namespace vk swapchain_base* instance::create_swapchain(display_handle_t window_handle, vk::physical_device& dev) { bool force_wm_reporting_off = false; -#ifdef _WIN32 - HINSTANCE hInstance = NULL; - - VkWin32SurfaceCreateInfoKHR createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; - createInfo.hinstance = hInstance; - createInfo.hwnd = window_handle; - - CHECK_RESULT(vkCreateWin32SurfaceKHR(m_instance, &createInfo, NULL, &m_surface)); - -#elif defined(__APPLE__) - VkMacOSSurfaceCreateInfoMVK createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; - createInfo.pView = window_handle; - - CHECK_RESULT(vkCreateMacOSSurfaceMVK(m_instance, &createInfo, NULL, &m_surface)); -#else - - std::visit([&](auto&& p) - { - using T = std::decay_t; - -#ifdef HAVE_X11 - if constexpr (std::is_same_v>) - { - VkXlibSurfaceCreateInfoKHR createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; - createInfo.dpy = p.first; - createInfo.window = p.second; - CHECK_RESULT(vkCreateXlibSurfaceKHR(this->m_instance, &createInfo, nullptr, &m_surface)); - } - else -#endif -#ifdef HAVE_WAYLAND - if constexpr (std::is_same_v>) - { - VkWaylandSurfaceCreateInfoKHR createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR; - createInfo.display = p.first; - createInfo.surface = p.second; - CHECK_RESULT(vkCreateWaylandSurfaceKHR(this->m_instance, &createInfo, nullptr, &m_surface)); - force_wm_reporting_off = true; - } - else -#endif - { - static_assert(std::conditional_t::value, "Unhandled window_handle type in std::variant"); - } - }, window_handle); -#endif + m_surface = make_WSI_surface(m_instance, window_handle); u32 device_queues = dev.get_queue_count(); std::vector supports_present(device_queues, VK_FALSE); diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp index a4d8b613de..6e6d0cada5 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp @@ -52,6 +52,13 @@ namespace vk }; using swapchain_NATIVE = swapchain_ANDROID; + + // TODO: Implement this + static + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle) + { + return VK_NULL_HANDLE; + } #endif } diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp index a9daf7718d..7b06a854dd 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp @@ -52,5 +52,17 @@ namespace vk }; using swapchain_NATIVE = swapchain_MacOS; + + static + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t handle) + { + VkSurfaceKHR result = VK_NULL_HANDLE; + VkMacOSSurfaceCreateInfoMVK createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; + createInfo.pView = window_handle; + + CHECK_RESULT(vkCreateMacOSSurfaceMVK(vk_instance, &createInfo, NULL, &result)); + return result; + } #endif } diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp index c9d005045a..7431054936 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp @@ -158,4 +158,44 @@ namespace vk #endif #endif + + static + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle) + { + VkSurfaceKHR result = VK_NULL_HANDLE; + + std::visit([&](auto&& p) + { + using T = std::decay_t; + +#ifdef HAVE_X11 + if constexpr (std::is_same_v>) + { + VkXlibSurfaceCreateInfoKHR createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; + createInfo.dpy = p.first; + createInfo.window = p.second; + CHECK_RESULT(vkCreateXlibSurfaceKHR(vk_instance, &createInfo, nullptr, &result)); + } + else +#endif +#ifdef HAVE_WAYLAND + if constexpr (std::is_same_v>) + { + VkWaylandSurfaceCreateInfoKHR createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR; + createInfo.display = p.first; + createInfo.surface = p.second; + CHECK_RESULT(vkCreateWaylandSurfaceKHR(vk_instance, &createInfo, nullptr, &result)); + force_wm_reporting_off = true; + } + else +#endif + { + static_assert(std::conditional_t::value, "Unhandled window_handle type in std::variant"); + } + }, window_handle); + + return ensure(result, "Failed to initialize Vulkan display surface"); + } } diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp index 005a09d988..de7f45c5c4 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp @@ -93,6 +93,18 @@ namespace vk using swapchain_NATIVE = swapchain_WIN32; + static + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle) + { + HINSTANCE hInstance = NULL; + VkSurfaceKHR result = VK_NULL_HANDLE; + VkWin32SurfaceCreateInfoKHR createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; + createInfo.hinstance = hInstance; + createInfo.hwnd = window_handle; + CHECK_RESULT(vkCreateWin32SurfaceKHR(vk_instance, &createInfo, NULL, &result)); + return result; + } #endif } From 4e9365f76bf3d180d4ea3afb938ba28e213c8e9c Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 1 Mar 2025 14:31:16 +0300 Subject: [PATCH 005/529] vk/swapchain: Consolidate native swapchain implementation for platforms where it is not implemented - NATIVE swapchain only matters in headless scenarios or where we otherwise cannot access WSI properly. - It is now optional, with a stub provided when WSI is not available. --- .../Emu/RSX/VK/vkutils/swapchain_android.hpp | 47 +------------------ rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h | 22 +++++++++ rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp | 47 +------------------ rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp | 31 +----------- 4 files changed, 25 insertions(+), 122 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp index 6e6d0cada5..38da782e87 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp @@ -5,52 +5,7 @@ namespace vk { #if defined(ANDROID) - class swapchain_ANDROID : public native_swapchain_base - { - void* surface_handle = nullptr; // FIXME: No idea what the android native surface is called - - public: - swapchain_ANDROID(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - {} - - ~swapchain_ANDROID() {} - - bool init() override - { - //TODO: get from `surface` - m_width = 0; - m_height = 0; - - if (m_width == 0 || m_height == 0) - { - rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); - return false; - } - - init_swapchain_images(dev, 3); - return true; - } - - void create(display_handle_t& window_handle) override - { - surface_handle = window_handle; - } - - void destroy(bool full = true) override - { - swapchain_images.clear(); - - if (full) - dev.destroy(); - } - - VkResult present(VkSemaphore /*semaphore*/, u32 /*index*/) override - { - fmt::throw_exception("Native macOS swapchain is not implemented yet!"); - } - }; - + using swapchain_ANDROID = native_swapchain_base; using swapchain_NATIVE = swapchain_ANDROID; // TODO: Implement this diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h b/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h index bb0f3db3c0..37285c4f77 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h @@ -121,6 +121,28 @@ namespace vk VkResult acquire_next_swapchain_image(VkSemaphore semaphore, u64 timeout, u32* result) override; + // Clients must implement these methods to render without WSI support + bool init() override + { + fmt::throw_exception("Native swapchain is not implemented yet!"); + } + + void create(display_handle_t& /*window_handle*/) override + { + fmt::throw_exception("Native swapchain is not implemented yet!"); + } + + void destroy(bool /*full*/ = true) override + { + fmt::throw_exception("Native swapchain is not implemented yet!"); + } + + VkResult present(VkSemaphore /*semaphore*/, u32 /*index*/) override + { + fmt::throw_exception("Native swapchain is not implemented yet!"); + } + + // Generic accessors void end_frame(command_buffer& cmd, u32 index) override { swapchain_images[index].second->do_dma_transfer(cmd); diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp index 7b06a854dd..ec53ab1812 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp @@ -5,52 +5,7 @@ namespace vk { #if defined(__APPLE__) - class swapchain_MacOS : public native_swapchain_base - { - void* nsView = nullptr; - - public: - swapchain_MacOS(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - {} - - ~swapchain_MacOS() {} - - bool init() override - { - //TODO: get from `nsView` - m_width = 0; - m_height = 0; - - if (m_width == 0 || m_height == 0) - { - rsx_log.error("Invalid window dimensions %d x %d", m_width, m_height); - return false; - } - - init_swapchain_images(dev, 3); - return true; - } - - void create(display_handle_t& window_handle) override - { - nsView = window_handle; - } - - void destroy(bool full = true) override - { - swapchain_images.clear(); - - if (full) - dev.destroy(); - } - - VkResult present(VkSemaphore /*semaphore*/, u32 /*index*/) override - { - fmt::throw_exception("Native macOS swapchain is not implemented yet!"); - } - }; - + using swapchain_MacOS = native_swapchain_base; using swapchain_NATIVE = swapchain_MacOS; static diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp index 7431054936..a2bf589346 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp @@ -122,36 +122,7 @@ namespace vk #endif #if defined(HAVE_WAYLAND) - - class swapchain_Wayland : public native_swapchain_base - { - public: - swapchain_Wayland(physical_device& gpu, u32 present_queue, u32 graphics_queue, u32 transfer_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) - : native_swapchain_base(gpu, present_queue, graphics_queue, transfer_queue, format) - {} - - ~swapchain_Wayland() {} - - bool init() override - { - fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); - } - - void create(display_handle_t& window_handle) override - { - fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); - } - - void destroy(bool full = true) override - { - fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); - } - - VkResult present(VkSemaphore /*semaphore*/, u32 index) override - { - fmt::throw_exception("Native Wayland swapchain is not implemented yet!"); - } - }; + using swapchain_Wayland = native_swapchain_base; #ifndef HAVE_X11 using swapchain_NATIVE = swapchain_Wayland; From b8411a90cd95da4ac69ee1830f71c0c53eabe78a Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 1 Mar 2025 16:16:07 +0300 Subject: [PATCH 006/529] vk/swapchain: Fix WSI swapchain configuration overrides --- rpcs3/Emu/RSX/VK/vkutils/instance.cpp | 9 ++++++--- rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp | 4 ++-- rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h | 5 +++++ rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp | 4 ++-- rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp | 6 +++--- rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp | 4 ++-- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp index d28b90b338..0527376e08 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp @@ -250,8 +250,11 @@ namespace vk swapchain_base* instance::create_swapchain(display_handle_t window_handle, vk::physical_device& dev) { - bool force_wm_reporting_off = false; - m_surface = make_WSI_surface(m_instance, window_handle); + WSI_config surface_config + { + .supports_automatic_wm_reports = true + }; + m_surface = make_WSI_surface(m_instance, window_handle, &surface_config); u32 device_queues = dev.get_queue_count(); std::vector supports_present(device_queues, VK_FALSE); @@ -358,6 +361,6 @@ namespace vk color_space = surfFormats[0].colorSpace; - return new swapchain_WSI(dev, present_queue_idx, graphics_queue_idx, transfer_queue_idx, format, m_surface, color_space, force_wm_reporting_off); + return new swapchain_WSI(dev, present_queue_idx, graphics_queue_idx, transfer_queue_idx, format, m_surface, color_space, !surface_config.supports_automatic_wm_reports); } } diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp index 38da782e87..ccec22a383 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp @@ -9,8 +9,8 @@ namespace vk using swapchain_NATIVE = swapchain_ANDROID; // TODO: Implement this - static - VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle) + [[maybe_unused]] static + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* /*config*/) { return VK_NULL_HANDLE; } diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h b/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h index 37285c4f77..aaf8426b9a 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h @@ -219,4 +219,9 @@ namespace vk return VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; } }; + + struct WSI_config + { + bool supports_automatic_wm_reports = true; + }; } diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp index ec53ab1812..1d502d1b9f 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp @@ -8,8 +8,8 @@ namespace vk using swapchain_MacOS = native_swapchain_base; using swapchain_NATIVE = swapchain_MacOS; - static - VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t handle) + [[maybe_unused]] static + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t handle, WSI_config* /*config*/) { VkSurfaceKHR result = VK_NULL_HANDLE; VkMacOSSurfaceCreateInfoMVK createInfo = {}; diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp index a2bf589346..ec893da8e8 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp @@ -130,8 +130,8 @@ namespace vk #endif - static - VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle) + [[maybe_unused]] static + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* config) { VkSurfaceKHR result = VK_NULL_HANDLE; @@ -158,7 +158,7 @@ namespace vk createInfo.display = p.first; createInfo.surface = p.second; CHECK_RESULT(vkCreateWaylandSurfaceKHR(vk_instance, &createInfo, nullptr, &result)); - force_wm_reporting_off = true; + config->supports_automatic_wm_reports = false; } else #endif diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp index de7f45c5c4..c509d7cffa 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp @@ -93,8 +93,8 @@ namespace vk using swapchain_NATIVE = swapchain_WIN32; - static - VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle) + [[maybe_unused]] static + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* /*config*/) { HINSTANCE hInstance = NULL; VkSurfaceKHR result = VK_NULL_HANDLE; From 0aca5e222f319783af9907d8ebac219657ce26bf Mon Sep 17 00:00:00 2001 From: kd-11 <15904127+kd-11@users.noreply.github.com> Date: Sat, 1 Mar 2025 16:56:43 +0300 Subject: [PATCH 007/529] vk: Fix MacOS build --- rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp index 1d502d1b9f..9e4217692d 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp @@ -9,7 +9,7 @@ namespace vk using swapchain_NATIVE = swapchain_MacOS; [[maybe_unused]] static - VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t handle, WSI_config* /*config*/) + VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* /*config*/) { VkSurfaceKHR result = VK_NULL_HANDLE; VkMacOSSurfaceCreateInfoMVK createInfo = {}; From 8e6272bfeef72b2dda239c4aced05aa88982c700 Mon Sep 17 00:00:00 2001 From: trigger Date: Sat, 1 Mar 2025 10:03:04 -0800 Subject: [PATCH 008/529] Qt: Fix boot failed dialog --- rpcs3/rpcs3qt/main_window.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index a0f94331fd..eaa72807f3 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -549,13 +549,12 @@ void main_window::show_boot_error(game_boot_result status) } const QString link = tr("

For information on setting up the emulator and dumping your PS3 games, read the quickstart guide.").arg(gui::utils::get_link_style()); - QMessageBox* msg = new QMessageBox(); + QMessageBox* msg = new QMessageBox(this); msg->setWindowTitle(tr("Boot Failed")); msg->setIcon(QMessageBox::Critical); msg->setTextFormat(Qt::RichText); msg->setStandardButtons(QMessageBox::Ok); msg->setText(tr("Booting failed: %1 %2").arg(message).arg(link)); - msg->setParent(this); msg->setAttribute(Qt::WA_DeleteOnClose); msg->open(); } From 6bd1ab576c7c36640d1ebb70fbca6935abced88e Mon Sep 17 00:00:00 2001 From: Malcolm Jestadt Date: Fri, 28 Feb 2025 08:45:34 -0500 Subject: [PATCH 009/529] RSX: Use AVX-512-ICL code in get_vertecx_program_ucode_hash and in vertex_program_compare - Code is about 4 times as fast on my zen4 machine - Should be twice as fast on zen5 machines with full width AVX-512 --- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 205 ++++++++++++++++++-- 1 file changed, 186 insertions(+), 19 deletions(-) diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index ae7edebe48..ccba75b985 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "ProgramStateCache.h" #include "Emu/system_config.h" +#include "util/sysinfo.hpp" #include @@ -21,31 +22,119 @@ #endif #endif +#ifdef ARCH_ARM64 +#define AVX512_ICL_FUNC +#endif + +#ifdef _MSC_VER +#define AVX512_ICL_FUNC +#else +#define AVX512_ICL_FUNC __attribute__((__target__("avx512f,avx512bw,avx512dq,avx512cd,avx512vl,avx512bitalg,avx512ifma,avx512vbmi,avx512vbmi2,avx512vnni,avx512vpopcntdq"))) +#endif + + using namespace program_hash_util; -usz vertex_program_utils::get_vertex_program_ucode_hash(const RSXVertexProgram &program) +AVX512_ICL_FUNC usz vertex_program_utils::get_vertex_program_ucode_hash(const RSXVertexProgram &program) { - // Checksum as hash with rotated data - const void* instbuffer = program.data.data(); - u32 instIndex = 0; - usz acc0 = 0; - usz acc1 = 0; - - do +#ifdef ARCH_X64 + if (utils::has_avx512_icl()) { - if (program.instruction_mask[instIndex]) + // Load all elements of the instruction_mask bitset + const __m512i* instMask512 = reinterpret_cast(&program.instruction_mask); + const __m128i* instMask128 = reinterpret_cast(&program.instruction_mask); + + const __m512i lowerMask = _mm512_loadu_si512(instMask512); + const __m128i upper128 = _mm_loadu_si128(instMask128 + 4); + const __m512i upperMask = _mm512_zextsi128_si512(upper128); + + __m512i maskIndex = _mm512_setzero_si512(); + const __m512i negativeOnes = _mm512_set1_epi64(-1); + + // Special masks to test against bitset + const __m512i testMask0 = _mm512_set_epi64( + 0x0808080808080808, + 0x0808080808080808, + 0x0404040404040404, + 0x0404040404040404, + 0x0202020202020202, + 0x0202020202020202, + 0x0101010101010101, + 0x0101010101010101); + + const __m512i testMask1 = _mm512_set_epi64( + 0x8080808080808080, + 0x8080808080808080, + 0x4040404040404040, + 0x4040404040404040, + 0x2020202020202020, + 0x2020202020202020, + 0x1010101010101010, + 0x1010101010101010); + + const __m512i* instBuffer = reinterpret_cast(program.data.data()); + __m512i acc0 = _mm512_setzero_si512(); + __m512i acc1 = _mm512_setzero_si512(); + + __m512i rotMask0 = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0); + __m512i rotMask1 = _mm512_set_epi64(15, 14, 13, 12, 11, 10, 9, 8); + __m512i rotMaskAdd = _mm512_set_epi64(16, 16, 16, 16, 16, 16, 16, 16); + + u32 instIndex = 0; + + // If there is remainder, add an extra (masked) iteration + u32 extraIteration = (program.data.size() % 32 != 0) ? 1 : 0; + u32 length = (program.data.size() / 32) + extraIteration; + + // The instruction mask will prevent us from reading out of bounds, we do not need a seperate masked loop + // for the remainder, or a scalar loop. + while (instIndex < (length)) { - const auto inst = v128::loadu(instbuffer, instIndex); - usz tmp0 = std::rotr(inst._u64[0], instIndex * 2); - acc0 += tmp0; - usz tmp1 = std::rotr(inst._u64[1], (instIndex * 2) + 1); - acc1 += tmp1; + const __m512i masks = _mm512_permutex2var_epi8(lowerMask, maskIndex, upperMask); + const __mmask8 result0 = _mm512_test_epi64_mask(masks, testMask0); + const __mmask8 result1 = _mm512_test_epi64_mask(masks, testMask1); + const __m512i load0 = _mm512_maskz_loadu_epi64(result0, (instBuffer + instIndex * 2)); + const __m512i load1 = _mm512_maskz_loadu_epi64(result1, (instBuffer + (instIndex * 2)+ 1)); + + const __m512i rotated0 = _mm512_rorv_epi64(load0, rotMask0); + const __m512i rotated1 = _mm512_rorv_epi64(load1, rotMask1); + + acc0 = _mm512_add_epi64(acc0, rotated0); + acc1 = _mm512_add_epi64(acc1, rotated1); + + rotMask0 = _mm512_add_epi64(rotMask0, rotMaskAdd); + rotMask1 = _mm512_add_epi64(rotMask1, rotMaskAdd); + maskIndex = _mm512_sub_epi8(maskIndex, negativeOnes); + + instIndex++; } - instIndex++; - } while (instIndex < (program.data.size() / 4)); + const __m512i result = _mm512_add_epi64(acc0, acc1); + return _mm512_reduce_add_epi64(result); + } +#endif + + // Checksum as hash with rotated data + const void* instbuffer = program.data.data(); + u32 instIndex = 0; + usz acc0 = 0; + usz acc1 = 0; + + do + { + if (program.instruction_mask[instIndex]) + { + const auto inst = v128::loadu(instbuffer, instIndex); + usz tmp0 = std::rotr(inst._u64[0], instIndex * 2); + acc0 += tmp0; + usz tmp1 = std::rotr(inst._u64[1], (instIndex * 2) + 1); + acc1 += tmp1; + } + + instIndex++; + } while (instIndex < (program.data.size() / 4)); return acc0 + acc1; -} + } vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vertex_program(const u32* data, u32 entry, RSXVertexProgram& dst_prog) { @@ -350,7 +439,7 @@ usz vertex_program_storage_hash::operator()(const RSXVertexProgram &program) con return rpcs3::hash64(ucode_hash, metadata_hash); } -bool vertex_program_compare::operator()(const RSXVertexProgram &binary1, const RSXVertexProgram &binary2) const +AVX512_ICL_FUNC bool vertex_program_compare::operator()(const RSXVertexProgram &binary1, const RSXVertexProgram &binary2) const { if (binary1.output_mask != binary2.output_mask) return false; @@ -363,10 +452,88 @@ bool vertex_program_compare::operator()(const RSXVertexProgram &binary1, const R if (binary1.jump_table != binary2.jump_table) return false; +#ifdef ARCH_X64 + if (utils::has_avx512_icl()) + { + // Load all elements of the instruction_mask bitset + const __m512i* instMask512 = reinterpret_cast(&binary1.instruction_mask); + const __m128i* instMask128 = reinterpret_cast(&binary1.instruction_mask); + + const __m512i lowerMask = _mm512_loadu_si512(instMask512); + const __m128i upper128 = _mm_loadu_si128(instMask128 + 4); + const __m512i upperMask = _mm512_zextsi128_si512(upper128); + + __m512i maskIndex = _mm512_setzero_si512(); + const __m512i negativeOnes = _mm512_set1_epi64(-1); + + // Special masks to test against bitset + const __m512i testMask0 = _mm512_set_epi64( + 0x0808080808080808, + 0x0808080808080808, + 0x0404040404040404, + 0x0404040404040404, + 0x0202020202020202, + 0x0202020202020202, + 0x0101010101010101, + 0x0101010101010101); + + const __m512i testMask1 = _mm512_set_epi64( + 0x8080808080808080, + 0x8080808080808080, + 0x4040404040404040, + 0x4040404040404040, + 0x2020202020202020, + 0x2020202020202020, + 0x1010101010101010, + 0x1010101010101010); + + const __m512i* instBuffer1 = reinterpret_cast(binary1.data.data()); + const __m512i* instBuffer2 = reinterpret_cast(binary2.data.data()); + + // If there is remainder, add an extra (masked) iteration + u32 extraIteration = (binary1.data.size() % 32 != 0) ? 1 : 0; + u32 length = (binary1.data.size() / 32) + extraIteration; + + u32 instIndex = 0; + + // The instruction mask will prevent us from reading out of bounds, we do not need a seperate masked loop + // for the remainder, or a scalar loop. + while (instIndex < (length)) + { + const __m512i masks = _mm512_permutex2var_epi8(lowerMask, maskIndex, upperMask); + + const __mmask8 result0 = _mm512_test_epi64_mask(masks, testMask0); + const __mmask8 result1 = _mm512_test_epi64_mask(masks, testMask1); + + const __m512i load0 = _mm512_maskz_loadu_epi64(result0, (instBuffer1 + (instIndex * 2))); + const __m512i load1 = _mm512_maskz_loadu_epi64(result0, (instBuffer2 + (instIndex * 2))); + const __m512i load2 = _mm512_maskz_loadu_epi64(result1, (instBuffer1 + (instIndex * 2) + 1)); + const __m512i load3 = _mm512_maskz_loadu_epi64(result1, (instBuffer2 + (instIndex * 2)+ 1)); + + const __mmask8 res0 = _mm512_cmpneq_epi64_mask(load0, load1); + const __mmask8 res1 = _mm512_cmpneq_epi64_mask(load2, load3); + + const u8 result = _kortestz_mask8_u8(res0, res1); + + //kortestz will set result to 1 if all bits are zero, so invert the check for result + if (!result) + { + return false; + } + + maskIndex = _mm512_sub_epi8(maskIndex, negativeOnes); + + instIndex++; + } + + return true; + } +#endif + const void* instBuffer1 = binary1.data.data(); const void* instBuffer2 = binary2.data.data(); usz instIndex = 0; - for (unsigned i = 0; i < binary1.data.size() / 4; i++) + while (instIndex < (binary1.data.size() / 4)) { if (binary1.instruction_mask[instIndex]) { From 1dc3ebf891d29a7cd31c940e4ba8aaf987421bce Mon Sep 17 00:00:00 2001 From: trigger <5994581+cipherxof@users.noreply.github.com> Date: Sun, 2 Mar 2025 00:24:42 -0800 Subject: [PATCH 010/529] SPU Analyzer: A fixup for crash, TODO: proper fix --- rpcs3/Emu/Cell/SPUCommonRecompiler.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp index 698e5bd178..b466267a14 100644 --- a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp @@ -4603,7 +4603,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s { bb.terminator = term_type::interrupt_call; } - else if (last_inst != spu_itype::BISL && bb.targets[0] == tia + 4 && op.ra == s_reg_lr) + else if (last_inst != spu_itype::BISL && !bb.targets.empty() && bb.targets[0] == tia + 4 && op.ra == s_reg_lr) { // Conditional return (TODO) bb.terminator = term_type::ret; @@ -4728,9 +4728,11 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s if (is_ok && bb.terminator == term_type::fallthrough) { // Can't just fall out of the function - if (bb.targets.size() != 1 || bb.targets[0] >= flim) + const auto bb_target_value = bb.targets.empty() ? 0 : bb.targets[0]; + + if (bb.targets.size() != 1 || bb_target_value >= flim) { - spu_log.error("Function 0x%05x: [0x%05x] bad fallthrough to 0x%x", f.first, addr, bb.targets[0]); + spu_log.error("Function 0x%05x: [0x%05x] bad fallthrough to 0x%x", f.first, addr, bb_target_value); is_ok = false; } } From b3d28e2309fef60c4edb54214ed71e36d45e6822 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Sat, 1 Mar 2025 11:06:41 -0800 Subject: [PATCH 011/529] Switch Windows and Linux x64 builds and deployments to GitHub Actions --- .github/workflows/rpcs3.yml | 31 ++++-- azure-pipelines.yml | 214 ++++++++++++++++++------------------ 2 files changed, 126 insertions(+), 119 deletions(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 789e923075..d143e46b1a 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -1,5 +1,8 @@ name: Build RPCS3 +defaults: + run: + shell: bash on: push: paths-ignore: @@ -33,6 +36,8 @@ jobs: docker_img: "rpcs3/rpcs3-ci-jammy:1.1" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: clang + UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f + UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" - os: ubuntu-24.04 docker_img: "rpcs3/rpcs3-ci-jammy:1.1" build_sh: "/rpcs3/.ci/build-linux.sh" @@ -92,8 +97,7 @@ jobs: github.event_name != 'pull_request' && github.repository == 'RPCS3/rpcs3' && github.ref == 'refs/heads/master' && - matrix.compiler == 'clang' && - runner.arch == 'ARM64' + matrix.compiler == 'clang' env: RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }} run: | @@ -120,6 +124,8 @@ jobs: CCACHE_INODECACHE: 'true' CCACHE_SLOPPINESS: 'time_macros' DEPS_CACHE_DIR: ./dependency_cache + UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e + UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win" steps: - name: Checkout repository @@ -128,12 +134,12 @@ jobs: fetch-depth: 0 - name: Setup env + shell: pwsh run: | echo "QTDIR=C:\Qt\${{ env.QT_VER }}\${{ env.QT_VER_MSVC }}_64" >> ${{ github.env }} echo "VULKAN_SDK=C:\VulkanSDK\${{ env.VULKAN_VER }}" >> ${{ github.env }} - name: Get Cache Keys - shell: bash run: .ci/get_keys-windows.sh - name: Setup Build Ccache @@ -151,11 +157,9 @@ jobs: restore-keys: ${{ runner.os }}-${{ env.COMPILER }}- - name: Download and unpack dependencies - shell: bash run: .ci/setup-windows.sh - name: Export Variables - shell: bash run: | while IFS='=' read -r key val; do # Skip lines that are empty or start with '#' @@ -167,24 +171,27 @@ jobs: uses: microsoft/setup-msbuild@main - name: Compile RPCS3 + shell: pwsh run: msbuild rpcs3.sln /p:Configuration=Release /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_no_debug_info.targets" - name: Pack up build artifacts - shell: bash run: | mkdir -p "${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}" .ci/deploy-windows.sh - name: Upload artifacts (7z) - #TODO: Upload artifact to release repository - #condition for release - #if: | - # github.event_name != 'pull_request' && - # github.repository == 'RPCS3/rpcs3' && - # github.ref == 'refs/heads/master' uses: actions/upload-artifact@main with: name: RPCS3 for Windows (MSVC) path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }} compression-level: 0 if-no-files-found: error + + - name: Deploy master build to GitHub Releases + if: | + github.event_name != 'pull_request' && + github.repository == 'RPCS3/rpcs3' && + github.ref == 'refs/heads/master' + env: + RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }} + run: .ci/github-upload.sh diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2907949c9f..98e071462b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,131 +10,131 @@ pr: include: - master jobs: -- job: Linux_Build - strategy: - matrix: - Clang: - COMPILER: clang - GCC: - COMPILER: gcc - variables: - CCACHE_DIR: $(Pipeline.Workspace)/ccache - CI_HAS_ARTIFACTS: true - UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f - UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-linux" - DEPLOY_APPIMAGE: true - APPDIR: "/rpcs3/build/appdir" - ARTDIR: "/root/artifacts" - RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage.txt" +# - job: Linux_Build +# strategy: +# matrix: +# Clang: +# COMPILER: clang +# GCC: +# COMPILER: gcc +# variables: +# CCACHE_DIR: $(Pipeline.Workspace)/ccache +# CI_HAS_ARTIFACTS: true +# UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f +# UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-linux" +# DEPLOY_APPIMAGE: true +# APPDIR: "/rpcs3/build/appdir" +# ARTDIR: "/root/artifacts" +# RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage.txt" - pool: - vmImage: 'ubuntu-latest' +# pool: +# vmImage: 'ubuntu-latest' - steps: - - task: Cache@2 - inputs: - key: ccache | $(Agent.OS) | $(COMPILER) | $(Build.SourceVersion) - restoreKeys: | - ccache | $(Agent.OS) | $(COMPILER) - path: $(CCACHE_DIR) - displayName: ccache +# steps: +# - task: Cache@2 +# inputs: +# key: ccache | $(Agent.OS) | $(COMPILER) | $(Build.SourceVersion) +# restoreKeys: | +# ccache | $(Agent.OS) | $(COMPILER) +# path: $(CCACHE_DIR) +# displayName: ccache - - bash: | - docker pull --quiet rpcs3/rpcs3-ci-jammy:1.1 - docker run \ - -v $(pwd):/rpcs3 \ - --env-file .ci/docker.env \ - -v $CCACHE_DIR:/root/.ccache \ - -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ - rpcs3/rpcs3-ci-jammy:1.1 \ - /rpcs3/.ci/build-linux.sh - displayName: Docker setup and build +# - bash: | +# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.1 +# docker run \ +# -v $(pwd):/rpcs3 \ +# --env-file .ci/docker.env \ +# -v $CCACHE_DIR:/root/.ccache \ +# -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ +# rpcs3/rpcs3-ci-jammy:1.1 \ +# /rpcs3/.ci/build-linux.sh +# displayName: Docker setup and build - - publish: $(Build.ArtifactStagingDirectory) - condition: succeeded() - artifact: RPCS3 for Linux ($(COMPILER)) +# - publish: $(Build.ArtifactStagingDirectory) +# condition: succeeded() +# artifact: RPCS3 for Linux ($(COMPILER)) - - bash: | - COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp) - COMM_COUNT=$(git rev-list --count HEAD) - COMM_HASH=$(git rev-parse --short=8 HEAD) +# - bash: | +# COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp) +# COMM_COUNT=$(git rev-list --count HEAD) +# COMM_HASH=$(git rev-parse --short=8 HEAD) - export AVVER="${COMM_TAG}-${COMM_COUNT}" +# export AVVER="${COMM_TAG}-${COMM_COUNT}" - .ci/github-upload.sh - condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['COMPILER'], 'clang')) - displayName: Push build to GitHub - env: - RPCS3_TOKEN: $(RPCS3-Token) +# .ci/github-upload.sh +# condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['COMPILER'], 'clang')) +# displayName: Push build to GitHub +# env: +# RPCS3_TOKEN: $(RPCS3-Token) -- job: Windows_Build - variables: - COMPILER: msvc - QT_VER_MAIN: '6' - QT_VER: '6.8.2' - QT_VER_MSVC: 'msvc2022' - QT_DATE: '202501260838' - QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 - VULKAN_VER: '1.3.268.0' - VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' - VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER) - CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9' - CCACHE_BIN_DIR: 'C:\ccache_bin' - CCACHE_DIR: 'C:\ccache' - CCACHE_INODECACHE: 'true' - CCACHE_SLOPPINESS: 'time_macros' - DEPS_CACHE_DIR: ./dependency_cache - UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e - UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win" +# - job: Windows_Build +# variables: +# COMPILER: msvc +# QT_VER_MAIN: '6' +# QT_VER: '6.8.2' +# QT_VER_MSVC: 'msvc2022' +# QT_DATE: '202501260838' +# QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 +# VULKAN_VER: '1.3.268.0' +# VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' +# VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER) +# CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9' +# CCACHE_BIN_DIR: 'C:\ccache_bin' +# CCACHE_DIR: 'C:\ccache' +# CCACHE_INODECACHE: 'true' +# CCACHE_SLOPPINESS: 'time_macros' +# DEPS_CACHE_DIR: ./dependency_cache +# UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e +# UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win" - pool: - vmImage: "windows-latest" +# pool: +# vmImage: "windows-latest" - steps: - - bash: .ci/get_keys-windows.sh - displayName: Get Cache Keys +# steps: +# - bash: .ci/get_keys-windows.sh +# displayName: Get Cache Keys - - task: Cache@2 - inputs: - key: ccache | $(Agent.OS) | $(COMPILER) | "$(Build.SourceVersion)" - path: $(CCACHE_DIR) - restoreKeys: - ccache | $(Agent.OS) | $(COMPILER) - displayName: Build Ccache +# - task: Cache@2 +# inputs: +# key: ccache | $(Agent.OS) | $(COMPILER) | "$(Build.SourceVersion)" +# path: $(CCACHE_DIR) +# restoreKeys: +# ccache | $(Agent.OS) | $(COMPILER) +# displayName: Build Ccache - - task: Cache@2 - inputs: - key: $(Agent.OS) | $(COMPILER) | "$(QT_VER)" | $(VULKAN_SDK_SHA) | $(CCACHE_SHA) | llvm.lock | glslang.lock - path: $(DEPS_CACHE_DIR) - displayName: Dependencies Cache +# - task: Cache@2 +# inputs: +# key: $(Agent.OS) | $(COMPILER) | "$(QT_VER)" | $(VULKAN_SDK_SHA) | $(CCACHE_SHA) | llvm.lock | glslang.lock +# path: $(DEPS_CACHE_DIR) +# displayName: Dependencies Cache - - bash: .ci/setup-windows.sh - displayName: Download and unpack dependencies +# - bash: .ci/setup-windows.sh +# displayName: Download and unpack dependencies - - bash: .ci/export-azure-vars.sh - displayName: Export Variables +# - bash: .ci/export-azure-vars.sh +# displayName: Export Variables - - task: VSBuild@1 - inputs: - solution: 'rpcs3.sln' - maximumCpuCount: true - platform: x64 - configuration: 'Release' - msbuildArgs: /p:CLToolPath=$(CCACHE_BIN_DIR) /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="$(Build.SourcesDirectory)\buildfiles\msvc\ci_no_debug_info.targets" - displayName: Compile RPCS3 +# - task: VSBuild@1 +# inputs: +# solution: 'rpcs3.sln' +# maximumCpuCount: true +# platform: x64 +# configuration: 'Release' +# msbuildArgs: /p:CLToolPath=$(CCACHE_BIN_DIR) /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="$(Build.SourcesDirectory)\buildfiles\msvc\ci_no_debug_info.targets" +# displayName: Compile RPCS3 - - bash: .ci/deploy-windows.sh - displayName: Pack up build artifacts +# - bash: .ci/deploy-windows.sh +# displayName: Pack up build artifacts - - publish: $(Build.ArtifactStagingDirectory) - condition: succeeded() - artifact: RPCS3 for Windows +# - publish: $(Build.ArtifactStagingDirectory) +# condition: succeeded() +# artifact: RPCS3 for Windows - - bash: .ci/github-upload.sh - condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) - displayName: Push build to GitHub - env: - RPCS3_TOKEN: $(RPCS3-Token) +# - bash: .ci/github-upload.sh +# condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) +# displayName: Push build to GitHub +# env: +# RPCS3_TOKEN: $(RPCS3-Token) - job: Mac_Build_x86_64 timeoutInMinutes: 180 From 6f5f7ece0662b755adbcfc834f4de7b23eba5fb0 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 28 Feb 2025 21:05:23 +0100 Subject: [PATCH 012/529] overlays: fix and optimize layout exit loops --- .../overlay_friends_list_dialog.cpp | 11 ++++---- .../overlay_home_menu_message_box.cpp | 4 +-- .../HomeMenu/overlay_home_menu_message_box.h | 2 -- .../HomeMenu/overlay_home_menu_page.cpp | 6 ++--- rpcs3/Emu/RSX/Overlays/overlay_controls.cpp | 27 ++++++++++++++++--- rpcs3/Emu/RSX/Overlays/overlay_controls.h | 2 ++ rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp | 8 +++--- 7 files changed, 40 insertions(+), 20 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp index 0e6feaa2a7..cbdcb989da 100644 --- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp @@ -121,6 +121,7 @@ namespace rsx m_list->set_pos(20, 85); m_message_box = std::make_shared(20, 85, virtual_width - 2 * 20, 540); + m_message_box->visible = false; m_description = std::make_unique @@ -1370,6 +1373,9 @@ Gui\utils + + Gui\game list + diff --git a/rpcs3/rpcs3qt/CMakeLists.txt b/rpcs3/rpcs3qt/CMakeLists.txt index 29531499a7..60b5ede8e8 100644 --- a/rpcs3/rpcs3qt/CMakeLists.txt +++ b/rpcs3/rpcs3qt/CMakeLists.txt @@ -37,6 +37,7 @@ add_library(rpcs3_ui STATIC gui_application.cpp gl_gs_frame.cpp gs_frame.cpp + gui_game_info.cpp gui_settings.cpp infinity_dialog.cpp input_dialog.cpp diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp index a8a0cd959f..edc33634a8 100644 --- a/rpcs3/rpcs3qt/game_list_base.cpp +++ b/rpcs3/rpcs3qt/game_list_base.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "game_list_base.h" -#include "localized.h" #include #include @@ -189,17 +188,6 @@ QColor game_list_base::GetGridCompatibilityColor(const QString& string) const return QColor(); } -std::string game_list_base::GetGameVersion(const game_info& game) -{ - if (game->info.app_ver == Localized().category.unknown.toStdString()) - { - // Fall back to Disc/Pkg Revision - return game->info.version; - } - - return game->info.app_ver; -} - QIcon game_list_base::GetCustomConfigIcon(const game_info& game) { if (!game) diff --git a/rpcs3/rpcs3qt/game_list_base.h b/rpcs3/rpcs3qt/game_list_base.h index 5e21097b05..66012d9e34 100644 --- a/rpcs3/rpcs3qt/game_list_base.h +++ b/rpcs3/rpcs3qt/game_list_base.h @@ -1,31 +1,10 @@ #pragma once -#include "movie_item_base.h" -#include "game_compatibility.h" -#include "Emu/GameInfo.h" +#include "gui_game_info.h" #include -#include #include -/* Having the icons associated with the game info simplifies logic internally */ -struct gui_game_info -{ - GameInfo info{}; - QString localized_category; - compat::status compat; - QPixmap icon; - QPixmap pxmap; - bool hasCustomConfig = false; - bool hasCustomPadConfig = false; - bool has_hover_gif = false; - bool has_hover_pam = false; - movie_item_base* item = nullptr; -}; - -typedef std::shared_ptr game_info; -Q_DECLARE_METATYPE(game_info) - class game_list_base { public: @@ -45,9 +24,6 @@ public: virtual void repaint_icons(std::vector& game_data, const QColor& icon_color, const QSize& icon_size, qreal device_pixel_ratio); - // Returns the visible version string in the game list - static std::string GetGameVersion(const game_info& game); - /** Sets the custom config icon. */ static QIcon GetCustomConfigIcon(const game_info& game); diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 2df8852718..4f699106d6 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -839,45 +839,44 @@ void game_list_frame::OnRefreshFinished() const std::string cat_unknown_localized = localized.category.unknown.toStdString(); // Try to update the app version for disc games if there is a patch - for (const auto& entry : m_game_data) + for (const game_info& entry : m_game_data) { - if (entry->info.category == "DG") + if (entry->info.category != "DG") continue; + + for (const auto& other : m_game_data) { - for (const auto& other : m_game_data) + // The patch is game data and must have the same serial and an app version + static constexpr auto version_is_bigger = [](const std::string& v0, const std::string& v1, const std::string& serial, bool is_fw) { - // The patch is game data and must have the same serial and an app version - static constexpr auto version_is_bigger = [](const std::string& v0, const std::string& v1, const std::string& serial, bool is_fw) + std::add_pointer_t ev0, ev1; + const double ver0 = std::strtod(v0.c_str(), &ev0); + const double ver1 = std::strtod(v1.c_str(), &ev1); + + if (v0.c_str() + v0.size() == ev0 && v1.c_str() + v1.size() == ev1) { - std::add_pointer_t ev0, ev1; - const double ver0 = std::strtod(v0.c_str(), &ev0); - const double ver1 = std::strtod(v1.c_str(), &ev1); + return ver0 > ver1; + } - if (v0.c_str() + v0.size() == ev0 && v1.c_str() + v1.size() == ev1) - { - return ver0 > ver1; - } + game_list_log.error("Failed to update the displayed %s numbers for title ID %s\n'%s'-'%s'", is_fw ? "firmware version" : "version", serial, v0, v1); + return false; + }; - game_list_log.error("Failed to update the displayed %s numbers for title ID %s\n'%s'-'%s'", is_fw ? "firmware version" : "version", serial, v0, v1); - return false; - }; - - if (entry->info.serial == other->info.serial && other->info.category != "DG" && other->info.app_ver != cat_unknown_localized) + if (entry->info.serial == other->info.serial && other->info.category != "DG" && other->info.app_ver != cat_unknown_localized) + { + // Update the app version if it's higher than the disc's version (old games may not have an app version) + if (entry->info.app_ver == cat_unknown_localized || version_is_bigger(other->info.app_ver, entry->info.app_ver, entry->info.serial, true)) { - // Update the app version if it's higher than the disc's version (old games may not have an app version) - if (entry->info.app_ver == cat_unknown_localized || version_is_bigger(other->info.app_ver, entry->info.app_ver, entry->info.serial, true)) - { - entry->info.app_ver = other->info.app_ver; - } - // Update the firmware version if possible and if it's higher than the disc's version - if (other->info.fw != cat_unknown_localized && version_is_bigger(other->info.fw, entry->info.fw, entry->info.serial, false)) - { - entry->info.fw = other->info.fw; - } - // Update the parental level if possible and if it's higher than the disc's level - if (other->info.parental_lvl != 0 && other->info.parental_lvl > entry->info.parental_lvl) - { - entry->info.parental_lvl = other->info.parental_lvl; - } + entry->info.app_ver = other->info.app_ver; + } + // Update the firmware version if possible and if it's higher than the disc's version + if (other->info.fw != cat_unknown_localized && version_is_bigger(other->info.fw, entry->info.fw, entry->info.serial, false)) + { + entry->info.fw = other->info.fw; + } + // Update the parental level if possible and if it's higher than the disc's level + if (other->info.parental_lvl != 0 && other->info.parental_lvl > entry->info.parental_lvl) + { + entry->info.parental_lvl = other->info.parental_lvl; } } } @@ -1873,15 +1872,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) }); connect(configure_patches, &QAction::triggered, this, [this, gameinfo]() { - std::unordered_map> games; - for (const auto& game : m_game_data) - { - if (game) - { - games[game->info.serial].insert(game_list::GetGameVersion(game)); - } - } - patch_manager_dialog patch_manager(m_gui_settings, games, gameinfo->info.serial, game_list::GetGameVersion(gameinfo), this); + patch_manager_dialog patch_manager(m_gui_settings, m_game_data, gameinfo->info.serial, gameinfo->GetGameVersion(), this); patch_manager.exec(); }); connect(check_compat, &QAction::triggered, this, [serial] diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3qt/game_list_table.cpp index 32a9419a74..49aa7962eb 100644 --- a/rpcs3/rpcs3qt/game_list_table.cpp +++ b/rpcs3/rpcs3qt/game_list_table.cpp @@ -332,7 +332,7 @@ void game_list_table::populate( } // Version - QString app_version = QString::fromStdString(game_list::GetGameVersion(game)); + QString app_version = QString::fromStdString(game->GetGameVersion()); if (game->info.bootable && !game->compat.latest_version.isEmpty()) { diff --git a/rpcs3/rpcs3qt/gui_game_info.cpp b/rpcs3/rpcs3qt/gui_game_info.cpp new file mode 100644 index 0000000000..61187a6f11 --- /dev/null +++ b/rpcs3/rpcs3qt/gui_game_info.cpp @@ -0,0 +1,14 @@ +#include "stdafx.h" +#include "gui_game_info.h" +#include "localized.h" + +std::string gui_game_info::GetGameVersion() const +{ + if (info.app_ver == Localized().category.unknown.toStdString()) + { + // Fall back to Disc/Pkg Revision + return info.version; + } + + return info.app_ver; +} diff --git a/rpcs3/rpcs3qt/gui_game_info.h b/rpcs3/rpcs3qt/gui_game_info.h new file mode 100644 index 0000000000..60f89ed9da --- /dev/null +++ b/rpcs3/rpcs3qt/gui_game_info.h @@ -0,0 +1,29 @@ +#pragma once + +#include "movie_item_base.h" +#include "game_compatibility.h" + +#include "Emu/GameInfo.h" + +#include + +/* Having the icons associated with the game info simplifies logic internally */ +struct gui_game_info +{ + GameInfo info{}; + QString localized_category; + compat::status compat; + QPixmap icon; + QPixmap pxmap; + bool hasCustomConfig = false; + bool hasCustomPadConfig = false; + bool has_hover_gif = false; + bool has_hover_pam = false; + movie_item_base* item = nullptr; + + // Returns the visible version string in the game list + std::string GetGameVersion() const; +}; + +typedef std::shared_ptr game_info; +Q_DECLARE_METATYPE(game_info) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index eaa72807f3..71adff9dbe 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -3070,18 +3070,7 @@ void main_window::CreateConnects() connect(ui->actionManage_Game_Patches, &QAction::triggered, this, [this] { - std::unordered_map> games; - if (m_game_list_frame) - { - for (const game_info& game : m_game_list_frame->GetGameInfo()) - { - if (game) - { - games[game->info.serial].insert(game_list::GetGameVersion(game)); - } - } - } - patch_manager_dialog patch_manager(m_gui_settings, games, "", "", this); + patch_manager_dialog patch_manager(m_gui_settings, m_game_list_frame ? m_game_list_frame->GetGameInfo() : std::vector{}, "", "", this); patch_manager.exec(); }); diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.cpp b/rpcs3/rpcs3qt/patch_manager_dialog.cpp index 47cc299160..c17b296400 100644 --- a/rpcs3/rpcs3qt/patch_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/patch_manager_dialog.cpp @@ -57,12 +57,11 @@ enum node_level : int Q_DECLARE_METATYPE(patch_engine::patch_config_value); -patch_manager_dialog::patch_manager_dialog(std::shared_ptr gui_settings, std::unordered_map> games, const std::string& title_id, const std::string& version, QWidget* parent) +patch_manager_dialog::patch_manager_dialog(std::shared_ptr gui_settings, const std::vector& games, const std::string& title_id, const std::string& version, QWidget* parent) : QDialog(parent) , m_gui_settings(std::move(gui_settings)) , m_expand_current_match(!title_id.empty() && !version.empty()) // Expand first search results , m_search_version(QString::fromStdString(version)) - , m_owned_games(std::move(games)) , ui(new Ui::patch_manager_dialog) { ui->setupUi(this); @@ -71,6 +70,15 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr gui_set // Load gui settings m_show_owned_games_only = m_gui_settings->GetValue(gui::pm_show_owned).toBool(); + // Get owned games + for (const auto& game : games) + { + if (game) + { + m_owned_games[game->info.serial].insert(game->GetGameVersion()); + } + } + // Initialize gui controls ui->patch_filter->setText(QString::fromStdString(title_id)); ui->cb_owned_games_only->setChecked(m_show_owned_games_only); diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.h b/rpcs3/rpcs3qt/patch_manager_dialog.h index c554f6f309..4639afd454 100644 --- a/rpcs3/rpcs3qt/patch_manager_dialog.h +++ b/rpcs3/rpcs3qt/patch_manager_dialog.h @@ -5,6 +5,7 @@ #include #include +#include "gui_game_info.h" #include "Utilities/bin_patch.h" #include @@ -39,7 +40,7 @@ class patch_manager_dialog : public QDialog const QString tr_all_versions = tr("All versions"); public: - explicit patch_manager_dialog(std::shared_ptr gui_settings, std::unordered_map> games, const std::string& title_id, const std::string& version, QWidget* parent = nullptr); + explicit patch_manager_dialog(std::shared_ptr gui_settings, const std::vector& games, const std::string& title_id, const std::string& version, QWidget* parent = nullptr); ~patch_manager_dialog(); int exec() override; From d429776418be48f90819937847bbcf57bf2f8971 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 3 Mar 2025 09:04:32 +0100 Subject: [PATCH 021/529] Qt/patches: Only consider bootable games --- rpcs3/rpcs3qt/patch_manager_dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.cpp b/rpcs3/rpcs3qt/patch_manager_dialog.cpp index c17b296400..21264e35bc 100644 --- a/rpcs3/rpcs3qt/patch_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/patch_manager_dialog.cpp @@ -73,7 +73,7 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr gui_set // Get owned games for (const auto& game : games) { - if (game) + if (game && game->info.bootable) { m_owned_games[game->info.serial].insert(game->GetGameVersion()); } From cb659474d9fbe6666acc525aedbd78f48c98a1c7 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 3 Mar 2025 18:00:44 +0100 Subject: [PATCH 022/529] overlays: fix friends/trophy list input on paused emulation --- .../RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp | 2 ++ rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp index cbdcb989da..ff6770136b 100644 --- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp @@ -113,6 +113,8 @@ namespace rsx : m_page_btn(120, 30) , m_extra_btn(120, 30) { + m_allow_input_on_pause = true; + m_dim_background = std::make_unique(); m_dim_background->set_size(virtual_width, virtual_height); m_dim_background->back_color.a = 0.5f; diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp index 1291e7e216..c30a6fe878 100644 --- a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp @@ -90,6 +90,8 @@ namespace rsx trophy_list_dialog::trophy_list_dialog() { + m_allow_input_on_pause = true; + m_dim_background = std::make_unique(); m_dim_background->set_size(virtual_width, virtual_height); m_dim_background->back_color.a = 0.9f; From 66952fe301d6198444168b75b2c4bf817316e6f5 Mon Sep 17 00:00:00 2001 From: RipleyTom Date: Sat, 1 Mar 2025 17:08:10 +0100 Subject: [PATCH 023/529] Add memory breakpoints RPCS3 needs to be compiled with -DHAS_MEMORY_BREAKPOINTS=ON for it to be available --- CMakeLists.txt | 1 + rpcs3/Emu/CMakeLists.txt | 4 + rpcs3/Emu/Cell/PPUInterpreter.cpp | 81 +++++++++++----- rpcs3/Emu/Memory/vm.h | 59 ++++++++++++ rpcs3/rpcs3.vcxproj | 17 ++++ rpcs3/rpcs3.vcxproj.filters | 9 ++ rpcs3/rpcs3qt/CMakeLists.txt | 5 + rpcs3/rpcs3qt/breakpoint_handler.cpp | 38 ++++++-- rpcs3/rpcs3qt/breakpoint_handler.h | 18 +++- rpcs3/rpcs3qt/breakpoint_list.cpp | 67 +++++++++---- rpcs3/rpcs3qt/breakpoint_list.h | 7 +- rpcs3/rpcs3qt/debugger_add_bp_window.cpp | 116 +++++++++++++++++++++++ rpcs3/rpcs3qt/debugger_add_bp_window.h | 13 +++ rpcs3/rpcs3qt/debugger_frame.cpp | 20 +++- rpcs3/rpcs3qt/debugger_frame.h | 31 +++--- rpcs3/rpcs3qt/debugger_list.cpp | 2 +- rpcs3/rpcs3qt/debugger_list.h | 2 +- 17 files changed, 416 insertions(+), 74 deletions(-) create mode 100644 rpcs3/rpcs3qt/debugger_add_bp_window.cpp create mode 100644 rpcs3/rpcs3qt/debugger_add_bp_window.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 28ed1bd5dc..2208f2335e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,7 @@ option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF) option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON) option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON) option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON) +option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF) option(USE_LTO "Use LTO for building" ON) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake") diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index 562dd29476..e135e53ede 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -28,6 +28,10 @@ if(USE_ASAN) set_source_files_properties(../../Utilities/Thread.cpp PROPERTIES COMPILE_DEFINITIONS USE_ASAN) endif() +if(HAS_MEMORY_BREAKPOINTS) + target_compile_definitions(rpcs3_emu PRIVATE RPCS3_HAS_MEMORY_BREAKPOINTS) +endif() + target_link_libraries(rpcs3_emu PRIVATE 3rdparty::zlib 3rdparty::yaml-cpp 3rdparty::zstd diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp index 9b7ad2ecba..690581acaa 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp @@ -26,6 +26,29 @@ #pragma GCC diagnostic ignored "-Wuninitialized" #endif +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS +void ppubreak(ppu_thread& ppu) +{ + if (!g_breakpoint_handler.IsBreakOnBPM()) + return; + + if (!ppu.state.test_and_set(cpu_flag::dbg_pause)) + { + ppu.check_state(); + } +} + +#define PPU_WRITE_8(addr, value) vm::write8(addr, value, &ppu); +#define PPU_WRITE_16(addr, value) vm::write16(addr, value, &ppu); +#define PPU_WRITE_32(addr, value) vm::write32(addr, value, &ppu); +#define PPU_WRITE_64(addr, value) vm::write64(addr, value, &ppu); +#else +#define PPU_WRITE_8(addr, value) vm::write8(addr, value); +#define PPU_WRITE_16(addr, value) vm::write16(addr, value); +#define PPU_WRITE_32(addr, value) vm::write32(addr, value); +#define PPU_WRITE_64(addr, value) vm::write64(addr, value); +#endif + extern bool is_debugger_present(); extern const ppu_decoder g_ppu_itype; @@ -428,6 +451,14 @@ auto ppu_feed_data(ppu_thread& ppu, u64 addr) auto value = vm::_ref(vm::cast(addr)); +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + if (g_breakpoint_handler.HasBreakpoint(addr, breakpoint_types::bp_read)) + { + debugbp_log.success("BPMR: breakpoint reading 0x%x at 0x%x", value, addr); + ppubreak(ppu); + } +#endif + if constexpr (!((Flags == use_feed_data) || ...)) { return value; @@ -4274,7 +4305,7 @@ auto STVEBX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]; const u8 eb = addr & 0xf; - vm::write8(vm::cast(addr), ppu.vr[op.vs]._u8[15 - eb]); + PPU_WRITE_8(vm::cast(addr), ppu.vr[op.vs]._u8[15 - eb]); }; RETURN_(ppu, op); } @@ -4381,7 +4412,7 @@ auto STDX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]; - vm::write64(vm::cast(addr), ppu.gpr[op.rs]); + PPU_WRITE_64(vm::cast(addr), ppu.gpr[op.rs]); }; RETURN_(ppu, op); } @@ -4407,7 +4438,7 @@ auto STWX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]; - vm::write32(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_32(vm::cast(addr), static_cast(ppu.gpr[op.rs])); }; RETURN_(ppu, op); } @@ -4421,7 +4452,7 @@ auto STVEHX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~1ULL; const u8 eb = (addr & 0xf) >> 1; - vm::write16(vm::cast(addr), ppu.vr[op.vs]._u16[7 - eb]); + PPU_WRITE_16(vm::cast(addr), ppu.vr[op.vs]._u16[7 - eb]); }; RETURN_(ppu, op); } @@ -4434,7 +4465,7 @@ auto STDUX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb]; - vm::write64(vm::cast(addr), ppu.gpr[op.rs]); + PPU_WRITE_64(vm::cast(addr), ppu.gpr[op.rs]); ppu.gpr[op.ra] = addr; }; RETURN_(ppu, op); @@ -4448,7 +4479,7 @@ auto STWUX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb]; - vm::write32(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_32(vm::cast(addr), static_cast(ppu.gpr[op.rs])); ppu.gpr[op.ra] = addr; }; RETURN_(ppu, op); @@ -4463,7 +4494,7 @@ auto STVEWX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = (op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]) & ~3ULL; const u8 eb = (addr & 0xf) >> 2; - vm::write32(vm::cast(addr), ppu.vr[op.vs]._u32[3 - eb]); + PPU_WRITE_32(vm::cast(addr), ppu.vr[op.vs]._u32[3 - eb]); }; RETURN_(ppu, op); } @@ -4527,7 +4558,7 @@ auto STBX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]; - vm::write8(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_8(vm::cast(addr), static_cast(ppu.gpr[op.rs])); }; RETURN_(ppu, op); } @@ -4639,7 +4670,7 @@ auto STBUX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb]; - vm::write8(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_8(vm::cast(addr), static_cast(ppu.gpr[op.rs])); ppu.gpr[op.ra] = addr; }; RETURN_(ppu, op); @@ -4883,7 +4914,7 @@ auto STHX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]; - vm::write16(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_16(vm::cast(addr), static_cast(ppu.gpr[op.rs])); }; RETURN_(ppu, op); } @@ -4922,7 +4953,7 @@ auto STHUX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = ppu.gpr[op.ra] + ppu.gpr[op.rb]; - vm::write16(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_16(vm::cast(addr), static_cast(ppu.gpr[op.rs])); ppu.gpr[op.ra] = addr; }; RETURN_(ppu, op); @@ -5346,7 +5377,7 @@ auto STSWX() u32 count = ppu.xer.cnt & 0x7F; for (; count >= 4; count -= 4, addr += 4, op.rs = (op.rs + 1) & 31) { - vm::write32(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_32(vm::cast(addr), static_cast(ppu.gpr[op.rs])); } if (count) { @@ -5354,7 +5385,7 @@ auto STSWX() for (u32 byte = 0; byte < count; byte++) { u8 byte_value = static_cast(value >> ((3 ^ byte) * 8)); - vm::write8(vm::cast(addr + byte), byte_value); + PPU_WRITE_8(vm::cast(addr + byte), byte_value); } } }; @@ -5434,7 +5465,7 @@ auto STSWI() { if (N > 3) { - vm::write32(vm::cast(addr), static_cast(ppu.gpr[reg])); + PPU_WRITE_32(vm::cast(addr), static_cast(ppu.gpr[reg])); addr += 4; N -= 4; } @@ -5444,7 +5475,7 @@ auto STSWI() while (N > 0) { N = N - 1; - vm::write8(vm::cast(addr), (0xFF000000 & buf) >> 24); + PPU_WRITE_8(vm::cast(addr), (0xFF000000 & buf) >> 24); buf <<= 8; addr++; } @@ -5678,7 +5709,7 @@ auto STFIWX() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra ? ppu.gpr[op.ra] + ppu.gpr[op.rb] : ppu.gpr[op.rb]; - vm::write32(vm::cast(addr), static_cast(std::bit_cast(ppu.fpr[op.frs]))); + PPU_WRITE_32(vm::cast(addr), static_cast(std::bit_cast(ppu.fpr[op.frs]))); }; RETURN_(ppu, op); } @@ -5793,7 +5824,7 @@ auto STW() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16; const u32 value = static_cast(ppu.gpr[op.rs]); - vm::write32(vm::cast(addr), value); + PPU_WRITE_32(vm::cast(addr), value); //Insomniac engine v3 & v4 (newer R&C, Fuse, Resitance 3) if (value == 0xAAAAAAAA) [[unlikely]] @@ -5813,7 +5844,7 @@ auto STWU() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = ppu.gpr[op.ra] + op.simm16; - vm::write32(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_32(vm::cast(addr), static_cast(ppu.gpr[op.rs])); ppu.gpr[op.ra] = addr; }; RETURN_(ppu, op); @@ -5827,7 +5858,7 @@ auto STB() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16; - vm::write8(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_8(vm::cast(addr), static_cast(ppu.gpr[op.rs])); }; RETURN_(ppu, op); } @@ -5840,7 +5871,7 @@ auto STBU() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = ppu.gpr[op.ra] + op.simm16; - vm::write8(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_8(vm::cast(addr), static_cast(ppu.gpr[op.rs])); ppu.gpr[op.ra] = addr; }; RETURN_(ppu, op); @@ -5908,7 +5939,7 @@ auto STH() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = op.ra || 1 ? ppu.gpr[op.ra] + op.simm16 : op.simm16; - vm::write16(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_16(vm::cast(addr), static_cast(ppu.gpr[op.rs])); }; RETURN_(ppu, op); } @@ -5921,7 +5952,7 @@ auto STHU() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = ppu.gpr[op.ra] + op.simm16; - vm::write16(vm::cast(addr), static_cast(ppu.gpr[op.rs])); + PPU_WRITE_16(vm::cast(addr), static_cast(ppu.gpr[op.rs])); ppu.gpr[op.ra] = addr; }; RETURN_(ppu, op); @@ -5953,7 +5984,7 @@ auto STMW() u64 addr = op.ra ? ppu.gpr[op.ra] + op.simm16 : op.simm16; for (u32 i = op.rs; i<32; ++i, addr += 4) { - vm::write32(vm::cast(addr), static_cast(ppu.gpr[i])); + PPU_WRITE_32(vm::cast(addr), static_cast(ppu.gpr[i])); } }; RETURN_(ppu, op); @@ -6115,7 +6146,7 @@ auto STD() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = (op.simm16 & ~3) + (op.ra ? ppu.gpr[op.ra] : 0); - vm::write64(vm::cast(addr), ppu.gpr[op.rs]); + PPU_WRITE_64(vm::cast(addr), ppu.gpr[op.rs]); }; RETURN_(ppu, op); } @@ -6128,7 +6159,7 @@ auto STDU() static const auto exec = [](ppu_thread& ppu, ppu_opcode_t op) { const u64 addr = ppu.gpr[op.ra] + (op.simm16 & ~3); - vm::write64(vm::cast(addr), ppu.gpr[op.rs]); + PPU_WRITE_64(vm::cast(addr), ppu.gpr[op.rs]); ppu.gpr[op.ra] = addr; }; RETURN_(ppu, op); diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h index 9680187cd4..915791e2d6 100644 --- a/rpcs3/Emu/Memory/vm.h +++ b/rpcs3/Emu/Memory/vm.h @@ -8,6 +8,17 @@ #include "util/to_endian.hpp" +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS +#include "rpcs3qt/breakpoint_handler.h" +#include "util/logs.hpp" + +LOG_CHANNEL(debugbp_log, "DebugBP"); + +class ppu_thread; + +void ppubreak(ppu_thread& ppu); +#endif + namespace utils { class shm; @@ -242,9 +253,21 @@ namespace vm return g_base_addr[addr]; } +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + inline void write8(u32 addr, u8 value, ppu_thread* ppu = nullptr) +#else inline void write8(u32 addr, u8 value) +#endif { g_base_addr[addr] = value; + +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + if (ppu && g_breakpoint_handler.HasBreakpoint(addr, breakpoint_types::bp_write)) + { + debugbp_log.success("BPMW: breakpoint writing(8) 0x%x at 0x%x", value, addr); + ppubreak(*ppu); + } +#endif } // Read or write virtual memory in a safe manner, returns false on failure @@ -276,9 +299,21 @@ namespace vm return _ref(addr); } +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + inline void write16(u32 addr, be_t value, ppu_thread* ppu = nullptr) +#else inline void write16(u32 addr, be_t value) +#endif { _ref(addr) = value; + +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + if (ppu && g_breakpoint_handler.HasBreakpoint(addr, breakpoint_types::bp_write)) + { + debugbp_log.success("BPMW: breakpoint writing(16) 0x%x at 0x%x", value, addr); + ppubreak(*ppu); + } +#endif } inline const be_t& read32(u32 addr) @@ -286,9 +321,21 @@ namespace vm return _ref(addr); } +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + inline void write32(u32 addr, be_t value, ppu_thread* ppu = nullptr) +#else inline void write32(u32 addr, be_t value) +#endif { _ref(addr) = value; + +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + if (ppu && g_breakpoint_handler.HasBreakpoint(addr, breakpoint_types::bp_write)) + { + debugbp_log.success("BPMW: breakpoint writing(32) 0x%x at 0x%x", value, addr); + ppubreak(*ppu); + } +#endif } inline const be_t& read64(u32 addr) @@ -296,9 +343,21 @@ namespace vm return _ref(addr); } +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + inline void write64(u32 addr, be_t value, ppu_thread* ppu = nullptr) +#else inline void write64(u32 addr, be_t value) +#endif { _ref(addr) = value; + +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + if (ppu && g_breakpoint_handler.HasBreakpoint(addr, breakpoint_types::bp_write)) + { + debugbp_log.success("BPMW: breakpoint writing(64) 0x%x at 0x%x", value, addr); + ppubreak(*ppu); + } +#endif } void init(); diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 9a7e529fdd..2df8c722c6 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -232,6 +232,9 @@ true + + true + true @@ -511,6 +514,9 @@ true + + true + true @@ -846,6 +852,7 @@ + @@ -961,6 +968,16 @@ $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + + Moc%27ing debugger_add_bp_window.h... + .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + Moc%27ing debugger_add_bp_window.h... + .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing debugger_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index 6f4fa09019..407f9dfef6 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -213,6 +213,12 @@ Generated Files\Release + + Generated Files\Debug + + + Generated Files\Release + Generated Files\Debug @@ -396,6 +402,9 @@ Gui\dev tools + + Gui\debugger + Gui\debugger diff --git a/rpcs3/rpcs3qt/CMakeLists.txt b/rpcs3/rpcs3qt/CMakeLists.txt index 60b5ede8e8..ffe2a96d9f 100644 --- a/rpcs3/rpcs3qt/CMakeLists.txt +++ b/rpcs3/rpcs3qt/CMakeLists.txt @@ -13,6 +13,7 @@ add_library(rpcs3_ui STATIC curl_handle.cpp custom_dialog.cpp custom_table_widget_item.cpp + debugger_add_bp_window.cpp debugger_frame.cpp debugger_list.cpp downloader.cpp @@ -129,6 +130,10 @@ add_library(rpcs3_ui STATIC "../resources.qrc" ) +if(HAS_MEMORY_BREAKPOINTS) + target_compile_definitions(rpcs3_ui PRIVATE RPCS3_HAS_MEMORY_BREAKPOINTS) +endif() + if(WIN32) target_sources(rpcs3_ui PUBLIC "../windows.qrc") target_compile_definitions(rpcs3_ui PRIVATE UNICODE _UNICODE) diff --git a/rpcs3/rpcs3qt/breakpoint_handler.cpp b/rpcs3/rpcs3qt/breakpoint_handler.cpp index b65525a72e..d2c4c44bae 100644 --- a/rpcs3/rpcs3qt/breakpoint_handler.cpp +++ b/rpcs3/rpcs3qt/breakpoint_handler.cpp @@ -2,29 +2,53 @@ extern bool ppu_breakpoint(u32 loc, bool is_adding); -bool breakpoint_handler::HasBreakpoint(u32 loc) const +bool breakpoint_handler::IsBreakOnBPM() const { - return m_breakpoints.contains(loc); + return m_break_on_bpm; } -bool breakpoint_handler::AddBreakpoint(u32 loc) +void breakpoint_handler::SetBreakOnBPM(bool break_on_bpm) { - if (!ppu_breakpoint(loc, true)) + m_break_on_bpm = break_on_bpm; +} + +bool breakpoint_handler::HasBreakpoint(u32 loc, bs_t type) +{ + std::lock_guard lock(mutex_breakpoints); + + return m_breakpoints.contains(loc) && ((m_breakpoints.at(loc) & type) == type); +} + +bool breakpoint_handler::AddBreakpoint(u32 loc, bs_t type) +{ + std::lock_guard lock(mutex_breakpoints); + + if ((type & breakpoint_types::bp_exec) && !ppu_breakpoint(loc, true)) { return false; } - ensure(m_breakpoints.insert(loc).second); - return true; + return m_breakpoints.insert({loc, type}).second; } bool breakpoint_handler::RemoveBreakpoint(u32 loc) { + std::lock_guard lock(mutex_breakpoints); + + bs_t bp_type{}; + if (m_breakpoints.contains(loc)) + { + bp_type = m_breakpoints.at(loc); + } + if (m_breakpoints.erase(loc) == 0) { return false; } - ensure(ppu_breakpoint(loc, false)); + if (bp_type & breakpoint_types::bp_exec) + { + ensure(ppu_breakpoint(loc, false)); + } return true; } diff --git a/rpcs3/rpcs3qt/breakpoint_handler.h b/rpcs3/rpcs3qt/breakpoint_handler.h index 4794fd1d83..f27f8031c2 100644 --- a/rpcs3/rpcs3qt/breakpoint_handler.h +++ b/rpcs3/rpcs3qt/breakpoint_handler.h @@ -1,13 +1,16 @@ #pragma once #include "util/types.hpp" -#include +#include "Utilities/bit_set.h" +#include +#include "Utilities/mutex.h" enum class breakpoint_types { bp_read = 0x1, bp_write = 0x2, bp_exec = 0x4, + __bitset_enum_max }; /* @@ -20,16 +23,19 @@ public: breakpoint_handler() = default; ~breakpoint_handler() = default; + bool IsBreakOnBPM() const; + void SetBreakOnBPM(bool break_on_bpm); + /** * Returns true iff breakpoint exists at loc. * TODO: Add arg for flags, gameid, and maybe even thread if it should be thread local breakpoint.... breakpoint struct is probably what'll happen */ - bool HasBreakpoint(u32 loc) const; + bool HasBreakpoint(u32 loc, bs_t type); /** * Returns true if added successfully. TODO: flags */ - bool AddBreakpoint(u32 loc); + bool AddBreakpoint(u32 loc, bs_t type); /** * Returns true if removed breakpoint at loc successfully. @@ -39,5 +45,9 @@ public: private: // TODO : generalize to hold multiple games and handle flags.Probably do : std::map>. // Although, externally, they'll only be accessed by loc (I think) so a map of maps may also do? - std::set m_breakpoints; //! Holds all breakpoints. + shared_mutex mutex_breakpoints; + std::map> m_breakpoints; //! Holds all breakpoints. + bool m_break_on_bpm = false; }; + +extern breakpoint_handler g_breakpoint_handler; diff --git a/rpcs3/rpcs3qt/breakpoint_list.cpp b/rpcs3/rpcs3qt/breakpoint_list.cpp index 03fc4105ea..63e7756c9a 100644 --- a/rpcs3/rpcs3qt/breakpoint_list.cpp +++ b/rpcs3/rpcs3qt/breakpoint_list.cpp @@ -4,6 +4,7 @@ #include "Emu/CPU/CPUDisAsm.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/SPUThread.h" +#include "rpcs3qt/debugger_add_bp_window.h" #include #include @@ -72,19 +73,35 @@ void breakpoint_list::RemoveBreakpoint(u32 addr) } } -bool breakpoint_list::AddBreakpoint(u32 pc) +bool breakpoint_list::AddBreakpoint(u32 pc, bs_t type) { - if (!m_ppu_breakpoint_handler->AddBreakpoint(pc)) + if (!m_ppu_breakpoint_handler->AddBreakpoint(pc, type)) { return false; } - m_disasm->disasm(pc); + QString breakpoint_item_text; - QString text = QString::fromStdString(m_disasm->last_opcode); - text.remove(10, 13); + if (type == breakpoint_types::bp_exec) + { + m_disasm->disasm(m_disasm->dump_pc = pc); + breakpoint_item_text = QString::fromStdString(m_disasm->last_opcode); + breakpoint_item_text.remove(10, 13); + } + else if (type == breakpoint_types::bp_read) + { + breakpoint_item_text = QString("BPMR: 0x%1").arg(pc, 8, 16, QChar('0')); + } + else if (type == breakpoint_types::bp_write) + { + breakpoint_item_text = QString("BPMW: 0x%1").arg(pc, 8, 16, QChar('0')); + } + else if (type == (breakpoint_types::bp_read + breakpoint_types::bp_write)) + { + breakpoint_item_text = QString("BPMRW: 0x%1").arg(pc, 8, 16, QChar('0')); + } - QListWidgetItem* breakpoint_item = new QListWidgetItem(text); + QListWidgetItem* breakpoint_item = new QListWidgetItem(breakpoint_item_text); breakpoint_item->setForeground(m_text_color_bp); breakpoint_item->setBackground(m_color_bp); breakpoint_item->setData(Qt::UserRole, pc); @@ -96,8 +113,8 @@ bool breakpoint_list::AddBreakpoint(u32 pc) } /** -* If breakpoint exists, we remove it, else add new one. Yeah, it'd be nicer from a code logic to have it be set/reset. But, that logic has to happen somewhere anyhow. -*/ + * If breakpoint exists, we remove it, else add new one. Yeah, it'd be nicer from a code logic to have it be set/reset. But, that logic has to happen somewhere anyhow. + */ void breakpoint_list::HandleBreakpointRequest(u32 loc, bool only_add) { const auto cpu = m_disasm ? m_disasm->get_cpu() : nullptr; @@ -168,7 +185,7 @@ void breakpoint_list::HandleBreakpointRequest(u32 loc, bool only_add) return; } - if (m_ppu_breakpoint_handler->HasBreakpoint(loc)) + if (m_ppu_breakpoint_handler->HasBreakpoint(loc, breakpoint_types::bp_exec)) { if (!only_add) { @@ -177,7 +194,7 @@ void breakpoint_list::HandleBreakpointRequest(u32 loc, bool only_add) } else { - if (!AddBreakpoint(loc)) + if (!AddBreakpoint(loc, breakpoint_types::bp_exec)) { QMessageBox::warning(this, tr("Unknown error while setting breakpoint!"), tr("Failed to set breakpoints.")); return; @@ -194,13 +211,8 @@ void breakpoint_list::OnBreakpointListDoubleClicked() } } -void breakpoint_list::OnBreakpointListRightClicked(const QPoint &pos) +void breakpoint_list::OnBreakpointListRightClicked(const QPoint& pos) { - if (!itemAt(pos)) - { - return; - } - m_context_menu = new QMenu(); if (selectedItems().count() == 1) @@ -215,7 +227,28 @@ void breakpoint_list::OnBreakpointListRightClicked(const QPoint &pos) m_context_menu->addSeparator(); } - m_context_menu->addAction(m_delete_action); + if (selectedItems().count() >= 1) + { + m_context_menu->addAction(m_delete_action); + } + + QAction* m_addbp = new QAction(tr("Add Breakpoint"), this); + connect(m_addbp, &QAction::triggered, this, [this] + { + debugger_add_bp_window dlg(this, this); + dlg.exec(); + }); + m_context_menu->addAction(m_addbp); + +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + QAction* m_tglbpmbreak = new QAction(m_ppu_breakpoint_handler->IsBreakOnBPM() ? tr("Disable BPM") : tr("Enable BPM"), this); + connect(m_tglbpmbreak, &QAction::triggered, [this] + { + m_ppu_breakpoint_handler->SetBreakOnBPM(!m_ppu_breakpoint_handler->IsBreakOnBPM()); + }); + m_context_menu->addAction(m_tglbpmbreak); +#endif + m_context_menu->exec(viewport()->mapToGlobal(pos)); m_context_menu->deleteLater(); m_context_menu = nullptr; diff --git a/rpcs3/rpcs3qt/breakpoint_list.h b/rpcs3/rpcs3qt/breakpoint_list.h index 5481e06efc..15d87857eb 100644 --- a/rpcs3/rpcs3qt/breakpoint_list.h +++ b/rpcs3/rpcs3qt/breakpoint_list.h @@ -4,9 +4,10 @@ #include +#include "breakpoint_handler.h" + class CPUDisAsm; class cpu_thread; -class breakpoint_handler; class breakpoint_list : public QListWidget { @@ -16,8 +17,8 @@ public: breakpoint_list(QWidget* parent, breakpoint_handler* handler); void UpdateCPUData(std::shared_ptr disasm); void ClearBreakpoints(); - bool AddBreakpoint(u32 pc); void RemoveBreakpoint(u32 addr); + bool AddBreakpoint(u32 pc, bs_t type); QColor m_text_color_bp; QColor m_color_bp; @@ -36,7 +37,7 @@ private Q_SLOTS: void OnBreakpointListDelete(); private: - breakpoint_handler* m_ppu_breakpoint_handler; + breakpoint_handler* m_ppu_breakpoint_handler = nullptr; QMenu* m_context_menu = nullptr; QAction* m_delete_action; std::shared_ptr m_disasm = nullptr; diff --git a/rpcs3/rpcs3qt/debugger_add_bp_window.cpp b/rpcs3/rpcs3qt/debugger_add_bp_window.cpp new file mode 100644 index 0000000000..64255ecc50 --- /dev/null +++ b/rpcs3/rpcs3qt/debugger_add_bp_window.cpp @@ -0,0 +1,116 @@ +#include "debugger_add_bp_window.h" +#include "Utilities/StrFmt.h" +#include "Utilities/StrUtil.h" +#include "breakpoint_handler.h" +#include "util/types.hpp" + +#include +#include +#include +#include +#include +#include +#include + +debugger_add_bp_window::debugger_add_bp_window(breakpoint_list* bp_list, QWidget* parent) + : QDialog(parent) +{ + ensure(bp_list); + + setWindowTitle(tr("Add a breakpoint")); + setModal(true); + + QVBoxLayout* vbox_panel = new QVBoxLayout(); + + QHBoxLayout* hbox_top = new QHBoxLayout(); + QLabel* l_address = new QLabel(tr("Address")); + QLineEdit* t_address = new QLineEdit(); + t_address->setPlaceholderText(tr("Address here")); + t_address->setFocus(); + + hbox_top->addWidget(l_address); + hbox_top->addWidget(t_address); + vbox_panel->addLayout(hbox_top); + + QHBoxLayout* hbox_bot = new QHBoxLayout(); + QComboBox* co_bptype = new QComboBox(this); + QStringList qstr_breakpoint_types; + + qstr_breakpoint_types +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + << tr("Memory Read") + << tr("Memory Write") + << tr("Memory Read&Write") +#endif + << tr("Execution"); + + co_bptype->addItems(qstr_breakpoint_types); + + hbox_bot->addWidget(co_bptype); + vbox_panel->addLayout(hbox_bot); + + QHBoxLayout* hbox_buttons = new QHBoxLayout(); + QDialogButtonBox* button_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + button_box->button(QDialogButtonBox::Ok)->setText(tr("Add")); + + hbox_buttons->addWidget(button_box); + vbox_panel->addLayout(hbox_buttons); + + setLayout(vbox_panel); + + connect(button_box, &QDialogButtonBox::accepted, this, [=, this] + { + const std::string str_address = t_address->text().toStdString(); + + if (str_address.empty()) + { + QMessageBox::warning(this, tr("Add BP error"), tr("Address is empty!")); + return; + } + + // We always want hex + const std::string parsed_string = (!str_address.starts_with("0x") && !str_address.starts_with("0X")) ? fmt::format("0x%s", str_address) : str_address; + u64 parsed_address = 0; + + // We don't accept 0 + if (!try_to_uint64(&parsed_address, parsed_string, 1, 0xFF'FF'FF'FF)) + { + QMessageBox::warning(this, tr("Add BP error"), tr("Address is invalid!")); + return; + } + + const u32 address = static_cast(parsed_address); + bs_t bp_t{}; + +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + switch (co_bptype->currentIndex()) + { + case 0: + bp_t = breakpoint_types::bp_read; + break; + case 1: + bp_t = breakpoint_types::bp_write; + break; + case 2: + bp_t = breakpoint_types::bp_read + breakpoint_types::bp_write; + break; + case 3: + bp_t = breakpoint_types::bp_exec; + break; + default: + break; + } +#else + bp_t = breakpoint_types::bp_exec; +#endif + + if (bp_t) + bp_list->AddBreakpoint(address, bp_t); + + QDialog::accept(); + }); + + connect(button_box, &QDialogButtonBox::rejected, this, &QDialog::reject); + + move(QCursor::pos()); +} diff --git a/rpcs3/rpcs3qt/debugger_add_bp_window.h b/rpcs3/rpcs3qt/debugger_add_bp_window.h new file mode 100644 index 0000000000..c57c6873d8 --- /dev/null +++ b/rpcs3/rpcs3qt/debugger_add_bp_window.h @@ -0,0 +1,13 @@ +#pragma once + +#include "breakpoint_list.h" + +#include + +class debugger_add_bp_window : public QDialog +{ + Q_OBJECT + +public: + explicit debugger_add_bp_window(breakpoint_list* bp_list, QWidget* parent = nullptr); +}; diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index b62efcc716..606b491bf8 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -34,6 +34,7 @@ #include #include +#include "rpcs3qt/debugger_add_bp_window.h" #include "util/asm.hpp" constexpr auto qstr = QString::fromStdString; @@ -43,6 +44,9 @@ constexpr auto s_pause_flags = cpu_flag::dbg_pause + cpu_flag::dbg_global_pause; extern atomic_t g_debugger_pause_all_threads_on_bp; extern const ppu_decoder g_ppu_itype; +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS +breakpoint_handler g_breakpoint_handler = breakpoint_handler(); +#endif extern bool is_using_interpreter(thread_class t_class); @@ -66,7 +70,12 @@ debugger_frame::debugger_frame(std::shared_ptr gui_settings, QWidg QHBoxLayout* hbox_b_main = new QHBoxLayout(); hbox_b_main->setContentsMargins(0, 0, 0, 0); +#ifdef RPCS3_HAS_MEMORY_BREAKPOINTS + m_ppu_breakpoint_handler = &g_breakpoint_handler; +#else m_ppu_breakpoint_handler = new breakpoint_handler(); +#endif + m_breakpoint_list = new breakpoint_list(this, m_ppu_breakpoint_handler); m_debugger_list = new debugger_list(this, m_gui_settings, m_ppu_breakpoint_handler); @@ -90,6 +99,7 @@ debugger_frame::debugger_frame(std::shared_ptr gui_settings, QWidg m_go_to_pc = new QPushButton(tr("Go To PC"), this); m_btn_step = new QPushButton(tr("Step"), this); m_btn_step_over = new QPushButton(tr("Step Over"), this); + m_btn_add_bp = new QPushButton(tr("Add BP"), this); m_btn_run = new QPushButton(RunString, this); EnableButtons(false); @@ -100,6 +110,7 @@ debugger_frame::debugger_frame(std::shared_ptr gui_settings, QWidg hbox_b_main->addWidget(m_go_to_pc); hbox_b_main->addWidget(m_btn_step); hbox_b_main->addWidget(m_btn_step_over); + hbox_b_main->addWidget(m_btn_add_bp); hbox_b_main->addWidget(m_btn_run); hbox_b_main->addWidget(m_choice_units); hbox_b_main->addStretch(); @@ -152,6 +163,12 @@ debugger_frame::debugger_frame(std::shared_ptr gui_settings, QWidg connect(m_btn_step, &QAbstractButton::clicked, this, &debugger_frame::DoStep); connect(m_btn_step_over, &QAbstractButton::clicked, [this]() { DoStep(true); }); + connect(m_btn_add_bp, &QAbstractButton::clicked, this, [this] + { + debugger_add_bp_window dlg(m_breakpoint_list, this); + dlg.exec(); + }); + connect(m_btn_run, &QAbstractButton::clicked, this, &debugger_frame::RunBtnPress); connect(m_choice_units->lineEdit(), &QLineEdit::editingFinished, [&] @@ -1588,7 +1605,7 @@ void debugger_frame::DoStep(bool step_over) // Set breakpoint on next instruction const u32 next_instruction_pc = current_instruction_pc + 4; - m_ppu_breakpoint_handler->AddBreakpoint(next_instruction_pc); + m_ppu_breakpoint_handler->AddBreakpoint(next_instruction_pc, breakpoint_types::bp_exec); // Undefine previous step over breakpoint if it hasn't been already // This can happen when the user steps over a branch that doesn't return to itself @@ -1680,6 +1697,7 @@ void debugger_frame::EnableButtons(bool enable) m_go_to_addr->setEnabled(enable); m_go_to_pc->setEnabled(enable); + m_btn_add_bp->setEnabled(enable); m_btn_step->setEnabled(step); m_btn_step_over->setEnabled(step); m_btn_run->setEnabled(enable); diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h index ee685231c5..46df22e3c8 100644 --- a/rpcs3/rpcs3qt/debugger_frame.h +++ b/rpcs3/rpcs3qt/debugger_frame.h @@ -46,20 +46,21 @@ class debugger_frame : public custom_dock_widget const QString RunString = tr("Run"); const QString PauseString = tr("Pause"); - debugger_list* m_debugger_list; - QSplitter* m_right_splitter; + debugger_list* m_debugger_list = nullptr; + QSplitter* m_right_splitter = nullptr; QFont m_mono; - QPlainTextEdit* m_misc_state; - QPlainTextEdit* m_regs; - QPushButton* m_go_to_addr; - QPushButton* m_go_to_pc; - QPushButton* m_btn_step; - QPushButton* m_btn_step_over; - QPushButton* m_btn_run; + QPlainTextEdit* m_misc_state = nullptr; + QPlainTextEdit* m_regs = nullptr; + QPushButton* m_go_to_addr = nullptr; + QPushButton* m_go_to_pc = nullptr; + QPushButton* m_btn_step = nullptr; + QPushButton* m_btn_step_over = nullptr; + QPushButton* m_btn_add_bp = nullptr; + QPushButton* m_btn_run = nullptr; - QComboBox* m_choice_units; - QTimer* m_update; - QSplitter* m_splitter; + QComboBox* m_choice_units = nullptr; + QTimer* m_update = nullptr; + QSplitter* m_splitter = nullptr; u64 m_threads_created = -1; u64 m_threads_deleted = -1; @@ -83,9 +84,9 @@ class debugger_frame : public custom_dock_widget u32 m_spu_disasm_pc = 0; bool m_is_spu_disasm_mode = false; - breakpoint_list* m_breakpoint_list; - breakpoint_handler* m_ppu_breakpoint_handler; - call_stack_list* m_call_stack_list; + breakpoint_list* m_breakpoint_list = nullptr; + breakpoint_handler* m_ppu_breakpoint_handler = nullptr; + call_stack_list* m_call_stack_list = nullptr; instruction_editor_dialog* m_inst_editor = nullptr; register_editor_dialog* m_reg_editor = nullptr; QDialog* m_goto_dialog = nullptr; diff --git a/rpcs3/rpcs3qt/debugger_list.cpp b/rpcs3/rpcs3qt/debugger_list.cpp index d1e0f97677..e398921aaf 100644 --- a/rpcs3/rpcs3qt/debugger_list.cpp +++ b/rpcs3/rpcs3qt/debugger_list.cpp @@ -157,7 +157,7 @@ void debugger_list::ShowAddress(u32 addr, bool select_addr, bool direct) { case thread_class::ppu: { - return m_ppu_breakpoint_handler->HasBreakpoint(pc); + return m_ppu_breakpoint_handler->HasBreakpoint(pc, breakpoint_types::bp_exec); } case thread_class::spu: { diff --git a/rpcs3/rpcs3qt/debugger_list.h b/rpcs3/rpcs3qt/debugger_list.h index ebae5bcc13..e0429db884 100644 --- a/rpcs3/rpcs3qt/debugger_list.h +++ b/rpcs3/rpcs3qt/debugger_list.h @@ -56,7 +56,7 @@ private: std::shared_ptr m_gui_settings; - breakpoint_handler* m_ppu_breakpoint_handler; + breakpoint_handler* m_ppu_breakpoint_handler = nullptr; cpu_thread* m_cpu = nullptr; std::shared_ptr m_disasm; QDialog* m_cmd_detail = nullptr; From 229734e45f167b93767ab67a49c62dc2a61324fe Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 22:46:03 +0100 Subject: [PATCH 024/529] VS: add some missing filters --- rpcs3/rpcs3.vcxproj | 1 + rpcs3/rpcs3.vcxproj.filters | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 2df8c722c6..2330fe3115 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -2087,6 +2087,7 @@ + diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index 407f9dfef6..a2e4afd1a6 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -1714,6 +1714,9 @@ Gui\vfs + + Gui\debugger + @@ -1848,5 +1851,8 @@ Darwin + + CI + \ No newline at end of file From 760e43ad2c9eeca20acbc10d634dc608c1cd9e7e Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 22:47:17 +0100 Subject: [PATCH 025/529] VS: move LLVM AdditionalDependencies to rpcs3_default.props --- buildfiles/msvc/rpcs3_debug.props | 100 +------------------------- buildfiles/msvc/rpcs3_default.props | 108 +++++++++++++++++++++++++++- buildfiles/msvc/rpcs3_release.props | 100 +------------------------- 3 files changed, 109 insertions(+), 199 deletions(-) diff --git a/buildfiles/msvc/rpcs3_debug.props b/buildfiles/msvc/rpcs3_debug.props index b843fdf82b..877dcc77f8 100644 --- a/buildfiles/msvc/rpcs3_debug.props +++ b/buildfiles/msvc/rpcs3_debug.props @@ -15,105 +15,7 @@ %(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib - %(AdditionalDependencies); - LLVMAggressiveInstCombine.lib; - LLVMAnalysis.lib; - LLVMAsmParser.lib; - LLVMAsmPrinter.lib; - LLVMBinaryFormat.lib; - LLVMBitReader.lib; - LLVMBitstreamReader.lib; - LLVMBitWriter.lib; - LLVMCFGuard.lib; - LLVMCodeGen.lib; - LLVMCodeGenData.lib; - LLVMCodeGenTypes.lib; - LLVMCore.lib; - LLVMCoroutines.lib; - LLVMCoverage.lib; - LLVMDebugInfoBTF.lib; - LLVMDebugInfoCodeView.lib; - LLVMDebuginfod.lib; - LLVMDebugInfoDWARF.lib; - LLVMDebugInfoGSYM.lib; - LLVMDebugInfoLogicalView.lib; - LLVMDebugInfoMSF.lib; - LLVMDebugInfoPDB.lib; - LLVMDemangle.lib; - LLVMDlltoolDriver.lib; - LLVMDWARFLinker.lib; - LLVMDWARFLinkerClassic.lib; - LLVMDWARFLinkerParallel.lib; - LLVMDWP.lib; - LLVMExecutionEngine.lib; - LLVMExtensions.lib; - LLVMFileCheck.lib; - LLVMFrontendDriver.lib; - LLVMFrontendHLSL.lib; - LLVMFrontendOffloading.lib; - LLVMFrontendOpenACC.lib; - LLVMFrontendOpenMP.lib; - LLVMFuzzerCLI.lib; - LLVMFuzzMutate.lib; - LLVMGlobalISel.lib; - LLVMHipStdPar.lib; - LLVMInstCombine.lib; - LLVMInstrumentation.lib; - LLVMIntelJITEvents.lib; - LLVMIntelJITProfiling.lib; - LLVMInterfaceStub.lib; - LLVMInterpreter.lib; - LLVMipo.lib; - LLVMIRPrinter.lib; - LLVMIRReader.lib; - LLVMJITLink.lib; - LLVMLibDriver.lib; - LLVMLineEditor.lib; - LLVMLinker.lib; - LLVMLTO.lib; - LLVMMC.lib; - LLVMMCA.lib; - LLVMMCDisassembler.lib; - LLVMMCJIT.lib; - LLVMMCParser.lib; - LLVMMIRParser.lib; - LLVMObjCARCOpts.lib; - LLVMObjCopy.lib; - LLVMObject.lib; - LLVMObjectYAML.lib; - LLVMOption.lib; - LLVMOrcDebugging.lib; - LLVMOrcJIT.lib; - LLVMOrcShared.lib; - LLVMOrcTargetProcess.lib; - LLVMPasses.lib; - LLVMProfileData.lib; - LLVMRemarks.lib; - LLVMRuntimeDyld.lib; - LLVMSandboxIR.lib; - LLVMScalarOpts.lib; - LLVMSelectionDAG.lib; - LLVMSupport.lib; - LLVMSymbolize.lib; - LLVMTableGen.lib; - LLVMTableGenBasic.lib; - LLVMTableGenCommon.lib; - LLVMTarget.lib; - LLVMTargetParser.lib; - LLVMTextAPI.lib; - LLVMTextAPIBinaryReader.lib; - LLVMTransformUtils.lib; - LLVMVectorize.lib; - LLVMWindowsDriver.lib; - LLVMWindowsManifest.lib; - LLVMX86AsmParser.lib; - LLVMX86CodeGen.lib; - LLVMX86Desc.lib; - LLVMX86Disassembler.lib; - LLVMX86Info.lib; - LLVMX86TargetMCA.lib; - LLVMXRay.lib; - + %(AdditionalDependencies); diff --git a/buildfiles/msvc/rpcs3_default.props b/buildfiles/msvc/rpcs3_default.props index 4f5862ca84..ad2ac1ee2f 100644 --- a/buildfiles/msvc/rpcs3_default.props +++ b/buildfiles/msvc/rpcs3_default.props @@ -23,7 +23,113 @@ /utf-8 /Zc:throwingNew- /constexpr:steps16777216 %(AdditionalOptions) - ws2_32.lib;Iphlpapi.lib;Bcrypt.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib + + ws2_32.lib; + Iphlpapi.lib; + Bcrypt.lib; + avcodec.lib; + avformat.lib; + avutil.lib; + swresample.lib; + swscale.lib; + LLVMAggressiveInstCombine.lib; + LLVMAnalysis.lib; + LLVMAsmParser.lib; + LLVMAsmPrinter.lib; + LLVMBinaryFormat.lib; + LLVMBitReader.lib; + LLVMBitstreamReader.lib; + LLVMBitWriter.lib; + LLVMCFGuard.lib; + LLVMCodeGen.lib; + LLVMCodeGenData.lib; + LLVMCodeGenTypes.lib; + LLVMCore.lib; + LLVMCoroutines.lib; + LLVMCoverage.lib; + LLVMDebugInfoBTF.lib; + LLVMDebugInfoCodeView.lib; + LLVMDebuginfod.lib; + LLVMDebugInfoDWARF.lib; + LLVMDebugInfoGSYM.lib; + LLVMDebugInfoLogicalView.lib; + LLVMDebugInfoMSF.lib; + LLVMDebugInfoPDB.lib; + LLVMDemangle.lib; + LLVMDlltoolDriver.lib; + LLVMDWARFLinker.lib; + LLVMDWARFLinkerClassic.lib; + LLVMDWARFLinkerParallel.lib; + LLVMDWP.lib; + LLVMExecutionEngine.lib; + LLVMExtensions.lib; + LLVMFileCheck.lib; + LLVMFrontendDriver.lib; + LLVMFrontendHLSL.lib; + LLVMFrontendOffloading.lib; + LLVMFrontendOpenACC.lib; + LLVMFrontendOpenMP.lib; + LLVMFuzzerCLI.lib; + LLVMFuzzMutate.lib; + LLVMGlobalISel.lib; + LLVMHipStdPar.lib; + LLVMInstCombine.lib; + LLVMInstrumentation.lib; + LLVMIntelJITEvents.lib; + LLVMIntelJITProfiling.lib; + LLVMInterfaceStub.lib; + LLVMInterpreter.lib; + LLVMipo.lib; + LLVMIRPrinter.lib; + LLVMIRReader.lib; + LLVMJITLink.lib; + LLVMLibDriver.lib; + LLVMLineEditor.lib; + LLVMLinker.lib; + LLVMLTO.lib; + LLVMMC.lib; + LLVMMCA.lib; + LLVMMCDisassembler.lib; + LLVMMCJIT.lib; + LLVMMCParser.lib; + LLVMMIRParser.lib; + LLVMObjCARCOpts.lib; + LLVMObjCopy.lib; + LLVMObject.lib; + LLVMObjectYAML.lib; + LLVMOption.lib; + LLVMOrcDebugging.lib; + LLVMOrcJIT.lib; + LLVMOrcShared.lib; + LLVMOrcTargetProcess.lib; + LLVMPasses.lib; + LLVMProfileData.lib; + LLVMRemarks.lib; + LLVMRuntimeDyld.lib; + LLVMSandboxIR.lib; + LLVMScalarOpts.lib; + LLVMSelectionDAG.lib; + LLVMSupport.lib; + LLVMSymbolize.lib; + LLVMTableGen.lib; + LLVMTableGenBasic.lib; + LLVMTableGenCommon.lib; + LLVMTarget.lib; + LLVMTargetParser.lib; + LLVMTextAPI.lib; + LLVMTextAPIBinaryReader.lib; + LLVMTransformUtils.lib; + LLVMVectorize.lib; + LLVMWindowsDriver.lib; + LLVMWindowsManifest.lib; + LLVMX86AsmParser.lib; + LLVMX86CodeGen.lib; + LLVMX86Desc.lib; + LLVMX86Disassembler.lib; + LLVMX86Info.lib; + LLVMX86TargetMCA.lib; + LLVMXRay.lib; + ..\3rdparty\ffmpeg\lib\windows\x86_64 8388608 1048576 diff --git a/buildfiles/msvc/rpcs3_release.props b/buildfiles/msvc/rpcs3_release.props index 98066601c4..378ba797d6 100644 --- a/buildfiles/msvc/rpcs3_release.props +++ b/buildfiles/msvc/rpcs3_release.props @@ -16,105 +16,7 @@ true true %(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib - %(AdditionalDependencies); - LLVMAggressiveInstCombine.lib; - LLVMAnalysis.lib; - LLVMAsmParser.lib; - LLVMAsmPrinter.lib; - LLVMBinaryFormat.lib; - LLVMBitReader.lib; - LLVMBitstreamReader.lib; - LLVMBitWriter.lib; - LLVMCFGuard.lib; - LLVMCodeGen.lib; - LLVMCodeGenData.lib; - LLVMCodeGenTypes.lib; - LLVMCore.lib; - LLVMCoroutines.lib; - LLVMCoverage.lib; - LLVMDebugInfoBTF.lib; - LLVMDebugInfoCodeView.lib; - LLVMDebuginfod.lib; - LLVMDebugInfoDWARF.lib; - LLVMDebugInfoGSYM.lib; - LLVMDebugInfoLogicalView.lib; - LLVMDebugInfoMSF.lib; - LLVMDebugInfoPDB.lib; - LLVMDemangle.lib; - LLVMDlltoolDriver.lib; - LLVMDWARFLinker.lib; - LLVMDWARFLinkerClassic.lib; - LLVMDWARFLinkerParallel.lib; - LLVMDWP.lib; - LLVMExecutionEngine.lib; - LLVMExtensions.lib; - LLVMFileCheck.lib; - LLVMFrontendDriver.lib; - LLVMFrontendHLSL.lib; - LLVMFrontendOffloading.lib; - LLVMFrontendOpenACC.lib; - LLVMFrontendOpenMP.lib; - LLVMFuzzerCLI.lib; - LLVMFuzzMutate.lib; - LLVMGlobalISel.lib; - LLVMHipStdPar.lib; - LLVMInstCombine.lib; - LLVMInstrumentation.lib; - LLVMIntelJITEvents.lib; - LLVMIntelJITProfiling.lib; - LLVMInterfaceStub.lib; - LLVMInterpreter.lib; - LLVMipo.lib; - LLVMIRPrinter.lib; - LLVMIRReader.lib; - LLVMJITLink.lib; - LLVMLibDriver.lib; - LLVMLineEditor.lib; - LLVMLinker.lib; - LLVMLTO.lib; - LLVMMC.lib; - LLVMMCA.lib; - LLVMMCDisassembler.lib; - LLVMMCJIT.lib; - LLVMMCParser.lib; - LLVMMIRParser.lib; - LLVMObjCARCOpts.lib; - LLVMObjCopy.lib; - LLVMObject.lib; - LLVMObjectYAML.lib; - LLVMOption.lib; - LLVMOrcDebugging.lib; - LLVMOrcJIT.lib; - LLVMOrcShared.lib; - LLVMOrcTargetProcess.lib; - LLVMPasses.lib; - LLVMProfileData.lib; - LLVMRemarks.lib; - LLVMRuntimeDyld.lib; - LLVMSandboxIR.lib; - LLVMScalarOpts.lib; - LLVMSelectionDAG.lib; - LLVMSupport.lib; - LLVMSymbolize.lib; - LLVMTableGen.lib; - LLVMTableGenBasic.lib; - LLVMTableGenCommon.lib; - LLVMTarget.lib; - LLVMTargetParser.lib; - LLVMTextAPI.lib; - LLVMTextAPIBinaryReader.lib; - LLVMTransformUtils.lib; - LLVMVectorize.lib; - LLVMWindowsDriver.lib; - LLVMWindowsManifest.lib; - LLVMX86AsmParser.lib; - LLVMX86CodeGen.lib; - LLVMX86Desc.lib; - LLVMX86Disassembler.lib; - LLVMX86Info.lib; - LLVMX86TargetMCA.lib; - LLVMXRay.lib; - + %(AdditionalDependencies); From d3c5cc7b13f82e190b004152279e0bbf7d6778fd Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 22:45:44 +0100 Subject: [PATCH 026/529] ci: Use more variables for LLVM and QT --- .ci/build-mac-arm64.sh | 2 +- .ci/get_keys-windows.sh | 2 +- .ci/install-freebsd.sh | 8 ++++---- .ci/setup-windows.sh | 4 ++-- .cirrus.yml | 2 ++ .github/workflows/rpcs3.yml | 7 ++++--- azure-pipelines.yml | 13 +++++++------ 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index 23a16f4319..6d5bda2257 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -47,7 +47,7 @@ ln -s /usr/local/opt/curl/bin/curl /opt/homebrew1/opt/curl/bin/curl brew_arm64_install_packages 0mq aom aribb24 ca-certificates cjson dav1d ffmpeg@5 fontconfig freetype freetype2 gettext glew gmp gnutls lame libbluray libidn2 libnettle libogg libpng librist libsodium libsoxr libtasn libtasn1 libunistring libvmaf libvorbis libvpx libx11 libxau libxcb libxdmcp llvm@$LLVM_COMPILER_VER mbedtls molten-vk nettle opencore-amr openjpeg openssl opus p11-kit pkg-config pkgconfig pzstd rav1e sdl2 snappy speex srt svt-av1 theora vulkan-headers webp x264 x265 xz z3 zeromq zmq zstd "$BREW_ARM64_PATH/bin/brew" link -f ffmpeg@5 -ln -s /opt/homebrew1/opt/llvm@19/lib/unwind/libunwind.1.dylib /opt/homebrew1/opt/llvm@19/lib/libunwind.1.dylib +ln -s "/opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib/unwind/libunwind.1.dylib" "/opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib" # moltenvk based on commit for 1.2.11 release wget https://raw.githubusercontent.com/Homebrew/homebrew-core/6bfc8950c696d1f952425e8af2a6248603dc0df9/Formula/m/molten-vk.rb diff --git a/.ci/get_keys-windows.sh b/.ci/get_keys-windows.sh index efc63978f1..8c7ea9c14e 100644 --- a/.ci/get_keys-windows.sh +++ b/.ci/get_keys-windows.sh @@ -1,4 +1,4 @@ #!/bin/sh -ex -curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z.sha256" +curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z.sha256" curl -fLo "./glslang.lock" "https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z.sha256" diff --git a/.ci/install-freebsd.sh b/.ci/install-freebsd.sh index a7b39733b3..3c2896af63 100755 --- a/.ci/install-freebsd.sh +++ b/.ci/install-freebsd.sh @@ -9,10 +9,10 @@ export ASSUME_ALWAYS_YES=true pkg info # debug # WITH_LLVM -pkg install llvm19 +pkg install "llvm$LLVM_COMPILER_VER" -# Mandatory dependencies (qt6-base is pulled via qt6-multimedia) -pkg install git ccache cmake ninja qt6-multimedia qt6-svg glew openal-soft ffmpeg +# Mandatory dependencies (qtX-base is pulled via qtX-multimedia) +pkg install git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg -# Optional dependencies (libevdev is pulled by qt6-base) +# Optional dependencies (libevdev is pulled by qtX-base) pkg install pkgconf alsa-lib pulseaudio sdl2 evdev-proto vulkan-headers vulkan-loader diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh index 789253d9d5..f1073c9218 100755 --- a/.ci/setup-windows.sh +++ b/.ci/setup-windows.sh @@ -19,9 +19,9 @@ QT_DECL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtdeclarative${QT_SUFFIX}" QT_TOOL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qttools${QT_SUFFIX}" QT_MM_URL="${QT_HOST}${QT_PREFIX}addons.qtmultimedia.${QT_PREFIX_2}qtmultimedia${QT_SUFFIX}" QT_SVG_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtsvg${QT_SUFFIX}" -LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z' +LLVMLIBS_URL="https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z" GLSLANG_URL='https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z' -VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-1.3.268.0-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1" +VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-${VULKAN_VER}-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1" CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-windows-x86_64.zip" DEP_URLS=" \ diff --git a/.cirrus.yml b/.cirrus.yml index 2ef3e9d7ed..6f2a08bb8a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,6 +8,8 @@ env: RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1] QT_VER_MAIN: '6' QT_VER: '6.8.2' + LLVM_COMPILER_VER: '19' + LLVM_VER: '19.1.7' # windows_task: # matrix: diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index d143e46b1a..cc819e8468 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -91,7 +91,7 @@ jobs: name: RPCS3 for Linux (${{ runner.arch }}, ${{ matrix.compiler }}) path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}/*.AppImage compression-level: 0 - + - name: Deploy master build to GitHub Releases if: | github.event_name != 'pull_request' && @@ -116,6 +116,7 @@ jobs: QT_VER: '6.8.2' QT_VER_MSVC: 'msvc2022' QT_DATE: '202501260838' + LLVM_VER: '19.1.7' VULKAN_VER: '1.3.268.0' VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9' @@ -148,7 +149,7 @@ jobs: path: ${{ env.CCACHE_DIR }} key: "${{ runner.os }}-ccache-${{ env.COMPILER }}-${{github.run_id}}" restore-keys: ${{ runner.os }}-ccache-${{ env.COMPILER }}- - + - name: Setup Dependencies Cache uses: actions/cache@main with: @@ -186,7 +187,7 @@ jobs: path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }} compression-level: 0 if-no-files-found: error - + - name: Deploy master build to GitHub Releases if: | github.event_name != 'pull_request' && diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98e071462b..d715095825 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -75,6 +75,7 @@ jobs: # QT_VER_MSVC: 'msvc2022' # QT_DATE: '202501260838' # QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 +# LLVM_VER: '19.1.7' # VULKAN_VER: '1.3.268.0' # VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' # VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER) @@ -101,7 +102,7 @@ jobs: # restoreKeys: # ccache | $(Agent.OS) | $(COMPILER) # displayName: Build Ccache - + # - task: Cache@2 # inputs: # key: $(Agent.OS) | $(COMPILER) | "$(QT_VER)" | $(VULKAN_SDK_SHA) | $(CCACHE_SHA) | llvm.lock | glslang.lock @@ -161,7 +162,7 @@ jobs: restoreKeys: | ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)" displayName: Ccache cache - + - task: Cache@2 inputs: key: qt | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(QT_VER)" @@ -169,7 +170,7 @@ jobs: restoreKeys: | qt | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(QT_VER)" displayName: Qt cache - + # - task: Cache@2 # inputs: # key: brew | "$(Agent.OS)" @@ -196,7 +197,7 @@ jobs: displayName: Push build to GitHub env: RPCS3_TOKEN: $(RPCS3-Token) - + - job: Mac_Build_arm64 timeoutInMinutes: 180 variables: @@ -222,7 +223,7 @@ jobs: restoreKeys: | ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)" displayName: Ccache cache - + - task: Cache@2 inputs: key: qt | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(QT_VER)" @@ -230,7 +231,7 @@ jobs: restoreKeys: | qt | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(QT_VER)" displayName: Qt cache - + # - task: Cache@2 # inputs: # key: brew | "$(Agent.OS)" From a8fc3f5f7492c664ef102cb926629ad9c110645b Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:38:16 +0100 Subject: [PATCH 027/529] static analysis: more const --- Utilities/StrUtil.h | 2 +- rpcs3/Crypto/aes.cpp | 6 +-- rpcs3/Crypto/ec.cpp | 60 ++++++++++++++-------------- rpcs3/Crypto/ec.h | 2 +- rpcs3/Crypto/key_vault.cpp | 2 +- rpcs3/Crypto/key_vault.h | 2 +- rpcs3/Crypto/unedat.cpp | 2 +- rpcs3/Emu/Io/emulated_pad_config.h | 4 +- rpcs3/Emu/Io/usb_device.h | 2 +- rpcs3/Emu/RSX/Common/surface_utils.h | 8 ++-- rpcs3/Emu/RSX/Program/ShaderParam.h | 8 ++-- rpcs3/Emu/RSX/VK/VKProgramBuffer.h | 2 +- rpcs3/Emu/RSX/VK/VKResourceManager.h | 14 +++---- rpcs3/Emu/RSX/VK/vkutils/device.cpp | 6 +-- rpcs3/Input/mm_joystick_handler.cpp | 2 +- rpcs3/rpcs3qt/config_adapter.cpp | 4 +- rpcs3/rpcs3qt/render_creator.cpp | 2 +- rpcs3/util/fixed_typemap.hpp | 2 +- 18 files changed, 64 insertions(+), 66 deletions(-) diff --git a/Utilities/StrUtil.h b/Utilities/StrUtil.h index 4fe6fc90cc..4614f6f623 100644 --- a/Utilities/StrUtil.h +++ b/Utilities/StrUtil.h @@ -159,7 +159,7 @@ namespace fmt std::string result; bool first = true; - for (auto& v : sources) + for (const auto& v : sources) { if (first) { diff --git a/rpcs3/Crypto/aes.cpp b/rpcs3/Crypto/aes.cpp index 61ae4ae85c..1cfc72aaab 100644 --- a/rpcs3/Crypto/aes.cpp +++ b/rpcs3/Crypto/aes.cpp @@ -897,7 +897,7 @@ unsigned char const_Zero[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -void leftshift_onebit(unsigned char *input, unsigned char *output) +void leftshift_onebit(const unsigned char *input, unsigned char *output) { int i; unsigned char overflow = 0; @@ -910,7 +910,7 @@ void leftshift_onebit(unsigned char *input, unsigned char *output) } } -void xor_128(unsigned char *a, unsigned char *b, unsigned char *out) +void xor_128(const unsigned char *a, const unsigned char *b, unsigned char *out) { int i; for (i = 0; i < 16; i++) @@ -945,7 +945,7 @@ void generate_subkey(aes_context *ctx, unsigned char *K1, unsigned char *K2) } } -void padding(unsigned char *lastb, unsigned char *pad, size_t length) +void padding(const unsigned char *lastb, unsigned char *pad, size_t length) { for (unsigned int i = 0; i < 16; i++) { diff --git a/rpcs3/Crypto/ec.cpp b/rpcs3/Crypto/ec.cpp index efef91228c..3789928492 100644 --- a/rpcs3/Crypto/ec.cpp +++ b/rpcs3/Crypto/ec.cpp @@ -5,7 +5,7 @@ #include "util/types.hpp" #include -static inline int bn_compare(u8* a, u8* b, u32 n) +static inline int bn_compare(const u8* a, const u8* b, u32 n) { for (u32 i = 0; i < n; i++) { @@ -18,7 +18,7 @@ static inline int bn_compare(u8* a, u8* b, u32 n) return 0; } -static u8 bn_add_1(u8* d, u8* a, u8* b, u32 n) +static u8 bn_add_1(u8* d, const u8* a, const u8* b, u32 n) { u8 c = 0; for (u32 i = n - 1; i != umax; i--) @@ -31,7 +31,7 @@ static u8 bn_add_1(u8* d, u8* a, u8* b, u32 n) return c; } -static u8 bn_sub_1(u8* d, u8* a, u8* b, u32 n) +static u8 bn_sub_1(u8* d, const u8* a, const u8* b, u32 n) { u8 c = 1; for (u32 i = n - 1; i != umax; i--) @@ -44,13 +44,13 @@ static u8 bn_sub_1(u8* d, u8* a, u8* b, u32 n) return 1 - c; } -static void bn_reduce(u8* d, u8* N, u32 n) +static void bn_reduce(u8* d, const u8* N, u32 n) { if (bn_compare(d, N, n) >= 0) bn_sub_1(d, d, N, n); } -static void bn_add(u8* d, u8* a, u8* b, u8* N, u32 n) +static void bn_add(u8* d, const u8* a, const u8* b, const u8* N, u32 n) { if (bn_add_1(d, a, b, n)) bn_sub_1(d, d, N, n); @@ -58,7 +58,7 @@ static void bn_add(u8* d, u8* a, u8* b, u8* N, u32 n) bn_reduce(d, N, n); } -static void bn_sub(u8* d, u8* a, u8* b, u8* N, u32 n) +static void bn_sub(u8* d, const u8* a, const u8* b, const u8* N, u32 n) { if (bn_sub_1(d, a, b, n)) bn_add_1(d, d, N, n); @@ -83,7 +83,7 @@ static constexpr u8 inv256[0x80] = { 0x11, 0x3b, 0x5d, 0xc7, 0x49, 0x33, 0x55, 0xff, }; -static void bn_mon_muladd_dig(u8* d, u8* a, u8 b, u8* N, u32 n) +static void bn_mon_muladd_dig(u8* d, const u8* a, u8 b, const u8* N, u32 n) { const u8 z = -(d[n - 1] + a[n - 1] * b) * inv256[N[n - 1] / 2]; @@ -106,7 +106,7 @@ static void bn_mon_muladd_dig(u8* d, u8* a, u8 b, u8* N, u32 n) bn_reduce(d, N, n); } -static void bn_mon_mul(u8* d, u8* a, u8* b, u8* N, u32 n) +static void bn_mon_mul(u8* d, const u8* a, const u8* b, const u8* N, u32 n) { u8 t[512]; memset(t, 0, n); @@ -117,13 +117,13 @@ static void bn_mon_mul(u8* d, u8* a, u8* b, u8* N, u32 n) memcpy(d, t, n); } -static void bn_to_mon(u8* d, u8* N, u32 n) +static void bn_to_mon(u8* d, const u8* N, u32 n) { for (u32 i = 0; i < 8 * n; i++) bn_add(d, d, d, N, n); } -static void bn_from_mon(u8* d, u8* N, u32 n) +static void bn_from_mon(u8* d, const u8* N, u32 n) { u8 t[512]; @@ -132,7 +132,7 @@ static void bn_from_mon(u8* d, u8* N, u32 n) bn_mon_mul(d, d, t, N, n); } -static void bn_mon_exp(u8* d, u8* a, u8* N, u32 n, u8* e, u32 en) +static void bn_mon_exp(u8* d, const u8* a, const u8* N, u32 n, const u8* e, u32 en) { u8 t[512]; @@ -153,7 +153,7 @@ static void bn_mon_exp(u8* d, u8* a, u8* N, u32 n, u8* e, u32 en) } } -static void bn_mon_inv(u8* d, u8* a, u8* N, u32 n) +static void bn_mon_inv(u8* d, const u8* a, const u8* N, u32 n) { u8 t[512], s[512]; @@ -179,7 +179,7 @@ static thread_local u8 ec_k[21]{}; static thread_local bool ec_curve_initialized{}; static thread_local bool ec_pub_initialized{}; -static inline bool elt_is_zero(u8* d) +static inline bool elt_is_zero(const u8* d) { for (u32 i = 0; i < 20; i++) if (d[i] != 0) @@ -188,27 +188,27 @@ static inline bool elt_is_zero(u8* d) return true; } -static void elt_add(u8* d, u8* a, u8* b) +static void elt_add(u8* d, const u8* a, const u8* b) { bn_add(d, a, b, ec_p, 20); } -static void elt_sub(u8* d, u8* a, u8* b) +static void elt_sub(u8* d, const u8* a, const u8* b) { bn_sub(d, a, b, ec_p, 20); } -static void elt_mul(u8* d, u8* a, u8* b) +static void elt_mul(u8* d, const u8* a, const u8* b) { bn_mon_mul(d, a, b, ec_p, 20); } -static void elt_square(u8* d, u8* a) +static void elt_square(u8* d, const u8* a) { elt_mul(d, a, a); } -static void elt_inv(u8* d, u8* a) +static void elt_inv(u8* d, const u8* a) { u8 s[20]; memcpy(s, a, 20); @@ -233,19 +233,19 @@ static inline void point_zero(point* p) memset(p->y, 0, 20); } -static inline bool point_is_zero(point* p) +static inline bool point_is_zero(const point* p) { return elt_is_zero(p->x) && elt_is_zero(p->y); } -static void point_double(point* r, point* p) +static void point_double(point* r, const point* p) { u8 s[20], t[20]; point pp = *p; - u8* px = pp.x; - u8* py = pp.y; + const u8* px = pp.x; + const u8* py = pp.y; u8* rx = r->x; u8* ry = r->y; @@ -272,17 +272,17 @@ static void point_double(point* r, point* p) elt_sub(ry, ry, py); // ry = -s*(rx-px) - py } -static void point_add(point* r, point* p, point* q) +static void point_add(point* r, const point* p, const point* q) { u8 s[20], t[20], u[20]; point pp = *p; point qq = *q; - u8* px = pp.x; - u8* py = pp.y; - u8* qx = qq.x; - u8* qy = qq.y; + const u8* px = pp.x; + const u8* py = pp.y; + const u8* qx = qq.x; + const u8* qy = qq.y; u8* rx = r->x; u8* ry = r->y; @@ -326,7 +326,7 @@ static void point_add(point* r, point* p, point* q) elt_sub(ry, ry, py); // ry = -s*(rx-px) - py } -static void point_mul(point* d, u8* a, point* b) // a is bignum +static void point_mul(point* d, const u8* a, const point* b) // a is bignum { point_zero(d); @@ -341,7 +341,7 @@ static void point_mul(point* d, u8* a, point* b) // a is bignum } } -static bool check_ecdsa(struct point* Q, u8* R, u8* S, u8* hash) +static bool check_ecdsa(const struct point* Q, u8* R, u8* S, const u8* hash) { u8 Sinv[21]; u8 e[21]; @@ -417,7 +417,7 @@ void ecdsa_set_priv(const u8* k) memcpy(ec_k, k, sizeof ec_k); } -bool ecdsa_verify(u8* hash, u8* R, u8* S) +bool ecdsa_verify(const u8* hash, u8* R, u8* S) { return check_ecdsa(&ec_Q, R, S, hash); } diff --git a/rpcs3/Crypto/ec.h b/rpcs3/Crypto/ec.h index 9efa5f17ff..f5ee60ba52 100644 --- a/rpcs3/Crypto/ec.h +++ b/rpcs3/Crypto/ec.h @@ -9,4 +9,4 @@ void ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u8* Gx, const u8* Gy); void ecdsa_set_pub(const u8* Q); void ecdsa_set_priv(const u8* k); -bool ecdsa_verify(u8* hash, u8* R, u8* S); +bool ecdsa_verify(const u8* hash, u8* R, u8* S); diff --git a/rpcs3/Crypto/key_vault.cpp b/rpcs3/Crypto/key_vault.cpp index b9222cd63e..2533b4d7fc 100644 --- a/rpcs3/Crypto/key_vault.cpp +++ b/rpcs3/Crypto/key_vault.cpp @@ -762,7 +762,7 @@ const u8* KeyVault::GetKlicenseeKey() const return klicensee_key; } -void rap_to_rif(unsigned char* rap, unsigned char* rif) +void rap_to_rif(const unsigned char* rap, unsigned char* rif) { int i; int round; diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/Crypto/key_vault.h index ac5ba084b9..4dff84992b 100644 --- a/rpcs3/Crypto/key_vault.h +++ b/rpcs3/Crypto/key_vault.h @@ -347,4 +347,4 @@ private: }; // RAP to RIF function. -void rap_to_rif(unsigned char* rap, unsigned char* rif); +void rap_to_rif(const unsigned char* rap, unsigned char* rif); diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp index d7eacd5ca1..985b2fc74c 100644 --- a/rpcs3/Crypto/unedat.cpp +++ b/rpcs3/Crypto/unedat.cpp @@ -674,7 +674,7 @@ u128 GetEdatRifKeyFromRapFile(const fs::file& rap_file) rap_file.read(rapkey); - rap_to_rif(reinterpret_cast(&rapkey), reinterpret_cast(&rifkey)); + rap_to_rif(reinterpret_cast(&rapkey), reinterpret_cast(&rifkey)); return rifkey; } diff --git a/rpcs3/Emu/Io/emulated_pad_config.h b/rpcs3/Emu/Io/emulated_pad_config.h index ad74e0dfc2..e2b46d3daa 100644 --- a/rpcs3/Emu/Io/emulated_pad_config.h +++ b/rpcs3/Emu/Io/emulated_pad_config.h @@ -40,7 +40,7 @@ public: { std::lock_guard lock(m_mutex); - if (cfg_pad_btn* item = get_button(id)) + if (const cfg_pad_btn* item = get_button(id)) { return item->get(); } @@ -52,7 +52,7 @@ public: { std::lock_guard lock(m_mutex); - if (cfg_pad_btn* item = get_button(id)) + if (const cfg_pad_btn* item = get_button(id)) { return item->get_default(); } diff --git a/rpcs3/Emu/Io/usb_device.h b/rpcs3/Emu/Io/usb_device.h index e0fad67966..3d60bd36b0 100644 --- a/rpcs3/Emu/Io/usb_device.h +++ b/rpcs3/Emu/Io/usb_device.h @@ -134,7 +134,7 @@ struct UsbDescriptorNode { memcpy(data, &_data, sizeof(T)); } - UsbDescriptorNode(u8 _bLength, u8 _bDescriptorType, u8* _data) + UsbDescriptorNode(u8 _bLength, u8 _bDescriptorType, const u8* _data) : bLength(_bLength), bDescriptorType(_bDescriptorType) { memcpy(data, _data, _bLength - 2); diff --git a/rpcs3/Emu/RSX/Common/surface_utils.h b/rpcs3/Emu/RSX/Common/surface_utils.h index 2fb55810e4..05e1993780 100644 --- a/rpcs3/Emu/RSX/Common/surface_utils.h +++ b/rpcs3/Emu/RSX/Common/surface_utils.h @@ -437,7 +437,7 @@ namespace rsx bool test() { - for (auto &e : memory_tag_samples) + for (const auto& e : memory_tag_samples) { if (e.second != *reinterpret_cast*>(vm::g_sudo_addr + e.first)) return false; @@ -471,10 +471,10 @@ namespace rsx return 0; // Sort here before doing transfers since surfaces may have been updated in the meantime - std::sort(old_contents.begin(), old_contents.end(), [](auto& a, auto &b) + std::sort(old_contents.begin(), old_contents.end(), [](const auto& a, const auto &b) { - auto _a = static_cast(a.source); - auto _b = static_cast(b.source); + const auto _a = static_cast(a.source); + const auto _b = static_cast(b.source); return (_a->last_use_tag < _b->last_use_tag); }); diff --git a/rpcs3/Emu/RSX/Program/ShaderParam.h b/rpcs3/Emu/RSX/Program/ShaderParam.h index 01e4931869..266ab51cbd 100644 --- a/rpcs3/Emu/RSX/Program/ShaderParam.h +++ b/rpcs3/Emu/RSX/Program/ShaderParam.h @@ -190,7 +190,7 @@ struct ParamArray bool HasParam(const ParamFlag flag, const std::string& type, const std::string& name) { - ParamType* t = SearchParam(flag, type); + const ParamType* t = SearchParam(flag, type); return t && t->HasItem(name); } @@ -300,7 +300,7 @@ public: { 3, 'w' } }; - for (auto& p : pos_to_swizzle) + for (const auto& p : pos_to_swizzle) { swizzle[p.second] = swizzles[0].length() > p.first ? swizzles[0][p.first] : 0; } @@ -309,7 +309,7 @@ public: { std::unordered_map new_swizzle; - for (auto& p : pos_to_swizzle) + for (const auto& p : pos_to_swizzle) { new_swizzle[p.second] = swizzle[swizzles[i].length() <= p.first ? '\0' : swizzles[i][p.first]]; } @@ -320,7 +320,7 @@ public: swizzles.clear(); std::string new_swizzle; - for (auto& p : pos_to_swizzle) + for (const auto& p : pos_to_swizzle) { if (swizzle[p.second] != '\0') new_swizzle += swizzle[p.second]; diff --git a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h index 63db151ab3..34cb08bae4 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h +++ b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h @@ -91,7 +91,7 @@ namespace vk get_graphics_pipeline(vp, fp, props, false, false, std::forward(args)...); } - void preload_programs(RSXVertexProgram& vp, RSXFragmentProgram& fp) + void preload_programs(const RSXVertexProgram& vp, const RSXFragmentProgram& fp) { search_vertex_program(vp); search_fragment_program(fp); diff --git a/rpcs3/Emu/RSX/VK/VKResourceManager.h b/rpcs3/Emu/RSX/VK/VKResourceManager.h index 11e6558018..30d838d065 100644 --- a/rpcs3/Emu/RSX/VK/VKResourceManager.h +++ b/rpcs3/Emu/RSX/VK/VKResourceManager.h @@ -161,19 +161,17 @@ namespace vk { while (!m_eid_map.empty()) { - auto& scope = m_eid_map.front(); + const auto& scope = m_eid_map.front(); if (scope.eid > eid) { break; } - else + + eid_scope_t tmp(0); { - eid_scope_t tmp(0); - { - std::lock_guard lock(m_eid_map_lock); - m_eid_map.front().swap(tmp); - m_eid_map.pop_front(); - } + std::lock_guard lock(m_eid_map_lock); + m_eid_map.front().swap(tmp); + m_eid_map.pop_front(); } } } diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/Emu/RSX/VK/vkutils/device.cpp index 5391e1308e..35c94e35cd 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/device.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/device.cpp @@ -1072,7 +1072,7 @@ namespace vk ensure(!host_coherent_types.empty()); // BAR heap, currently parked for future use, I have some plans for it (kd-11) - for (auto& type : bar_memory_types) + for (const auto& type : bar_memory_types) { result.device_bar.push(type.type_index, type.size); result.device_bar_total_bytes += type.size; @@ -1094,7 +1094,7 @@ namespace vk }); } - for (auto& type : device_local_types) + for (const auto& type : device_local_types) { result.device_local.push(type.type_index, type.size); result.device_local_total_bytes += type.size; @@ -1106,7 +1106,7 @@ namespace vk std::sort(host_coherent_types.begin(), host_coherent_types.end(), FN(x.size > y.size)); } - for (auto& type : host_coherent_types) + for (const auto& type : host_coherent_types) { result.host_visible_coherent.push(type.type_index, type.size); result.host_visible_total_bytes += type.size; diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp index 3d48efccf9..112620bf37 100644 --- a/rpcs3/Input/mm_joystick_handler.cpp +++ b/rpcs3/Input/mm_joystick_handler.cpp @@ -115,7 +115,7 @@ void mm_joystick_handler::enumerate_devices() continue; } - auto& device = it->second; + const auto& device = it->second; if (!device) continue; diff --git a/rpcs3/rpcs3qt/config_adapter.cpp b/rpcs3/rpcs3qt/config_adapter.cpp index bc6effef3d..ddc0cc839c 100644 --- a/rpcs3/rpcs3qt/config_adapter.cpp +++ b/rpcs3/rpcs3qt/config_adapter.cpp @@ -6,11 +6,11 @@ LOG_CHANNEL(cfg_log, "CFG"); // Helper methods to interact with YAML and the config settings. namespace cfg_adapter { - static cfg::_base& get_cfg(cfg::_base& root, const std::string& name) + static cfg::_base& get_cfg(const cfg::_base& root, const std::string& name) { if (root.get_type() == cfg::type::node) { - for (const auto& node : static_cast(root).get_nodes()) + for (const auto& node : static_cast(root).get_nodes()) { if (node->get_name() == name) { diff --git a/rpcs3/rpcs3qt/render_creator.cpp b/rpcs3/rpcs3qt/render_creator.cpp index ef425366b3..57cd71ecbf 100644 --- a/rpcs3/rpcs3qt/render_creator.cpp +++ b/rpcs3/rpcs3qt/render_creator.cpp @@ -41,7 +41,7 @@ render_creator::render_creator(QObject *parent) : QObject(parent) if (device_enum_context.create("RPCS3", true)) { device_enum_context.bind(); - std::vector& gpus = device_enum_context.enumerate_devices(); + const std::vector& gpus = device_enum_context.enumerate_devices(); lock.lock(); diff --git a/rpcs3/util/fixed_typemap.hpp b/rpcs3/util/fixed_typemap.hpp index 65d161c333..bcb5f36baa 100644 --- a/rpcs3/util/fixed_typemap.hpp +++ b/rpcs3/util/fixed_typemap.hpp @@ -272,7 +272,7 @@ namespace stx order[pos++] = {type.init_pos(), std::addressof(type)}; } - std::stable_sort(order.get(), order.get() + type_count, [](auto& a, auto& b) + std::stable_sort(order.get(), order.get() + type_count, [](const auto& a, const auto& b) { if (a.second->is_trivial_and_nonsavable && !b.second->is_trivial_and_nonsavable) { From df2f68da44a8301384b248abca8d4fe9100c5d50 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:39:25 +0100 Subject: [PATCH 028/529] static analysis: more const ref --- rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp | 2 +- rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp | 2 +- rpcs3/Emu/Io/Dimensions.cpp | 2 +- rpcs3/Emu/Io/Dimensions.h | 2 +- rpcs3/Emu/Io/PadHandler.h | 2 +- rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp | 2 +- rpcs3/Emu/RSX/color_utils.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp b/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp index 877628d5d0..c669d0e87f 100644 --- a/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp +++ b/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp @@ -104,7 +104,7 @@ std::vector cubeb_enumerator::get_output_ cubeb_dev_enum.error("cubeb_device_collection_destroy() failed: %i", err); } - std::sort(device_list.begin(), device_list.end(), [](audio_device_enumerator::audio_device a, audio_device_enumerator::audio_device b) + std::sort(device_list.begin(), device_list.end(), [](const audio_device_enumerator::audio_device& a, const audio_device_enumerator::audio_device& b) { return a.name < b.name; }); diff --git a/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp b/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp index 0655f29dca..e170addb0e 100644 --- a/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp +++ b/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp @@ -144,7 +144,7 @@ std::vector xaudio2_enumerator::get_outpu device_list.emplace_back(dev); } - std::sort(device_list.begin(), device_list.end(), [](audio_device_enumerator::audio_device a, audio_device_enumerator::audio_device b) + std::sort(device_list.begin(), device_list.end(), [](const audio_device_enumerator::audio_device& a, const audio_device_enumerator::audio_device& b) { return a.name < b.name; }); diff --git a/rpcs3/Emu/Io/Dimensions.cpp b/rpcs3/Emu/Io/Dimensions.cpp index a8ef6bc447..158f310bdb 100644 --- a/rpcs3/Emu/Io/Dimensions.cpp +++ b/rpcs3/Emu/Io/Dimensions.cpp @@ -217,7 +217,7 @@ u32 dimensions_toypad::scramble(const std::array& uid, u8 count) return read_from_ptr>(dimensions_randomize(to_scramble, count).data()); } -std::array dimensions_toypad::dimensions_randomize(const std::vector key, u8 count) +std::array dimensions_toypad::dimensions_randomize(const std::vector& key, u8 count) { u32 scrambled = 0; for (u8 i = 0; i < count; i++) diff --git a/rpcs3/Emu/Io/Dimensions.h b/rpcs3/Emu/Io/Dimensions.h index 9cf1bd7395..e4886c11f1 100644 --- a/rpcs3/Emu/Io/Dimensions.h +++ b/rpcs3/Emu/Io/Dimensions.h @@ -49,7 +49,7 @@ private: static std::array generate_figure_key(const std::array& buf); static u32 scramble(const std::array& uid, u8 count); static std::array pwd_generate(const std::array& uid); - static std::array dimensions_randomize(const std::vector key, u8 count); + static std::array dimensions_randomize(const std::vector& key, u8 count); static u32 get_figure_id(const std::array& buf); u32 get_next(); dimensions_figure& get_figure_by_index(u8 index); diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h index 792515c5d8..19178f7682 100644 --- a/rpcs3/Emu/Io/PadHandler.h +++ b/rpcs3/Emu/Io/PadHandler.h @@ -307,7 +307,7 @@ public: }; std::vector& bindings() { return m_bindings; } - std::string name_string() const { return m_name_string; } + const std::string& name_string() const { return m_name_string; } usz max_devices() const { return m_max_devices; } bool has_config() const { return b_has_config; } bool has_rumble() const { return b_has_rumble; } diff --git a/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp b/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp index ecafa1d827..03ce077bcc 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp @@ -75,7 +75,7 @@ namespace vk return attachments.back()->image()->format(); } - bool matches(std::vector fbo_images, u32 width, u32 height) + bool matches(const std::vector& fbo_images, u32 width, u32 height) { if (m_width != width || m_height != height) return false; diff --git a/rpcs3/Emu/RSX/color_utils.h b/rpcs3/Emu/RSX/color_utils.h index 7d315c66ad..55e9e483fd 100644 --- a/rpcs3/Emu/RSX/color_utils.h +++ b/rpcs3/Emu/RSX/color_utils.h @@ -204,7 +204,7 @@ namespace rsx return result; } - static inline u32 encode_color_to_storage_key(color4f color) + static inline u32 encode_color_to_storage_key(const color4f& color) { const u32 r = static_cast(color.r * 255); const u32 g = static_cast(color.g * 255); From 815a4e7dc1b4afbd09acfd2c439e74d02ef228bc Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:41:34 +0100 Subject: [PATCH 029/529] static analysis: less references --- rpcs3/Emu/RSX/Program/ProgramStateCache.h | 4 ++-- rpcs3/Emu/RSX/color_utils.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/Emu/RSX/Program/ProgramStateCache.h index 6c8ff3f1c3..17857b80ad 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.h @@ -256,13 +256,13 @@ public: program_buffer_patch_entry() = default; - program_buffer_patch_entry(f32& key, f32& value) + program_buffer_patch_entry(f32 key, f32 value) { fp_key = key; fp_value = value; } - program_buffer_patch_entry(u32& key, u32& value) + program_buffer_patch_entry(u32 key, u32 value) { hex_key = key; hex_value = value; diff --git a/rpcs3/Emu/RSX/color_utils.h b/rpcs3/Emu/RSX/color_utils.h index 55e9e483fd..fd3156bd3e 100644 --- a/rpcs3/Emu/RSX/color_utils.h +++ b/rpcs3/Emu/RSX/color_utils.h @@ -110,14 +110,14 @@ namespace rsx return result; } - static inline void get_g8b8_r8g8_colormask(bool& red, bool&/*green*/, bool& blue, bool& alpha) + static inline void get_g8b8_r8g8_colormask(bool& red, bool/*green*/, bool& blue, bool& alpha) { red = blue; blue = false; alpha = false; } - static inline void get_g8b8_clear_color(u8& red, u8& /*green*/, u8& blue, u8& /*alpha*/) + static inline void get_g8b8_clear_color(u8& red, u8 /*green*/, u8 blue, u8 /*alpha*/) { red = blue; } @@ -132,12 +132,12 @@ namespace rsx return result; } - static inline void get_abgr8_colormask(bool& red, bool& /*green*/, bool& blue, bool& /*alpha*/) + static inline void get_abgr8_colormask(bool& red, bool /*green*/, bool& blue, bool /*alpha*/) { std::swap(red, blue); } - static inline void get_abgr8_clear_color(u8& red, u8& /*green*/, u8& blue, u8& /*alpha*/) + static inline void get_abgr8_clear_color(u8& red, u8 /*green*/, u8& blue, u8 /*alpha*/) { std::swap(red, blue); } @@ -151,7 +151,7 @@ namespace rsx return static_cast((value * 255) / base); } - static inline void get_rgb565_clear_color(u8& red, u8& green, u8& blue, u8& /*alpha*/) + static inline void get_rgb565_clear_color(u8& red, u8& green, u8& blue, u8 /*alpha*/) { // RSX clear color is just a memcpy, so in this case the input is ARGB8 so only BG have the 16-bit input const u16 raw_value = static_cast(green) << 8 | blue; @@ -189,7 +189,7 @@ namespace rsx alpha = false; } - static inline void get_b8_clear_color(u8& red, u8& /*green*/, u8& blue, u8& /*alpha*/) + static inline void get_b8_clear_color(u8& red, u8 /*green*/, u8& blue, u8 /*alpha*/) { std::swap(red, blue); } From e8463403f57172d1b45beacb4ef036a56c755ace Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:42:10 +0100 Subject: [PATCH 030/529] static analysis: uninitialized variables --- rpcs3/Emu/Io/Infinity.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/Io/Infinity.h b/rpcs3/Emu/Io/Infinity.h index 2709a0c266..2bfcff245f 100644 --- a/rpcs3/Emu/Io/Infinity.h +++ b/rpcs3/Emu/Io/Infinity.h @@ -43,10 +43,10 @@ private: infinity_figure& get_figure_by_order(u8 order_added); u8 derive_figure_position(u8 position); - u32 random_a; - u32 random_b; - u32 random_c; - u32 random_d; + u32 random_a = 0; + u32 random_b = 0; + u32 random_c = 0; + u32 random_d = 0; u8 m_figure_order = 0; std::queue> m_figure_added_removed_responses; From 6abb863a54525b16508e529603447b00dcf2ee0d Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:43:44 +0100 Subject: [PATCH 031/529] static analysis: std::move --- Utilities/Config.h | 2 +- rpcs3/Emu/RSX/GSFrameBase.h | 2 +- rpcs3/Input/ps_move_config.h | 2 +- rpcs3/rpcs3qt/gs_frame.cpp | 2 +- rpcs3/rpcs3qt/gs_frame.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Utilities/Config.h b/Utilities/Config.h index f303fe54b7..24f910e555 100644 --- a/Utilities/Config.h +++ b/Utilities/Config.h @@ -543,7 +543,7 @@ namespace cfg std::string def; string(node* owner, std::string name, std::string def = {}, bool dynamic = false) - : _base(type::string, owner, name, dynamic) + : _base(type::string, owner, std::move(name), dynamic) , m_value(def) , def(std::move(def)) { diff --git a/rpcs3/Emu/RSX/GSFrameBase.h b/rpcs3/Emu/RSX/GSFrameBase.h index 1f426f9ef1..ef17378dd3 100644 --- a/rpcs3/Emu/RSX/GSFrameBase.h +++ b/rpcs3/Emu/RSX/GSFrameBase.h @@ -32,5 +32,5 @@ public: virtual bool can_consume_frame() const = 0; virtual void present_frame(std::vector& data, u32 pitch, u32 width, u32 height, bool is_bgra) const = 0; - virtual void take_screenshot(const std::vector sshot_data, u32 sshot_width, u32 sshot_height, bool is_bgra) = 0; + virtual void take_screenshot(std::vector&& sshot_data, u32 sshot_width, u32 sshot_height, bool is_bgra) = 0; }; diff --git a/rpcs3/Input/ps_move_config.h b/rpcs3/Input/ps_move_config.h index 0e12889956..3fbae71dab 100644 --- a/rpcs3/Input/ps_move_config.h +++ b/rpcs3/Input/ps_move_config.h @@ -7,7 +7,7 @@ struct cfg_ps_move final : cfg::node { cfg_ps_move() : cfg::node() {} - cfg_ps_move(cfg::node* owner, std::string name) : cfg::node(owner, name) {} + cfg_ps_move(cfg::node* owner, std::string name) : cfg::node(owner, std::move(name)) {} cfg::uint<0, 255> r{ this, "Color R", 0, true }; cfg::uint<0, 255> g{ this, "Color G", 0, true }; diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index b8371a19e4..7b5481d2d4 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -793,7 +793,7 @@ void gs_frame::present_frame(std::vector& data, u32 pitch, u32 width, u32 he video_provider.present_frame(data, pitch, width, height, is_bgra); } -void gs_frame::take_screenshot(std::vector data, u32 sshot_width, u32 sshot_height, bool is_bgra) +void gs_frame::take_screenshot(std::vector&& data, u32 sshot_width, u32 sshot_height, bool is_bgra) { std::thread( [sshot_width, sshot_height, is_bgra](std::vector sshot_data) diff --git a/rpcs3/rpcs3qt/gs_frame.h b/rpcs3/rpcs3qt/gs_frame.h index 8d6316bd88..38bbaa0a3e 100644 --- a/rpcs3/rpcs3qt/gs_frame.h +++ b/rpcs3/rpcs3qt/gs_frame.h @@ -79,7 +79,7 @@ public: bool can_consume_frame() const override; void present_frame(std::vector& data, u32 pitch, u32 width, u32 height, bool is_bgra) const override; - void take_screenshot(std::vector data, u32 sshot_width, u32 sshot_height, bool is_bgra) override; + void take_screenshot(std::vector&& data, u32 sshot_width, u32 sshot_height, bool is_bgra) override; protected: video_renderer m_renderer; From 7a6a96254c7435abc57d7e5f2b1df162db9c23c4 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:44:17 +0100 Subject: [PATCH 032/529] static analysis: remove unused overrides --- rpcs3/Emu/Io/Null/NullPadHandler.h | 5 ----- rpcs3/Emu/RSX/Overlays/overlays.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/rpcs3/Emu/Io/Null/NullPadHandler.h b/rpcs3/Emu/Io/Null/NullPadHandler.h index 57e9767ccd..afb59ea704 100644 --- a/rpcs3/Emu/Io/Null/NullPadHandler.h +++ b/rpcs3/Emu/Io/Null/NullPadHandler.h @@ -10,11 +10,6 @@ public: b_has_pressure_intensity_button = false; } - bool Init() override - { - return true; - } - void init_config(cfg_pad* cfg) override { if (!cfg) return; diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h index 254a47cb7b..9bcef52482 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.h +++ b/rpcs3/Emu/RSX/Overlays/overlays.h @@ -121,8 +121,6 @@ namespace rsx bool is_detached() const { return m_input_thread_detached; } void detach_input() { m_input_thread_detached.store(true); } - void update(u64 /*timestamp_us*/) override {} - compiled_resource get_compiled() override = 0; virtual void on_button_pressed(pad_button /*button_press*/, bool /*is_auto_repeat*/) {} From 4f52c6756608a7d7ee6f43498c24aa7f5c74466d Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:44:39 +0100 Subject: [PATCH 033/529] static analysis: suspicious code --- rpcs3/Input/mm_joystick_handler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp index 112620bf37..7c483732fc 100644 --- a/rpcs3/Input/mm_joystick_handler.cpp +++ b/rpcs3/Input/mm_joystick_handler.cpp @@ -77,7 +77,7 @@ bool mm_joystick_handler::Init() m_devices.clear(); m_max_devices = joyGetNumDevs(); - if (m_max_devices <= 0) + if (!m_max_devices) { input_log.error("mmjoy: Driver doesn't support Joysticks"); return false; @@ -408,7 +408,7 @@ std::unordered_map mm_joystick_handler::GetButtonValues(const JOYINFOE if (entry.first == NO_BUTTON) continue; - button_values.emplace(entry.first, js_info.dwButtons & entry.first ? 255 : 0); + button_values.emplace(entry.first, (js_info.dwButtons & entry.first) ? 255 : 0); } if (js_caps.wCaps & JOYCAPS_HASPOV) From a49c4c7682756d606acd63ad2b4a53e21ad36eb1 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:44:58 +0100 Subject: [PATCH 034/529] static analysis: duplicate assignment --- rpcs3/Emu/RSX/rsx_utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/Emu/RSX/rsx_utils.h index 46ff619577..37874933f4 100644 --- a/rpcs3/Emu/RSX/rsx_utils.h +++ b/rpcs3/Emu/RSX/rsx_utils.h @@ -500,10 +500,10 @@ namespace rsx { if (clip_x >= parent_width) { - if (clip_width < parent_width) - width = clip_width; - else + if (clip_width >= parent_width) width = parent_width; + //else + // width = clip_width; // Already initialized with clip_width x = static_cast(0); } @@ -520,10 +520,10 @@ namespace rsx { if (clip_y >= parent_height) { - if (clip_height < parent_height) - height = clip_height; - else + if (clip_height >= parent_height) height = parent_height; + //else + // height = clip_height; // Already initialized with clip_height y = static_cast(0); } From ca3d02fc6188ce870f7f0f6680aa26ee960bd534 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:45:22 +0100 Subject: [PATCH 035/529] static analysis: ensure is always false --- rpcs3/Emu/RSX/Common/simple_array.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/simple_array.hpp b/rpcs3/Emu/RSX/Common/simple_array.hpp index 8ae4179a0c..0fec530852 100644 --- a/rpcs3/Emu/RSX/Common/simple_array.hpp +++ b/rpcs3/Emu/RSX/Common/simple_array.hpp @@ -246,7 +246,7 @@ namespace rsx return pos; } - ensure(_loc < _size); + AUDIT(_loc < _size); const auto remaining = (_size - _loc); memmove(pos + 1, pos, remaining * sizeof(Ty)); @@ -274,7 +274,7 @@ namespace rsx return pos; } - ensure(_loc < _size); + AUDIT(_loc < _size); const u32 remaining = (_size - _loc); memmove(pos + 1, pos, remaining * sizeof(Ty)); From ba12de867ecdefcc208a501748bf870fee5c7dff Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 4 Mar 2025 19:45:46 +0100 Subject: [PATCH 036/529] static analysis: fix memory leak in decompress --- rpcs3/Crypto/lz.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/rpcs3/Crypto/lz.cpp b/rpcs3/Crypto/lz.cpp index 30e201c5f5..f8a5aa0101 100644 --- a/rpcs3/Crypto/lz.cpp +++ b/rpcs3/Crypto/lz.cpp @@ -3,6 +3,7 @@ // http://www.gnu.org/licenses/gpl-2.0.txt #include +#include #include "lz.h" void decode_range(unsigned int *range, unsigned int *code, unsigned char **src) @@ -123,19 +124,17 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size) { int result; - unsigned char *tmp = new unsigned char[0xCC8]; - int offset = 0; int bit_flag = 0; int data_length = 0; int data_offset = 0; unsigned char *tmp_sect1, *tmp_sect2, *tmp_sect3; - unsigned char *buf_start, *buf_end; + const unsigned char *buf_start, *buf_end; unsigned char prev = 0; unsigned char *start = out; - unsigned char *end = (out + size); + const unsigned char *end = (out + size); unsigned char head = in[0]; unsigned int range = 0xFFFFFFFF; @@ -154,6 +153,8 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size) else { // Set up a temporary buffer (sliding window). + std::vector tmp_vec(0xCC8); + unsigned char* tmp = tmp_vec.data(); memset(tmp, 0x80, 0xCA8); while (true) { @@ -254,14 +255,12 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size) // Underflow. if (buf_start < out) { - delete[] tmp; return -1; } // Overflow. if (buf_end > end) { - delete[] tmp; return -1; } @@ -279,6 +278,5 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size) } result = static_cast(start - out); } - delete[] tmp; return result; } From 59280a133cbd510be7efada1ae92cd51098a101f Mon Sep 17 00:00:00 2001 From: kd-11 Date: Wed, 5 Mar 2025 13:51:45 +0300 Subject: [PATCH 037/529] vk: Do not force strict query scopes by default --- rpcs3/Emu/RSX/VK/VKHelpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp index ffd020979c..f59878ec18 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp +++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp @@ -29,7 +29,7 @@ namespace vk bool g_drv_sanitize_fp_values = false; bool g_drv_disable_fence_reset = false; bool g_drv_emulate_cond_render = false; - bool g_drv_strict_query_scopes = true; + bool g_drv_strict_query_scopes = false; bool g_drv_force_reuse_query_pools = false; u64 g_num_processed_frames = 0; From 583ec5d819c4a28d22e1819252d8d8d3d0c02db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3oPaulo?= <53271430+Joaozin-tech@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:00:07 -0300 Subject: [PATCH 038/529] Update FW 4.92 Latest Version (#16811) Update FW 4.92 Latest Version Updates the latest FW version according to: https://www.playstation.com/en-us/support/hardware/ps3/system-software/ List of changes: This system software update improves system performance. --- rpcs3/rpcs3qt/main_window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 71adff9dbe..9c5562d6a0 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -1586,7 +1586,7 @@ void main_window::HandlePupInstallation(const QString& file_path, const QString& return; } - static constexpr std::string_view cur_version = "4.91"; + static constexpr std::string_view cur_version = "4.92"; std::string version_string; From 8ed20890709ac160e5c4549196d8c101120529c4 Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Thu, 6 Mar 2025 18:03:32 +0200 Subject: [PATCH 039/529] RSX: Fix UB in FIFO_control::get_current_arg_ptr() --- rpcs3/Emu/RSX/RSXFIFO.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/Emu/RSX/RSXFIFO.cpp index 3f6889bdaa..f9a63efa6c 100644 --- a/rpcs3/Emu/RSX/RSXFIFO.cpp +++ b/rpcs3/Emu/RSX/RSXFIFO.cpp @@ -233,7 +233,11 @@ namespace rsx else { // Return a raw pointer with no limited access - return {static_cast(vm::base(m_iotable->get_addr(m_internal_get))), 0x10000}; + constexpr u32 _1m = 0x100000; + const u32 base = m_iotable->get_addr(m_internal_get); + const u32 base_1m = m_iotable->get_addr(m_internal_get + _1m); + + return {static_cast(vm::base(base)), (base_1m - _1m == base ? _1m : (_1m - (m_internal_get % _1m))) / 4 }; } } From bfb9dfea7e9b553199b26d68d1d718d0592af9bc Mon Sep 17 00:00:00 2001 From: Whatcookie Date: Fri, 7 Mar 2025 02:54:12 -0500 Subject: [PATCH 040/529] RSX: ProgramStateCache loops optimizations --- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 104 ++++++++++---------- 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index f38e750609..3ce6dbca41 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -76,13 +76,13 @@ AVX512_ICL_FUNC usz get_vertex_program_ucode_hash_512(const RSXVertexProgram &pr __m512i rotMask0 = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0); __m512i rotMask1 = _mm512_set_epi64(15, 14, 13, 12, 11, 10, 9, 8); - __m512i rotMaskAdd = _mm512_set_epi64(16, 16, 16, 16, 16, 16, 16, 16); + const __m512i rotMaskAdd = _mm512_set_epi64(16, 16, 16, 16, 16, 16, 16, 16); u32 instIndex = 0; // If there is remainder, add an extra (masked) iteration - u32 extraIteration = (program.data.size() % 32 != 0) ? 1 : 0; - u32 length = (program.data.size() / 32) + extraIteration; + const u32 extraIteration = (program.data.size() % 32 != 0) ? 1 : 0; + const u32 length = static_cast(program.data.size() / 32) + extraIteration; // The instruction mask will prevent us from reading out of bounds, we do not need a seperate masked loop // for the remainder, or a scalar loop. @@ -125,9 +125,9 @@ usz vertex_program_utils::get_vertex_program_ucode_hash(const RSXVertexProgram & if (program.instruction_mask[instIndex]) { const auto inst = v128::loadu(instbuffer, instIndex); - usz tmp0 = std::rotr(inst._u64[0], instIndex * 2); + const usz tmp0 = std::rotr(inst._u64[0], instIndex * 2); acc0 += tmp0; - usz tmp1 = std::rotr(inst._u64[1], (instIndex * 2) + 1); + const usz tmp1 = std::rotr(inst._u64[1], (instIndex * 2) + 1); acc1 += tmp1; } @@ -147,10 +147,10 @@ vertex_program_utils::vertex_program_metadata vertex_program_utils::analyse_vert bool has_branch_instruction = false; std::stack call_stack; - D3 d3; - D2 d2; - D1 d1; - D0 d0; + D3 d3{}; + D2 d2{}; + D1 d1{}; + D0 d0{}; std::function walk_function = [&](u32 start, bool fast_exit) { @@ -491,8 +491,8 @@ AVX512_ICL_FUNC bool vertex_program_compare_512(const RSXVertexProgram &binary1, const __m512i* instBuffer2 = reinterpret_cast(binary2.data.data()); // If there is remainder, add an extra (masked) iteration - u32 extraIteration = (binary1.data.size() % 32 != 0) ? 1 : 0; - u32 length = (binary1.data.size() / 32) + extraIteration; + const u32 extraIteration = (binary1.data.size() % 32 != 0) ? 1 : 0; + const u32 length = static_cast(binary1.data.size() / 32) + extraIteration; u32 instIndex = 0; @@ -584,7 +584,7 @@ usz fragment_program_utils::get_fragment_program_ucode_size(const void* ptr) while (true) { const v128 inst = v128::loadu(instBuffer, instIndex); - bool end = (inst._u32[0] >> 8) & 0x1; + const bool end = (inst._u32[0] >> 8) & 0x1; if (is_any_src_constant(inst)) { @@ -606,6 +606,30 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys const auto instBuffer = ptr; s32 index = 0; + // Find the start of the program + while (true) + { + const auto inst = v128::loadu(instBuffer, index); + + const u32 opcode = (inst._u32[0] >> 16) & 0x3F; + if (opcode) + { + // We found the start of the program, don't advance the index + result.program_start_offset = index * 16; + break; + } + + if ((inst._u32[0] >> 8) & 0x1) + { + result.program_start_offset = index * 16; + result.program_ucode_length = 16; + result.is_nop_shader = true; + return result; + } + + index++; + } + while (true) { const auto inst = v128::loadu(instBuffer, index); @@ -622,11 +646,6 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys const u32 opcode = (inst._u32[0] >> 16) & 0x3F; if (opcode) { - if (result.program_start_offset == umax) - { - result.program_start_offset = index * 16; - } - switch (opcode) { case RSX_FP_OPCODE_TEX: @@ -660,35 +679,23 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys } } - if (is_any_src_constant(inst)) + if (is_any_src_constant(inst)) { //Instruction references constant, skip one slot occupied by data index++; - result.program_ucode_length += 16; result.program_constants_buffer_length += 16; } } - if (result.program_start_offset != umax) - { - result.program_ucode_length += 16; - } + index++; if ((inst._u32[0] >> 8) & 0x1) { - if (result.program_start_offset == umax) - { - result.program_start_offset = index * 16; - result.program_ucode_length = 16; - result.is_nop_shader = true; - } - break; } - - index++; } + result.program_ucode_length = (index - (result.program_start_offset / 16)) * 16; return result; } @@ -696,26 +703,21 @@ usz fragment_program_utils::get_fragment_program_ucode_hash(const RSXFragmentPro { // Checksum as hash with rotated data const void* instbuffer = program.get_data(); - u32 instIndex = 0; usz acc0 = 0; usz acc1 = 0; - while (true) + for (usz instIndex = 0; instIndex < (program.ucode_length / 16); instIndex++) { const auto inst = v128::loadu(instbuffer, instIndex); - usz tmp0 = std::rotr(inst._u64[0], instIndex * 2); + const usz tmp0 = std::rotr(inst._u64[0], instIndex * 2); acc0 += tmp0; - usz tmp1 = std::rotr(inst._u64[1], (instIndex * 2) + 1); + const usz tmp1 = std::rotr(inst._u64[1], (instIndex * 2) + 1); acc1 += tmp1; - instIndex++; // Skip constants if (fragment_program_utils::is_any_src_constant(inst)) instIndex++; - bool end = (inst._u32[0] >> 8) & 0x1; - if (end) - return acc0 + acc1; } - return 0; + return acc0 + acc1; } usz fragment_program_storage_hash::operator()(const RSXFragmentProgram& program) const @@ -750,8 +752,7 @@ bool fragment_program_compare::operator()(const RSXFragmentProgram& binary1, con const void* instBuffer1 = binary1.get_data(); const void* instBuffer2 = binary2.get_data(); - usz instIndex = 0; - while (true) + for (usz instIndex = 0; instIndex < (binary1.ucode_length / 16); instIndex++) { const auto inst1 = v128::loadu(instBuffer1, instIndex); const auto inst2 = v128::loadu(instBuffer2, instIndex); @@ -761,17 +762,12 @@ bool fragment_program_compare::operator()(const RSXFragmentProgram& binary1, con return false; } - instIndex++; // Skip constants if (fragment_program_utils::is_any_src_constant(inst1)) instIndex++; - - const bool end = ((inst1._u32[0] >> 8) & 0x1); - if (end) - { - return true; - } } + + return true; } namespace rsx @@ -782,9 +778,9 @@ namespace rsx f32* dst = buffer.data(); for (usz offset_in_fragment_program : offsets_cache) { - char* data = static_cast(rsx_prog.get_data()) + offset_in_fragment_program; + const char* data = static_cast(rsx_prog.get_data()) + offset_in_fragment_program; - const __m128i vector = _mm_loadu_si128(reinterpret_cast<__m128i*>(data)); + const __m128i vector = _mm_loadu_si128(reinterpret_cast(data)); const __m128i shuffled_vector = _mm_or_si128(_mm_slli_epi16(vector, 8), _mm_srli_epi16(vector, 8)); if (sanitize) @@ -810,11 +806,11 @@ namespace rsx for (usz offset_in_fragment_program : offsets_cache) { - char* data = static_cast(rsx_prog.get_data()) + offset_in_fragment_program; + const char* data = static_cast(rsx_prog.get_data()) + offset_in_fragment_program; for (u32 i = 0; i < 4; i++) { - const u32 value = reinterpret_cast(data)[i]; + const u32 value = reinterpret_cast(data)[i]; const u32 shuffled = ((value >> 8) & 0xff00ff) | ((value << 8) & 0xff00ff00); if (sanitize && (shuffled & 0x7fffffff) >= 0x7f800000) From e4b9a21acc833ad72728aedf520b5723058228ac Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Sat, 8 Mar 2025 10:19:35 +0200 Subject: [PATCH 041/529] SPU Analyzer: Fix for value propagation --- rpcs3/Emu/Cell/SPUCommonRecompiler.cpp | 105 ++++++++++++------------- rpcs3/Emu/Cell/SPULLVMRecompiler.cpp | 2 +- 2 files changed, 53 insertions(+), 54 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp index b466267a14..dedc31599e 100644 --- a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp @@ -2915,7 +2915,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s // Result bounds u32 lsa = entry_point; - u32 limit = 0x40000; + u32 limit = SPU_LS_SIZE; if (g_cfg.core.spu_block_size == spu_block_size_type::giga) { @@ -3132,13 +3132,13 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s break; } - if (target >= lsa && target < 0x40000) + if (target >= lsa && target < SPU_LS_SIZE) { // Possible jump table entry (absolute) jt_abs.push_back(target); } - if (target + start >= lsa && target + start < 0x40000) + if (target + start >= lsa && target + start < SPU_LS_SIZE) { // Possible jump table entry (relative) jt_rel.push_back(target + start); @@ -3607,7 +3607,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s } } - while (lsa > 0 || limit < 0x40000) + while (lsa > 0 || limit < SPU_LS_SIZE) { const u32 initial_size = ::size32(result.data); @@ -4001,7 +4001,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s bool need_repeat = false; u32 start = 0; - u32 limit = 0x40000; + u32 limit = SPU_LS_SIZE; // Walk block list in ascending order for (auto& block : m_bbs) @@ -4012,7 +4012,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s { const auto upper = m_funcs.upper_bound(addr); start = addr; - limit = upper == m_funcs.end() ? 0x40000 : upper->first; + limit = upper == m_funcs.end() ? SPU_LS_SIZE : upper->first; } // Find targets that exceed [start; limit) range and make new functions from them @@ -4082,7 +4082,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s { const u32 _old = ::at32(m_bbs, pred).chunk; - if (_old < 0x40000 && _old != _new) + if (_old < SPU_LS_SIZE && _old != _new) { // If block has multiple 'entry' points, it becomes an entry point itself new_entries.push_back(addr); @@ -4107,7 +4107,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s const u32 value = m_entry_info[target / 4] ? target : block.chunk; - if (u32& tval = tb.chunk; tval < 0x40000) + if (u32& tval = tb.chunk; tval < SPU_LS_SIZE) { // TODO: fix condition if (tval != value && !m_entry_info[target / 4]) @@ -4139,7 +4139,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s for (auto& bb : m_bbs) { // Reset chunk info - bb.second.chunk = 0x40000; + bb.second.chunk = SPU_LS_SIZE; } } @@ -4201,7 +4201,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s for (u32 i = 0; i < s_reg_max; i++) { if (block.reg_origin[i] == 0x80000000) - block.reg_origin[i] = 0x40000; + block.reg_origin[i] = SPU_LS_SIZE; } } @@ -4210,7 +4210,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s for (u32 i = 0; i < s_reg_max; i++) { if (block.reg_origin_abs[i] == 0x80000000) - block.reg_origin_abs[i] = 0x40000; + block.reg_origin_abs[i] = SPU_LS_SIZE; else if (block.reg_origin_abs[i] + 1 == 0) block.reg_origin_abs[i] = -2; } @@ -4235,14 +4235,16 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s if (tb.reg_origin[i] == 0x80000000) { + must_repeat |= !tb.targets.empty() && tb.reg_origin[i] != expected; + tb.reg_origin[i] = expected; } else if (tb.reg_origin[i] != expected) { - // Set -1 if multiple origins merged (requires PHI node) - tb.reg_origin[i] = -1; + must_repeat |= !tb.targets.empty() && tb.reg_origin[i] != umax; - must_repeat |= !tb.targets.empty(); + // Set umax if multiple origins merged (requires PHI node) + tb.reg_origin[i] = umax; } } @@ -4256,9 +4258,9 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s } else if (tb.reg_origin_abs[i] != expected) { - if (tb.reg_origin_abs[i] == 0x40000 || expected + 2 == 0 || expected == 0x40000) + if (tb.reg_origin_abs[i] == SPU_LS_SIZE || expected + 2 == 0 || expected == SPU_LS_SIZE) { - // Set -2: sticky value indicating possible external reg origin (0x40000) + // Set -2: sticky value indicating possible external reg origin (SPU_LS_SIZE) tb.reg_origin_abs[i] = -2; must_repeat |= !tb.targets.empty(); @@ -4288,9 +4290,9 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s // Reset values for the next attempt (keep negative values) for (u32 i = 0; i < s_reg_max; i++) { - if (block.reg_origin[i] <= 0x40000) + if (block.reg_origin[i] <= SPU_LS_SIZE) block.reg_origin[i] = 0x80000000; - if (block.reg_origin_abs[i] <= 0x40000) + if (block.reg_origin_abs[i] <= SPU_LS_SIZE) block.reg_origin_abs[i] = 0x80000000; } } @@ -4323,21 +4325,21 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s bb.reg_val32[i] = src.reg_val32[i]; } - if (!bb.reg_save_dom[i] && bb.reg_use[i] && (orig == 0x40000 || orig + 2 == 0)) + if (!bb.reg_save_dom[i] && bb.reg_use[i] && (orig == SPU_LS_SIZE || orig + 2 == 0)) { // Destroy offset if external reg value is used func.reg_save_off[i] = -1; } } - if (u32 orig = bb.reg_origin_abs[s_reg_sp]; orig < 0x40000) + if (u32 orig = bb.reg_origin_abs[s_reg_sp]; orig < SPU_LS_SIZE) { auto& prologue = ::at32(m_bbs, orig); // Copy stack offset (from the assumed prologue) bb.stack_sub = prologue.stack_sub; } - else if (orig > 0x40000) + else if (orig > SPU_LS_SIZE) { // Unpredictable stack bb.stack_sub = 0x80000000; @@ -4510,7 +4512,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s } // Check for funny values. - if (bb.stack_sub >= 0x40000 || bb.stack_sub % 16) + if (bb.stack_sub >= SPU_LS_SIZE || bb.stack_sub % 16) { bb.stack_sub = 0x80000000; } @@ -4659,7 +4661,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s if (is_ok && bb.terminator == term_type::ret) { // Check $LR (alternative return registers are currently not supported) - if (u32 lr_orig = bb.reg_mod[s_reg_lr] ? addr : bb.reg_origin_abs[s_reg_lr]; lr_orig < 0x40000) + if (u32 lr_orig = bb.reg_mod[s_reg_lr] ? addr : bb.reg_origin_abs[s_reg_lr]; lr_orig < SPU_LS_SIZE) { auto& src = ::at32(m_bbs, lr_orig); @@ -4674,7 +4676,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s is_ok = false; } } - else if (lr_orig > 0x40000) + else if (lr_orig > SPU_LS_SIZE) { spu_log.todo("Function 0x%05x: [0x%05x] $LR unpredictable (src=0x%x)", f.first, addr, lr_orig); is_ok = false; @@ -4683,7 +4685,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s // Check $80..$127 (should be restored or unmodified) for (u32 i = s_reg_80; is_ok && i <= s_reg_127; i++) { - if (u32 orig = bb.reg_mod[i] ? addr : bb.reg_origin_abs[i]; orig < 0x40000) + if (u32 orig = bb.reg_mod[i] ? addr : bb.reg_origin_abs[i]; orig < SPU_LS_SIZE) { auto& src = ::at32(m_bbs, orig); @@ -4693,7 +4695,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s is_ok = false; } } - else if (orig > 0x40000) + else if (orig > SPU_LS_SIZE) { spu_log.todo("Function 0x%05x: [0x%05x] $%u unpredictable (src=0x%x)", f.first, addr, i, orig); is_ok = false; @@ -5229,7 +5231,7 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s auto& block = infos[bpc]; - if (pos == entry_point || (g_cfg.core.spu_block_size != spu_block_size_type::safe && (m_ret_info[bpc / 4] || m_entry_info[bpc / 4]))) + if (bpc == entry_point || (g_cfg.core.spu_block_size != spu_block_size_type::safe && (m_ret_info[bpc / 4] || m_entry_info[bpc / 4]))) { // Do not allow value passthrough for (reg_state_t& f : block->start_reg_state) @@ -7269,6 +7271,24 @@ void spu_recompiler_base::dump(const spu_program& result, std::string& out) for (auto& bb : m_bbs) { + if (m_block_info[bb.first / 4]) + { + fmt::append(out, "A: [0x%05x] %s\n", bb.first, m_entry_info[bb.first / 4] ? (m_ret_info[bb.first / 4] ? "Chunk" : "Entry") : "Block"); + + fmt::append(out, "\t F: 0x%05x\n", bb.second.func); + + for (u32 pred : bb.second.preds) + { + fmt::append(out, "\t <- 0x%05x\n", pred); + } + } + else + { + fmt::append(out, "A: [0x%05x] ?\n", bb.first); + } + + out += "\n"; + for (u32 pos = bb.first, end = bb.first + bb.second.size * 4; pos < end; pos += 4) { dis_asm.disasm(pos); @@ -7285,24 +7305,11 @@ void spu_recompiler_base::dump(const spu_program& result, std::string& out) if (m_block_info[bb.first / 4]) { - fmt::append(out, "A: [0x%05x] %s\n", bb.first, m_entry_info[bb.first / 4] ? (m_ret_info[bb.first / 4] ? "Chunk" : "Entry") : "Block"); - - fmt::append(out, "\tF: 0x%05x\n", bb.second.func); - - for (u32 pred : bb.second.preds) - { - fmt::append(out, "\t<- 0x%05x\n", pred); - } - for (u32 target : bb.second.targets) { fmt::append(out, "\t-> 0x%05x%s\n", target, m_bbs.count(target) ? "" : " (null)"); } } - else - { - fmt::append(out, "A: [0x%05x] ?\n", bb.first); - } out += '\n'; } @@ -8143,23 +8150,15 @@ std::array& block_reg_info::evaluate_start_state(const s } } - if (qi == 0) - { - // TODO: First block is always resolved here, but this logic can be improved to detect more cases of opportunistic resolving - is_all_resolved = true; - } - auto& res_state = is_all_resolved ? cur_node->start_reg_state : temp; - for (usz bi = 0; bi < it->state_prev.size(); bi++) + if (!is_all_resolved) { - if (it->state_prev[bi].disconnected) - { - // Loop state, even if not ignored for a million times the result would still be the same - // So ignore it - continue; - } + res_state = reg_state_t::make_unknown(it->block_pc); + } + for (usz bi = 0; is_all_resolved && bi < it->state_prev.size(); bi++) + { std::array* arg_state{}; const auto& node = ::at32(map, it->state_prev[bi].block_pc); diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp index 469d52d43c..cfa047f2ed 100644 --- a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp @@ -2054,7 +2054,7 @@ public: _phi->addIncoming(value, &m_function->getEntryBlock()); } } - else if (src < 0x40000) + else if (src < SPU_LS_SIZE) { // Passthrough register value const auto bfound = m_blocks.find(src); From e4ed5c47a378d01b4d7d55990ba55e6a58a7cd35 Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Sat, 8 Mar 2025 10:39:39 +0200 Subject: [PATCH 042/529] Fixup --- rpcs3/Emu/Cell/SPUCommonRecompiler.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp index dedc31599e..b65553976f 100644 --- a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp @@ -4235,16 +4235,14 @@ spu_program spu_recompiler_base::analyse(const be_t* ls, u32 entry_point, s if (tb.reg_origin[i] == 0x80000000) { - must_repeat |= !tb.targets.empty() && tb.reg_origin[i] != expected; - tb.reg_origin[i] = expected; } else if (tb.reg_origin[i] != expected) { - must_repeat |= !tb.targets.empty() && tb.reg_origin[i] != umax; - // Set umax if multiple origins merged (requires PHI node) tb.reg_origin[i] = umax; + + must_repeat |= !tb.targets.empty(); } } From eb43fbbb2a4b54dddf396cec857c9be31df5e9ee Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 24 Jan 2025 08:27:08 +0100 Subject: [PATCH 043/529] Update SDL to 3.2.8 --- .ci/build-mac-arm64.sh | 8 +- .ci/build-mac.sh | 4 +- .ci/deploy-mac-arm64.sh | 2 +- .ci/deploy-mac.sh | 2 +- .ci/install-freebsd.sh | 2 +- .cirrus.yml | 4 +- .github/workflows/rpcs3.yml | 6 +- 3rdparty/CMakeLists.txt | 52 +- 3rdparty/FAudio | 2 +- 3rdparty/libsdl-org/SDL | 2 +- 3rdparty/libsdl-org/SDL.vcxproj | 336 ++-- 3rdparty/libsdl-org/SDL.vcxproj.filters | 1991 ++++++++++++++++++----- BUILDING.md | 6 +- azure-pipelines.yml | 4 +- rpcs3/Emu/CMakeLists.txt | 6 +- rpcs3/Emu/Io/PadHandler.h | 3 + rpcs3/Emu/Io/pad_config_types.cpp | 2 +- rpcs3/Emu/Io/pad_config_types.h | 2 +- rpcs3/Input/dualsense_pad_handler.h | 1 - rpcs3/Input/gui_pad_thread.cpp | 4 +- rpcs3/Input/hid_pad_handler.h | 1 - rpcs3/Input/pad_thread.cpp | 4 +- rpcs3/Input/sdl_pad_handler.cpp | 392 ++--- rpcs3/Input/sdl_pad_handler.h | 56 +- rpcs3/emucore.vcxproj | 4 +- rpcs3/rpcs3.vcxproj | 22 +- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 6 +- rpcs3/rpcs3qt/settings_dialog.cpp | 2 +- 28 files changed, 2081 insertions(+), 845 deletions(-) diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index 6d5bda2257..f03ce64524 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -31,7 +31,7 @@ sudo rm -rf /usr/local/Cellar/curl /usr/local/opt/curl /usr/local/bin/brew link --overwrite python || true /usr/local/bin/brew install -f --overwrite nasm ninja p7zip ccache pipenv #create-dmg /usr/local/bin/brew link -f curl || true -/usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl2 vulkan-headers coreutils +/usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl3 vulkan-headers coreutils /usr/local/bin/brew link -f llvm@$LLVM_COMPILER_VER ffmpeg@5 || true export BREW_ARM64_PATH="/opt/homebrew1" @@ -45,7 +45,7 @@ brew_arm64_install_packages curl mv /opt/homebrew1/opt/curl/bin/curl /opt/homebrew1/opt/curl/bin/curl.bak ln -s /usr/local/opt/curl/bin/curl /opt/homebrew1/opt/curl/bin/curl -brew_arm64_install_packages 0mq aom aribb24 ca-certificates cjson dav1d ffmpeg@5 fontconfig freetype freetype2 gettext glew gmp gnutls lame libbluray libidn2 libnettle libogg libpng librist libsodium libsoxr libtasn libtasn1 libunistring libvmaf libvorbis libvpx libx11 libxau libxcb libxdmcp llvm@$LLVM_COMPILER_VER mbedtls molten-vk nettle opencore-amr openjpeg openssl opus p11-kit pkg-config pkgconfig pzstd rav1e sdl2 snappy speex srt svt-av1 theora vulkan-headers webp x264 x265 xz z3 zeromq zmq zstd +brew_arm64_install_packages 0mq aom aribb24 ca-certificates cjson dav1d ffmpeg@5 fontconfig freetype freetype2 gettext glew gmp gnutls lame libbluray libidn2 libnettle libogg libpng librist libsodium libsoxr libtasn libtasn1 libunistring libvmaf libvorbis libvpx libx11 libxau libxcb libxdmcp llvm@$LLVM_COMPILER_VER mbedtls molten-vk nettle opencore-amr openjpeg openssl opus p11-kit pkg-config pkgconfig pzstd rav1e sdl3 snappy speex srt svt-av1 theora vulkan-headers webp x264 x265 xz z3 zeromq zmq zstd "$BREW_ARM64_PATH/bin/brew" link -f ffmpeg@5 ln -s "/opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib/unwind/libunwind.1.dylib" "/opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib" @@ -86,10 +86,10 @@ cd "$WORKDIR" ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER" export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN" -export SDL2_DIR="$BREW_ARM64_PATH/opt/sdl2/lib/cmake/SDL2" +export SDL3_DIR="$BREW_ARM64_PATH/opt/sdl3/lib/cmake/SDL3" export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH" -export LDFLAGS="-L$BREW_ARM64_PATH/lib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_ARM64_PATH/lib/libSDL2.dylib $BREW_ARM64_PATH/lib/libGLEW.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib -Wl,-rpath,$BREW_ARM64_PATH/lib" +export LDFLAGS="-L$BREW_ARM64_PATH/lib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_ARM64_PATH/lib/libSDL3.dylib $BREW_ARM64_PATH/lib/libGLEW.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib -Wl,-rpath,$BREW_ARM64_PATH/lib" export CPPFLAGS="-I$BREW_ARM64_PATH/include -I$BREW_X64_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" export LIBRARY_PATH="$BREW_ARM64_PATH/lib" diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index cdc175c200..809ec1faa9 100644 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -13,7 +13,7 @@ arch -x86_64 /usr/local/bin/brew install -f --overwrite python || arch -x86_64 / arch -x86_64 /usr/local/bin/brew uninstall -f --ignore-dependencies ffmpeg arch -x86_64 /usr/local/bin/brew install -f --build-from-source ffmpeg@5 arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source gnutls freetype -arch -x86_64 /usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl2 vulkan-headers coreutils +arch -x86_64 /usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl3 vulkan-headers coreutils arch -x86_64 /usr/local/bin/brew link -f llvm@$LLVM_COMPILER_VER ffmpeg@5 # moltenvk based on commit for 1.2.11 release @@ -53,7 +53,7 @@ cd "$WORKDIR" ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER" export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN" -export SDL2_DIR="$BREW_X64_PATH/opt/sdl2/lib/cmake/SDL2" +export SDL3_DIR="$BREW_X64_PATH/opt/sdl3/lib/cmake/SDL3" export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH" export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib" diff --git a/.ci/deploy-mac-arm64.sh b/.ci/deploy-mac-arm64.sh index 0baedfa99d..da1fbe9165 100644 --- a/.ci/deploy-mac-arm64.sh +++ b/.ci/deploy-mac-arm64.sh @@ -37,7 +37,7 @@ install_name_tool \ -delete_rpath /opt/homebrew/lib \ -delete_rpath /opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib \ -delete_rpath /usr/local/lib RPCS3.app/Contents/MacOS/rpcs3 -#-delete_rpath /opt/homebrew1/Cellar/sdl2/2.30.7/lib +#-delete_rpath /opt/homebrew1/Cellar/sdl3/3.2.8/lib # Need to do this rename hack due to case insensitive filesystem mv rpcs3.app RPCS3_.app diff --git a/.ci/deploy-mac.sh b/.ci/deploy-mac.sh index 91eb253589..c293358748 100644 --- a/.ci/deploy-mac.sh +++ b/.ci/deploy-mac.sh @@ -39,7 +39,7 @@ mv RPCS3_.app RPCS3.app install_name_tool \ -delete_rpath /usr/local/lib \ -delete_rpath /usr/local/opt/llvm@$LLVM_COMPILER_VER/lib RPCS3.app/Contents/MacOS/rpcs3 -#-delete_rpath /usr/local/Cellar/sdl2/2.30.3/lib +#-delete_rpath /usr/local/Cellar/sdl3/3.2.8/lib # NOTE: "--deep" is deprecated codesign --deep -fs - RPCS3.app diff --git a/.ci/install-freebsd.sh b/.ci/install-freebsd.sh index 3c2896af63..de10561dfa 100755 --- a/.ci/install-freebsd.sh +++ b/.ci/install-freebsd.sh @@ -15,4 +15,4 @@ pkg install "llvm$LLVM_COMPILER_VER" pkg install git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg # Optional dependencies (libevdev is pulled by qtX-base) -pkg install pkgconf alsa-lib pulseaudio sdl2 evdev-proto vulkan-headers vulkan-loader +pkg install pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader diff --git a/.cirrus.yml b/.cirrus.yml index 6f2a08bb8a..6a7bdd0743 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -58,7 +58,7 @@ env: # linux_task: # container: -# image: rpcs3/rpcs3-ci-jammy:1.1 +# image: rpcs3/rpcs3-ci-jammy:1.2 # cpu: 4 # memory: 16G # env: @@ -134,7 +134,7 @@ freebsd_task: # matrix: # - name: Cirrus Linux AArch64 Clang # arm_container: -# image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.1' +# image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.2' # cpu: 8 # memory: 8G # clang_script: diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index cc819e8468..26880dedf8 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -33,17 +33,17 @@ jobs: matrix: include: - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.1" + docker_img: "rpcs3/rpcs3-ci-jammy:1.2" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: clang UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.1" + docker_img: "rpcs3/rpcs3-ci-jammy:1.2" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: gcc - os: ubuntu-24.04-arm - docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.1" + docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.2" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" compiler: clang UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 4625c0e81e..9568548651 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -210,16 +210,14 @@ add_subdirectory(OpenAL EXCLUDE_FROM_ALL) # FAudio set(FAUDIO_TARGET 3rdparty_dummy_lib) if(USE_FAUDIO) - # FAudio depends on SDL2 - find_package(SDL2) + # FAudio depends on SDL3 + find_package(SDL3) if (USE_SYSTEM_FAUDIO) - if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12) + if (NOT SDL3_FOUND OR SDL3_VERSION VERSION_LESS 3.2.0) message(WARNING - "RPCS3: System FAudio requires SDL 2.0.9 or newer. Please note, this warning" - "can also be displayed with SDL2 versions between 2.0.9-2.0.12, as the" - "CMake config files are not correctly installed. Since a valid SDL2" - ">=2.0.9 version cannot be found, building with FAudio will be skipped.") - set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 2.0.12" FORCE) + "RPCS3: System FAudio requires SDL 3.2.0 or newer. Since a valid SDL3" + ">=3.2.0 version cannot be found, building with FAudio will be skipped.") + set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 3.2.0" FORCE) else() message(STATUS "RPCS3: Using system FAudio") find_package(FAudio REQUIRED CONFIGS FAudioConfig.cmake FAudio-config.cmake) @@ -229,11 +227,11 @@ if(USE_FAUDIO) set(FAUDIO_TARGET 3rdparty_FAudio) endif() else() - if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.24.0) + if (NOT SDL3_FOUND OR SDL3_VERSION VERSION_LESS 3.2.0) message(WARNING - "-- RPCS3: 3rdparty FAudio requires SDL 2.24.0 or newer. Since a valid SDL2" - ">=2.24.0 version cannot be found, building with FAudio will be skipped.") - set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 2.24.0" FORCE) + "-- RPCS3: 3rdparty FAudio requires SDL 3.2.0 or newer. Since a valid SDL3" + ">=3.2.0 version cannot be found, building with FAudio will be skipped.") + set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 3.2.0" FORCE) else() message(STATUS "RPCS3: Using builtin FAudio") set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library") @@ -303,26 +301,26 @@ add_subdirectory(wolfssl EXCLUDE_FROM_ALL) # CURL add_subdirectory(curl EXCLUDE_FROM_ALL) -# SDL2 -set(SDL2_TARGET 3rdparty_dummy_lib) +# SDL3 +set(SDL3_TARGET 3rdparty_dummy_lib) if(USE_SDL) if(USE_SYSTEM_SDL) - find_package(SDL2) - if(SDL2_FOUND AND NOT SDL2_VERSION VERSION_LESS 2.24.0) - message(STATUS "Using system SDL2") - add_library(3rdparty_sdl2 INTERFACE) - target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1) - target_link_libraries(3rdparty_sdl2 INTERFACE SDL2::SDL2) - set(SDL2_TARGET 3rdparty_sdl2) + find_package(SDL3) + if(SDL3_FOUND AND NOT SDL3_VERSION VERSION_LESS 3.2.0) + message(STATUS "Using system SDL3 version '${SDL3_VERSION}'") + add_library(3rdparty_sdl3 INTERFACE) + target_compile_definitions(3rdparty_sdl3 INTERFACE -DHAVE_SDL3=1) + target_link_libraries(3rdparty_sdl3 INTERFACE SDL3::SDL3) + set(SDL3_TARGET 3rdparty_sdl3) else() - message(FATAL_ERROR "SDL2 is not available on this system") + message(FATAL_ERROR "SDL3 is not available on this system") endif() else() - message(STATUS "Using static SDL2 from 3rdparty") - add_library(3rdparty_sdl2 INTERFACE) - target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1) + message(STATUS "Using static SDL3 from 3rdparty") + add_library(3rdparty_sdl3 INTERFACE) + target_compile_definitions(3rdparty_sdl3 INTERFACE -DHAVE_SDL3=1) add_subdirectory(libsdl-org EXCLUDE_FROM_ALL) - set(SDL2_TARGET 3rdparty_sdl2) + set(SDL3_TARGET 3rdparty_sdl3) endif() endif() @@ -365,7 +363,7 @@ add_library(3rdparty::glew ALIAS 3rdparty_glew) add_library(3rdparty::wolfssl ALIAS wolfssl) add_library(3rdparty::libcurl ALIAS 3rdparty_libcurl) add_library(3rdparty::soundtouch ALIAS soundtouch) -add_library(3rdparty::sdl2 ALIAS ${SDL2_TARGET}) +add_library(3rdparty::sdl3 ALIAS ${SDL3_TARGET}) add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static) add_library(3rdparty::rtmidi ALIAS rtmidi) add_library(3rdparty::opencv ALIAS ${OPENCV_TARGET}) diff --git a/3rdparty/FAudio b/3rdparty/FAudio index af74e661c1..486e33eef3 160000 --- a/3rdparty/FAudio +++ b/3rdparty/FAudio @@ -1 +1 @@ -Subproject commit af74e661c1bd8b105840d14485cc01d9c782b513 +Subproject commit 486e33eef3f282e4ce3d29f32ded3e67bacdbe5c diff --git a/3rdparty/libsdl-org/SDL b/3rdparty/libsdl-org/SDL index 7a44b1ab00..f6864924f7 160000 --- a/3rdparty/libsdl-org/SDL +++ b/3rdparty/libsdl-org/SDL @@ -1 +1 @@ -Subproject commit 7a44b1ab002cee6efa56d3b4c0e146b7fbaed80b +Subproject commit f6864924f76e1a0b4abaefc76ae2ed22b1a8916e diff --git a/3rdparty/libsdl-org/SDL.vcxproj b/3rdparty/libsdl-org/SDL.vcxproj index 687761ae93..e062060fab 100644 --- a/3rdparty/libsdl-org/SDL.vcxproj +++ b/3rdparty/libsdl-org/SDL.vcxproj @@ -11,137 +11,141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + + + + + + + - - - + + - @@ -151,6 +155,7 @@ + @@ -172,17 +177,36 @@ + - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -191,24 +215,17 @@ + - - - - - - - - @@ -224,29 +241,39 @@ + + + + + + + - + + - + + + @@ -261,8 +288,6 @@ - - @@ -272,78 +297,71 @@ + + - - + + + + - + + + - + - + + + + + + - + + - - - - - - - - - - - - - - - - - - - - + @@ -351,18 +369,24 @@ + + + + + + @@ -374,11 +398,12 @@ - - + + + @@ -388,23 +413,43 @@ + + + + + + + + + + + + + + + + + + + + @@ -420,25 +465,35 @@ - + + + + + + + + + + + {8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA} @@ -467,13 +522,18 @@ + + SDL\src;$(IncludePath) + TurnOffAllWarnings false - SDL\include;%(AdditionalIncludeDirectories) + SDL\include;SDL\include\build_config;%(AdditionalIncludeDirectories) ProgramDatabase MaxSpeed + SDL_HIDAPI_DISABLED;%(PreprocessorDefinitions) + SDL_HIDAPI_DISABLED;%(PreprocessorDefinitions) diff --git a/3rdparty/libsdl-org/SDL.vcxproj.filters b/3rdparty/libsdl-org/SDL.vcxproj.filters index e7f2fa2dcb..44d4e4ec9f 100644 --- a/3rdparty/libsdl-org/SDL.vcxproj.filters +++ b/3rdparty/libsdl-org/SDL.vcxproj.filters @@ -1,433 +1,1592 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {395b3af0-33d0-411b-b153-de1676bf1ef8} + + + {5a3e3167-75be-414f-8947-a5306df372b2} + + + {546d9ed1-988e-49d3-b1a5-e5b3d19de6c1} + + + {a56247ff-5108-4960-ba6a-6814fd1554ec} + + + {8880dfad-2a06-4e84-ab6e-6583641ad2d1} + + + {2b996a7f-f3e9-4300-a97f-2c907bcd89a9} + + + {5713d682-2bc7-4da4-bcf0-262a98f142eb} + + + {5e27e19f-b3f8-4e2d-b323-b00b2040ec86} + + + {a3ab9cff-8495-4a5c-8af6-27e43199a712} + + + {377061e4-3856-4f05-b916-0d3b360df0f6} + + + {226a6643-1c65-4c7f-92aa-861313d974bb} + + + {ef859522-a7fe-4a00-a511-d6a9896adf5b} + + + {01fd2642-4493-4316-b548-fb829f4c9125} + + + {cce7558f-590a-4f0a-ac0d-e579f76e588e} + + + {7a53c9e4-d4bd-40ed-9265-1625df685121} + + + {4c7a051c-ce7c-426c-bf8c-9187827f9052} + + + {97e2f79f-311b-42ea-81b2-e801649fdd93} + + + {baf97c8c-7e90-41e5-bff8-14051b8d3956} + + + {45e50d3a-56c9-4352-b811-0c60c49a2431} + + + {9d86e0ef-d6f6-4db2-bfc5-b3529406fa8d} + + + {b35fa13c-6ed2-4680-8c56-c7d71b76ceab} + + + {61b61b31-9e26-4171-a3bb-b969f1889726} + + + {f63aa216-6ee7-4143-90d3-32be3787f276} + + + {90bee923-89df-417f-a6c3-3e260a7dd54d} + + + {4c8ad943-c2fb-4014-9ca3-041e0ad08426} + + + {3d68ae70-a9ff-46cf-be69-069f0b02aca0} + + + {ebc2fca3-3c26-45e3-815e-3e0581d5e226} + + + {47c445a2-7014-4e15-9660-7c89a27dddcf} + + + {d008487d-6ed0-4251-848b-79a68e3c1459} + + + {c9e8273e-13ae-47dc-bef8-8ad8e64c9a3e} + + + {c9e8273e-13ae-47dc-bef8-8ad8e64c9a3d} + + + {0b8e136d-56ae-47e7-9981-e863a57ac616} + + + {bf3febd3-9328-43e8-b196-0fd3be8177dd} + + + {1a62dc68-52d2-4c07-9d81-d94dfe1d0d12} + + + {e9f01b22-34b3-4380-ade6-0e96c74e9c90} + + + {f674f22f-7841-4f3a-974e-c36b2d4823fc} + + + {d7ad92de-4e55-4202-9b2b-1bd9a35fe4dc} + + + {8311d79d-9ad5-4369-99fe-b2fb2659d402} + + + {6c4dfb80-fdf9-497c-a6ff-3cd8f22efde9} + + + {4810e35c-33cb-4da2-bfaf-452da20d3c9a} + + + {2cf93f1d-81fd-4bdc-998c-5e2fa43988bc} + + + {5752b7ab-2344-4f38-95ab-b5d3bc150315} + + + {7a0eae3d-f113-4914-b926-6816d1929250} + + + {ee602cbf-96a2-4b0b-92a9-51d38a727411} + + + {a812185b-9060-4a1c-8431-be4f66894626} + + + {31c16cdf-adc4-4950-8293-28ba530f3882} + + + {add61b53-8144-47d6-bd67-3420a87c4905} + + + {e7cdcf36-b462-49c7-98b7-07ea7b3687f4} + + + {82588eef-dcaa-4f69-b2a9-e675940ce54c} + + + {560239c3-8fa1-4d23-a81a-b8408b2f7d3f} + + + {81711059-7575-4ece-9e68-333b63e992c4} + + + {1e44970f-7535-4bfb-b8a5-ea0cea0349e0} + + + {1dd91224-1176-492b-a2cb-e26153394db0} + + + {e3ecfe50-cf22-41d3-8983-2fead5164b47} + + + {5521d22f-1e52-47a6-8c52-06a3b6bdefd7} + + + {4755f3a6-49ac-46d6-86be-21f5c21f2197} + + + {f48c2b17-1bee-4fec-a7c8-24cf619abe08} + + + {653672cc-90ae-4eba-a256-6479f2c31804} + + + {00001967ea2801028a046a722a070000} + + + {0000ddc7911820dbe64274d3654f0000} + + + {0000de1b75e1a954834693f1c81e0000} + + + {0000fc2700d453b3c8d79fe81e1c0000} + + + {0000fbfe2d21e4f451142e7d0e870000} + + + {5115ba31-20f8-4eab-a8c5-6a572ab78ff7} + + + {00003288226ff86b99eee5b443e90000} + + + {0000d7fda065b13b0ca4ab262c380000} + + + {098fbef9-d8a0-4b3b-b57b-d157d395335d} + + + {00008dfdfa0190856fbf3c7db52d0000} + + + {748cf015-00b8-4e71-ac48-02e947e4d93d} + + + {00009d5ded166cc6c6680ec771a30000} + + + {00004d6806b6238cae0ed62db5440000} + + + {000028b2ea36d7190d13777a4dc70000} + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + API Headers + + + camera + + + camera + + + filesystem + + + io + + + io + + + main + + + + + API Headers + + + API Headers + + + API Headers + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + core\windows + + + core\windows + + + core\windows + + + core\windows + + + core\windows + + + core\windows + + + core\windows + + + cpuinfo + + + dynapi + + + dynapi + + + dynapi + + + dynapi + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + haptic + + + haptic + + + joystick + + + joystick + + + joystick + + + joystick + + + joystick + + + joystick + + + joystick + + + libm + + + libm + + + hidapi\hidapi + + + locale + + + misc + + + audio\directsound + + + audio\disk + + + audio\dummy + + + audio\wasapi + + + haptic\windows + + + haptic\windows + + + joystick\hidapi + + + joystick\hidapi + + + joystick\windows + + + joystick\windows + + + joystick\windows + + + joystick\windows + + + joystick\virtual + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video\dummy + + + video\dummy + + + video\dummy + + + video\yuv2rgb + + + video\yuv2rgb + + + video\yuv2rgb + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + timer + + + thread + + + thread + + + thread\windows + + + thread\windows + + + thread\generic + + + sensor + + + sensor + + + sensor\dummy + + + sensor\windows + + + render + + + render + + + render + + + render\direct3d + + + render\direct3d11 + + + render\opengl + + + render\opengl + + + render\opengles2 + + + render\opengles2 + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + power + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + + video\khronos\vulkan + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + render\direct3d12 + + + + - - - - - - - - - + + render\vulkan + + + video\offscreen + + + video\offscreen + + + video\offscreen + + + video\offscreen + + + video\offscreen + + + video\offscreen + + + API Headers + + + gpu + + + gpu + + + + + + + + + camera\dummy + + + camera\mediafoundation + + + camera + + + dialog + + + dialog + + + filesystem + + + filesystem\windows + + + io\generic + + + io + + + io\windows + + + main\generic + + + main + + + main + + + main\windows + + + + + + + + + + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + audio + + + atomic + + + atomic + + + core + + + core\windows + + + core\windows + + + core\windows + + + core\windows + + + core\windows + + + cpuinfo + + + dialog + + + dynapi + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + events + + + io + + + filesystem\windows + + + haptic + + + hidapi + + + joystick + + + joystick + + + joystick + + + joystick + + + libm + + + loadso\windows + + + misc + + + misc\windows + + + locale\windows + + + locale + + + audio\directsound + + + audio\disk + + + audio\dummy + + + audio\wasapi + + + haptic\windows + + + haptic\windows + + + haptic\dummy + + + joystick\dummy + + + joystick\gdk + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\hidapi + + + joystick\windows + + + joystick\windows + + + joystick\windows + + + joystick\windows + + + joystick\windows + + + joystick\virtual + + + time + + + time\windows + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video + + + video\dummy + + + video\dummy + + + video\dummy + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + video\windows + + + timer + + + timer\windows + + + thread + + + thread\windows + + + thread\windows + + + thread\windows + + + thread\windows + + + thread\windows + + + thread\windows + + + thread\generic + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + stdlib + + + sensor + + + sensor\dummy + + + sensor\windows + + + render + + + render + + + render + + + render + + + render\direct3d + + + render\direct3d + + + render\direct3d11 + + + render\direct3d11 + + + render\opengl + + + render\opengl + + + render\opengles2 + + + render\opengles2 + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + render\software + + + power + + + power\windows + + + + render\direct3d12 + + + render\direct3d12 + + + core\windows + + + stdlib + + + + + + + + render\vulkan + + + render\vulkan + + + video\offscreen + + + video\offscreen + + + video\offscreen + + + video\offscreen + + + video\offscreen + + + video\offscreen + + + gpu + + + gpu + + + gpu + + + + + + + + + + + + \ No newline at end of file diff --git a/BUILDING.md b/BUILDING.md index 7cad89f8c5..c4830d056d 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -40,17 +40,17 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst - [CMake 3.28.0+](https://www.cmake.org/download/) - [Qt 6.8.2](https://www.qt.io/download-qt-installer) - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. -- [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) +- [SDL3](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) **If you have an NVIDIA GPU, you may need to install the libglvnd package.** #### Arch Linux - sudo pacman -S glew openal cmake vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl2 sndio jack2 base-devel + sudo pacman -S glew openal cmake vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl3 sndio jack2 base-devel #### Debian & Ubuntu - sudo apt-get install build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl2-2.0 libsdl2-dev libjack-dev libsndio-dev + sudo apt-get install build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl3-3.2 libsdl3-dev libjack-dev libsndio-dev Ubuntu is usually horrendously out of date, and some packages need to be downloaded by hand. This part is for Qt, GCC, Vulkan, and CMake diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d715095825..afaa294b7f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,13 +40,13 @@ jobs: # displayName: ccache # - bash: | -# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.1 +# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.2 # docker run \ # -v $(pwd):/rpcs3 \ # --env-file .ci/docker.env \ # -v $CCACHE_DIR:/root/.ccache \ # -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -# rpcs3/rpcs3-ci-jammy:1.1 \ +# rpcs3/rpcs3-ci-jammy:1.2 \ # /rpcs3/.ci/build-linux.sh # displayName: Docker setup and build diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index e135e53ede..034133c3b2 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -143,8 +143,8 @@ target_sources(rpcs3_emu PRIVATE ) if(USE_FAUDIO) - find_package(SDL2) - if(SDL2_FOUND AND SDL2_VERSION VERSION_GREATER_EQUAL 2.0.9) + find_package(SDL3) + if(SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0) target_sources(rpcs3_emu PRIVATE Audio/FAudio/FAudioBackend.cpp Audio/FAudio/faudio_enumerator.cpp @@ -641,7 +641,7 @@ endif() target_link_libraries(rpcs3_emu PUBLIC - 3rdparty::ffmpeg 3rdparty::sdl2 + 3rdparty::ffmpeg 3rdparty::sdl3 3rdparty::opengl 3rdparty::stblib 3rdparty::vulkan 3rdparty::glew 3rdparty::libusb 3rdparty::wolfssl diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h index 19178f7682..99c085b015 100644 --- a/rpcs3/Emu/Io/PadHandler.h +++ b/rpcs3/Emu/Io/PadHandler.h @@ -50,6 +50,9 @@ public: color color_override{}; bool color_override_active{}; + bool enable_player_leds{}; + bool update_player_leds{true}; + std::shared_ptr ahrs; // Used to calculate quaternions from sensor data u64 last_ahrs_update_time_us = 0; // Last ahrs update diff --git a/rpcs3/Emu/Io/pad_config_types.cpp b/rpcs3/Emu/Io/pad_config_types.cpp index ab1503604e..e09be8a4e0 100644 --- a/rpcs3/Emu/Io/pad_config_types.cpp +++ b/rpcs3/Emu/Io/pad_config_types.cpp @@ -19,7 +19,7 @@ void fmt_class_string::format(std::string& out, u64 arg) case pad_handler::xinput: return "XInput"; case pad_handler::mm: return "MMJoystick"; #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 case pad_handler::sdl: return "SDL"; #endif #ifdef HAVE_LIBEVDEV diff --git a/rpcs3/Emu/Io/pad_config_types.h b/rpcs3/Emu/Io/pad_config_types.h index b9b7132ce1..36fc8328fa 100644 --- a/rpcs3/Emu/Io/pad_config_types.h +++ b/rpcs3/Emu/Io/pad_config_types.h @@ -15,7 +15,7 @@ enum class pad_handler xinput, mm, #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 sdl, #endif #ifdef HAVE_LIBEVDEV diff --git a/rpcs3/Input/dualsense_pad_handler.h b/rpcs3/Input/dualsense_pad_handler.h index ac2b2afba8..981b8a568d 100644 --- a/rpcs3/Input/dualsense_pad_handler.h +++ b/rpcs3/Input/dualsense_pad_handler.h @@ -178,7 +178,6 @@ public: DualSenseFeatureSet feature_set{DualSenseFeatureSet::Normal}; bool init_lightbar{true}; bool update_lightbar{true}; - bool update_player_leds{true}; bool release_leds{false}; // Controls for lightbar pulse. This seems somewhat hacky for now, as I haven't found out a nicer way. diff --git a/rpcs3/Input/gui_pad_thread.cpp b/rpcs3/Input/gui_pad_thread.cpp index 08d6b4e9ee..3844d7ba9e 100644 --- a/rpcs3/Input/gui_pad_thread.cpp +++ b/rpcs3/Input/gui_pad_thread.cpp @@ -10,7 +10,7 @@ #elif HAVE_LIBEVDEV #include "evdev_joystick_handler.h" #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 #include "sdl_pad_handler.h" #endif #include "Emu/Io/PadHandler.h" @@ -225,7 +225,7 @@ std::shared_ptr gui_pad_thread::GetHandler(pad_handler type) case pad_handler::mm: return std::make_shared(); #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 case pad_handler::sdl: return std::make_shared(); #endif diff --git a/rpcs3/Input/hid_pad_handler.h b/rpcs3/Input/hid_pad_handler.h index 50e7d59e20..b6dc093983 100644 --- a/rpcs3/Input/hid_pad_handler.h +++ b/rpcs3/Input/hid_pad_handler.h @@ -39,7 +39,6 @@ public: hid_device* bt_device{nullptr}; // Used in ps move handler #endif std::string path; - bool enable_player_leds{false}; u8 led_delay_on{0}; u8 led_delay_off{0}; u8 battery_level{0}; diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp index a2b91dd109..4465035c3f 100644 --- a/rpcs3/Input/pad_thread.cpp +++ b/rpcs3/Input/pad_thread.cpp @@ -12,7 +12,7 @@ #elif HAVE_LIBEVDEV #include "evdev_joystick_handler.h" #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 #include "sdl_pad_handler.h" #endif #include "keyboard_pad_handler.h" @@ -668,7 +668,7 @@ std::shared_ptr pad_thread::GetHandler(pad_handler type) case pad_handler::mm: return std::make_shared(); #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 case pad_handler::sdl: return std::make_shared(); #endif diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/Input/sdl_pad_handler.cpp index 562085f037..38bd6bc1bd 100644 --- a/rpcs3/Input/sdl_pad_handler.cpp +++ b/rpcs3/Input/sdl_pad_handler.cpp @@ -1,4 +1,4 @@ -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 #include "stdafx.h" #include "sdl_pad_handler.h" @@ -46,14 +46,14 @@ public: sdl_log.error("Could not set SDL_HINT_JOYSTICK_THREAD: %s", SDL_GetError()); } - if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER) < 0) + if (!SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD)) { sdl_log.error("Could not initialize! SDL Error: %s", SDL_GetError()); return false; } - SDL_LogSetAllPriority(SDL_LOG_PRIORITY_VERBOSE); - SDL_LogSetOutputFunction([](void*, int category, SDL_LogPriority priority, const char* message) + SDL_SetLogPriorities(SDL_LOG_PRIORITY_VERBOSE); + SDL_SetLogOutputFunction([](void*, int category, SDL_LogPriority priority, const char* message) { std::string category_name; switch (category) @@ -126,10 +126,10 @@ sdl_pad_handler::sdl_pad_handler() : PadHandlerBase(pad_handler::sdl) button_list = { { SDLKeyCodes::None, "" }, - { SDLKeyCodes::A, "A" }, - { SDLKeyCodes::B, "B" }, - { SDLKeyCodes::X, "X" }, - { SDLKeyCodes::Y, "Y" }, + { SDLKeyCodes::South, "South" }, + { SDLKeyCodes::East, "East" }, + { SDLKeyCodes::West, "West" }, + { SDLKeyCodes::North, "North" }, { SDLKeyCodes::Left, "Left" }, { SDLKeyCodes::Right, "Right" }, { SDLKeyCodes::Up, "Up" }, @@ -142,10 +142,10 @@ sdl_pad_handler::sdl_pad_handler() : PadHandlerBase(pad_handler::sdl) { SDLKeyCodes::RS, "RS" }, { SDLKeyCodes::Guide, "Guide" }, { SDLKeyCodes::Misc1, "Misc 1" }, - { SDLKeyCodes::Paddle1, "Paddle 1" }, - { SDLKeyCodes::Paddle2, "Paddle 2" }, - { SDLKeyCodes::Paddle3, "Paddle 3" }, - { SDLKeyCodes::Paddle4, "Paddle 4" }, + { SDLKeyCodes::RPaddle1, "R Paddle 1" }, + { SDLKeyCodes::LPaddle1, "L Paddle 1" }, + { SDLKeyCodes::RPaddle2, "R Paddle 2" }, + { SDLKeyCodes::LPaddle2, "L Paddle 2" }, { SDLKeyCodes::Touchpad, "Touchpad" }, { SDLKeyCodes::Touch_L, "Touch Left" }, { SDLKeyCodes::Touch_R, "Touch Right" }, @@ -176,6 +176,7 @@ sdl_pad_handler::sdl_pad_handler() : PadHandlerBase(pad_handler::sdl) b_has_rumble = true; b_has_motion = true; b_has_led = true; + b_has_player_led = true; b_has_rgb = true; b_has_battery = true; b_has_battery_led = true; @@ -192,11 +193,11 @@ sdl_pad_handler::~sdl_pad_handler() for (auto& controller : m_controllers) { - if (controller.second && controller.second->sdl.game_controller) + if (controller.second && controller.second->sdl.gamepad) { set_rumble(controller.second.get(), 0, 0); - SDL_GameControllerClose(controller.second->sdl.game_controller); - controller.second->sdl.game_controller = nullptr; + SDL_CloseGamepad(controller.second->sdl.gamepad); + controller.second->sdl.gamepad = nullptr; } } } @@ -217,10 +218,10 @@ void sdl_pad_handler::init_config(cfg_pad* cfg) cfg->start.def = ::at32(button_list, SDLKeyCodes::Start); cfg->select.def = ::at32(button_list, SDLKeyCodes::Back); cfg->ps.def = ::at32(button_list, SDLKeyCodes::Guide); - cfg->square.def = ::at32(button_list, SDLKeyCodes::X); - cfg->cross.def = ::at32(button_list, SDLKeyCodes::A); - cfg->circle.def = ::at32(button_list, SDLKeyCodes::B); - cfg->triangle.def = ::at32(button_list, SDLKeyCodes::Y); + cfg->square.def = ::at32(button_list, SDLKeyCodes::West); + cfg->cross.def = ::at32(button_list, SDLKeyCodes::South); + cfg->circle.def = ::at32(button_list, SDLKeyCodes::East); + cfg->triangle.def = ::at32(button_list, SDLKeyCodes::North); cfg->left.def = ::at32(button_list, SDLKeyCodes::Left); cfg->down.def = ::at32(button_list, SDLKeyCodes::Down); cfg->right.def = ::at32(button_list, SDLKeyCodes::Right); @@ -282,7 +283,7 @@ bool sdl_pad_handler::Init() if (fs::is_file(db_path)) { - if (SDL_GameControllerAddMappingsFromFile(db_path.c_str()) < 0) + if (SDL_AddGamepadMappingsFromFile(db_path.c_str()) < 0) { sdl_log.error("Could not add mappings from file '%s'! SDL Error: %s", db_path, SDL_GetError()); } @@ -293,16 +294,13 @@ bool sdl_pad_handler::Init() } } - SDL_version version{}; - SDL_GetVersion(&version); - if (const char* revision = SDL_GetRevision(); revision && strlen(revision) > 0) { - sdl_log.notice("Using version: %d.%d.%d (revision='%s')", version.major, version.minor, version.patch, revision); + sdl_log.notice("Using version: %d.%d.%d (revision='%s')", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_MICRO_VERSION, revision); } else { - sdl_log.notice("Using version: %d.%d.%d", version.major, version.minor, version.patch); + sdl_log.notice("Using version: %d.%d.%d", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_MICRO_VERSION); } m_is_init = true; @@ -321,45 +319,52 @@ void sdl_pad_handler::process() PadHandlerBase::process(); } -SDLDevice::sdl_info sdl_pad_handler::get_sdl_info(int i) +SDLDevice::sdl_info sdl_pad_handler::get_sdl_info(SDL_JoystickID id) { SDLDevice::sdl_info info{}; - info.game_controller = SDL_GameControllerOpen(i); + info.gamepad = SDL_OpenGamepad(id); - if (!info.game_controller) + if (!info.gamepad) { - sdl_log.error("Could not open device %d! SDL Error: %s", i, SDL_GetError()); + sdl_log.error("Could not open device %d! SDL Error: %s", id, SDL_GetError()); return {}; } - if (const char* name = SDL_GameControllerName(info.game_controller)) + if (const char* name = SDL_GetGamepadName(info.gamepad)) { info.name = name; } - if (const char* path = SDL_GameControllerPath(info.game_controller)) + if (const char* path = SDL_GetGamepadPath(info.gamepad)) { info.path = path; } - if (const char* serial = SDL_GameControllerGetSerial(info.game_controller)) + if (const char* serial = SDL_GetGamepadSerial(info.gamepad)) { info.serial = serial; } - info.joystick = SDL_GameControllerGetJoystick(info.game_controller); - info.type = SDL_GameControllerGetType(info.game_controller); - info.vid = SDL_GameControllerGetVendor(info.game_controller); - info.pid = SDL_GameControllerGetProduct(info.game_controller); - info.product_version= SDL_GameControllerGetProductVersion(info.game_controller); - info.firmware_version = SDL_GameControllerGetFirmwareVersion(info.game_controller); - info.has_led = SDL_GameControllerHasLED(info.game_controller); - info.has_rumble = SDL_GameControllerHasRumble(info.game_controller); - info.has_rumble_triggers = SDL_GameControllerHasRumbleTriggers(info.game_controller); - info.has_accel = SDL_GameControllerHasSensor(info.game_controller, SDL_SENSOR_ACCEL); - info.has_gyro = SDL_GameControllerHasSensor(info.game_controller, SDL_SENSOR_GYRO); + const SDL_PropertiesID property_id = SDL_GetGamepadProperties(info.gamepad); + if (!property_id) + { + sdl_log.error("Could not get properties of device %d! SDL Error: %s", id, SDL_GetError()); + } - if (const int num_touchpads = SDL_GameControllerGetNumTouchpads(info.game_controller); num_touchpads > 0) + info.type = SDL_GetGamepadType(info.gamepad); + info.vid = SDL_GetGamepadVendor(info.gamepad); + info.pid = SDL_GetGamepadProduct(info.gamepad); + info.product_version = SDL_GetGamepadProductVersion(info.gamepad); + info.firmware_version = SDL_GetGamepadFirmwareVersion(info.gamepad); + info.has_led = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_RGB_LED_BOOLEAN); + info.has_mono_led = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_MONO_LED_BOOLEAN); + info.has_player_led = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_PLAYER_LED_BOOLEAN); + info.has_rumble = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_RUMBLE_BOOLEAN); + info.has_rumble_triggers = SDL_HasProperty(property_id, SDL_PROP_GAMEPAD_CAP_TRIGGER_RUMBLE_BOOLEAN); + info.has_accel = SDL_GamepadHasSensor(info.gamepad, SDL_SENSOR_ACCEL); + info.has_gyro = SDL_GamepadHasSensor(info.gamepad, SDL_SENSOR_GYRO); + + if (const int num_touchpads = SDL_GetNumGamepadTouchpads(info.gamepad); num_touchpads > 0) { info.touchpads.resize(num_touchpads); @@ -368,7 +373,7 @@ SDLDevice::sdl_info sdl_pad_handler::get_sdl_info(int i) SDLDevice::touchpad& touchpad = ::at32(info.touchpads, i); touchpad.index = i; - if (const int num_fingers = SDL_GameControllerGetNumTouchpadFingers(info.game_controller, touchpad.index); num_fingers > 0) + if (const int num_fingers = SDL_GetNumGamepadTouchpadFingers(info.gamepad, touchpad.index); num_fingers > 0) { touchpad.fingers.resize(num_fingers); @@ -380,52 +385,52 @@ SDLDevice::sdl_info sdl_pad_handler::get_sdl_info(int i) } } - sdl_log.notice("Found game controller %d: type=%d, name='%s', path='%s', serial='%s', vid=0x%x, pid=0x%x, product_version=0x%x, firmware_version=0x%x, has_led=%d, has_rumble=%d, has_rumble_triggers=%d, has_accel=%d, has_gyro=%d", - i, static_cast(info.type), info.name, info.path, info.serial, info.vid, info.pid, info.product_version, info.firmware_version, info.has_led, info.has_rumble, info.has_rumble_triggers, info.has_accel, info.has_gyro); + sdl_log.notice("Found game pad %d: type=%d, name='%s', path='%s', serial='%s', vid=0x%x, pid=0x%x, product_version=0x%x, firmware_version=0x%x, has_led=%d, has_player_led=%d, has_mono_led=%d, has_rumble=%d, has_rumble_triggers=%d, has_accel=%d, has_gyro=%d", + id, static_cast(info.type), info.name, info.path, info.serial, info.vid, info.pid, info.product_version, info.firmware_version, info.has_led, info.has_player_led, info.has_mono_led, info.has_rumble, info.has_rumble_triggers, info.has_accel, info.has_gyro); if (info.has_accel) { - if (SDL_GameControllerSetSensorEnabled(info.game_controller, SDL_SENSOR_ACCEL, SDL_TRUE) != 0 || - !SDL_GameControllerIsSensorEnabled(info.game_controller, SDL_SENSOR_ACCEL)) + if (!SDL_SetGamepadSensorEnabled(info.gamepad, SDL_SENSOR_ACCEL, true) || + !SDL_GamepadSensorEnabled(info.gamepad, SDL_SENSOR_ACCEL)) { - sdl_log.error("Could not activate acceleration sensor of device %d! SDL Error: %s", i, SDL_GetError()); + sdl_log.error("Could not activate acceleration sensor of device %d! SDL Error: %s", id, SDL_GetError()); info.has_accel = false; } else { - info.data_rate_accel = SDL_GameControllerGetSensorDataRate(info.game_controller, SDL_SENSOR_ACCEL); - sdl_log.notice("Acceleration sensor data rate of device %d = %.2f/s", i, info.data_rate_accel); + info.data_rate_accel = SDL_GetGamepadSensorDataRate(info.gamepad, SDL_SENSOR_ACCEL); + sdl_log.notice("Acceleration sensor data rate of device %d = %.2f/s", id, info.data_rate_accel); } } if (info.has_gyro) { - if (SDL_GameControllerSetSensorEnabled(info.game_controller, SDL_SENSOR_GYRO, SDL_TRUE) != 0 || - !SDL_GameControllerIsSensorEnabled(info.game_controller, SDL_SENSOR_GYRO)) + if (!SDL_SetGamepadSensorEnabled(info.gamepad, SDL_SENSOR_GYRO, true) || + !SDL_GamepadSensorEnabled(info.gamepad, SDL_SENSOR_GYRO)) { - sdl_log.error("Could not activate gyro sensor of device %d! SDL Error: %s", i, SDL_GetError()); + sdl_log.error("Could not activate gyro sensor of device %d! SDL Error: %s", id, SDL_GetError()); info.has_gyro = false; } else { - info.data_rate_gyro = SDL_GameControllerGetSensorDataRate(info.game_controller, SDL_SENSOR_GYRO); - sdl_log.notice("Gyro sensor data rate of device %d = %.2f/s", i, info.data_rate_accel); + info.data_rate_gyro = SDL_GetGamepadSensorDataRate(info.gamepad, SDL_SENSOR_GYRO); + sdl_log.notice("Gyro sensor data rate of device %d = %.2f/s", id, info.data_rate_accel); } } - for (int i = 0; i < SDL_CONTROLLER_BUTTON_MAX; i++) + for (int i = 0; i < SDL_GAMEPAD_BUTTON_COUNT; i++) { - const SDL_GameControllerButton button_id = static_cast(i); - if (SDL_GameControllerHasButton(info.game_controller, button_id)) + const SDL_GamepadButton button_id = static_cast(i); + if (SDL_GamepadHasButton(info.gamepad, button_id)) { info.button_ids.insert(button_id); } } - for (int i = 0; i < SDL_CONTROLLER_AXIS_MAX; i++) + for (int i = 0; i < SDL_GAMEPAD_AXIS_COUNT; i++) { - const SDL_GameControllerAxis axis_id = static_cast(i); - if (SDL_GameControllerHasAxis(info.game_controller, axis_id)) + const SDL_GamepadAxis axis_id = static_cast(i); + if (SDL_GamepadHasAxis(info.gamepad, axis_id)) { info.axis_ids.insert(axis_id); } @@ -454,15 +459,11 @@ void sdl_pad_handler::enumerate_devices() if (!m_is_init) return; - for (int i = 0; i < SDL_NumJoysticks(); i++) + int count = 0; + SDL_JoystickID* gamepads = SDL_GetGamepads(&count); + for (int i = 0; i < count && gamepads; i++) { - if (!SDL_IsGameController(i)) - { - sdl_log.error("Joystick %d is not game controller interface compatible! SDL Error: %s", i, SDL_GetError()); - continue; - } - - if (SDLDevice::sdl_info info = get_sdl_info(i); info.game_controller) + if (SDLDevice::sdl_info info = get_sdl_info(gamepads[i]); info.gamepad) { std::shared_ptr dev = std::make_shared(); dev->sdl = std::move(info); @@ -482,16 +483,17 @@ void sdl_pad_handler::enumerate_devices() m_controllers[device_name] = std::move(dev); } } + SDL_free(gamepads); } -std::shared_ptr sdl_pad_handler::get_device_by_game_controller(SDL_GameController* game_controller) const +std::shared_ptr sdl_pad_handler::get_device_by_gamepad(SDL_Gamepad* gamepad) const { - if (!game_controller) + if (!gamepad) return nullptr; - const char* name = SDL_GameControllerName(game_controller); - const char* path = SDL_GameControllerPath(game_controller); - const char* serial = SDL_GameControllerGetSerial(game_controller); + const char* name = SDL_GetGamepadName(gamepad); + const char* path = SDL_GetGamepadPath(gamepad); + const char* serial = SDL_GetGamepadSerial(gamepad); // Try to find a real device for (const auto& controller : m_controllers) @@ -551,17 +553,13 @@ PadHandlerBase::connection sdl_pad_handler::update_connection(const std::shared_ { if (SDLDevice* dev = static_cast(device.get())) { - if (dev->sdl.game_controller) + if (dev->sdl.gamepad) { - if (SDL_GameControllerGetAttached(dev->sdl.game_controller)) + if (SDL_GamepadConnected(dev->sdl.gamepad)) { - if (SDL_HasEvent(SDL_EventType::SDL_CONTROLLERBUTTONDOWN) || - SDL_HasEvent(SDL_EventType::SDL_CONTROLLERBUTTONUP) || - SDL_HasEvent(SDL_EventType::SDL_CONTROLLERAXISMOTION) || - SDL_HasEvent(SDL_EventType::SDL_CONTROLLERSENSORUPDATE) || - SDL_HasEvent(SDL_EventType::SDL_CONTROLLERTOUCHPADUP) || - SDL_HasEvent(SDL_EventType::SDL_CONTROLLERTOUCHPADDOWN) || - SDL_HasEvent(SDL_EventType::SDL_JOYBATTERYUPDATED)) + if (SDL_HasEvents(SDL_EventType::SDL_EVENT_GAMEPAD_AXIS_MOTION, SDL_EventType::SDL_EVENT_GAMEPAD_BUTTON_UP) || + SDL_HasEvents(SDL_EventType::SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN, SDL_EventType::SDL_EVENT_GAMEPAD_SENSOR_UPDATE) || + SDL_HasEvent(SDL_EventType::SDL_EVENT_JOYSTICK_BATTERY_UPDATED)) { return connection::connected; } @@ -569,52 +567,49 @@ PadHandlerBase::connection sdl_pad_handler::update_connection(const std::shared_ return connection::no_data; } - SDL_GameControllerClose(dev->sdl.game_controller); - dev->sdl.game_controller = nullptr; - dev->sdl.joystick = nullptr; + SDL_CloseGamepad(dev->sdl.gamepad); + dev->sdl.gamepad = nullptr; } // Try to reconnect - for (int i = 0; i < SDL_NumJoysticks(); i++) + int count = 0; + SDL_JoystickID* gamepads = SDL_GetGamepads(&count); + for (int i = 0; i < count; i++) { - if (!SDL_IsGameController(i)) - { - continue; - } - - // Get game controller - SDL_GameController* game_controller = SDL_GameControllerOpen(i); - if (!game_controller) + // Get game pad + SDL_Gamepad* gamepad = SDL_OpenGamepad(gamepads[i]); + if (!gamepad) { continue; } // Find out if we already know this controller - std::shared_ptr sdl_device = get_device_by_game_controller(game_controller); + std::shared_ptr sdl_device = get_device_by_gamepad(gamepad); if (!sdl_device) { - // Close the game controller if we don't know it. - SDL_GameControllerClose(game_controller); + // Close the game pad if we don't know it. + SDL_CloseGamepad(gamepad); continue; } // Re-attach the controller if the device matches the current one if (sdl_device.get() == dev) { - if (SDLDevice::sdl_info info = get_sdl_info(i); info.game_controller) + if (SDLDevice::sdl_info info = get_sdl_info(gamepads[i]); info.gamepad) { dev->sdl = std::move(info); } break; } } + SDL_free(gamepads); } return connection::disconnected; } -void sdl_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool /*player_led*/, bool battery_led, u32 battery_led_brightness) +void sdl_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 large_motor, u8 small_motor, s32 r, s32 g, s32 b, bool player_led, bool battery_led, u32 battery_led_brightness) { std::shared_ptr device = get_device(padId); SDLDevice* dev = static_cast(device.get()); @@ -628,6 +623,9 @@ void sdl_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 larg set_rumble(dev, large_motor, small_motor); + dev->update_player_leds = true; + dev->config->player_led_enabled.set(player_led); + if (battery_led) { const u32 combined_color = get_battery_color(dev->sdl.power_level, battery_led_brightness); @@ -642,27 +640,26 @@ void sdl_pad_handler::SetPadData(const std::string& padId, u8 player_id, u8 larg dev->config->colorB.set(b); } - if (dev->sdl.has_led && SDL_GameControllerSetLED(dev->sdl.game_controller, r, g, b) != 0) + if ((dev->sdl.has_led || dev->sdl.has_mono_led) && !SDL_SetGamepadLED(dev->sdl.gamepad, r, g, b)) { sdl_log.error("Could not set LED of device %d! SDL Error: %s", player_id, SDL_GetError()); } + + if (dev->sdl.has_player_led && !SDL_SetGamepadPlayerIndex(dev->sdl.gamepad, player_led ? player_id : -1)) + { + sdl_log.error("Could not set player LED of device %d! SDL Error: %s", player_id, SDL_GetError()); + } } -u32 sdl_pad_handler::get_battery_color(SDL_JoystickPowerLevel power_level, u32 brightness) const +u32 sdl_pad_handler::get_battery_color(int power_level, u32 brightness) const { u32 combined_color{}; - switch (power_level) - { - default: combined_color = 0xFF00; break; - case SDL_JOYSTICK_POWER_UNKNOWN: combined_color = 0xFF00; break; - case SDL_JOYSTICK_POWER_EMPTY: combined_color = 0xFF33; break; - case SDL_JOYSTICK_POWER_LOW: combined_color = 0xFFCC; break; - case SDL_JOYSTICK_POWER_MEDIUM: combined_color = 0x66FF; break; - case SDL_JOYSTICK_POWER_FULL: combined_color = 0x00FF; break; - case SDL_JOYSTICK_POWER_WIRED: combined_color = 0x00FF; break; - case SDL_JOYSTICK_POWER_MAX: combined_color = 0x00FF; break; - } + if (power_level < 20) combined_color = 0xFF00; + else if (power_level < 40) combined_color = 0xFF33; + else if (power_level < 60) combined_color = 0xFFCC; + else if (power_level < 80) combined_color = 0x66FF; + else combined_color = 0x00FF; const u32 red = (combined_color >> 8) * brightness / 100; const u32 green = (combined_color & 0xff) * brightness / 100; @@ -676,20 +673,16 @@ u32 sdl_pad_handler::get_battery_level(const std::string& padId) if (!dev) return 0; - if (dev->sdl.joystick) + if (dev->sdl.gamepad) { - dev->sdl.power_level = SDL_JoystickCurrentPowerLevel(dev->sdl.joystick); - - switch (dev->sdl.power_level) + const SDL_PowerState power_state = SDL_GetGamepadPowerInfo(dev->sdl.gamepad, &dev->sdl.power_level); + switch (power_state) { - case SDL_JOYSTICK_POWER_UNKNOWN: return 0; - case SDL_JOYSTICK_POWER_EMPTY: return 5; - case SDL_JOYSTICK_POWER_LOW: return 20; - case SDL_JOYSTICK_POWER_MEDIUM: return 70; - case SDL_JOYSTICK_POWER_FULL: return 100; - case SDL_JOYSTICK_POWER_WIRED: return 100; - case SDL_JOYSTICK_POWER_MAX: return 100; - default: return 0; + case SDL_PowerState::SDL_POWERSTATE_ERROR: + case SDL_PowerState::SDL_POWERSTATE_UNKNOWN: + return 0; + default: + return std::clamp(dev->sdl.power_level, 0, 100); } } @@ -700,24 +693,28 @@ void sdl_pad_handler::get_extended_info(const pad_ensemble& binding) { const auto& pad = binding.pad; SDLDevice* dev = static_cast(binding.device.get()); - if (!dev || !dev->sdl.game_controller || !pad) + if (!dev || !dev->sdl.gamepad || !pad) return; - if (dev->sdl.joystick) + if (dev->sdl.gamepad) { - dev->sdl.power_level = SDL_JoystickCurrentPowerLevel(dev->sdl.joystick); - pad->m_cable_state = dev->sdl.power_level == SDL_JOYSTICK_POWER_WIRED; - - switch (dev->sdl.power_level) + const SDL_PowerState power_state = SDL_GetGamepadPowerInfo(dev->sdl.gamepad, &dev->sdl.power_level); + switch (power_state) { - case SDL_JOYSTICK_POWER_UNKNOWN: pad->m_battery_level = 0; break; - case SDL_JOYSTICK_POWER_EMPTY: pad->m_battery_level = 5; break; - case SDL_JOYSTICK_POWER_LOW: pad->m_battery_level = 20; break; - case SDL_JOYSTICK_POWER_MEDIUM: pad->m_battery_level = 70; break; - case SDL_JOYSTICK_POWER_FULL: pad->m_battery_level = 100; break; - case SDL_JOYSTICK_POWER_WIRED: pad->m_battery_level = 100; break; - case SDL_JOYSTICK_POWER_MAX: pad->m_battery_level = 100; break; - default: pad->m_battery_level = 0; break; + case SDL_PowerState::SDL_POWERSTATE_ON_BATTERY: + pad->m_battery_level = std::clamp(dev->sdl.power_level, 0, 100); + pad->m_cable_state = 0; + break; + case SDL_PowerState::SDL_POWERSTATE_NO_BATTERY: + case SDL_PowerState::SDL_POWERSTATE_CHARGING: + case SDL_PowerState::SDL_POWERSTATE_CHARGED: + pad->m_battery_level = std::clamp(dev->sdl.power_level, 0, 100); + pad->m_cable_state = 1; + break; + default: + pad->m_battery_level = 0; + pad->m_cable_state = 0; + break; } } else @@ -728,7 +725,7 @@ void sdl_pad_handler::get_extended_info(const pad_ensemble& binding) if (dev->sdl.has_accel) { - if (SDL_GameControllerGetSensorData(dev->sdl.game_controller, SDL_SENSOR_ACCEL, dev->values_accel.data(), 3) != 0) + if (!SDL_GetGamepadSensorData(dev->sdl.gamepad, SDL_SENSOR_ACCEL, dev->values_accel.data(), 3)) { sdl_log.error("Could not get acceleration sensor data of device %d! SDL Error: %s", dev->player_id, SDL_GetError()); } @@ -747,7 +744,7 @@ void sdl_pad_handler::get_extended_info(const pad_ensemble& binding) if (dev->sdl.has_gyro) { - if (SDL_GameControllerGetSensorData(dev->sdl.game_controller, SDL_SENSOR_GYRO, dev->values_gyro.data(), 3) != 0) + if (!SDL_GetGamepadSensorData(dev->sdl.gamepad, SDL_SENSOR_GYRO, dev->values_gyro.data(), 3)) { sdl_log.error("Could not get gyro sensor data of device %d! SDL Error: %s", dev->player_id, SDL_GetError()); } @@ -823,7 +820,7 @@ void sdl_pad_handler::apply_pad_data(const pad_ensemble& binding) } } - if (dev->sdl.has_led) + if (dev->sdl.has_led || dev->sdl.has_mono_led) { // Use LEDs to indicate battery level if (cfg->led_battery_indicator) @@ -879,7 +876,7 @@ void sdl_pad_handler::apply_pad_data(const pad_ensemble& binding) const u8 g = dev->led_is_on ? cfg->colorG : 0; const u8 b = dev->led_is_on ? cfg->colorB : 0; - if (SDL_GameControllerSetLED(dev->sdl.game_controller, r, g, b) != 0) + if (!SDL_SetGamepadLED(dev->sdl.gamepad, r, g, b)) { sdl_log.error("Could not set LED of device %d! SDL Error: %s", dev->player_id, SDL_GetError()); } @@ -887,19 +884,30 @@ void sdl_pad_handler::apply_pad_data(const pad_ensemble& binding) dev->led_needs_update = false; } } + + if (dev->sdl.has_player_led && (dev->update_player_leds || dev->enable_player_leds != cfg->player_led_enabled.get())) + { + dev->enable_player_leds = cfg->player_led_enabled.get(); + dev->update_player_leds = false; + + if (!SDL_SetGamepadPlayerIndex(dev->sdl.gamepad, dev->enable_player_leds ? dev->player_id : -1)) + { + sdl_log.error("Could not set player LED of device %d! SDL Error: %s", dev->player_id, SDL_GetError()); + } + } } void sdl_pad_handler::set_rumble(SDLDevice* dev, u8 speed_large, u8 speed_small) { - if (!dev || !dev->sdl.game_controller) return; + if (!dev || !dev->sdl.gamepad) return; constexpr u32 rumble_duration_ms = static_cast((min_output_interval + 100ms).count()); // Some number higher than the min_output_interval. if (dev->sdl.has_rumble) { - if (SDL_GameControllerRumble(dev->sdl.game_controller, speed_large * 257, speed_small * 257, rumble_duration_ms) != 0) + if (!SDL_RumbleGamepad(dev->sdl.gamepad, speed_large * 257, speed_small * 257, rumble_duration_ms)) { - sdl_log.error("Unable to play game controller rumble of player %d! SDL Error: %s", dev->player_id, SDL_GetError()); + sdl_log.error("Unable to play game pad rumble of player %d! SDL Error: %s", dev->player_id, SDL_GetError()); } } @@ -909,9 +917,9 @@ void sdl_pad_handler::set_rumble(SDLDevice* dev, u8 speed_large, u8 speed_small) if (false && dev->sdl.has_rumble_triggers) { // Only the large motor shall control both triggers. It wouldn't make sense to differentiate here. - if (SDL_GameControllerRumbleTriggers(dev->sdl.game_controller, speed_large * 257, speed_large * 257, rumble_duration_ms) != 0) + if (!SDL_RumbleGamepadTriggers(dev->sdl.gamepad, speed_large * 257, speed_large * 257, rumble_duration_ms)) { - sdl_log.error("Unable to play game controller trigger rumble of player %d! SDL Error: %s", dev->player_id, SDL_GetError()); + sdl_log.error("Unable to play game pad trigger rumble of player %d! SDL Error: %s", dev->player_id, SDL_GetError()); } } } @@ -972,43 +980,43 @@ std::unordered_map sdl_pad_handler::get_button_values(const std::share { std::unordered_map values; SDLDevice* dev = static_cast(device.get()); - if (!dev || !dev->sdl.game_controller) + if (!dev || !dev->sdl.gamepad) return values; - for (SDL_GameControllerButton button_id : dev->sdl.button_ids) + for (SDL_GamepadButton button_id : dev->sdl.button_ids) { - const u8 value = SDL_GameControllerGetButton(dev->sdl.game_controller, button_id); + const u8 value = SDL_GetGamepadButton(dev->sdl.gamepad, button_id); const SDLKeyCodes key_code = get_button_code(button_id); // TODO: SDL does not support DS3 button intensity in the current version values[key_code] = value ? 255 : 0; } - for (SDL_GameControllerAxis axis_id : dev->sdl.axis_ids) + for (SDL_GamepadAxis axis_id : dev->sdl.axis_ids) { - const s16 value = SDL_GameControllerGetAxis(dev->sdl.game_controller, axis_id); + const s16 value = SDL_GetGamepadAxis(dev->sdl.gamepad, axis_id); switch (axis_id) { - case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERLEFT: + case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_LEFT_TRIGGER: values[SDLKeyCodes::LT] = std::max(0, value); break; - case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERRIGHT: + case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_RIGHT_TRIGGER: values[SDLKeyCodes::RT] = std::max(0, value); break; - case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX: + case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_LEFTX: values[SDLKeyCodes::LSXNeg] = value < 0 ? std::abs(value) - 1 : 0; values[SDLKeyCodes::LSXPos] = value > 0 ? value : 0; break; - case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY: + case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_LEFTY: values[SDLKeyCodes::LSYNeg] = value > 0 ? value : 0; values[SDLKeyCodes::LSYPos] = value < 0 ? std::abs(value) - 1 : 0; break; - case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX: + case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_RIGHTX: values[SDLKeyCodes::RSXNeg] = value < 0 ? std::abs(value) - 1 : 0; values[SDLKeyCodes::RSXPos] = value > 0 ? value : 0; break; - case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY: + case SDL_GamepadAxis::SDL_GAMEPAD_AXIS_RIGHTY: values[SDLKeyCodes::RSYNeg] = value > 0 ? value : 0; values[SDLKeyCodes::RSYPos] = value < 0 ? std::abs(value) - 1 : 0; break; @@ -1021,20 +1029,20 @@ std::unordered_map sdl_pad_handler::get_button_values(const std::share { for (const SDLDevice::touch_point& finger : touchpad.fingers) { - u8 state = 0; // 1 means the finger is touching the pad + bool down = false; // true means the finger is touching the pad f32 x = 0.0f; // 0 = left, 1 = right f32 y = 0.0f; // 0 = top, 1 = bottom f32 pressure = 0.0f; // In the current SDL version the pressure is always 1 if the state is 1 - if (SDL_GameControllerGetTouchpadFinger(dev->sdl.game_controller, touchpad.index, finger.index, &state, &x, &y, &pressure) != 0) + if (!SDL_GetGamepadTouchpadFinger(dev->sdl.gamepad, touchpad.index, finger.index, &down, &x, &y, &pressure)) { sdl_log.error("Could not get touchpad %d finger %d data of device %d! SDL Error: %s", touchpad.index, finger.index, dev->player_id, SDL_GetError()); } else { - sdl_log.trace("touchpad=%d, finger=%d, state=%d, x=%f, y=%f, pressure=%f", touchpad.index, finger.index, state, x, y, pressure); + sdl_log.trace("touchpad=%d, finger=%d, state=%d, x=%f, y=%f, pressure=%f", touchpad.index, finger.index, down, x, y, pressure); - if (state == 0) + if (!down) { continue; } @@ -1066,9 +1074,9 @@ pad_preview_values sdl_pad_handler::get_preview_values(const std::unordered_map< }; } -std::string sdl_pad_handler::button_to_string(SDL_GameControllerButton button) +std::string sdl_pad_handler::button_to_string(SDL_GamepadButton button) { - if (const char* name = SDL_GameControllerGetStringForButton(button)) + if (const char* name = SDL_GetGamepadStringForButton(button)) { return name; } @@ -1076,9 +1084,9 @@ std::string sdl_pad_handler::button_to_string(SDL_GameControllerButton button) return {}; } -std::string sdl_pad_handler::axis_to_string(SDL_GameControllerAxis axis) +std::string sdl_pad_handler::axis_to_string(SDL_GamepadAxis axis) { - if (const char* name = SDL_GameControllerGetStringForAxis(axis)) + if (const char* name = SDL_GetGamepadStringForAxis(axis)) { return name; } @@ -1086,33 +1094,33 @@ std::string sdl_pad_handler::axis_to_string(SDL_GameControllerAxis axis) return {}; } -sdl_pad_handler::SDLKeyCodes sdl_pad_handler::get_button_code(SDL_GameControllerButton button) +sdl_pad_handler::SDLKeyCodes sdl_pad_handler::get_button_code(SDL_GamepadButton button) { switch (button) { default: - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_INVALID: return SDLKeyCodes::None; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_A: return SDLKeyCodes::A; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_B: return SDLKeyCodes::B; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_X: return SDLKeyCodes::X; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_Y: return SDLKeyCodes::Y; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT: return SDLKeyCodes::Left; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT: return SDLKeyCodes::Right; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP: return SDLKeyCodes::Up; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN: return SDLKeyCodes::Down; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSHOULDER: return SDLKeyCodes::LB; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: return SDLKeyCodes::RB; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_BACK: return SDLKeyCodes::Back; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_START: return SDLKeyCodes::Start; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSTICK: return SDLKeyCodes::LS; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSTICK: return SDLKeyCodes::RS; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_GUIDE: return SDLKeyCodes::Guide; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_MISC1: return SDLKeyCodes::Misc1; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_PADDLE1: return SDLKeyCodes::Paddle1; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_PADDLE2: return SDLKeyCodes::Paddle2; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_PADDLE3: return SDLKeyCodes::Paddle3; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_PADDLE4: return SDLKeyCodes::Paddle4; - case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_TOUCHPAD: return SDLKeyCodes::Touchpad; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_INVALID: return SDLKeyCodes::None; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_SOUTH: return SDLKeyCodes::South; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_EAST: return SDLKeyCodes::East; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_WEST: return SDLKeyCodes::West; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_NORTH: return SDLKeyCodes::North; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_DPAD_LEFT: return SDLKeyCodes::Left; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_DPAD_RIGHT: return SDLKeyCodes::Right; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_DPAD_UP: return SDLKeyCodes::Up; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_DPAD_DOWN: return SDLKeyCodes::Down; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_SHOULDER: return SDLKeyCodes::LB; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER: return SDLKeyCodes::RB; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_BACK: return SDLKeyCodes::Back; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_START: return SDLKeyCodes::Start; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_STICK: return SDLKeyCodes::LS; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_STICK: return SDLKeyCodes::RS; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_GUIDE: return SDLKeyCodes::Guide; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC1: return SDLKeyCodes::Misc1; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1: return SDLKeyCodes::RPaddle1; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_PADDLE1: return SDLKeyCodes::LPaddle1; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2: return SDLKeyCodes::RPaddle2; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_PADDLE2: return SDLKeyCodes::LPaddle2; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_TOUCHPAD: return SDLKeyCodes::Touchpad; } } diff --git a/rpcs3/Input/sdl_pad_handler.h b/rpcs3/Input/sdl_pad_handler.h index a375f8a07f..1e8dff73f2 100644 --- a/rpcs3/Input/sdl_pad_handler.h +++ b/rpcs3/Input/sdl_pad_handler.h @@ -1,9 +1,18 @@ #pragma once -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 #include "Emu/Io/PadHandler.h" -#include "SDL.h" + +#ifndef _MSC_VER +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" +#endif +#include "SDL3/SDL.h" +#ifndef _MSC_VER +#pragma GCC diagnostic pop +#endif + class SDLDevice : public PadDevice { @@ -24,11 +33,10 @@ public: struct sdl_info { - SDL_GameController* game_controller = nullptr; - SDL_GameControllerType type = SDL_GameControllerType::SDL_CONTROLLER_TYPE_UNKNOWN; - SDL_Joystick* joystick = nullptr; - SDL_JoystickPowerLevel power_level = SDL_JoystickPowerLevel::SDL_JOYSTICK_POWER_UNKNOWN; - SDL_JoystickPowerLevel last_power_level = SDL_JoystickPowerLevel::SDL_JOYSTICK_POWER_UNKNOWN; + SDL_Gamepad* gamepad = nullptr; + SDL_GamepadType type = SDL_GamepadType::SDL_GAMEPAD_TYPE_UNKNOWN; + int power_level = 0; + int last_power_level = 0; std::string name; std::string path; @@ -41,6 +49,8 @@ public: bool is_virtual_device = false; bool has_led = false; + bool has_mono_led = false; + bool has_player_led = false; bool has_rumble = false; bool has_rumble_triggers = false; bool has_accel = false; @@ -49,8 +59,8 @@ public: f32 data_rate_accel = 0.0f; f32 data_rate_gyro = 0.0f; - std::set button_ids; - std::set axis_ids; + std::set button_ids; + std::set axis_ids; std::vector touchpads; }; @@ -72,10 +82,10 @@ class sdl_pad_handler : public PadHandlerBase { None = 0, - A, - B, - X, - Y, + South, + East, + West, + North, Left, Right, Up, @@ -88,10 +98,10 @@ class sdl_pad_handler : public PadHandlerBase Back, Guide, Misc1, - Paddle1, - Paddle2, - Paddle3, - Paddle4, + RPaddle1, + LPaddle1, + RPaddle2, + LPaddle2, Touchpad, Touch_L, @@ -116,7 +126,7 @@ public: sdl_pad_handler(); ~sdl_pad_handler(); - SDLDevice::sdl_info get_sdl_info(int i); + SDLDevice::sdl_info get_sdl_info(SDL_JoystickID id); bool Init() override; void process() override; @@ -132,7 +142,7 @@ private: std::map> m_controllers; void enumerate_devices(); - std::shared_ptr get_device_by_game_controller(SDL_GameController* game_controller) const; + std::shared_ptr get_device_by_gamepad(SDL_Gamepad* gamepad) const; std::shared_ptr get_device(const std::string& device) override; PadHandlerBase::connection update_connection(const std::shared_ptr& device) override; @@ -146,13 +156,13 @@ private: std::unordered_map get_button_values(const std::shared_ptr& device) override; pad_preview_values get_preview_values(const std::unordered_map& data) override; - u32 get_battery_color(SDL_JoystickPowerLevel power_level, u32 brightness) const; + u32 get_battery_color(int power_level, u32 brightness) const; void set_rumble(SDLDevice* dev, u8 speed_large, u8 speed_small); - static std::string button_to_string(SDL_GameControllerButton button); - static std::string axis_to_string(SDL_GameControllerAxis axis); + static std::string button_to_string(SDL_GamepadButton button); + static std::string axis_to_string(SDL_GamepadAxis axis); - static SDLKeyCodes get_button_code(SDL_GameControllerButton button); + static SDLKeyCodes get_button_code(SDL_GamepadButton button); }; #endif diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index b9a3b59bf0..d5d9f992b2 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -42,8 +42,8 @@ Use ..\3rdparty\miniupnp\miniupnp\miniupnpc\include;..\3rdparty\wolfssl\wolfssl;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\SoundTouch\soundtouch\include;..\3rdparty\rtmidi\rtmidi;..\3rdparty\zlib\zlib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm\include;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\include;$(VULKAN_SDK)\Include;..\3rdparty\zstd\zstd\lib;$(SolutionDir)3rdparty\fusion\fusion\Fusion;$(SolutionDir)3rdparty\wolfssl\extra\win32 MaxSpeed - AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions) - AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions) + AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL3;ZLIB_CONST;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions) + AL_LIBTYPE_STATIC;MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL3;ZLIB_CONST;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions) %(AdditionalModuleDependencies) %(AdditionalModuleDependencies) diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 2330fe3115..ce0b4fd6c7 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -79,7 +79,7 @@ 4577;4467;4281;%(DisableSpecificWarnings) $(IntDir) MaxSpeed - _WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;HAVE_SDL2;WITH_DISCORD_RPC;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;HAVE_SDL3;WITH_DISCORD_RPC;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions) false $(IntDir)vc$(PlatformToolsetVersion).pdb true @@ -1155,7 +1155,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1307,7 +1307,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1317,7 +1317,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1337,7 +1337,7 @@ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1363,7 +1363,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1374,7 +1374,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1384,7 +1384,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1573,7 +1573,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1666,7 +1666,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1699,7 +1699,7 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index c20510c929..1522e89858 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -1436,7 +1436,7 @@ void pad_settings_dialog::ChangeHandler() case pad_handler::ds4: m_description = tooltips.gamepad_settings.ds4_other; break; case pad_handler::dualsense: m_description = tooltips.gamepad_settings.dualsense_other; break; #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 case pad_handler::sdl: m_description = tooltips.gamepad_settings.sdl; break; #endif #ifdef HAVE_LIBEVDEV @@ -1976,7 +1976,7 @@ QString pad_settings_dialog::GetLocalizedPadHandler(const QString& original, pad case pad_handler::xinput: return tr("XInput"); case pad_handler::mm: return tr("MMJoystick"); #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 case pad_handler::sdl: return tr("SDL"); #endif #ifdef HAVE_LIBEVDEV @@ -2001,7 +2001,7 @@ QString pad_settings_dialog::GetLocalizedPadName(pad_handler handler, const QStr case pad_handler::xinput: return tr("XInput Pad #%0").arg(index); case pad_handler::mm: return tr("Joystick #%0").arg(index); #endif -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL3 case pad_handler::sdl: break; // Localization not feasible. Names differ for each device. #endif #ifdef HAVE_LIBEVDEV diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 85af632ff2..d4285911a8 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1285,7 +1285,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceCheckBox(ui->lockOverlayInputToPlayerOne, emu_settings_type::LockOvlIptToP1); SubscribeTooltip(ui->lockOverlayInputToPlayerOne, tooltips.settings.lock_overlay_input_to_player_one); -#if HAVE_SDL2 +#if HAVE_SDL3 m_emu_settings->EnhanceCheckBox(ui->loadSdlMappings, emu_settings_type::SDLMappings); SubscribeTooltip(ui->loadSdlMappings, tooltips.settings.sdl_mappings); #else From ae39c5b8cb28565087c0d4d5b44134045a520ed2 Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Tue, 4 Mar 2025 06:24:11 +0200 Subject: [PATCH 044/529] RSX: Optimize vertex program ucode invalidation --- rpcs3/Emu/RSX/NV47/HW/nv4097.cpp | 33 ++++++++++++++++-- rpcs3/Emu/RSX/Program/ProgramStateCache.h | 42 +++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp index 8d9aecfaee..ce7d0130a2 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp @@ -155,9 +155,38 @@ namespace rsx rcount = ::size32(fifo_span); } - copy_data_swap_u32(®S(ctx)->transform_program[load_pos * 4 + index % 4], fifo_span.data(), rcount); + const auto out_ptr = ®S(ctx)->transform_program[load_pos * 4 + index % 4]; - RSX(ctx)->m_graphics_state |= rsx::pipeline_state::vertex_program_ucode_dirty; + pipeline_state to_set_dirty = rsx::pipeline_state::vertex_program_ucode_dirty; + + if (rcount >= 4 && !RSX(ctx)->m_graphics_state.test(rsx::pipeline_state::vertex_program_ucode_dirty)) + { + // Assume clean + to_set_dirty = {}; + + const usz first_index_off = 0; + const usz second_index_off = (((rcount / 4) - 1) / 2) * 4; + + const u64 src_op1_2 = read_from_ptr>(fifo_span.data() + first_index_off); + const u64 src_op2_2 = read_from_ptr>(fifo_span.data() + second_index_off); + + // Fast comparison + if (src_op1_2 != read_from_ptr(out_ptr + first_index_off) || src_op2_2 != read_from_ptr(out_ptr + second_index_off)) + { + to_set_dirty = rsx::pipeline_state::vertex_program_ucode_dirty; + } + } + + if (to_set_dirty) + { + copy_data_swap_u32(out_ptr, fifo_span.data(), rcount); + } + else if (copy_data_swap_u32_cmp(out_ptr, fifo_span.data(), rcount)) + { + to_set_dirty = rsx::pipeline_state::vertex_program_ucode_dirty; + } + + RSX(ctx)->m_graphics_state |= to_set_dirty; REGS(ctx)->transform_program_load_set(load_pos + ((rcount + index % 4) / 4)); RSX(ctx)->fifo_ctrl->skip_methods(rcount - 1); } diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/Emu/RSX/Program/ProgramStateCache.h index 17857b80ad..c4bacedf30 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.h @@ -172,16 +172,35 @@ protected: bool recompile = false; vertex_program_type* new_shader; { + thread_local const std::pair* prev_vp = nullptr; + thread_local usz prev_count = umax; + static atomic_t invl_count = 0; + reader_lock lock(m_vertex_mutex); + if (prev_count == invl_count) + { + // prev_vp must be non-null here + if (prev_vp->first.data.size() == rsx_vp.data.size() && prev_vp->first.output_mask == rsx_vp.output_mask) + { + if (program_hash_util::vertex_program_compare()(prev_vp->first, rsx_vp)) + { + return std::forward_as_tuple(prev_vp->second, true); + } + } + } + const auto& I = m_vertex_shader_cache.find(rsx_vp); if (I != m_vertex_shader_cache.end()) { + prev_vp = &*I; + prev_count = invl_count; return std::forward_as_tuple(I->second, true); } if (!force_load) { + prev_count = umax; return std::forward_as_tuple(__null_vertex_program, false); } @@ -191,6 +210,8 @@ protected: auto [it, inserted] = m_vertex_shader_cache.try_emplace(rsx_vp); new_shader = &(it->second); recompile = inserted; + prev_count = umax; + invl_count++; } if (recompile) @@ -209,16 +230,35 @@ protected: fragment_program_type* new_shader; { + thread_local const std::pair* prev_fp = nullptr; + thread_local usz prev_count = umax; + static atomic_t invl_count = 0; + reader_lock lock(m_fragment_mutex); + if (prev_count == invl_count) + { + // prev_vp must be non-null here + if (prev_fp->first.ucode_length == rsx_fp.ucode_length && prev_fp->first.texcoord_control_mask == rsx_fp.texcoord_control_mask) + { + if (program_hash_util::fragment_program_compare()(prev_fp->first, rsx_fp)) + { + return std::forward_as_tuple(prev_fp->second, true); + } + } + } + const auto& I = m_fragment_shader_cache.find(rsx_fp); if (I != m_fragment_shader_cache.end()) { + prev_fp = &*I; + prev_count = invl_count; return std::forward_as_tuple(I->second, true); } if (!force_load) { + prev_count = umax; return std::forward_as_tuple(__null_fragment_program, false); } @@ -227,6 +267,8 @@ protected: lock.upgrade(); std::tie(it, recompile) = m_fragment_shader_cache.try_emplace(rsx_fp); new_shader = &(it->second); + prev_count = umax; + invl_count++; } if (recompile) From 75dc2a12e262dcfb3a2d0d557f3bbc0366a91ae0 Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Wed, 5 Mar 2025 13:51:49 +0200 Subject: [PATCH 045/529] RSX: Return VP shader as is if no changes were made --- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 5 +- rpcs3/Emu/RSX/GL/GLProgramBuffer.h | 6 +-- rpcs3/Emu/RSX/Program/ProgramStateCache.h | 62 ++++++++++++----------- rpcs3/Emu/RSX/RSXThread.cpp | 2 + rpcs3/Emu/RSX/RSXThread.h | 2 + rpcs3/Emu/RSX/VK/VKGSRender.cpp | 5 +- rpcs3/Emu/RSX/VK/VKProgramBuffer.h | 6 +-- 7 files changed, 51 insertions(+), 37 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 6dbd7f919c..0a8b78bf51 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -781,7 +781,10 @@ bool GLGSRender::load_program() if (shadermode != shader_mode::interpreter_only) [[likely]] { void* pipeline_properties = nullptr; - std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer.get_graphics_pipeline(current_vertex_program, current_fragment_program, pipeline_properties, + std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer.get_graphics_pipeline( + current_vertex_program, vertex_program_invalidation_count, + current_fragment_program, fragment_program_invalidation_count, + pipeline_properties, shadermode != shader_mode::recompiler, true); if (m_prog_buffer.check_cache_missed()) diff --git a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h index 2d6f19f271..9a1d249f59 100644 --- a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h +++ b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h @@ -135,13 +135,13 @@ struct GLProgramBuffer : public program_state_cache template void add_pipeline_entry(const RSXVertexProgram& vp, const RSXFragmentProgram& fp, void* &props, Args&& ...args) { - get_graphics_pipeline(vp, fp, props, false, false, std::forward(args)...); + get_graphics_pipeline(vp, umax, fp, umax, props, false, false, std::forward(args)...); } void preload_programs(const RSXVertexProgram& vp, const RSXFragmentProgram& fp) { - search_vertex_program(vp); - search_fragment_program(fp); + search_vertex_program(vp, umax); + search_fragment_program(fp, umax); } bool check_cache_missed() const diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/Emu/RSX/Program/ProgramStateCache.h index c4bacedf30..ae0e8f6258 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.h @@ -167,24 +167,30 @@ protected: pipeline_storage_type __null_pipeline_handle; /// bool here to inform that the program was preexisting. - std::tuple search_vertex_program(const RSXVertexProgram& rsx_vp, bool force_load = true) + std::tuple search_vertex_program(const RSXVertexProgram& rsx_vp, usz rsx_vp_invalidation_count) { bool recompile = false; vertex_program_type* new_shader; { thread_local const std::pair* prev_vp = nullptr; - thread_local usz prev_count = umax; - static atomic_t invl_count = 0; + thread_local usz prev_map_count = umax, prev_rsx_count = umax; + static atomic_t map_invl_count = 0; reader_lock lock(m_vertex_mutex); - if (prev_count == invl_count) + if (prev_map_count == map_invl_count) { // prev_vp must be non-null here if (prev_vp->first.data.size() == rsx_vp.data.size() && prev_vp->first.output_mask == rsx_vp.output_mask) { + if (rsx_vp_invalidation_count != umax && prev_rsx_count == rsx_vp_invalidation_count) + { + return std::forward_as_tuple(prev_vp->second, true); + } + if (program_hash_util::vertex_program_compare()(prev_vp->first, rsx_vp)) { + prev_rsx_count = rsx_vp_invalidation_count; return std::forward_as_tuple(prev_vp->second, true); } } @@ -194,24 +200,20 @@ protected: if (I != m_vertex_shader_cache.end()) { prev_vp = &*I; - prev_count = invl_count; + prev_map_count = map_invl_count; + prev_rsx_count = rsx_vp_invalidation_count; return std::forward_as_tuple(I->second, true); } - if (!force_load) - { - prev_count = umax; - return std::forward_as_tuple(__null_vertex_program, false); - } - rsx_log.trace("VP not found in buffer!"); lock.upgrade(); auto [it, inserted] = m_vertex_shader_cache.try_emplace(rsx_vp); new_shader = &(it->second); recompile = inserted; - prev_count = umax; - invl_count++; + prev_map_count = umax; + prev_rsx_count = umax; + map_invl_count++; } if (recompile) @@ -223,24 +225,28 @@ protected: } /// bool here to inform that the program was preexisting. - std::tuple search_fragment_program(const RSXFragmentProgram& rsx_fp, bool force_load = true) + std::tuple search_fragment_program(const RSXFragmentProgram& rsx_fp, usz /*rsx_fp_invalidation_count*/) { bool recompile = false; typename binary_to_fragment_program::iterator it; fragment_program_type* new_shader; - { thread_local const std::pair* prev_fp = nullptr; - thread_local usz prev_count = umax; - static atomic_t invl_count = 0; + thread_local usz prev_map_count = umax, prev_rsx_count = umax; + static atomic_t map_invl_count = 0; reader_lock lock(m_fragment_mutex); - if (prev_count == invl_count) + if (prev_map_count == map_invl_count) { // prev_vp must be non-null here if (prev_fp->first.ucode_length == rsx_fp.ucode_length && prev_fp->first.texcoord_control_mask == rsx_fp.texcoord_control_mask) { + // if (rsx_fp_invalidation_count != umax && prev_rsx_count == rsx_fp_invalidation_count) + // { + // return std::forward_as_tuple(prev_fp->second, true); + // } + if (program_hash_util::fragment_program_compare()(prev_fp->first, rsx_fp)) { return std::forward_as_tuple(prev_fp->second, true); @@ -252,23 +258,19 @@ protected: if (I != m_fragment_shader_cache.end()) { prev_fp = &*I; - prev_count = invl_count; + //prev_rsx_count = rsx_fp_invalidation_count; + prev_map_count = map_invl_count; return std::forward_as_tuple(I->second, true); } - if (!force_load) - { - prev_count = umax; - return std::forward_as_tuple(__null_fragment_program, false); - } - rsx_log.trace("FP not found in buffer!"); lock.upgrade(); std::tie(it, recompile) = m_fragment_shader_cache.try_emplace(rsx_fp); new_shader = &(it->second); - prev_count = umax; - invl_count++; + prev_map_count = umax; + prev_rsx_count = umax; + map_invl_count++; } if (recompile) @@ -332,15 +334,17 @@ public: template pipeline_data_type get_graphics_pipeline( const RSXVertexProgram& vertexShader, + usz vertexShaderInvalidationCount, const RSXFragmentProgram& fragmentShader, + usz fragmentShaderInvalidationCount, pipeline_properties& pipelineProperties, bool compile_async, bool allow_notification, Args&& ...args ) { - const auto& vp_search = search_vertex_program(vertexShader); - const auto& fp_search = search_fragment_program(fragmentShader); + const auto& vp_search = search_vertex_program(vertexShader, vertexShaderInvalidationCount); + const auto& fp_search = search_fragment_program(fragmentShader, fragmentShaderInvalidationCount); const bool already_existing_fragment_program = std::get<1>(fp_search); const bool already_existing_vertex_program = std::get<1>(vp_search); diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 420aa6eb8e..91efee217b 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -1953,6 +1953,7 @@ namespace rsx } m_graphics_state.clear(rsx::pipeline_state::vertex_program_ucode_dirty); + vertex_program_invalidation_count++; // Reload transform constants unconditionally for now m_graphics_state |= rsx::pipeline_state::transform_constants_dirty; @@ -2010,6 +2011,7 @@ namespace rsx return; } + vertex_program_invalidation_count++; ensure(!m_graphics_state.test(rsx::pipeline_state::vertex_program_ucode_dirty)); current_vertex_program.output_mask = rsx::method_registers.vertex_attrib_output_mask(); diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 8b5f2af10d..19b40d3087 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -242,6 +242,8 @@ namespace rsx rsx::atomic_bitmask_t m_eng_interrupt_mask; rsx::bitmask_t m_graphics_state; + u64 fragment_program_invalidation_count = umax; + u64 vertex_program_invalidation_count = umax; u64 ROP_sync_timestamp = 0; program_hash_util::fragment_program_utils::fragment_program_metadata current_fp_metadata = {}; diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index d37f6d62d0..2513b070eb 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -1960,7 +1960,10 @@ bool VKGSRender::load_program() vk::enter_uninterruptible(); // Load current program from cache - std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer->get_graphics_pipeline(vertex_program, fragment_program, m_pipeline_properties, + std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer->get_graphics_pipeline( + vertex_program, vertex_program_invalidation_count, + fragment_program, fragment_program_invalidation_count, + m_pipeline_properties, shadermode != shader_mode::recompiler, true, m_pipeline_layout); vk::leave_uninterruptible(); diff --git a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h index 34cb08bae4..6483176c43 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h +++ b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h @@ -88,13 +88,13 @@ namespace vk template void add_pipeline_entry(RSXVertexProgram& vp, RSXFragmentProgram& fp, vk::pipeline_props& props, Args&& ...args) { - get_graphics_pipeline(vp, fp, props, false, false, std::forward(args)...); + get_graphics_pipeline(vp, umax, fp, umax, props, false, false, std::forward(args)...); } void preload_programs(const RSXVertexProgram& vp, const RSXFragmentProgram& fp) { - search_vertex_program(vp); - search_fragment_program(fp); + search_vertex_program(vp, umax); + search_fragment_program(fp, umax); } bool check_cache_missed() const From 799518123518eafe1c9de99d52263814722679e7 Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Wed, 5 Mar 2025 18:36:20 +0200 Subject: [PATCH 046/529] RSX: Return FP shader as is if no changes were made --- rpcs3/Emu/RSX/NV47/HW/nv406e.cpp | 3 +++ rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp | 3 +++ rpcs3/Emu/RSX/Program/ProgramStateCache.h | 15 +++++++++------ rpcs3/Emu/RSX/RSXThread.cpp | 2 ++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp index ced6c3f386..242b1bdb73 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp @@ -25,6 +25,9 @@ namespace rsx RSX(ctx)->sync_point_request.release(true); const u32 addr = get_address(REGS(ctx)->semaphore_offset_406e(), REGS(ctx)->semaphore_context_dma_406e()); + // Syncronization point, may be associated with memory changes without actually changing addresses + RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_ucode_dirty; + const auto& sema = vm::_ref(addr).val; if (sema == arg) diff --git a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp b/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp index 9c153b2056..77a1a10b11 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp @@ -44,6 +44,9 @@ namespace rsx // Manually flush the pipeline. // It is possible to stream report writes using the host GPU, but that generates too much submit traffic. RSX(ctx)->sync(); + + // Syncronization point, may be associated with memory changes without actually changing addresses + RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_ucode_dirty; } } diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/Emu/RSX/Program/ProgramStateCache.h index ae0e8f6258..21f33ed6a6 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.h @@ -213,6 +213,7 @@ protected: recompile = inserted; prev_map_count = umax; prev_rsx_count = umax; + prev_vp = nullptr; map_invl_count++; } @@ -225,7 +226,7 @@ protected: } /// bool here to inform that the program was preexisting. - std::tuple search_fragment_program(const RSXFragmentProgram& rsx_fp, usz /*rsx_fp_invalidation_count*/) + std::tuple search_fragment_program(const RSXFragmentProgram& rsx_fp, usz rsx_fp_invalidation_count) { bool recompile = false; typename binary_to_fragment_program::iterator it; @@ -242,13 +243,14 @@ protected: // prev_vp must be non-null here if (prev_fp->first.ucode_length == rsx_fp.ucode_length && prev_fp->first.texcoord_control_mask == rsx_fp.texcoord_control_mask) { - // if (rsx_fp_invalidation_count != umax && prev_rsx_count == rsx_fp_invalidation_count) - // { - // return std::forward_as_tuple(prev_fp->second, true); - // } + if (rsx_fp_invalidation_count != umax && prev_rsx_count == rsx_fp_invalidation_count) + { + return std::forward_as_tuple(prev_fp->second, true); + } if (program_hash_util::fragment_program_compare()(prev_fp->first, rsx_fp)) { + prev_rsx_count = rsx_fp_invalidation_count; return std::forward_as_tuple(prev_fp->second, true); } } @@ -258,7 +260,7 @@ protected: if (I != m_fragment_shader_cache.end()) { prev_fp = &*I; - //prev_rsx_count = rsx_fp_invalidation_count; + prev_rsx_count = rsx_fp_invalidation_count; prev_map_count = map_invl_count; return std::forward_as_tuple(I->second, true); } @@ -270,6 +272,7 @@ protected: new_shader = &(it->second); prev_map_count = umax; prev_rsx_count = umax; + prev_fp = nullptr; map_invl_count++; } diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 91efee217b..3ea42c60df 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -1904,6 +1904,7 @@ namespace rsx } m_graphics_state.clear(rsx::pipeline_state::fragment_program_ucode_dirty); + fragment_program_invalidation_count++; // Request for update of fragment constants if the program block is invalidated m_graphics_state |= rsx::pipeline_state::fragment_constants_dirty; @@ -2046,6 +2047,7 @@ namespace rsx ensure(!m_graphics_state.test(rsx::pipeline_state::fragment_program_ucode_dirty)); m_graphics_state.clear(rsx::pipeline_state::fragment_program_dirty); + fragment_program_invalidation_count++; current_fragment_program.ctrl = m_ctx->register_state->shader_control() & (CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS | CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT); current_fragment_program.texcoord_control_mask = m_ctx->register_state->texcoord_control_mask(); From 32df7315befac5938f256984526d52625025b238 Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:29:32 +0200 Subject: [PATCH 047/529] RSX: Do not invalidate FP analysis on same register writes --- rpcs3/Emu/RSX/NV47/HW/common.cpp | 79 ++++++++++++++++++++- rpcs3/Emu/RSX/NV47/HW/common.h | 4 +- rpcs3/Emu/RSX/NV47/HW/nv4097.h | 27 +++++-- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 15 ++++ rpcs3/Emu/RSX/Program/ProgramStateCache.h | 12 +++- rpcs3/Emu/RSX/RSXThread.cpp | 4 +- rpcs3/Emu/RSX/rsx_methods.cpp | 20 +++--- 7 files changed, 141 insertions(+), 20 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/Emu/RSX/NV47/HW/common.cpp index f60ac94f5f..558a5c8309 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/common.cpp @@ -62,8 +62,13 @@ namespace rsx return vm::cast(get_address(offset, location)); } - void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 index) + void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index, bool /*is_shader_config*/) { + if (REGS(ctx)->latch == arg) + { + return; + } + RSX(ctx)->m_textures_dirty[index] = true; if (RSX(ctx)->current_fp_metadata.referenced_textures_mask & (1 << index)) @@ -72,6 +77,78 @@ namespace rsx } } + void set_texture_configuration_command(rsx::context* ctx, u32 reg) + { + const u32 reg_index = reg - NV4097_SET_TEXTURE_OFFSET; + ensure(reg_index % 8 == 0 && reg_index < 8 * 16); // Only NV4097_SET_TEXTURE_OFFSET is expected + + const u32 texture_index = reg_index / 8; + + // FIFO args count including this one + const u32 fifo_args_cnt = RSX(ctx)->fifo_ctrl->get_remaining_args_count() + 1; + + // The range of methods this function resposible to + constexpr u32 method_range = 8; + + // Get limit imposed by FIFO PUT (if put is behind get it will result in a number ignored by min) + const u32 fifo_read_limit = static_cast(((RSX(ctx)->ctrl->put & ~3ull) - (RSX(ctx)->fifo_ctrl->get_pos())) / 4); + + const u32 count = std::min({ fifo_args_cnt, fifo_read_limit, method_range }); + + // Clamp by the count of methods this function is responsible to + std::span command_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(); + + if (command_span.size() > count) + { + command_span = command_span.subspan(0, count); + } + + ensure(!command_span.empty()); + + u32* const dst_regs = ®S(ctx)->registers[reg]; + + //u8 change_mask = 0; + u8 change_mask = 0xff; + + if (dst_regs[0] != REGS(ctx)->latch) + { + // Fixup for the first method + change_mask |= 1; + } + + for (usz i = 1; i < command_span.size(); i++) + { + const u32 command_data = std::bit_cast>(command_span[i]); + + change_mask |= command_data != dst_regs[i] ? (1u << i) : 0; + + dst_regs[i] = command_data; + } + + // Disabled + // Bits set: + // NV4097_SET_TEXTURE_OFFSET + // NV4097_SET_TEXTURE_IMAGE_RECT + //constexpr u32 mask_of_texture_data_not_affecting_shader_config = 0x41; + constexpr u32 mask_of_texture_data_not_affecting_shader_config = 0; + + if (change_mask) + { + RSX(ctx)->m_textures_dirty[texture_index] = true; + + if (~mask_of_texture_data_not_affecting_shader_config & change_mask) + { + if (RSX(ctx)->current_fp_metadata.referenced_textures_mask & (1 << texture_index)) + { + RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_state_dirty; + } + } + } + + // Skip handled methods + RSX(ctx)->fifo_ctrl->skip_methods(static_cast(command_span.size()) - 1); + } + void set_vertex_texture_dirty_bit(rsx::context* ctx, u32 index) { RSX(ctx)->m_vertex_textures_dirty[index] = true; diff --git a/rpcs3/Emu/RSX/NV47/HW/common.h b/rpcs3/Emu/RSX/NV47/HW/common.h index bdcc367de0..0b22906ac9 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.h +++ b/rpcs3/Emu/RSX/NV47/HW/common.h @@ -17,7 +17,9 @@ namespace rsx void push_draw_parameter_change(rsx::context* ctx, rsx::command_barrier_type type, u32 reg, u32 arg0, u32 arg1 = 0u, u32 index = 0u); - void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 index); + void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index, bool is_shader_config); + + void set_texture_configuration_command(rsx::context* ctx, u32 reg); void set_vertex_texture_dirty_bit(rsx::context* ctx, u32 index); } diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.h b/rpcs3/Emu/RSX/NV47/HW/nv4097.h index 6d526d799a..4dff809123 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv4097.h +++ b/rpcs3/Emu/RSX/NV47/HW/nv4097.h @@ -221,12 +221,31 @@ namespace rsx } }; - template - struct set_texture_dirty_bit + template + struct set_texture_dirty_bit_texture_config { - static void impl(context* ctx, u32 /*reg*/, u32 /*arg*/) + static void impl(context* ctx, u32 /*reg*/, u32 arg) { - util::set_fragment_texture_dirty_bit(ctx, index); + util::set_fragment_texture_dirty_bit(ctx, arg, index, true); + } + }; + + template + struct set_texture_offset + { + static void impl(context* ctx, u32 reg, u32 /*arg*/) + { + fmt::throw_exception("Unreacable!"); + util::set_texture_configuration_command(ctx, reg); + } + }; + + template + struct set_texture_dirty_bit_location_and_area + { + static void impl(context* ctx, u32 /*reg*/, u32 arg) + { + util::set_fragment_texture_dirty_bit(ctx, arg, index, false); } }; diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index 3ce6dbca41..a6979a8f2b 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -770,6 +770,21 @@ bool fragment_program_compare::operator()(const RSXFragmentProgram& binary1, con return true; } +bool fragment_program_compare::config_only(const RSXFragmentProgram& binary1, const RSXFragmentProgram& binary2) +{ + if (binary1.ucode_length != binary2.ucode_length || + binary1.ctrl != binary2.ctrl || + binary1.texture_state != binary2.texture_state || + binary1.texcoord_control_mask != binary2.texcoord_control_mask || + binary1.two_sided_lighting != binary2.two_sided_lighting || + binary1.mrt_buffers_count != binary2.mrt_buffers_count) + { + return false; + } + + return true; +} + namespace rsx { #if defined(ARCH_X64) || defined(ARCH_ARM64) diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/Emu/RSX/Program/ProgramStateCache.h index 21f33ed6a6..6e460ab580 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.h @@ -80,6 +80,7 @@ namespace program_hash_util struct fragment_program_compare { bool operator()(const RSXFragmentProgram &binary1, const RSXFragmentProgram &binary2) const; + static bool config_only(const RSXFragmentProgram &binary1, const RSXFragmentProgram &binary2); }; } @@ -245,10 +246,15 @@ protected: { if (rsx_fp_invalidation_count != umax && prev_rsx_count == rsx_fp_invalidation_count) { - return std::forward_as_tuple(prev_fp->second, true); + // Shader UCODE must be the same. + // Shader config changes are not tracked at the moment + // Compare manually + if (program_hash_util::fragment_program_compare::config_only(prev_fp->first, rsx_fp)) + { + return std::forward_as_tuple(prev_fp->second, true); + } } - - if (program_hash_util::fragment_program_compare()(prev_fp->first, rsx_fp)) + else if (program_hash_util::fragment_program_compare()(prev_fp->first, rsx_fp)) { prev_rsx_count = rsx_fp_invalidation_count; return std::forward_as_tuple(prev_fp->second, true); diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 3ea42c60df..c12066ffb8 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -2047,7 +2047,9 @@ namespace rsx ensure(!m_graphics_state.test(rsx::pipeline_state::fragment_program_ucode_dirty)); m_graphics_state.clear(rsx::pipeline_state::fragment_program_dirty); - fragment_program_invalidation_count++; + + // FP config is always checked for now (see get_graphics_pipeline) + //fragment_program_invalidation_count++; current_fragment_program.ctrl = m_ctx->register_state->shader_control() & (CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS | CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT); current_fragment_program.texcoord_control_mask = m_ctx->register_state->texcoord_control_mask(); diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index ac5d92eef2..babcc878ae 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -1663,16 +1663,16 @@ namespace rsx bind(NV4097_SET_SURFACE_PITCH_D, nv4097::set_surface_dirty_bit); bind(NV4097_SET_SURFACE_PITCH_Z, nv4097::set_surface_dirty_bit); bind(NV4097_SET_WINDOW_OFFSET, nv4097::set_surface_dirty_bit); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); bind_range(); bind_range(); bind_range(); From 26495a845593b211bd2159e202f566dc249a56fa Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Sat, 8 Mar 2025 13:45:34 +0200 Subject: [PATCH 048/529] SPU: Fixup --- rpcs3/Emu/Cell/SPUCommonRecompiler.cpp | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp index b65553976f..e11cc7a817 100644 --- a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp @@ -8148,15 +8148,23 @@ std::array& block_reg_info::evaluate_start_state(const s } } - auto& res_state = is_all_resolved ? cur_node->start_reg_state : temp; - - if (!is_all_resolved) + if (qi == 0) { - res_state = reg_state_t::make_unknown(it->block_pc); + // TODO: First block is always resolved here, but this logic can be improved to detect more cases of opportunistic resolving + is_all_resolved = true; } - for (usz bi = 0; is_all_resolved && bi < it->state_prev.size(); bi++) + auto& res_state = is_all_resolved ? cur_node->start_reg_state : temp; + + for (usz bi = 0, is_first = 1; bi < it->state_prev.size(); bi++) { + if (it->state_prev[bi].disconnected) + { + // Loop state, even if not ignored for a million times the result would still be the same + // So ignore it + continue; + } + std::array* arg_state{}; const auto& node = ::at32(map, it->state_prev[bi].block_pc); @@ -8172,7 +8180,7 @@ std::array& block_reg_info::evaluate_start_state(const s ensure(it->state_prev[bi].state_written); } - if (bi == 0) + if (is_first) { res_state = *arg_state; } @@ -8180,6 +8188,8 @@ std::array& block_reg_info::evaluate_start_state(const s { merge(res_state, res_state, *arg_state, it->block_pc); } + + is_first = 0; } std::array* result_storage{}; From a1c8f3a528811be9c110d600f10bc31d5f6778c0 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 8 Mar 2025 19:03:05 +0300 Subject: [PATCH 049/529] rsx/prog: Use a proper cache hint key instead of disjointed counters --- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 5 +- rpcs3/Emu/RSX/GL/GLProgramBuffer.h | 8 +- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 14 ++ rpcs3/Emu/RSX/Program/ProgramStateCache.h | 156 ++++++++++---------- rpcs3/Emu/RSX/RSXThread.cpp | 8 +- rpcs3/Emu/RSX/RSXThread.h | 5 +- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 5 +- rpcs3/Emu/RSX/VK/VKProgramBuffer.h | 8 +- rpcs3/Emu/RSX/rsx_cache.h | 2 +- 9 files changed, 110 insertions(+), 101 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 0a8b78bf51..79c93b2cd4 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -782,8 +782,9 @@ bool GLGSRender::load_program() { void* pipeline_properties = nullptr; std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer.get_graphics_pipeline( - current_vertex_program, vertex_program_invalidation_count, - current_fragment_program, fragment_program_invalidation_count, + &m_program_cache_hint, + current_vertex_program, + current_fragment_program, pipeline_properties, shadermode != shader_mode::recompiler, true); diff --git a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h index 9a1d249f59..8dd34caacd 100644 --- a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h +++ b/rpcs3/Emu/RSX/GL/GLProgramBuffer.h @@ -135,13 +135,13 @@ struct GLProgramBuffer : public program_state_cache template void add_pipeline_entry(const RSXVertexProgram& vp, const RSXFragmentProgram& fp, void* &props, Args&& ...args) { - get_graphics_pipeline(vp, umax, fp, umax, props, false, false, std::forward(args)...); + get_graphics_pipeline(nullptr, vp, fp, props, false, false, std::forward(args)...); } - void preload_programs(const RSXVertexProgram& vp, const RSXFragmentProgram& fp) + void preload_programs(rsx::program_cache_hint_t* cache_hint, const RSXVertexProgram& vp, const RSXFragmentProgram& fp) { - search_vertex_program(vp, umax); - search_fragment_program(fp, umax); + search_vertex_program(cache_hint, vp); + search_fragment_program(cache_hint, fp); } bool check_cache_missed() const diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index a6979a8f2b..9cac524d61 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "ProgramStateCache.h" #include "Emu/system_config.h" +#include "Emu/RSX/Core/RSXDriverState.h" #include "util/sysinfo.hpp" #include @@ -851,4 +852,17 @@ namespace rsx write_fragment_constants_to_buffer_fallback(buffer, rsx_prog, offsets_cache, sanitize); #endif } + + void program_cache_hint_t::invalidate(u32 flags) + { + if (flags & rsx::vertex_program_dirty) + { + cached_vertex_program = nullptr; + } + + if (flags & rsx::fragment_program_dirty) + { + cached_fragment_program = nullptr; + } + } } diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/Emu/RSX/Program/ProgramStateCache.h index 6e460ab580..ff1082dc36 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.h @@ -7,6 +7,7 @@ #include "util/logs.hpp" #include "util/fnv_hash.hpp" #include "util/v128.hpp" +#include #include #include @@ -86,6 +87,47 @@ namespace program_hash_util namespace rsx { + struct program_cache_hint_t + { + template + T* get_fragment_program() const + { + return utils::bless(cached_fragment_program); + } + + template + T* get_vertex_program() const + { + return utils::bless(cached_vertex_program); + } + + bool has_vertex_program() const + { + return cached_vertex_program != nullptr; + } + + bool has_fragment_program() const + { + return cached_fragment_program != nullptr; + } + + void invalidate(u32 flags); + + static inline void cache_vertex_program(program_cache_hint_t* cache, void* vertex_program) + { + if (cache) cache->cached_vertex_program = vertex_program; + } + + static inline void cache_fragment_program(program_cache_hint_t* cache, void* fragment_program) + { + if (cache) cache->cached_fragment_program = fragment_program; + } + + protected: + void* cached_fragment_program = nullptr; + void* cached_vertex_program = nullptr; + }; + void write_fragment_constants_to_buffer(const std::span& buffer, const RSXFragmentProgram& rsx_prog, const std::vector& offsets_cache, bool sanitize = true); } @@ -97,13 +139,13 @@ namespace rsx * - a typedef VertexProgramData to a type that encapsulate vertex program info. It should provide an Id member. * - a typedef FragmentProgramData to a types that encapsulate fragment program info. It should provide an Id member and a fragment constant offset vector. * - a typedef PipelineData encapsulating monolithic program. -* - a typedef PipelineProperties to a type that encapsulate various state info relevant to program compilation (alpha test, primitive type,...) +* - a typedef pipeline_properties to a type that encapsulate various state info relevant to program compilation (alpha test, primitive type,...) * - a typedef ExtraData type that will be passed to the buildProgram function. * It should also contains the following function member : * - static void recompile_fragment_program(RSXFragmentProgram *RSXFP, FragmentProgramData& fragmentProgramData, usz ID); * - static void recompile_vertex_program(RSXVertexProgram *RSXVP, VertexProgramData& vertexProgramData, usz ID); -* - static PipelineData build_program(VertexProgramData &vertexProgramData, FragmentProgramData &fragmentProgramData, const PipelineProperties &pipelineProperties, const ExtraData& extraData); -* - static void validate_pipeline_properties(const VertexProgramData &vertexProgramData, const FragmentProgramData &fragmentProgramData, PipelineProperties& props); +* - static PipelineData build_program(VertexProgramData &vertexProgramData, FragmentProgramData &fragmentProgramData, const pipeline_properties &pipeline_properties, const ExtraData& extraData); +* - static void validate_pipeline_properties(const VertexProgramData &vertexProgramData, const FragmentProgramData &fragmentProgramData, pipeline_properties& props); */ template class program_state_cache @@ -168,41 +210,25 @@ protected: pipeline_storage_type __null_pipeline_handle; /// bool here to inform that the program was preexisting. - std::tuple search_vertex_program(const RSXVertexProgram& rsx_vp, usz rsx_vp_invalidation_count) + std::tuple search_vertex_program( + rsx::program_cache_hint_t* cache_hint, + const RSXVertexProgram& rsx_vp) { + if (cache_hint && cache_hint->has_vertex_program()) + { + // The caller guarantees that the cached vertex program is correct. + return std::forward_as_tuple(*cache_hint->get_vertex_program(), true); + } + bool recompile = false; vertex_program_type* new_shader; { - thread_local const std::pair* prev_vp = nullptr; - thread_local usz prev_map_count = umax, prev_rsx_count = umax; - static atomic_t map_invl_count = 0; - reader_lock lock(m_vertex_mutex); - if (prev_map_count == map_invl_count) - { - // prev_vp must be non-null here - if (prev_vp->first.data.size() == rsx_vp.data.size() && prev_vp->first.output_mask == rsx_vp.output_mask) - { - if (rsx_vp_invalidation_count != umax && prev_rsx_count == rsx_vp_invalidation_count) - { - return std::forward_as_tuple(prev_vp->second, true); - } - - if (program_hash_util::vertex_program_compare()(prev_vp->first, rsx_vp)) - { - prev_rsx_count = rsx_vp_invalidation_count; - return std::forward_as_tuple(prev_vp->second, true); - } - } - } - const auto& I = m_vertex_shader_cache.find(rsx_vp); if (I != m_vertex_shader_cache.end()) { - prev_vp = &*I; - prev_map_count = map_invl_count; - prev_rsx_count = rsx_vp_invalidation_count; + rsx::program_cache_hint_t::cache_vertex_program(cache_hint, &(I->second)); return std::forward_as_tuple(I->second, true); } @@ -212,10 +238,6 @@ protected: auto [it, inserted] = m_vertex_shader_cache.try_emplace(rsx_vp); new_shader = &(it->second); recompile = inserted; - prev_map_count = umax; - prev_rsx_count = umax; - prev_vp = nullptr; - map_invl_count++; } if (recompile) @@ -223,51 +245,29 @@ protected: backend_traits::recompile_vertex_program(rsx_vp, *new_shader, m_next_id++); } + rsx::program_cache_hint_t::cache_vertex_program(cache_hint, new_shader); return std::forward_as_tuple(*new_shader, false); } /// bool here to inform that the program was preexisting. - std::tuple search_fragment_program(const RSXFragmentProgram& rsx_fp, usz rsx_fp_invalidation_count) + std::tuple search_fragment_program(rsx::program_cache_hint_t* cache_hint, const RSXFragmentProgram& rsx_fp) { + if (cache_hint && cache_hint->has_fragment_program()) + { + // The caller guarantees that the cached fragemnt program is correct. + return std::forward_as_tuple(*cache_hint->get_fragment_program(), true); + } + bool recompile = false; typename binary_to_fragment_program::iterator it; fragment_program_type* new_shader; { - thread_local const std::pair* prev_fp = nullptr; - thread_local usz prev_map_count = umax, prev_rsx_count = umax; - static atomic_t map_invl_count = 0; - reader_lock lock(m_fragment_mutex); - if (prev_map_count == map_invl_count) - { - // prev_vp must be non-null here - if (prev_fp->first.ucode_length == rsx_fp.ucode_length && prev_fp->first.texcoord_control_mask == rsx_fp.texcoord_control_mask) - { - if (rsx_fp_invalidation_count != umax && prev_rsx_count == rsx_fp_invalidation_count) - { - // Shader UCODE must be the same. - // Shader config changes are not tracked at the moment - // Compare manually - if (program_hash_util::fragment_program_compare::config_only(prev_fp->first, rsx_fp)) - { - return std::forward_as_tuple(prev_fp->second, true); - } - } - else if (program_hash_util::fragment_program_compare()(prev_fp->first, rsx_fp)) - { - prev_rsx_count = rsx_fp_invalidation_count; - return std::forward_as_tuple(prev_fp->second, true); - } - } - } - const auto& I = m_fragment_shader_cache.find(rsx_fp); if (I != m_fragment_shader_cache.end()) { - prev_fp = &*I; - prev_rsx_count = rsx_fp_invalidation_count; - prev_map_count = map_invl_count; + rsx::program_cache_hint_t::cache_fragment_program(cache_hint, &(I->second)); return std::forward_as_tuple(I->second, true); } @@ -276,10 +276,6 @@ protected: lock.upgrade(); std::tie(it, recompile) = m_fragment_shader_cache.try_emplace(rsx_fp); new_shader = &(it->second); - prev_map_count = umax; - prev_rsx_count = umax; - prev_fp = nullptr; - map_invl_count++; } if (recompile) @@ -288,6 +284,7 @@ protected: backend_traits::recompile_fragment_program(rsx_fp, *new_shader, m_next_id++); } + rsx::program_cache_hint_t::cache_fragment_program(cache_hint, new_shader); return std::forward_as_tuple(*new_shader, false); } @@ -342,31 +339,30 @@ public: template pipeline_data_type get_graphics_pipeline( - const RSXVertexProgram& vertexShader, - usz vertexShaderInvalidationCount, - const RSXFragmentProgram& fragmentShader, - usz fragmentShaderInvalidationCount, - pipeline_properties& pipelineProperties, + rsx::program_cache_hint_t* cache_hint, + const RSXVertexProgram& vertex_shader, + const RSXFragmentProgram& fragment_shader, + pipeline_properties& pipeline_properties, bool compile_async, bool allow_notification, Args&& ...args ) { - const auto& vp_search = search_vertex_program(vertexShader, vertexShaderInvalidationCount); - const auto& fp_search = search_fragment_program(fragmentShader, fragmentShaderInvalidationCount); + const auto& vp_search = search_vertex_program(cache_hint, vertex_shader); + const auto& fp_search = search_fragment_program(cache_hint, fragment_shader); const bool already_existing_fragment_program = std::get<1>(fp_search); const bool already_existing_vertex_program = std::get<1>(vp_search); const vertex_program_type& vertex_program = std::get<0>(vp_search); const fragment_program_type& fragment_program = std::get<0>(fp_search); - const pipeline_key key = { vertex_program.id, fragment_program.id, pipelineProperties }; + const pipeline_key key = { vertex_program.id, fragment_program.id, pipeline_properties }; m_cache_miss_flag = true; if (already_existing_vertex_program && already_existing_fragment_program) { // There is a high chance the pipeline object was compiled if the two shaders already existed before - backend_traits::validate_pipeline_properties(vertex_program, fragment_program, pipelineProperties); + backend_traits::validate_pipeline_properties(vertex_program, fragment_program, pipeline_properties); reader_lock lock(m_pipeline_mutex); if (const auto I = m_storage.find(key); I != m_storage.end()) @@ -396,7 +392,7 @@ public: if (allow_notification) { - callback = [this, vertexShader, fragmentShader_ = RSXFragmentProgram::clone(fragmentShader), key] + callback = [this, vertex_shader, fragment_shader_ = RSXFragmentProgram::clone(fragment_shader), key] (pipeline_storage_type& pipeline) -> pipeline_type* { if (!pipeline) @@ -405,7 +401,7 @@ public: } rsx_log.success("Program compiled successfully"); - notify_pipeline_compiled(key.properties, vertexShader, fragmentShader_); + notify_pipeline_compiled(key.properties, vertex_shader, fragment_shader_); std::lock_guard lock(m_pipeline_mutex); auto& pipe_result = m_storage[key]; @@ -432,7 +428,7 @@ public: auto result = backend_traits::build_pipeline( vertex_program, // VS, must already be decompiled and recompiled above fragment_program, // FS, must already be decompiled and recompiled above - pipelineProperties, // Pipeline state + pipeline_properties, // Pipeline state compile_async, // Allow asynchronous compilation callback, // Insertion and notification callback std::forward(args)...); // Other arguments diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index c12066ffb8..860136e187 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -1904,7 +1904,6 @@ namespace rsx } m_graphics_state.clear(rsx::pipeline_state::fragment_program_ucode_dirty); - fragment_program_invalidation_count++; // Request for update of fragment constants if the program block is invalidated m_graphics_state |= rsx::pipeline_state::fragment_constants_dirty; @@ -1954,7 +1953,6 @@ namespace rsx } m_graphics_state.clear(rsx::pipeline_state::vertex_program_ucode_dirty); - vertex_program_invalidation_count++; // Reload transform constants unconditionally for now m_graphics_state |= rsx::pipeline_state::transform_constants_dirty; @@ -1990,6 +1988,8 @@ namespace rsx void thread::analyse_current_rsx_pipeline() { + m_program_cache_hint.invalidate(m_graphics_state.load()); + prefetch_vertex_program(); prefetch_fragment_program(); } @@ -2012,7 +2012,6 @@ namespace rsx return; } - vertex_program_invalidation_count++; ensure(!m_graphics_state.test(rsx::pipeline_state::vertex_program_ucode_dirty)); current_vertex_program.output_mask = rsx::method_registers.vertex_attrib_output_mask(); @@ -2048,9 +2047,6 @@ namespace rsx m_graphics_state.clear(rsx::pipeline_state::fragment_program_dirty); - // FP config is always checked for now (see get_graphics_pipeline) - //fragment_program_invalidation_count++; - current_fragment_program.ctrl = m_ctx->register_state->shader_control() & (CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS | CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT); current_fragment_program.texcoord_control_mask = m_ctx->register_state->texcoord_control_mask(); current_fragment_program.two_sided_lighting = m_ctx->register_state->two_side_light_en(); diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 19b40d3087..6c45e3e48a 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -242,8 +242,7 @@ namespace rsx rsx::atomic_bitmask_t m_eng_interrupt_mask; rsx::bitmask_t m_graphics_state; - u64 fragment_program_invalidation_count = umax; - u64 vertex_program_invalidation_count = umax; + u64 ROP_sync_timestamp = 0; program_hash_util::fragment_program_utils::fragment_program_metadata current_fp_metadata = {}; @@ -262,6 +261,8 @@ namespace rsx vertex_program_texture_state current_vp_texture_state = {}; fragment_program_texture_state current_fp_texture_state = {}; + program_cache_hint_t m_program_cache_hint; + // Runs shader prefetch and resolves pipeline status flags void analyse_current_rsx_pipeline(); diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 2513b070eb..c81df01ff3 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -1961,8 +1961,9 @@ bool VKGSRender::load_program() // Load current program from cache std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer->get_graphics_pipeline( - vertex_program, vertex_program_invalidation_count, - fragment_program, fragment_program_invalidation_count, + &m_program_cache_hint, + vertex_program, + fragment_program, m_pipeline_properties, shadermode != shader_mode::recompiler, true, m_pipeline_layout); diff --git a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h index 6483176c43..4f9f535a76 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h +++ b/rpcs3/Emu/RSX/VK/VKProgramBuffer.h @@ -88,13 +88,13 @@ namespace vk template void add_pipeline_entry(RSXVertexProgram& vp, RSXFragmentProgram& fp, vk::pipeline_props& props, Args&& ...args) { - get_graphics_pipeline(vp, umax, fp, umax, props, false, false, std::forward(args)...); + get_graphics_pipeline(nullptr, vp, fp, props, false, false, std::forward(args)...); } - void preload_programs(const RSXVertexProgram& vp, const RSXFragmentProgram& fp) + void preload_programs(rsx::program_cache_hint_t* cache_hint, const RSXVertexProgram& vp, const RSXFragmentProgram& fp) { - search_vertex_program(vp, umax); - search_fragment_program(fp, umax); + search_vertex_program(cache_hint, vp); + search_fragment_program(cache_hint, fp); } bool check_cache_missed() const diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/Emu/RSX/rsx_cache.h index 4bbec32d99..fcbb7869a7 100644 --- a/rpcs3/Emu/RSX/rsx_cache.h +++ b/rpcs3/Emu/RSX/rsx_cache.h @@ -111,7 +111,7 @@ namespace rsx continue; } - m_storage.preload_programs(std::get<1>(entry), std::get<2>(entry)); + m_storage.preload_programs(nullptr, std::get<1>(entry), std::get<2>(entry)); unpacked[unpacked.push_begin()] = std::move(entry); } From eca86ad449723c5eb78517aa23c4bbb2961d7137 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 8 Mar 2025 19:35:47 +0300 Subject: [PATCH 050/529] rsx: Add program cache lookup ellision rate to overlay --- rpcs3/Emu/Cell/Modules/cellPad.cpp | 2 +- rpcs3/Emu/RSX/Core/RSXDisplay.h | 3 +++ rpcs3/Emu/RSX/GL/GLGSRender.cpp | 13 +++++++++++++ rpcs3/Emu/RSX/GL/GLPresent.cpp | 13 ++++++++++--- .../HomeMenu/overlay_home_menu_settings.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp | 4 ++-- rpcs3/Emu/RSX/RSXThread.cpp | 2 +- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 13 +++++++++++++ rpcs3/Emu/RSX/VK/VKPresent.cpp | 15 +++++++++++---- rpcs3/Emu/system_config.h | 2 +- 10 files changed, 56 insertions(+), 13 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/Emu/Cell/Modules/cellPad.cpp index 39ee7d0359..f28d96d1ce 100644 --- a/rpcs3/Emu/Cell/Modules/cellPad.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPad.cpp @@ -717,7 +717,7 @@ error_code cellPadGetData(u32 port_no, vm::ptr data) pad_get_data(port_no, data.get_ptr()); - if (g_cfg.io.debug_overlay && !g_cfg.video.overlay && port_no == 0) + if (g_cfg.io.debug_overlay && !g_cfg.video.debug_overlay && port_no == 0) { show_debug_overlay(*data, *pad, config); } diff --git a/rpcs3/Emu/RSX/Core/RSXDisplay.h b/rpcs3/Emu/RSX/Core/RSXDisplay.h index 4d4c90cd0d..77407f2f19 100644 --- a/rpcs3/Emu/RSX/Core/RSXDisplay.h +++ b/rpcs3/Emu/RSX/Core/RSXDisplay.h @@ -59,6 +59,9 @@ namespace rsx u32 vertex_cache_request_count; u32 vertex_cache_miss_count; + u32 program_cache_lookups_total; + u32 program_cache_lookups_ellided; + framebuffer_statistics_t framebuffer_stats; }; diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 79c93b2cd4..8cefa0c794 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -780,6 +780,19 @@ bool GLGSRender::load_program() if (shadermode != shader_mode::interpreter_only) [[likely]] { + if (g_cfg.video.debug_overlay) + { + m_frame_stats.program_cache_lookups_total += 2; + if (m_program_cache_hint.has_fragment_program()) + { + m_frame_stats.program_cache_lookups_ellided++; + } + if (m_program_cache_hint.has_vertex_program()) + { + m_frame_stats.program_cache_lookups_ellided++; + } + } + void* pipeline_properties = nullptr; std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer.get_graphics_pipeline( &m_program_cache_hint, diff --git a/rpcs3/Emu/RSX/GL/GLPresent.cpp b/rpcs3/Emu/RSX/GL/GLPresent.cpp index 1eaa3a6193..c73415edb2 100644 --- a/rpcs3/Emu/RSX/GL/GLPresent.cpp +++ b/rpcs3/Emu/RSX/GL/GLPresent.cpp @@ -382,7 +382,7 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info) } } - if (g_cfg.video.overlay) + if (g_cfg.video.debug_overlay) { const auto num_dirty_textures = m_gl_texture_cache.get_unreleased_textures_count(); const auto texture_memory_size = m_gl_texture_cache.get_texture_memory_in_use() / (1024 * 1024); @@ -400,6 +400,11 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info) const auto vertex_cache_hit_ratio = info.stats.vertex_cache_request_count ? (vertex_cache_hit_count * 100) / info.stats.vertex_cache_request_count : 0; + const auto program_cache_lookups = info.stats.program_cache_lookups_total; + const auto program_cache_ellided = info.stats.program_cache_lookups_ellided; + const auto program_cache_ellision_rate = program_cache_lookups + ? (program_cache_ellided * 100) / program_cache_lookups + : 0; rsx::overlays::set_debug_overlay_text(fmt::format( "Internal Resolution: %s\n" @@ -413,13 +418,15 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info) "Texture memory: %12dM\n" "Flush requests: %12d = %2d (%3d%%) hard faults, %2d unavoidable, %2d misprediction(s), %2d speculation(s)\n" "Texture uploads: %11u (%u from CPU - %02u%%, %u copies avoided)\n" - "Vertex cache hits: %9u/%u (%u%%)", + "Vertex cache hits: %9u/%u (%u%%)\n" + "Program cache lookup ellision: %u/%u (%u%%)", info.stats.framebuffer_stats.to_string(!backend_config.supports_hw_msaa), get_load(), info.stats.draw_calls, info.stats.setup_time, info.stats.vertex_upload_time, info.stats.textures_upload_time, info.stats.draw_exec_time, num_dirty_textures, texture_memory_size, num_flushes, num_misses, cache_miss_ratio, num_unavoidable, num_mispredict, num_speculate, num_texture_upload, num_texture_upload_miss, texture_upload_miss_ratio, texture_copies_ellided, - vertex_cache_hit_count, info.stats.vertex_cache_request_count, vertex_cache_hit_ratio) + vertex_cache_hit_count, info.stats.vertex_cache_request_count, vertex_cache_hit_ratio, + program_cache_ellided, program_cache_lookups, program_cache_ellision_rate) ); } diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp index daaf5cc8ee..119f411a24 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp @@ -132,7 +132,7 @@ namespace rsx home_menu_settings_debug::home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_DEBUG)) { - add_checkbox(&g_cfg.video.overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY); + add_checkbox(&g_cfg.video.debug_overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY); add_checkbox(&g_cfg.io.debug_overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY); add_checkbox(&g_cfg.video.disable_video_output, localized_string_id::HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT); add_float_slider(&g_cfg.video.texture_lod_bias, localized_string_id::HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS, "", 0.25f); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp b/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp index 2f6aca17a2..d616737b16 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp @@ -50,7 +50,7 @@ namespace rsx { auto overlay = manager->get(); - if (g_cfg.video.overlay || g_cfg.io.debug_overlay) + if (g_cfg.video.debug_overlay || g_cfg.io.debug_overlay) { if (!overlay) { @@ -66,7 +66,7 @@ namespace rsx extern void set_debug_overlay_text(std::string&& text) { - if (!g_cfg.misc.use_native_interface || (!g_cfg.video.overlay && !g_cfg.io.debug_overlay)) + if (!g_cfg.misc.use_native_interface || (!g_cfg.video.debug_overlay && !g_cfg.io.debug_overlay)) return; if (auto manager = g_fxo->try_get()) diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 860136e187..f33c778e62 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -3151,7 +3151,7 @@ namespace rsx // Reset current stats m_frame_stats = {}; - m_profiler.enabled = !!g_cfg.video.overlay; + m_profiler.enabled = !!g_cfg.video.debug_overlay; } f64 thread::get_cached_display_refresh_rate() diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index c81df01ff3..8e834d3081 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -1959,6 +1959,19 @@ bool VKGSRender::load_program() { vk::enter_uninterruptible(); + if (g_cfg.video.debug_overlay) + { + m_frame_stats.program_cache_lookups_total += 2; + if (m_program_cache_hint.has_fragment_program()) + { + m_frame_stats.program_cache_lookups_ellided++; + } + if (m_program_cache_hint.has_vertex_program()) + { + m_frame_stats.program_cache_lookups_ellided++; + } + } + // Load current program from cache std::tie(m_program, m_vertex_prog, m_fragment_prog) = m_prog_buffer->get_graphics_pipeline( &m_program_cache_hint, diff --git a/rpcs3/Emu/RSX/VK/VKPresent.cpp b/rpcs3/Emu/RSX/VK/VKPresent.cpp index e8f182c897..b6d0496fd9 100644 --- a/rpcs3/Emu/RSX/VK/VKPresent.cpp +++ b/rpcs3/Emu/RSX/VK/VKPresent.cpp @@ -766,7 +766,7 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info) } const bool has_overlay = (m_overlay_manager && m_overlay_manager->has_visible()); - if (g_cfg.video.overlay || has_overlay) + if (g_cfg.video.debug_overlay || has_overlay) { if (target_layout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { @@ -809,7 +809,7 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info) } } - if (g_cfg.video.overlay) + if (g_cfg.video.debug_overlay) { const auto num_dirty_textures = m_texture_cache.get_unreleased_textures_count(); const auto texture_memory_size = m_texture_cache.get_texture_memory_in_use() / (1024 * 1024); @@ -828,6 +828,11 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info) const auto vertex_cache_hit_ratio = info.stats.vertex_cache_request_count ? (vertex_cache_hit_count * 100) / info.stats.vertex_cache_request_count : 0; + const auto program_cache_lookups = info.stats.program_cache_lookups_total; + const auto program_cache_ellided = info.stats.program_cache_lookups_ellided; + const auto program_cache_ellision_rate = program_cache_lookups + ? (program_cache_ellided * 100) / program_cache_lookups + : 0; rsx::overlays::set_debug_overlay_text(fmt::format( "Internal Resolution: %s\n" @@ -844,14 +849,16 @@ void VKGSRender::flip(const rsx::display_flip_info_t& info) "Temporary texture memory: %3dM\n" "Flush requests: %13d = %2d (%3d%%) hard faults, %2d unavoidable, %2d misprediction(s), %2d speculation(s)\n" "Texture uploads: %12u (%u from CPU - %02u%%, %u copies avoided)\n" - "Vertex cache hits: %10u/%u (%u%%)", + "Vertex cache hits: %10u/%u (%u%%)\n" + "Program cache lookup ellision: %u/%u (%u%%)", info.stats.framebuffer_stats.to_string(!backend_config.supports_hw_msaa), get_load(), info.stats.draw_calls, info.stats.submit_count, info.stats.setup_time, info.stats.vertex_upload_time, info.stats.textures_upload_time, info.stats.draw_exec_time, info.stats.flip_time, num_dirty_textures, texture_memory_size, tmp_texture_memory_size, num_flushes, num_misses, cache_miss_ratio, num_unavoidable, num_mispredict, num_speculate, num_texture_upload, num_texture_upload_miss, texture_upload_miss_ratio, texture_copies_ellided, - vertex_cache_hit_count, info.stats.vertex_cache_request_count, vertex_cache_hit_ratio) + vertex_cache_hit_count, info.stats.vertex_cache_request_count, vertex_cache_hit_ratio, + program_cache_ellided, program_cache_lookups, program_cache_ellision_rate) ); } diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 6256639add..a476e03584 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -141,7 +141,7 @@ struct cfg_root : cfg::node cfg::_bool log_programs{ this, "Log shader programs" }; cfg::_bool vsync{ this, "VSync" }; cfg::_bool debug_output{ this, "Debug output" }; - cfg::_bool overlay{ this, "Debug overlay", false, true }; + cfg::_bool debug_overlay{ this, "Debug overlay", false, true }; cfg::_bool renderdoc_compatiblity{ this, "Renderdoc Compatibility Mode" }; cfg::_bool use_gpu_texture_scaling{ this, "Use GPU texture scaling", false }; cfg::_bool stretch_to_display_area{ this, "Stretch To Display Area", false, true }; From a39a743abea8ad170452c786dc526195e6381d37 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 8 Mar 2025 19:38:17 +0300 Subject: [PATCH 051/529] rsx/prog: Fix compiler warning --- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index 9cac524d61..7f1ea5ae27 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -706,7 +706,7 @@ usz fragment_program_utils::get_fragment_program_ucode_hash(const RSXFragmentPro const void* instbuffer = program.get_data(); usz acc0 = 0; usz acc1 = 0; - for (usz instIndex = 0; instIndex < (program.ucode_length / 16); instIndex++) + for (int instIndex = 0; instIndex < static_cast(program.ucode_length / 16); instIndex++) { const auto inst = v128::loadu(instbuffer, instIndex); const usz tmp0 = std::rotr(inst._u64[0], instIndex * 2); From df7a2ab467aebe1596799ef3430e8a2e6d6a18f1 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 8 Mar 2025 19:43:10 +0300 Subject: [PATCH 052/529] rsx: Unify fragment texture config changes dirty bit tracking - Reverts unnecessary changes to dirty tracking. - The GPU keeps a separate set of details, so all dirty bits are treated equal. --- rpcs3/Emu/RSX/NV47/HW/common.cpp | 2 +- rpcs3/Emu/RSX/NV47/HW/common.h | 2 +- rpcs3/Emu/RSX/NV47/HW/nv4097.h | 13 ++----------- rpcs3/Emu/RSX/rsx_methods.cpp | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/Emu/RSX/NV47/HW/common.cpp index 558a5c8309..60ea4ff632 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/common.cpp @@ -62,7 +62,7 @@ namespace rsx return vm::cast(get_address(offset, location)); } - void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index, bool /*is_shader_config*/) + void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index) { if (REGS(ctx)->latch == arg) { diff --git a/rpcs3/Emu/RSX/NV47/HW/common.h b/rpcs3/Emu/RSX/NV47/HW/common.h index 0b22906ac9..e72565e488 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.h +++ b/rpcs3/Emu/RSX/NV47/HW/common.h @@ -17,7 +17,7 @@ namespace rsx void push_draw_parameter_change(rsx::context* ctx, rsx::command_barrier_type type, u32 reg, u32 arg0, u32 arg1 = 0u, u32 index = 0u); - void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index, bool is_shader_config); + void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index); void set_texture_configuration_command(rsx::context* ctx, u32 reg); diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.h b/rpcs3/Emu/RSX/NV47/HW/nv4097.h index 4dff809123..7d338a075c 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv4097.h +++ b/rpcs3/Emu/RSX/NV47/HW/nv4097.h @@ -221,15 +221,6 @@ namespace rsx } }; - template - struct set_texture_dirty_bit_texture_config - { - static void impl(context* ctx, u32 /*reg*/, u32 arg) - { - util::set_fragment_texture_dirty_bit(ctx, arg, index, true); - } - }; - template struct set_texture_offset { @@ -241,11 +232,11 @@ namespace rsx }; template - struct set_texture_dirty_bit_location_and_area + struct set_fragment_texture_dirty_bit { static void impl(context* ctx, u32 /*reg*/, u32 arg) { - util::set_fragment_texture_dirty_bit(ctx, arg, index, false); + util::set_fragment_texture_dirty_bit(ctx, arg, index); } }; diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index babcc878ae..5a8e9e3fcc 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -1663,16 +1663,16 @@ namespace rsx bind(NV4097_SET_SURFACE_PITCH_D, nv4097::set_surface_dirty_bit); bind(NV4097_SET_SURFACE_PITCH_Z, nv4097::set_surface_dirty_bit); bind(NV4097_SET_WINDOW_OFFSET, nv4097::set_surface_dirty_bit); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); - bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); + bind_range(); bind_range(); bind_range(); bind_range(); From ec120d1cbbc6a8bac1ef33533594e7f87978857f Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 8 Mar 2025 19:51:03 +0300 Subject: [PATCH 053/529] rsx: Add stubs for FP rehash checks on barrier acquire --- rpcs3/Emu/RSX/Core/RSXDriverState.h | 4 ++++ rpcs3/Emu/RSX/NV47/HW/nv406e.cpp | 2 +- rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/RSX/Core/RSXDriverState.h b/rpcs3/Emu/RSX/Core/RSXDriverState.h index e915cd67e2..16dd08c78d 100644 --- a/rpcs3/Emu/RSX/Core/RSXDriverState.h +++ b/rpcs3/Emu/RSX/Core/RSXDriverState.h @@ -40,6 +40,10 @@ namespace rsx xform_instancing_state_dirty = (1 << 25), // Transform instancing state has changed + // TODO - Should signal that we simply need to do a FP compare before the next draw call and invalidate the ucode if the content has changed. + // Marking as dirty to invalidate hot cache also works, it's not like there's tons of barriers per frame anyway. + fragment_program_needs_rehash = fragment_program_ucode_dirty, + fragment_program_dirty = fragment_program_ucode_dirty | fragment_program_state_dirty, vertex_program_dirty = vertex_program_ucode_dirty | vertex_program_state_dirty, invalidate_pipeline_bits = fragment_program_dirty | vertex_program_dirty | xform_instancing_state_dirty, diff --git a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp index 242b1bdb73..92e3b1af53 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp @@ -26,7 +26,7 @@ namespace rsx const u32 addr = get_address(REGS(ctx)->semaphore_offset_406e(), REGS(ctx)->semaphore_context_dma_406e()); // Syncronization point, may be associated with memory changes without actually changing addresses - RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_ucode_dirty; + RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_needs_rehash; const auto& sema = vm::_ref(addr).val; diff --git a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp b/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp index 77a1a10b11..1ab5371d9a 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp @@ -41,12 +41,12 @@ namespace rsx if constexpr (FlushPipe) { + // Syncronization point, may be associated with memory changes without actually changing addresses + RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_needs_rehash; + // Manually flush the pipeline. // It is possible to stream report writes using the host GPU, but that generates too much submit traffic. RSX(ctx)->sync(); - - // Syncronization point, may be associated with memory changes without actually changing addresses - RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_ucode_dirty; } } From 93899bf5a95716abdb1a90588d64a0c8181db980 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 8 Mar 2025 20:45:28 +0300 Subject: [PATCH 054/529] rsx/FIFO: Reimplement grabbing command args as a contiguous pointer - Allows grabbing indefinite size of buffer as long as the data is contiguously mapped. --- rpcs3/Emu/RSX/NV47/HW/common.cpp | 10 ++------- rpcs3/Emu/RSX/NV47/HW/nv308a.cpp | 2 +- rpcs3/Emu/RSX/NV47/HW/nv4097.cpp | 4 ++-- rpcs3/Emu/RSX/RSXFIFO.cpp | 38 ++++++++++++++++++++++++-------- rpcs3/Emu/RSX/RSXFIFO.h | 2 +- 5 files changed, 35 insertions(+), 21 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/Emu/RSX/NV47/HW/common.cpp index 60ea4ff632..0f6420928a 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/common.cpp @@ -96,14 +96,8 @@ namespace rsx const u32 count = std::min({ fifo_args_cnt, fifo_read_limit, method_range }); // Clamp by the count of methods this function is responsible to - std::span command_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(); - - if (command_span.size() > count) - { - command_span = command_span.subspan(0, count); - } - - ensure(!command_span.empty()); + std::span command_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(count); + ensure(!command_span.empty() && command_span.size() <= count); u32* const dst_regs = ®S(ctx)->registers[reg]; diff --git a/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp b/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp index 6a783f26ea..be3fab8830 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp @@ -42,7 +42,7 @@ namespace rsx const u32 x = REGS(ctx)->nv308a_x() + index; const u32 y = REGS(ctx)->nv308a_y(); - const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(); + const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(count); if (fifo_span.size() < count) { diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp index ce7d0130a2..78f01f4059 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp @@ -98,7 +98,7 @@ namespace rsx const auto values = ®S(ctx)->transform_constants[load + constant_id][subreg]; - const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(); + const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(rcount); if (fifo_span.size() < rcount) { @@ -148,7 +148,7 @@ namespace rsx rcount -= max - (max_vertex_program_instructions * 4); } - const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(); + const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(rcount); if (fifo_span.size() < rcount) { diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/Emu/RSX/RSXFIFO.cpp index f9a63efa6c..f2d279c5bb 100644 --- a/rpcs3/Emu/RSX/RSXFIFO.cpp +++ b/rpcs3/Emu/RSX/RSXFIFO.cpp @@ -223,22 +223,42 @@ namespace rsx m_remaining_commands = 0; } - std::span FIFO_control::get_current_arg_ptr() const + std::span FIFO_control::get_current_arg_ptr(u32 length_in_words) const { if (g_cfg.core.rsx_fifo_accuracy) { // Return a pointer to the cache storage with confined access - return {reinterpret_cast(&m_cache) + (m_internal_get - m_cache_addr) / 4, (m_cache_size - (m_internal_get - m_cache_addr)) / 4}; + const u32 cache_offset_in_words = (m_internal_get - m_cache_addr) / 4; + const u32 cache_size_in_words = m_cache_size / 4; + return {reinterpret_cast(&m_cache) + cache_offset_in_words, cache_size_in_words - cache_offset_in_words}; } - else - { - // Return a raw pointer with no limited access - constexpr u32 _1m = 0x100000; - const u32 base = m_iotable->get_addr(m_internal_get); - const u32 base_1m = m_iotable->get_addr(m_internal_get + _1m); - return {static_cast(vm::base(base)), (base_1m - _1m == base ? _1m : (_1m - (m_internal_get % _1m))) / 4 }; + // Return a raw pointer to contiguous memory + constexpr u32 _1M = 0x100000; + const u32 size = length_in_words * sizeof(u32); + const u32 from = m_iotable->get_addr(m_internal_get); + + for (u32 remaining = size, addr = m_internal_get, ptr = from; remaining > 0;) + { + const u32 next_block = utils::align(addr, _1M); + const u32 available = (next_block - addr); + if (remaining <= available) + { + return { static_cast(vm::base(from)), length_in_words }; + } + + remaining -= available; + const u32 next_ptr = m_iotable->get_addr(next_block); + if (next_ptr != (ptr + available)) + { + return { static_cast(vm::base(from)), (size - remaining) / sizeof(u32)}; + } + + ptr = next_ptr; + addr = next_block; } + + fmt::throw_exception("Unreachable"); } bool FIFO_control::read_unsafe(register_pair& data) diff --git a/rpcs3/Emu/RSX/RSXFIFO.h b/rpcs3/Emu/RSX/RSXFIFO.h index 8eb614b520..d62d32a134 100644 --- a/rpcs3/Emu/RSX/RSXFIFO.h +++ b/rpcs3/Emu/RSX/RSXFIFO.h @@ -159,7 +159,7 @@ namespace rsx u32 get_pos() const { return m_internal_get; } u32 last_cmd() const { return m_cmd; } void sync_get() const; - std::span get_current_arg_ptr() const; + std::span get_current_arg_ptr(u32 length_in_words) const; u32 get_remaining_args_count() const { return m_remaining_commands; } void restore_state(u32 cmd, u32 count); void inc_get(bool wait); From 3be1e0b6ff7b8cbf083e37b4e7b6fd265d781b3d Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 8 Mar 2025 20:58:44 +0300 Subject: [PATCH 055/529] rsx: Clean up and simplify texture register manipulation tests --- rpcs3/Emu/RSX/NV47/HW/common.cpp | 43 +++++++++----------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/Emu/RSX/NV47/HW/common.cpp index 0f6420928a..b1cb8917c4 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/common.cpp @@ -100,47 +100,28 @@ namespace rsx ensure(!command_span.empty() && command_span.size() <= count); u32* const dst_regs = ®S(ctx)->registers[reg]; - - //u8 change_mask = 0; - u8 change_mask = 0xff; - - if (dst_regs[0] != REGS(ctx)->latch) - { - // Fixup for the first method - change_mask |= 1; - } + bool set_dirty = (dst_regs[0] != REGS(ctx)->latch); for (usz i = 1; i < command_span.size(); i++) { const u32 command_data = std::bit_cast>(command_span[i]); - change_mask |= command_data != dst_regs[i] ? (1u << i) : 0; - + set_dirty = set_dirty || (command_data != dst_regs[i]); dst_regs[i] = command_data; } - // Disabled - // Bits set: - // NV4097_SET_TEXTURE_OFFSET - // NV4097_SET_TEXTURE_IMAGE_RECT - //constexpr u32 mask_of_texture_data_not_affecting_shader_config = 0x41; - constexpr u32 mask_of_texture_data_not_affecting_shader_config = 0; - - if (change_mask) - { - RSX(ctx)->m_textures_dirty[texture_index] = true; - - if (~mask_of_texture_data_not_affecting_shader_config & change_mask) - { - if (RSX(ctx)->current_fp_metadata.referenced_textures_mask & (1 << texture_index)) - { - RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_state_dirty; - } - } - } - // Skip handled methods RSX(ctx)->fifo_ctrl->skip_methods(static_cast(command_span.size()) - 1); + + if (set_dirty) + { + RSX(ctx)->m_textures_dirty[texture_index] = true; + + if (RSX(ctx)->current_fp_metadata.referenced_textures_mask & (1 << texture_index)) + { + RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_state_dirty; + } + } } void set_vertex_texture_dirty_bit(rsx::context* ctx, u32 index) From 563a3d3587b309bdbad947363faf1b9dab434d46 Mon Sep 17 00:00:00 2001 From: schm1dtmac Date: Wed, 19 Feb 2025 13:16:40 +0000 Subject: [PATCH 056/529] Target macOS 14 instead of 13 (fixes camera) --- .ci/build-mac-arm64.sh | 14 +++++++------- .ci/build-mac.sh | 8 ++++---- azure-pipelines.yml | 4 ++-- rpcs3/rpcs3.plist.in | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index f03ce64524..c9c60de240 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -4,13 +4,13 @@ brew_arm64_install_packages() { for pkg in "$@"; do echo "Fetching bottle for $pkg (arm64)..." - bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_ventura "$pkg")" + bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_sonoma "$pkg")" if [ ! -f "$bottle_path" ]; then - if ! "$BREW_ARM64_PATH/bin/brew" fetch --force --verbose --debug --bottle-tag=arm64_ventura "$pkg"; then + if ! "$BREW_ARM64_PATH/bin/brew" fetch --force --verbose --debug --bottle-tag=arm64_sonoma "$pkg"; then echo "Failed to fetch bottle for $pkg" return 1 fi - bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_ventura "$pkg")" + bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_sonoma "$pkg")" fi echo "Installing $pkg (arm64)..." @@ -90,8 +90,8 @@ export SDL3_DIR="$BREW_ARM64_PATH/opt/sdl3/lib/cmake/SDL3" export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH" export LDFLAGS="-L$BREW_ARM64_PATH/lib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_ARM64_PATH/lib/libSDL3.dylib $BREW_ARM64_PATH/lib/libGLEW.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib -Wl,-rpath,$BREW_ARM64_PATH/lib" -export CPPFLAGS="-I$BREW_ARM64_PATH/include -I$BREW_X64_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" -export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" +export CPPFLAGS="-I$BREW_ARM64_PATH/include -I$BREW_X64_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" +export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" export LIBRARY_PATH="$BREW_ARM64_PATH/lib" export LD_LIBRARY_PATH="$BREW_ARM64_PATH/lib" @@ -112,7 +112,7 @@ sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVer rm -rf build mkdir build && cd build || exit 1 -export MACOSX_DEPLOYMENT_TARGET=13.0 +export MACOSX_DEPLOYMENT_TARGET=14.0 "$BREW_X64_PATH/bin/cmake" .. \ -DUSE_SDL=ON \ @@ -144,7 +144,7 @@ export MACOSX_DEPLOYMENT_TARGET=13.0 -DCMAKE_IGNORE_PREFIX_PATH=/usr/local/opt \ -DCMAKE_SYSTEM_PROCESSOR=arm64 \ -DCMAKE_TOOLCHAIN_FILE=buildfiles/cmake/TCDarwinARM64.cmake \ - -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \ + -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \ -G Ninja "$BREW_PATH/bin/ninja"; build_status=$?; diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 809ec1faa9..2ae92fb9fd 100644 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -57,8 +57,8 @@ export SDL3_DIR="$BREW_X64_PATH/opt/sdl3/lib/cmake/SDL3" export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH" export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib" -export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" -export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" +export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" +export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" export LIBRARY_PATH="$BREW_X64_PATH/lib" export LD_LIBRARY_PATH="$BREW_X64_PATH/lib" @@ -78,7 +78,7 @@ sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVer mkdir build && cd build || exit 1 -export MACOSX_DEPLOYMENT_TARGET=13.0 +export MACOSX_DEPLOYMENT_TARGET=14.0 "$BREW_X64_PATH/bin/cmake" .. \ -DUSE_SDL=ON \ @@ -107,7 +107,7 @@ export MACOSX_DEPLOYMENT_TARGET=13.0 -DLLVM_TARGET_ARCH=X86_64 \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \ - -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \ + -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \ -G Ninja "$BREW_PATH/bin/ninja"; build_status=$?; diff --git a/azure-pipelines.yml b/azure-pipelines.yml index afaa294b7f..a1401a7e90 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -152,7 +152,7 @@ jobs: LLVM_COMPILER_VER: '19' pool: - vmImage: "macOS-13" + vmImage: "macOS-14" steps: - task: Cache@2 @@ -213,7 +213,7 @@ jobs: LLVM_COMPILER_VER: '19' pool: - vmImage: "macOS-13" + vmImage: "macOS-14" steps: - task: Cache@2 diff --git a/rpcs3/rpcs3.plist.in b/rpcs3/rpcs3.plist.in index 31df6d03a1..53902adea3 100644 --- a/rpcs3/rpcs3.plist.in +++ b/rpcs3/rpcs3.plist.in @@ -33,7 +33,7 @@ LSApplicationCategoryType public.app-category.games LSMinimumSystemVersion - 13.0 + 14.0 NSCameraUsageDescription The camera will be used for PlayStation Eye emulation NSMicrophoneUsageDescription From e6b3c2061e7f570157d1b4ee574967ae1f0261c8 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 9 Mar 2025 01:17:56 +0300 Subject: [PATCH 057/529] rsx: Fix boundary seek logic for FIFO addresses --- rpcs3/Emu/RSX/RSXFIFO.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/Emu/RSX/RSXFIFO.cpp index f2d279c5bb..7982da2393 100644 --- a/rpcs3/Emu/RSX/RSXFIFO.cpp +++ b/rpcs3/Emu/RSX/RSXFIFO.cpp @@ -240,7 +240,7 @@ namespace rsx for (u32 remaining = size, addr = m_internal_get, ptr = from; remaining > 0;) { - const u32 next_block = utils::align(addr, _1M); + const u32 next_block = utils::align(addr + 1, _1M); const u32 available = (next_block - addr); if (remaining <= available) { From 7df5cb84b50e89974960599818bc165e0c4bede5 Mon Sep 17 00:00:00 2001 From: FlexBy420 <68403300+FlexBy420@users.noreply.github.com> Date: Thu, 6 Mar 2025 00:10:41 +0100 Subject: [PATCH 058/529] add a job for generating translation template file (.ts) --- .github/workflows/rpcs3.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 26880dedf8..5535ee7aad 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -196,3 +196,38 @@ jobs: env: RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }} run: .ci/github-upload.sh + + Generate_Translation_Template: + name: Generate Translation Template + runs-on: ubuntu-24.04 + if: github.ref == 'refs/heads/main' + steps: + - name: Checkout repository + uses: actions/checkout@main + with: + fetch-depth: 0 + + - name: Install Qt6 Tools + run: | + sudo apt-get update + sudo apt-get install -y qt6-tools-dev qt6-l10n-tools + + - name: Generate .ts file using lupdate (Qt6) + run: | + mkdir -p translations + LUPDATE_PATH=$(find /usr -name lupdate -type f 2>/dev/null | head -n 1) + if [ -z "$LUPDATE_PATH" ]; then + echo "Error: lupdate not found!" + exit 1 + else + echo "lupdate found at: $LUPDATE_PATH" + $LUPDATE_PATH -recursive . -ts translations/rpcs3_template.ts + sed -i 's|filename="\.\./|filename="./|g' translations/rpcs3_template.ts + fi + + - name: Upload translation template + uses: actions/upload-artifact@main + with: + name: RPCS3_Translation_Template + path: translations/rpcs3_template.ts + compression-level: 0 From 9173fc9815f162bf24d360a7d2f21b91672c0a8f Mon Sep 17 00:00:00 2001 From: FlexBy420 <68403300+FlexBy420@users.noreply.github.com> Date: Thu, 6 Mar 2025 00:23:29 +0100 Subject: [PATCH 059/529] fix branch name in .ts job --- .github/workflows/rpcs3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 5535ee7aad..c6c5f1f60a 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -200,7 +200,7 @@ jobs: Generate_Translation_Template: name: Generate Translation Template runs-on: ubuntu-24.04 - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/master' steps: - name: Checkout repository uses: actions/checkout@main From cd76f05a86d82afa5c9fbd2df9303570f634c78e Mon Sep 17 00:00:00 2001 From: FlexBy420 <68403300+FlexBy420@users.noreply.github.com> Date: Thu, 6 Mar 2025 18:12:35 +0100 Subject: [PATCH 060/529] Create qt-ts.yml --- .github/workflows/qt-ts.yml | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/qt-ts.yml diff --git a/.github/workflows/qt-ts.yml b/.github/workflows/qt-ts.yml new file mode 100644 index 0000000000..119faf1240 --- /dev/null +++ b/.github/workflows/qt-ts.yml @@ -0,0 +1,45 @@ +name: Generate Translation Template + +on: + workflow_dispatch: + push: + branches: + - qt-test + paths: + - 'rpcs3/**' + +jobs: + Generate_Translation_Template: + name: Generate Translation Template + runs-on: ubuntu-24.04 + steps: + - name: Checkout repository + uses: actions/checkout@main + with: + fetch-depth: 0 + + - name: Install Qt6 Tools + run: | + sudo apt-get update + sudo apt-get install -y qt6-tools-dev qt6-l10n-tools + + - name: Generate .ts file using lupdate (Qt6) + run: | + mkdir -p translations + cd rpcs3 # Change to the rpcs3 directory + LUPDATE_PATH=$(find /usr -name lupdate -type f 2>/dev/null | head -n 1) + if [ -z "$LUPDATE_PATH" ]; then + echo "Error: lupdate not found!" + exit 1 + else + echo "lupdate found at: $LUPDATE_PATH" + $LUPDATE_PATH -recursive . -ts ../translations/rpcs3_template.ts + sed -i 's|filename="\.\./|filename="./|g' ../translations/rpcs3_template.ts + fi + + - name: Upload translation template + uses: actions/upload-artifact@main + with: + name: RPCS3_Translation_Template + path: translations/rpcs3_template.ts + compression-level: 0 From 47b880fa8df97a3268774186a9d3e5d3dc56c568 Mon Sep 17 00:00:00 2001 From: FlexBy420 <68403300+FlexBy420@users.noreply.github.com> Date: Thu, 6 Mar 2025 18:13:02 +0100 Subject: [PATCH 061/529] Move ts generator job to seperate workflow file --- .github/workflows/rpcs3.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index c6c5f1f60a..26880dedf8 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -196,38 +196,3 @@ jobs: env: RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }} run: .ci/github-upload.sh - - Generate_Translation_Template: - name: Generate Translation Template - runs-on: ubuntu-24.04 - if: github.ref == 'refs/heads/master' - steps: - - name: Checkout repository - uses: actions/checkout@main - with: - fetch-depth: 0 - - - name: Install Qt6 Tools - run: | - sudo apt-get update - sudo apt-get install -y qt6-tools-dev qt6-l10n-tools - - - name: Generate .ts file using lupdate (Qt6) - run: | - mkdir -p translations - LUPDATE_PATH=$(find /usr -name lupdate -type f 2>/dev/null | head -n 1) - if [ -z "$LUPDATE_PATH" ]; then - echo "Error: lupdate not found!" - exit 1 - else - echo "lupdate found at: $LUPDATE_PATH" - $LUPDATE_PATH -recursive . -ts translations/rpcs3_template.ts - sed -i 's|filename="\.\./|filename="./|g' translations/rpcs3_template.ts - fi - - - name: Upload translation template - uses: actions/upload-artifact@main - with: - name: RPCS3_Translation_Template - path: translations/rpcs3_template.ts - compression-level: 0 From ebcb61b34ba45567c70aca41dd77f9b1cd0fdfb1 Mon Sep 17 00:00:00 2001 From: FlexBy420 <68403300+FlexBy420@users.noreply.github.com> Date: Thu, 6 Mar 2025 18:13:58 +0100 Subject: [PATCH 062/529] fix the branch name in qt-ts.yml --- .github/workflows/qt-ts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt-ts.yml b/.github/workflows/qt-ts.yml index 119faf1240..8220cfca0e 100644 --- a/.github/workflows/qt-ts.yml +++ b/.github/workflows/qt-ts.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - qt-test + - master paths: - 'rpcs3/**' From cce43beeae2724842ea72acd727ce10d52dca30f Mon Sep 17 00:00:00 2001 From: FlexBy420 <68403300+FlexBy420@users.noreply.github.com> Date: Fri, 7 Mar 2025 00:51:50 +0100 Subject: [PATCH 063/529] Apply suggestions from code review Co-authored-by: Megamouse --- .github/workflows/qt-ts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qt-ts.yml b/.github/workflows/qt-ts.yml index 8220cfca0e..d8ab34f57c 100644 --- a/.github/workflows/qt-ts.yml +++ b/.github/workflows/qt-ts.yml @@ -18,12 +18,12 @@ jobs: with: fetch-depth: 0 - - name: Install Qt6 Tools + - name: Install Qt Tools run: | sudo apt-get update sudo apt-get install -y qt6-tools-dev qt6-l10n-tools - - name: Generate .ts file using lupdate (Qt6) + - name: Generate .ts file using lupdate (Qt) run: | mkdir -p translations cd rpcs3 # Change to the rpcs3 directory From 100454398cb720dacbd51e7efc3c3292d730f9bc Mon Sep 17 00:00:00 2001 From: FlexBy420 <68403300+FlexBy420@users.noreply.github.com> Date: Sat, 8 Mar 2025 00:35:16 +0100 Subject: [PATCH 064/529] Make suggested changes and remove unnecessary package --- .github/workflows/qt-ts.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/qt-ts.yml b/.github/workflows/qt-ts.yml index d8ab34f57c..a93937ddf2 100644 --- a/.github/workflows/qt-ts.yml +++ b/.github/workflows/qt-ts.yml @@ -15,18 +15,16 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@main - with: - fetch-depth: 0 - name: Install Qt Tools run: | - sudo apt-get update - sudo apt-get install -y qt6-tools-dev qt6-l10n-tools + sudo apt update + sudo apt install -y qt6-l10n-tools - name: Generate .ts file using lupdate (Qt) + working-directory: rpcs3 run: | - mkdir -p translations - cd rpcs3 # Change to the rpcs3 directory + mkdir -p ../translations LUPDATE_PATH=$(find /usr -name lupdate -type f 2>/dev/null | head -n 1) if [ -z "$LUPDATE_PATH" ]; then echo "Error: lupdate not found!" From a3d2e93b14dc54c0634d9c51d4dbb4d252cd5094 Mon Sep 17 00:00:00 2001 From: FlexBy420 Date: Sat, 8 Mar 2025 22:35:32 +0100 Subject: [PATCH 065/529] move script to .ci/generate-qt-ts.sh --- .ci/generate-qt-ts.sh | 13 +++++++++++++ .github/workflows/qt-ts.yml | 13 ++----------- 2 files changed, 15 insertions(+), 11 deletions(-) create mode 100755 .ci/generate-qt-ts.sh diff --git a/.ci/generate-qt-ts.sh b/.ci/generate-qt-ts.sh new file mode 100755 index 0000000000..a9fc139a93 --- /dev/null +++ b/.ci/generate-qt-ts.sh @@ -0,0 +1,13 @@ +#!/bin/sh -ex + +mkdir -p ../translations + +LUPDATE_PATH=$(find /usr -name lupdate -type f 2>/dev/null | head -n 1) +if [ -z "$LUPDATE_PATH" ]; then + echo "Error: lupdate not found!" + exit 1 +else + echo "lupdate found at: $LUPDATE_PATH" + $LUPDATE_PATH -recursive . -ts ../translations/rpcs3_template.ts + sed -i 's|filename="\.\./|filename="./|g' ../translations/rpcs3_template.ts +fi \ No newline at end of file diff --git a/.github/workflows/qt-ts.yml b/.github/workflows/qt-ts.yml index a93937ddf2..4596be29e0 100644 --- a/.github/workflows/qt-ts.yml +++ b/.github/workflows/qt-ts.yml @@ -24,20 +24,11 @@ jobs: - name: Generate .ts file using lupdate (Qt) working-directory: rpcs3 run: | - mkdir -p ../translations - LUPDATE_PATH=$(find /usr -name lupdate -type f 2>/dev/null | head -n 1) - if [ -z "$LUPDATE_PATH" ]; then - echo "Error: lupdate not found!" - exit 1 - else - echo "lupdate found at: $LUPDATE_PATH" - $LUPDATE_PATH -recursive . -ts ../translations/rpcs3_template.ts - sed -i 's|filename="\.\./|filename="./|g' ../translations/rpcs3_template.ts - fi + ../.ci/generate-qt-ts.sh - name: Upload translation template uses: actions/upload-artifact@main with: name: RPCS3_Translation_Template path: translations/rpcs3_template.ts - compression-level: 0 + compression-level: 0 \ No newline at end of file From 5e4637e15c7e71e8e24401df7437361466320def Mon Sep 17 00:00:00 2001 From: Elad <18193363+elad335@users.noreply.github.com> Date: Sat, 8 Mar 2025 18:49:36 +0200 Subject: [PATCH 066/529] SPU LLVM: Subtract Timebase from decrementer --- rpcs3/Emu/Cell/SPULLVMRecompiler.cpp | 8 +++++--- rpcs3/Emu/Cell/lv2/sys_time.cpp | 14 +++++++------- rpcs3/Emu/Cell/lv2/sys_time.h | 2 ++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp index cfa047f2ed..f1bb474e6f 100644 --- a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp @@ -5,6 +5,7 @@ #include "Emu/system_config.h" #include "Emu/IdManager.h" #include "Emu/Cell/timers.hpp" +#include "Emu/Cell/lv2/sys_time.h" #include "Emu/Memory/vm_reservation.h" #include "Emu/RSX/Core/RSXReservationLock.hpp" #include "Crypto/sha1.h" @@ -3482,13 +3483,13 @@ public: #if defined(ARCH_X64) if (utils::get_tsc_freq() && !(g_cfg.core.spu_loop_detection) && (g_cfg.core.clocks_scale == 100)) { + const auto timebase_offs = m_ir->CreateLoad(get_type(), m_ir->CreateIntToPtr(m_ir->getInt64(reinterpret_cast(&g_timebase_offs)), get_type())); const auto timestamp = m_ir->CreateLoad(get_type(), spu_ptr(&spu_thread::ch_dec_start_timestamp)); const auto dec_value = m_ir->CreateLoad(get_type(), spu_ptr(&spu_thread::ch_dec_value)); const auto tsc = m_ir->CreateCall(get_intrinsic(llvm::Intrinsic::x86_rdtsc)); const auto tscx = m_ir->CreateMul(m_ir->CreateUDiv(tsc, m_ir->getInt64(utils::get_tsc_freq())), m_ir->getInt64(80000000)); const auto tscm = m_ir->CreateUDiv(m_ir->CreateMul(m_ir->CreateURem(tsc, m_ir->getInt64(utils::get_tsc_freq())), m_ir->getInt64(80000000)), m_ir->getInt64(utils::get_tsc_freq())); - const auto tsctb = m_ir->CreateAdd(tscx, tscm); - + const auto tsctb = m_ir->CreateSub(m_ir->CreateAdd(tscx, tscm), timebase_offs); const auto frz = m_ir->CreateLoad(get_type(), spu_ptr(&spu_thread::is_dec_frozen)); const auto frzev = m_ir->CreateICmpEQ(frz, m_ir->getInt8(0)); @@ -4305,10 +4306,11 @@ public: #if defined(ARCH_X64) if (utils::get_tsc_freq() && !(g_cfg.core.spu_loop_detection) && (g_cfg.core.clocks_scale == 100)) { + const auto timebase_offs = m_ir->CreateLoad(get_type(), m_ir->CreateIntToPtr(m_ir->getInt64(reinterpret_cast(&g_timebase_offs)), get_type())); const auto tsc = m_ir->CreateCall(get_intrinsic(llvm::Intrinsic::x86_rdtsc)); const auto tscx = m_ir->CreateMul(m_ir->CreateUDiv(tsc, m_ir->getInt64(utils::get_tsc_freq())), m_ir->getInt64(80000000)); const auto tscm = m_ir->CreateUDiv(m_ir->CreateMul(m_ir->CreateURem(tsc, m_ir->getInt64(utils::get_tsc_freq())), m_ir->getInt64(80000000)), m_ir->getInt64(utils::get_tsc_freq())); - const auto tsctb = m_ir->CreateAdd(tscx, tscm); + const auto tsctb = m_ir->CreateSub(m_ir->CreateAdd(tscx, tscm), timebase_offs); m_ir->CreateStore(tsctb, spu_ptr(&spu_thread::ch_dec_start_timestamp)); } else diff --git a/rpcs3/Emu/Cell/lv2/sys_time.cpp b/rpcs3/Emu/Cell/lv2/sys_time.cpp index 1413304a8b..539bb9dedf 100644 --- a/rpcs3/Emu/Cell/lv2/sys_time.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_time.cpp @@ -9,7 +9,7 @@ #include "util/sysinfo.hpp" -static u64 timebase_offset; +u64 g_timebase_offs{}; static u64 systemtime_offset; #ifndef __linux__ @@ -145,8 +145,8 @@ static constexpr u64 g_timebase_freq = /*79800000*/ 80000000ull; // 80 Mhz u64 convert_to_timebased_time(u64 time) { const u64 result = time * (g_timebase_freq / 1000000ull) * g_cfg.core.clocks_scale / 100u; - ensure(result >= timebase_offset); - return result - timebase_offset; + ensure(result >= g_timebase_offs); + return result - g_timebase_offs; } u64 get_timebased_time() @@ -160,7 +160,7 @@ u64 get_timebased_time() #else const u64 result = (tsc / freq * g_timebase_freq + tsc % freq * g_timebase_freq / freq) * g_cfg.core.clocks_scale / 100u; #endif - return result - timebase_offset; + return result - g_timebase_offs; } while (true) @@ -183,7 +183,7 @@ u64 get_timebased_time() const u64 result = (static_cast(ts.tv_sec) * g_timebase_freq + static_cast(ts.tv_nsec) * g_timebase_freq / 1000000000ull) * g_cfg.core.clocks_scale / 100u; #endif - if (result) return result - timebase_offset; + if (result) return result - g_timebase_offs; } } @@ -192,7 +192,7 @@ u64 get_timebased_time() // If none-zero arg is specified it will become the base time (for savestates) void initialize_timebased_time(u64 timebased_init, bool reset) { - timebase_offset = 0; + g_timebase_offs = 0; if (reset) { @@ -204,7 +204,7 @@ void initialize_timebased_time(u64 timebased_init, bool reset) const u64 current = get_timebased_time(); timebased_init = current - timebased_init; - timebase_offset = timebased_init; + g_timebase_offs = timebased_init; systemtime_offset = timebased_init / (g_timebase_freq / 1000000); } diff --git a/rpcs3/Emu/Cell/lv2/sys_time.h b/rpcs3/Emu/Cell/lv2/sys_time.h index 63a0d1b4b6..fd8c729ab3 100644 --- a/rpcs3/Emu/Cell/lv2/sys_time.h +++ b/rpcs3/Emu/Cell/lv2/sys_time.h @@ -11,3 +11,5 @@ error_code sys_time_get_current_time(vm::ptr sec, vm::ptr nsec); error_code sys_time_set_current_time(s64 sec, s64 nsec); u64 sys_time_get_timebase_frequency(); error_code sys_time_get_rtc(vm::ptr rtc); + +extern u64 g_timebase_offs; From 5e5f82d1a2b47069baccc2ef746d86ca786d07dc Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Sat, 8 Mar 2025 09:58:31 -0800 Subject: [PATCH 067/529] Set CI msbuild verbosity to minimal to reduce spam --- .github/workflows/rpcs3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 26880dedf8..92083698b7 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -173,7 +173,7 @@ jobs: - name: Compile RPCS3 shell: pwsh - run: msbuild rpcs3.sln /p:Configuration=Release /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_no_debug_info.targets" + run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_no_debug_info.targets" - name: Pack up build artifacts run: | From 2dfbab457ad2e000a59aa80af0147ba3e7469c64 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 9 Mar 2025 21:08:12 +0300 Subject: [PATCH 068/529] rsx: Reupload surface if the surface cache denies knowledge of it --- rpcs3/Emu/RSX/Common/texture_cache.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index e367d46e6f..a5ed283534 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -381,9 +381,20 @@ namespace rsx { if (!(surface = surface_cache.get_surface_at(ref_address))) { - // Compositing op. Just ignore expiry for now - ensure(!ref_image); - return {}; + // Surface cache does not have our image. Two possibilities: + // 1. It was never a real RTT, just some op like dynamic/static-copy/composite request. image_ref is null in such cases. + // 2. It was real but probably deleted some time ago and we have a bogus pointer. Discard it in this case. + if (!ref_image) + { + // Compositing op. Just ignore expiry for now + return {}; + } + + // We have a real image but surface cache says it doesn't exist any more. Force a reupload. + // Normally the global samplers dirty flag should have been set to invalidate all references. + ensure(external_subresource_desc.op == deferred_request_command::nop); + rsx_log.warning("Renderer is holding a stale reference to a surface that no longer exists!"); + return { true, nullptr }; } } From eea2f19d82d6fa9801042d8007a773d919582438 Mon Sep 17 00:00:00 2001 From: AniLeo Date: Mon, 3 Mar 2025 12:46:24 +0100 Subject: [PATCH 069/529] Settings: Move 'SPU Block Size' to the middle column --- rpcs3/rpcs3qt/settings_dialog.ui | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 5eebe763ff..cbdc5217cb 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -163,6 +163,24 @@ + + + + + 0 + 0 + + + + SPU Block Size + + + + + + + + @@ -266,24 +284,6 @@ - - - - - 0 - 0 - - - - SPU Block Size - - - - - - - - From 6d46d45983d39e3b7455f0383013470b4b208b32 Mon Sep 17 00:00:00 2001 From: AniLeo Date: Mon, 3 Mar 2025 12:52:57 +0100 Subject: [PATCH 070/529] Settings: Default 'Shader Mode' to Async with Interpreter --- rpcs3/Emu/system_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index a476e03584..35befdeb7e 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -130,7 +130,7 @@ struct cfg_root : cfg::node cfg::_enum frame_limit{ this, "Frame limit", frame_limit_type::_auto, true }; cfg::_float<0, 1000> second_frame_limit{ this, "Second Frame Limit", 0, true }; // 0 disables its effect cfg::_enum antialiasing_level{ this, "MSAA", msaa_level::_auto }; - cfg::_enum shadermode{ this, "Shader Mode", shader_mode::async_recompiler }; + cfg::_enum shadermode{ this, "Shader Mode", shader_mode::async_with_interpreter }; cfg::_enum shader_precision{ this, "Shader Precision", gpu_preset_level::high }; cfg::_bool write_color_buffers{ this, "Write Color Buffers" }; From ac7d53cc370eaa114ab40d9aac18a99e3e80c326 Mon Sep 17 00:00:00 2001 From: AniLeo Date: Mon, 3 Mar 2025 12:55:37 +0100 Subject: [PATCH 071/529] Settings: Specify FSR 1 --- rpcs3/rpcs3qt/emu_settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index a8a11d3985..0dc672bc41 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -1064,7 +1064,7 @@ QString emu_settings::GetLocalizedSetting(const QString& original, emu_settings_ { case output_scaling_mode::nearest: return tr("Nearest", "Output Scaling Mode"); case output_scaling_mode::bilinear: return tr("Bilinear", "Output Scaling Mode"); - case output_scaling_mode::fsr: return tr("FidelityFX Super Resolution", "Output Scaling Mode"); + case output_scaling_mode::fsr: return tr("FidelityFX Super Resolution 1", "Output Scaling Mode"); } break; case emu_settings_type::AudioRenderer: From a074b14631e6c2f614b3c0d8dd9067a01a194cc5 Mon Sep 17 00:00:00 2001 From: AniLeo Date: Mon, 3 Mar 2025 12:59:50 +0100 Subject: [PATCH 072/529] Settings: Move 'PPU Vector NaN Fixup' to Debug --- rpcs3/rpcs3qt/settings_dialog.ui | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index cbdc5217cb..b1cca1ba01 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -2441,13 +2441,6 @@ - - - - PPU Vector NaN Fixup - - - @@ -4395,6 +4388,13 @@ + + + + PPU Vector NaN Fixup + + + From 2bf5ae32723803f655e7e67589ab0d139cf82feb Mon Sep 17 00:00:00 2001 From: AniLeo Date: Mon, 3 Mar 2025 13:00:50 +0100 Subject: [PATCH 073/529] Settings: Move 'SPU Profiler' to Debug --- rpcs3/rpcs3qt/settings_dialog.ui | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index b1cca1ba01..c929a21dbf 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -2469,13 +2469,6 @@ - - - - SPU Profiler - - - @@ -4395,6 +4388,13 @@ + + + + SPU Profiler + + + From af768d5c22261280427e860210a6b59c37f30715 Mon Sep 17 00:00:00 2001 From: AniLeo Date: Mon, 3 Mar 2025 13:02:29 +0100 Subject: [PATCH 074/529] Settings: Move 'Disable Asynchronous Memory Manager' to Debug --- rpcs3/rpcs3qt/settings_dialog.ui | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index c929a21dbf..5ca882a4f5 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -2712,13 +2712,6 @@ - - - - Disable Asynchronous Memory Manager - - - @@ -4272,6 +4265,13 @@ + + + + Disable Asynchronous Memory Manager + + + From aa819c8b97d9d3daa09563da9aaf0ef274754570 Mon Sep 17 00:00:00 2001 From: AniLeo Date: Mon, 3 Mar 2025 13:05:19 +0100 Subject: [PATCH 075/529] Settings: Move 'Disable On-Disk Shader Cache' to Debug --- rpcs3/rpcs3qt/settings_dialog.cpp | 6 +++--- rpcs3/rpcs3qt/settings_dialog.ui | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index d4285911a8..e2b0921e0e 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1567,9 +1567,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceCheckBox(ui->handleTiledMemory, emu_settings_type::HandleRSXTiledMemory); SubscribeTooltip(ui->handleTiledMemory, tooltips.settings.handle_tiled_memory); - m_emu_settings->EnhanceCheckBox(ui->disableOnDiskShaderCache, emu_settings_type::DisableOnDiskShaderCache); - SubscribeTooltip(ui->disableOnDiskShaderCache, tooltips.settings.disable_on_disk_shader_cache); - m_emu_settings->EnhanceCheckBox(ui->vblankNTSCFixup, emu_settings_type::VBlankNTSCFixup); ui->mfcDelayCommand->setChecked(m_emu_settings->GetSetting(emu_settings_type::MFCCommandsShuffling) == "1"); @@ -2430,6 +2427,9 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceCheckBox(ui->forceHwMSAAResolve, emu_settings_type::ForceHwMSAAResolve); SubscribeTooltip(ui->forceHwMSAAResolve, tooltips.settings.force_hw_MSAA); + m_emu_settings->EnhanceCheckBox(ui->disableOnDiskShaderCache, emu_settings_type::DisableOnDiskShaderCache); + SubscribeTooltip(ui->disableOnDiskShaderCache, tooltips.settings.disable_on_disk_shader_cache); + // Checkboxes: core debug options m_emu_settings->EnhanceCheckBox(ui->alwaysStart, emu_settings_type::StartOnBoot); SubscribeTooltip(ui->alwaysStart, tooltips.settings.start_on_boot); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 5ca882a4f5..06a1e5c63f 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -2677,13 +2677,6 @@ - - - - Disable On-Disk Shader Cache - - - @@ -4272,6 +4265,13 @@ + + + + Disable On-Disk Shader Cache + + + From bacce9bb370aba56848040fadc023483fd7b5f5e Mon Sep 17 00:00:00 2001 From: AniLeo Date: Mon, 3 Mar 2025 13:07:38 +0100 Subject: [PATCH 076/529] Settings: Move 'Vulkan Queue Scheduler' to Debug --- rpcs3/rpcs3qt/settings_dialog.cpp | 6 +++--- rpcs3/rpcs3qt/settings_dialog.ui | 36 +++++++++++++++---------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index e2b0921e0e..4e36b1d1dd 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1605,9 +1605,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std // Hide a developers' setting remove_item(ui->FIFOAccuracy, static_cast(rsx_fifo_mode::as_ps3), static_cast(g_cfg.core.rsx_fifo_accuracy.def)); - m_emu_settings->EnhanceComboBox(ui->vulkansched, emu_settings_type::VulkanAsyncSchedulerDriver); - SubscribeTooltip(ui->gb_vulkansched, tooltips.settings.vulkan_async_scheduler); - // Sliders EnhanceSlider(emu_settings_type::DriverWakeUpDelay, ui->wakeupDelay, ui->wakeupText, tr(reinterpret_cast(u8"%0 µs"), "Driver wake up delay")); @@ -2481,6 +2478,9 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceComboBox(ui->combo_num_ppu_threads, emu_settings_type::NumPPUThreads, true); SubscribeTooltip(ui->gb_num_ppu_threads, tooltips.settings.num_ppu_threads); + m_emu_settings->EnhanceComboBox(ui->vulkansched, emu_settings_type::VulkanAsyncSchedulerDriver); + SubscribeTooltip(ui->gb_vulkansched, tooltips.settings.vulkan_async_scheduler); + if (!restoreGeometry(m_gui_settings->GetValue(gui::cfg_geometry).toByteArray())) { // Ignore. This will most likely only fail if the setting doesn't contain any values diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 06a1e5c63f..2ccd5b3e05 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -2708,24 +2708,6 @@ - - - - - 0 - 0 - - - - Vulkan Queue Scheduler - - - - - - - - @@ -4476,6 +4458,24 @@ + + + + + 0 + 0 + + + + Vulkan Queue Scheduler + + + + + + + + From ddd3ac3663134ab1b6e71041b20eb567485d028d Mon Sep 17 00:00:00 2001 From: AniLeo Date: Tue, 4 Mar 2025 12:43:56 +0100 Subject: [PATCH 077/529] Settings: Move 'Max Shader Compile Threads' next to the equivalent LLVM setting --- rpcs3/rpcs3qt/settings_dialog.cpp | 10 +++++----- rpcs3/rpcs3qt/settings_dialog.ui | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 4e36b1d1dd..0a5fe8c7c5 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -597,10 +597,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceComboBox(ui->shaderPrecision, emu_settings_type::ShaderPrecisionQuality); SubscribeTooltip(ui->gbShaderPrecision, tooltips.settings.shader_precision); - m_emu_settings->EnhanceComboBox(ui->shaderCompilerThreads, emu_settings_type::ShaderCompilerNumThreads, true); - SubscribeTooltip(ui->gb_shader_compiler_threads, tooltips.settings.shader_compiler_threads); - ui->shaderCompilerThreads->setItemText(ui->shaderCompilerThreads->findData(0), tr("Auto", "Number of Shader Compiler Threads")); - // Custom control that simplifies operation of two independent variables. Can probably be done better but this works. ui->zcullPrecisionMode->addItem(tr("Precise (Slowest)"), static_cast(zcull_precision_level::precise)); ui->zcullPrecisionMode->addItem(tr("Approximate (Fast)"), static_cast(zcull_precision_level::approximate)); @@ -1794,7 +1790,11 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceComboBox(ui->maxLLVMThreads, emu_settings_type::MaxLLVMThreads, true, true, utils::get_thread_count()); SubscribeTooltip(ui->gb_max_llvm, tooltips.settings.max_llvm_threads); - ui->maxLLVMThreads->setItemText(ui->maxLLVMThreads->findData(0), tr("All (%1)", "Max LLVM threads").arg(utils::get_thread_count())); + ui->maxLLVMThreads->setItemText(ui->maxLLVMThreads->findData(0), tr("All (%1)", "Max LLVM Compile Threads").arg(utils::get_thread_count())); + + m_emu_settings->EnhanceComboBox(ui->shaderCompilerThreads, emu_settings_type::ShaderCompilerNumThreads, true); + SubscribeTooltip(ui->gb_shader_compiler_threads, tooltips.settings.shader_compiler_threads); + ui->shaderCompilerThreads->setItemText(ui->shaderCompilerThreads->findData(0), tr("Auto", "Max Shader Compile Threads")); m_emu_settings->EnhanceComboBox(ui->perfOverlayDetailLevel, emu_settings_type::PerfOverlayDetailLevel); SubscribeTooltip(ui->perf_overlay_detail_level, tooltips.settings.perf_overlay_detail_level); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 2ccd5b3e05..bdc51566d9 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -912,18 +912,6 @@ - - - - Number of Shader Compiler Threads - - - - - - - - @@ -3051,6 +3039,18 @@ + + + + Max Shader Compile Threads + + + + + + + + From 11e214f332a621b5824c2352eefd97686347b0c0 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Mon, 10 Mar 2025 14:21:22 +0300 Subject: [PATCH 078/529] rsx: Handle out-of-bounds read/writes from FIFO register IO --- rpcs3/Emu/RSX/NV47/HW/nv308a.cpp | 7 +++++++ rpcs3/Emu/RSX/NV47/HW/nv4097.cpp | 16 ++++++++++++++++ rpcs3/Emu/RSX/RSXFIFO.cpp | 7 +++++++ 3 files changed, 30 insertions(+) diff --git a/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp b/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp index be3fab8830..163ddb9a4c 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp @@ -35,6 +35,13 @@ namespace rsx u32 count = std::min({ fifo_args_cnt, fifo_read_limit, method_range }); + if (!count) + { + rsx_log.error("nv308a::color - No data to read/write."); + RSX(ctx)->fifo_ctrl->skip_methods(fifo_args_cnt - 1); + return; + } + const u32 dst_dma = REGS(ctx)->blit_engine_output_location_nv3062(); const u32 dst_offset = REGS(ctx)->blit_engine_output_offset_nv3062(); const u32 out_pitch = REGS(ctx)->blit_engine_output_pitch_nv3062(); diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp index 78f01f4059..eeb52a2242 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp @@ -82,6 +82,14 @@ namespace rsx rcount = 0; } + if (rcount == 0) + { + // Out-of-bounds write is a NOP + rsx_log.trace("Out of bounds write for transform constant block."); + RSX(ctx)->fifo_ctrl->skip_methods(fifo_args_cnt - 1); + return; + } + if (RSX(ctx)->in_begin_end && !REGS(ctx)->current_draw_clause.empty()) { // Updating constants mid-draw is messy. Defer the writes @@ -148,6 +156,14 @@ namespace rsx rcount -= max - (max_vertex_program_instructions * 4); } + if (!rcount) + { + // Out-of-bounds write is a NOP + rsx_log.trace("Out of bounds write for transform program block."); + RSX(ctx)->fifo_ctrl->skip_methods(fifo_args_cnt - 1); + return; + } + const auto fifo_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(rcount); if (fifo_span.size() < rcount) diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/Emu/RSX/RSXFIFO.cpp index 7982da2393..28cd0c286d 100644 --- a/rpcs3/Emu/RSX/RSXFIFO.cpp +++ b/rpcs3/Emu/RSX/RSXFIFO.cpp @@ -225,6 +225,13 @@ namespace rsx std::span FIFO_control::get_current_arg_ptr(u32 length_in_words) const { + if (!length_in_words) + { + // This means the caller is doing something stupid + rsx_log.error("Invalid access to FIFO args data, requested length = 0"); + return {}; + } + if (g_cfg.core.rsx_fifo_accuracy) { // Return a pointer to the cache storage with confined access From 798c194025a2bf65d849e3685235127d3e521433 Mon Sep 17 00:00:00 2001 From: DH Date: Mon, 24 Feb 2025 01:21:21 +0300 Subject: [PATCH 079/529] android stuff --- 3rdparty/CMakeLists.txt | 108 ++++--- 3rdparty/libusb/os.cmake | 6 +- Utilities/Thread.cpp | 22 +- Utilities/stack_trace.cpp | 5 +- rpcs3/CMakeLists.txt | 305 +++++++++--------- rpcs3/Emu/CMakeLists.txt | 72 +++-- .../Emu/Cell/lv2/sys_net/sys_net_helpers.cpp | 2 +- rpcs3/Emu/IPC_socket.h | 2 +- rpcs3/Emu/RSX/Program/CgBinaryProgram.h | 14 +- rpcs3/Emu/RSX/display.h | 2 + rpcs3/util/atomic.cpp | 2 + 11 files changed, 304 insertions(+), 236 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 9568548651..92805027e3 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -84,8 +84,12 @@ endif() # hidapi -add_subdirectory(hidapi) - +if (NOT ANDROID) + add_subdirectory(hidapi) +else() + add_library(3rdparty_hidapi INTERFACE) + target_compile_definitions(3rdparty_hidapi INTERFACE WITHOUT_HIDAPI=1) +endif() # glslang add_subdirectory(glslang EXCLUDE_FROM_ALL) @@ -99,24 +103,28 @@ add_subdirectory(yaml-cpp) # OpenGL -find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL) +if (NOT ANDROID) + find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL) -add_library(3rdparty_opengl INTERFACE) -target_include_directories(3rdparty_opengl INTERFACE GL) + add_library(3rdparty_opengl INTERFACE) + target_include_directories(3rdparty_opengl INTERFACE GL) -if (WIN32) - if(NOT MSVC) + if (WIN32) + if(NOT MSVC) + target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU) + else() + target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib) + endif() + elseif(APPLE) target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU) else() - target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib) + target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX) endif() -elseif(APPLE) - target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU) else() - target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX) + add_library(3rdparty_opengl INTERFACE) + target_compile_definitions(3rdparty_opengl INTERFACE WITHOUT_OPENGL=1) endif() - # stblib add_subdirectory(stblib) @@ -181,7 +189,7 @@ if(USE_VULKAN) target_compile_definitions(3rdparty_vulkan INTERFACE -DHAVE_VULKAN) target_link_libraries(3rdparty_vulkan INTERFACE Vulkan::Vulkan) - if(UNIX AND NOT APPLE) + if(UNIX AND NOT APPLE AND NOT ANDROID) find_package(Wayland) if (WAYLAND_FOUND) target_include_directories(3rdparty_vulkan @@ -205,7 +213,12 @@ endif() add_subdirectory(asmjit EXCLUDE_FROM_ALL) # OpenAL -add_subdirectory(OpenAL EXCLUDE_FROM_ALL) +if (NOT ANDROID) + add_subdirectory(OpenAL EXCLUDE_FROM_ALL) +else() + add_library(3rdparty_openal INTERFACE) + target_compile_definitions(3rdparty_openal INTERFACE WITHOUT_OPENAL=1) +endif() # FAudio set(FAUDIO_TARGET 3rdparty_dummy_lib) @@ -246,47 +259,48 @@ set_property(TARGET ${FAUDIO_TARGET} PROPERTY FOLDER "3rdparty/") # FFMPEG -add_library(3rdparty_ffmpeg INTERFACE) +if(NOT ANDROID) + add_library(3rdparty_ffmpeg INTERFACE) -# Select the version of ffmpeg to use, default is builtin -if(USE_SYSTEM_FFMPEG) - message(STATUS "RPCS3: using shared ffmpeg") - find_package(FFMPEG REQUIRED) + # Select the version of ffmpeg to use, default is builtin + if(USE_SYSTEM_FFMPEG) + message(STATUS "RPCS3: using shared ffmpeg") + find_package(FFMPEG REQUIRED) - target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR}) - target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES}) -else() - message(STATUS "RPCS3: using builtin ffmpeg") - add_subdirectory(ffmpeg EXCLUDE_FROM_ALL) - # ffmpeg-core libraries are extracted to CMAKE_BINARY_DIR - set(FFMPEG_LIB_DIR "${CMAKE_BINARY_DIR}/3rdparty/ffmpeg/lib") + target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR}) + target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES}) + else() + message(STATUS "RPCS3: using builtin ffmpeg") + add_subdirectory(ffmpeg EXCLUDE_FROM_ALL) + # ffmpeg-core libraries are extracted to CMAKE_BINARY_DIR + set(FFMPEG_LIB_DIR "${CMAKE_BINARY_DIR}/3rdparty/ffmpeg/lib") - if (WIN32) - target_link_libraries(3rdparty_ffmpeg INTERFACE "Bcrypt.lib") + if (WIN32) + target_link_libraries(3rdparty_ffmpeg INTERFACE "Bcrypt.lib") + endif() + else() + find_library(FFMPEG_LIB_AVFORMAT avformat PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) + find_library(FFMPEG_LIB_AVCODEC avcodec PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) + find_library(FFMPEG_LIB_AVUTIL avutil PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) + find_library(FFMPEG_LIB_SWSCALE swscale PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) + find_library(FFMPEG_LIB_SWRESAMPLE swresample PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) + + target_link_libraries(3rdparty_ffmpeg + INTERFACE + ${FFMPEG_LIB_AVFORMAT} + ${FFMPEG_LIB_AVCODEC} + ${FFMPEG_LIB_AVUTIL} + ${FFMPEG_LIB_SWSCALE} + ${FFMPEG_LIB_SWRESAMPLE} + ) + endif() + target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include") endif() - - find_library(FFMPEG_LIB_AVFORMAT avformat PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) - find_library(FFMPEG_LIB_AVCODEC avcodec PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) - find_library(FFMPEG_LIB_AVUTIL avutil PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) - find_library(FFMPEG_LIB_SWSCALE swscale PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) - find_library(FFMPEG_LIB_SWRESAMPLE swresample PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) - - target_link_libraries(3rdparty_ffmpeg - INTERFACE - ${FFMPEG_LIB_AVFORMAT} - ${FFMPEG_LIB_AVCODEC} - ${FFMPEG_LIB_AVUTIL} - ${FFMPEG_LIB_SWSCALE} - ${FFMPEG_LIB_SWRESAMPLE} - ) - - target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include") endif() - # GLEW add_library(3rdparty_glew INTERFACE) -if(NOT MSVC) +if(NOT MSVC AND NOT ANDROID) find_package(GLEW REQUIRED) target_link_libraries(3rdparty_glew INTERFACE GLEW::GLEW) endif() diff --git a/3rdparty/libusb/os.cmake b/3rdparty/libusb/os.cmake index e44ab083b1..dc87180272 100644 --- a/3rdparty/libusb/os.cmake +++ b/3rdparty/libusb/os.cmake @@ -77,7 +77,7 @@ int main() elseif (UNIX) # Unix is for all *NIX systems including OSX add_compile_definitions(PLATFORM_POSIX=1 HAVE_CLOCK_GETTIME) - if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") + if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR ANDROID) set(OS_LINUX 1) set(PLATFORM_SRC @@ -87,7 +87,9 @@ elseif (UNIX) events_posix.c ) - list(APPEND LIBUSB_LIBRARIES rt) + if(NOT ANDROID) + list(APPEND LIBUSB_LIBRARIES rt) + endif() endif() endif() diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index 603c430ba3..2fb7d94e66 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -1997,7 +1997,7 @@ static void signal_handler(int /*sig*/, siginfo_t* info, void* uct) noexcept #else const u32 insn = is_executing ? 0 : *reinterpret_cast(RIP(context)); - const bool is_writing = + const bool is_writing = (insn & 0xbfff0000) == 0x0c000000 || // STR , [, #] (store word with immediate offset) (insn & 0xbfe00000) == 0x0c800000 || // STP , , [, #] (store pair of registers with immediate offset) (insn & 0xbfdf0000) == 0x0d000000 || // STR , [, ] (store word with register offset) @@ -2172,7 +2172,11 @@ void thread_base::start() void thread_base::initialize(void (*error_cb)()) { #ifndef _WIN32 +#ifdef ANDROID + m_thread.release(pthread_self()); +#else m_thread.release(reinterpret_cast(pthread_self())); +#endif #endif // Initialize TLS variables @@ -2617,6 +2621,8 @@ thread_base::~thread_base() noexcept const HANDLE handle0 = reinterpret_cast(m_thread.load()); WaitForSingleObject(handle0, INFINITE); CloseHandle(handle0); +#elif defined(ANDROID) + pthread_join(m_thread.load(), nullptr); #else pthread_join(reinterpret_cast(m_thread.load()), nullptr); #endif @@ -2691,7 +2697,13 @@ u64 thread_base::get_cycles() #else clockid_t _clock; struct timespec thread_time; - if (!pthread_getcpuclockid(reinterpret_cast(handle), &_clock) && !clock_gettime(_clock, &thread_time)) + pthread_t thread_id; +#ifdef ANDROID + thread_id = handle; +#else + thread_id = reinterpret_cast(handle); +#endif + if (!pthread_getcpuclockid(thread_id, &_clock) && !clock_gettime(_clock, &thread_time)) { cycles = static_cast(thread_time.tv_sec) * 1'000'000'000 + thread_time.tv_nsec; #endif @@ -3194,7 +3206,7 @@ void thread_ctrl::set_thread_affinity_mask(u64 mask) thread_affinity_policy_data_t policy = { static_cast(std::countr_zero(mask)) }; thread_port_t mach_thread = pthread_mach_thread_np(pthread_self()); thread_policy_set(mach_thread, THREAD_AFFINITY_POLICY, reinterpret_cast(&policy), !mask ? 0 : 1); -#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) +#elif !defined(ANDROID) && (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)) if (!mask) { // Reset affinity mask @@ -3246,7 +3258,7 @@ u64 thread_ctrl::get_thread_affinity_mask() sig_log.error("Failed to get thread affinity mask."); return 0; -#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) +#elif !defined(ANDROID) && (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)) cpu_set_t cs; CPU_ZERO(&cs); @@ -3313,6 +3325,8 @@ u64 thread_ctrl::get_tid() { #ifdef _WIN32 return GetCurrentThreadId(); +#elif defined(ANDROID) + return static_cast(pthread_self()); #elif defined(__linux__) return syscall(SYS_gettid); #else diff --git a/Utilities/stack_trace.cpp b/Utilities/stack_trace.cpp index 9ca20387af..f44751fcda 100644 --- a/Utilities/stack_trace.cpp +++ b/Utilities/stack_trace.cpp @@ -126,15 +126,17 @@ namespace utils std::vector get_backtrace(int max_depth) { std::vector result(max_depth); +#ifndef ANDROID int depth = backtrace(result.data(), max_depth); - result.resize(depth); +#endif return result; } std::vector get_backtrace_symbols(const std::vector& stack) { std::vector result; +#ifndef ANDROID result.reserve(stack.size()); const auto symbols = backtrace_symbols(stack.data(), static_cast(stack.size())); @@ -144,6 +146,7 @@ namespace utils } free(symbols); +#endif return result; } #endif diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 2b76f3c5e7..3556502f7a 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -20,7 +20,7 @@ elseif(NOT WIN32 AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG") set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "iconv") endif() -if(UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE AND NOT ANDROID) add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}/rpcs3") # Optionally enable X11 for window management find_package(X11) @@ -33,162 +33,171 @@ if(UNIX AND NOT APPLE) endif() endif() -# Qt -# finds Qt libraries and setups custom commands for MOC and UIC -# Must be done here because generated MOC and UIC targets cant -# be found otherwise -include(${CMAKE_SOURCE_DIR}/3rdparty/qt6.cmake) +if (NOT ANDROID) + # Qt + # finds Qt libraries and setups custom commands for MOC and UIC + # Must be done here because generated MOC and UIC targets cant + # be found otherwise + include(${CMAKE_SOURCE_DIR}/3rdparty/qt6.cmake) +endif() # subdirectories add_subdirectory(Emu) -add_subdirectory(rpcs3qt) -if(WIN32) - add_executable(rpcs3 WIN32) - target_sources(rpcs3 PRIVATE rpcs3.rc) - target_compile_definitions(rpcs3 PRIVATE UNICODE _UNICODE) -elseif(APPLE) - add_executable(rpcs3 MACOSX_BUNDLE) - target_sources(rpcs3 PRIVATE rpcs3.icns update_helper.sh) - set_source_files_properties(update_helper.sh PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - set_target_properties(rpcs3 - PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.plist.in") -else() - add_executable(rpcs3) +if (NOT ANDROID) + add_subdirectory(rpcs3qt) endif() -target_sources(rpcs3 - PRIVATE - display_sleep_control.cpp - headless_application.cpp - main.cpp - main_application.cpp - module_verifier.cpp - rpcs3_version.cpp - stb_image.cpp - stdafx.cpp - - Input/basic_keyboard_handler.cpp - Input/basic_mouse_handler.cpp - Input/ds3_pad_handler.cpp - Input/ds4_pad_handler.cpp - Input/dualsense_pad_handler.cpp - Input/evdev_joystick_handler.cpp - Input/evdev_gun_handler.cpp - Input/gui_pad_thread.cpp - Input/hid_pad_handler.cpp - Input/keyboard_pad_handler.cpp - Input/mm_joystick_handler.cpp - Input/pad_thread.cpp - Input/product_info.cpp - Input/ps_move_calibration.cpp - Input/ps_move_config.cpp - Input/ps_move_handler.cpp - Input/ps_move_tracker.cpp - Input/raw_mouse_config.cpp - Input/raw_mouse_handler.cpp - Input/sdl_pad_handler.cpp - Input/skateboard_pad_handler.cpp - Input/xinput_pad_handler.cpp -) - gen_git_version(${CMAKE_CURRENT_SOURCE_DIR}) -set_target_properties(rpcs3 - PROPERTIES - AUTOMOC ON - AUTOUIC ON) -target_link_libraries(rpcs3 - PRIVATE - rpcs3_emu - rpcs3_ui - 3rdparty::discordRPC - 3rdparty::qt6 - 3rdparty::hidapi - 3rdparty::libusb - 3rdparty::wolfssl - 3rdparty::libcurl - 3rdparty::zlib - 3rdparty::opencv - 3rdparty::fusion - ${ADDITIONAL_LIBS}) - -# Unix display manager -if(X11_FOUND) - target_link_libraries(rpcs3 PRIVATE X11::X11) -elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE) - # Wayland has been checked in 3rdparty/CMakeLists.txt already. - message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.") -endif() - -if(UNIX) - set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - find_package(Threads REQUIRED) - target_link_libraries(rpcs3 PRIVATE Threads::Threads) -endif() - -if(WIN32) - target_link_libraries(rpcs3 PRIVATE bcrypt ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi pdh) -else() - target_link_libraries(rpcs3 PRIVATE ${CMAKE_DL_LIBS}) -endif() - -if(USE_PRECOMPILED_HEADERS) - target_precompile_headers(rpcs3 PRIVATE stdafx.h) -endif() - -# Copy icons to executable directory -if(APPLE) - if (CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo") - set(QT_DEPLOY_FLAGS "-no-strip") +if (NOT ANDROID) + if(WIN32) + add_executable(rpcs3 WIN32) + target_sources(rpcs3 PRIVATE rpcs3.rc) + target_compile_definitions(rpcs3 PRIVATE UNICODE _UNICODE) + elseif(APPLE) + add_executable(rpcs3 MACOSX_BUNDLE) + target_sources(rpcs3 PRIVATE rpcs3.icns update_helper.sh) + set_source_files_properties(update_helper.sh PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set_target_properties(rpcs3 + PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.plist.in") else() - set(QT_DEPLOY_FLAGS "") + add_executable(rpcs3) endif() - qt_finalize_target(rpcs3) - add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.icns $/../Resources/rpcs3.icns - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/../Resources/Icons - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/../Resources/GuiConfigs - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/../Resources/git - COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${PROJECT_BINARY_DIR}/bin/rpcs3.app" "${QT_DEPLOY_FLAGS}") -elseif(UNIX) - add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/Icons - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git) -elseif(WIN32) - add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy $ $ - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/Icons - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git - COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt - --no-translations --no-system-d3d-compiler --no-quick-import - --plugindir "$,$/plugins,$/share/qt6/plugins>" - --verbose 0 "$") -endif() -# Unix installation -if(UNIX AND NOT APPLE) - # Install the binary - install(TARGETS rpcs3 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - # Install the application icon and menu item - install(FILES rpcs3.svg - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps) - install(FILES rpcs3.png - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps) - install(FILES rpcs3.desktop - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) - install(FILES rpcs3.metainfo.xml - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) - # Install other files - install(DIRECTORY ../bin/Icons - DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) - install(DIRECTORY ../bin/GuiConfigs - DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) - install(DIRECTORY ../bin/git - DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) - install(DIRECTORY ../bin/test - DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + target_sources(rpcs3 + PRIVATE + display_sleep_control.cpp + headless_application.cpp + main.cpp + main_application.cpp + module_verifier.cpp + rpcs3_version.cpp + stb_image.cpp + stdafx.cpp + + Input/basic_keyboard_handler.cpp + Input/basic_mouse_handler.cpp + Input/ds3_pad_handler.cpp + Input/ds4_pad_handler.cpp + Input/dualsense_pad_handler.cpp + Input/evdev_joystick_handler.cpp + Input/evdev_gun_handler.cpp + Input/gui_pad_thread.cpp + Input/hid_pad_handler.cpp + Input/keyboard_pad_handler.cpp + Input/mm_joystick_handler.cpp + Input/pad_thread.cpp + Input/product_info.cpp + Input/ps_move_calibration.cpp + Input/ps_move_config.cpp + Input/ps_move_handler.cpp + Input/ps_move_tracker.cpp + Input/raw_mouse_config.cpp + Input/raw_mouse_handler.cpp + Input/sdl_pad_handler.cpp + Input/skateboard_pad_handler.cpp + Input/xinput_pad_handler.cpp + ) + + set_target_properties(rpcs3 + PROPERTIES + AUTOMOC ON + AUTOUIC ON) + + target_link_libraries(rpcs3 + PRIVATE + rpcs3_emu + rpcs3_ui + 3rdparty::discordRPC + 3rdparty::qt6 + 3rdparty::hidapi + 3rdparty::libusb + 3rdparty::wolfssl + 3rdparty::libcurl + 3rdparty::zlib + 3rdparty::opencv + 3rdparty::fusion + ${ADDITIONAL_LIBS}) + + # Unix display manager + if(X11_FOUND) + target_link_libraries(rpcs3 PRIVATE X11::X11) + elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE AND NOT ANDROID) + # Wayland has been checked in 3rdparty/CMakeLists.txt already. + message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.") + endif() + + if(UNIX) + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + find_package(Threads REQUIRED) + target_link_libraries(rpcs3 PRIVATE Threads::Threads) + endif() + + if(WIN32) + target_link_libraries(rpcs3 PRIVATE bcrypt ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi pdh) + else() + target_link_libraries(rpcs3 PRIVATE ${CMAKE_DL_LIBS}) + endif() + + if(USE_PRECOMPILED_HEADERS) + target_precompile_headers(rpcs3 PRIVATE stdafx.h) + endif() + + + # Copy icons to executable directory + if(APPLE) + if (CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo") + set(QT_DEPLOY_FLAGS "-no-strip") + else() + set(QT_DEPLOY_FLAGS "") + endif() + qt_finalize_target(rpcs3) + add_custom_command(TARGET rpcs3 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.icns $/../Resources/rpcs3.icns + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/../Resources/Icons + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/../Resources/GuiConfigs + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/../Resources/git + COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${PROJECT_BINARY_DIR}/bin/rpcs3.app" "${QT_DEPLOY_FLAGS}") + elseif(UNIX) + add_custom_command(TARGET rpcs3 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/Icons + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git) + elseif(WIN32) + add_custom_command(TARGET rpcs3 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/Icons + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git + COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt + --no-translations --no-system-d3d-compiler --no-quick-import + --plugindir "$,$/plugins,$/share/qt6/plugins>" + --verbose 0 "$") + endif() + + # Unix installation + if(UNIX AND NOT APPLE) + # Install the binary + install(TARGETS rpcs3 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + # Install the application icon and menu item + install(FILES rpcs3.svg + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps) + install(FILES rpcs3.png + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps) + install(FILES rpcs3.desktop + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) + install(FILES rpcs3.metainfo.xml + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) + # Install other files + install(DIRECTORY ../bin/Icons + DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + install(DIRECTORY ../bin/GuiConfigs + DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + install(DIRECTORY ../bin/git + DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + install(DIRECTORY ../bin/test + DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + endif() endif() diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index 034133c3b2..743b6c88d3 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -46,7 +46,14 @@ target_link_libraries(rpcs3_emu # For stdafx.h target_include_directories(rpcs3_emu PUBLIC - ${PROJECT_SOURCE_DIR}/rpcs3) + ${CMAKE_CURRENT_SOURCE_DIR}/../.. + ${CMAKE_CURRENT_SOURCE_DIR}/.. +) + +target_include_directories(rpcs3_emu + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty +) # Utilities target_sources(rpcs3_emu PRIVATE @@ -494,34 +501,6 @@ target_sources(rpcs3_emu PRIVATE RSX/Core/RSXDrawCommands.cpp RSX/gcm_enums.cpp RSX/gcm_printing.cpp - RSX/GL/GLCommonDecompiler.cpp - RSX/GL/GLCompute.cpp - RSX/GL/GLDMA.cpp - RSX/GL/GLDraw.cpp - RSX/GL/GLFragmentProgram.cpp - RSX/GL/GLGSRender.cpp - RSX/GL/GLHelpers.cpp - RSX/GL/GLOverlays.cpp - RSX/GL/GLPipelineCompiler.cpp - RSX/GL/GLPresent.cpp - RSX/GL/GLRenderTargets.cpp - RSX/GL/GLResolveHelper.cpp - RSX/GL/GLShaderInterpreter.cpp - RSX/GL/GLTexture.cpp - RSX/GL/GLTextureCache.cpp - RSX/GL/glutils/blitter.cpp - RSX/GL/glutils/buffer_object.cpp - RSX/GL/glutils/capabilities.cpp - RSX/GL/glutils/common.cpp - RSX/GL/glutils/fbo.cpp - RSX/GL/glutils/image.cpp - RSX/GL/glutils/program.cpp - RSX/GL/glutils/ring_buffer.cpp - RSX/GL/glutils/sampler.cpp - RSX/GL/GLVertexBuffers.cpp - RSX/GL/GLVertexProgram.cpp - RSX/GL/OpenGL.cpp - RSX/GL/upscalers/fsr1/fsr_pass.cpp RSX/GSRender.cpp RSX/Host/MM.cpp RSX/Host/RSXDMAWriter.cpp @@ -590,6 +569,39 @@ target_sources(rpcs3_emu PRIVATE RSX/rsx_vertex_data.cpp ) +if(NOT ANDROID) + target_sources(rpcs3_emu PRIVATE + RSX/GL/GLCommonDecompiler.cpp + RSX/GL/GLCompute.cpp + RSX/GL/GLDMA.cpp + RSX/GL/GLDraw.cpp + RSX/GL/GLFragmentProgram.cpp + RSX/GL/GLGSRender.cpp + RSX/GL/GLHelpers.cpp + RSX/GL/GLOverlays.cpp + RSX/GL/GLPipelineCompiler.cpp + RSX/GL/GLPresent.cpp + RSX/GL/GLRenderTargets.cpp + RSX/GL/GLResolveHelper.cpp + RSX/GL/GLShaderInterpreter.cpp + RSX/GL/GLTexture.cpp + RSX/GL/GLTextureCache.cpp + RSX/GL/glutils/blitter.cpp + RSX/GL/glutils/buffer_object.cpp + RSX/GL/glutils/capabilities.cpp + RSX/GL/glutils/common.cpp + RSX/GL/glutils/fbo.cpp + RSX/GL/glutils/image.cpp + RSX/GL/glutils/program.cpp + RSX/GL/glutils/ring_buffer.cpp + RSX/GL/glutils/sampler.cpp + RSX/GL/GLVertexBuffers.cpp + RSX/GL/GLVertexProgram.cpp + RSX/GL/OpenGL.cpp + RSX/GL/upscalers/fsr1/fsr_pass.cpp + ) +endif() + if(TARGET 3rdparty_vulkan) target_sources(rpcs3_emu PRIVATE RSX/VK/upscalers/fsr1/fsr_pass.cpp @@ -658,7 +670,7 @@ endif() if(USE_PRECOMPILED_HEADERS) - target_precompile_headers(rpcs3_emu PRIVATE "${PROJECT_SOURCE_DIR}/rpcs3/stdafx.h") + target_precompile_headers(rpcs3_emu PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../stdafx.h") endif() if(WAYLAND_FOUND) diff --git a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp b/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp index acd4bf6a1f..e11de85007 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp @@ -133,12 +133,12 @@ sys_net_sockaddr native_addr_to_sys_net_addr(const ::sockaddr_storage& native_ad sys_net_sockaddr sn_addr; sys_net_sockaddr_in* paddr = reinterpret_cast(&sn_addr); + *paddr = {}; paddr->sin_len = sizeof(sys_net_sockaddr_in); paddr->sin_family = SYS_NET_AF_INET; paddr->sin_port = std::bit_cast, u16>(reinterpret_cast(&native_addr)->sin_port); paddr->sin_addr = std::bit_cast, u32>(reinterpret_cast(&native_addr)->sin_addr.s_addr); - paddr->sin_zero = 0; return sn_addr; } diff --git a/rpcs3/Emu/IPC_socket.h b/rpcs3/Emu/IPC_socket.h index e631c90cbf..2e4cca549c 100644 --- a/rpcs3/Emu/IPC_socket.h +++ b/rpcs3/Emu/IPC_socket.h @@ -3,7 +3,7 @@ #include "Utilities/Thread.h" #include "util/logs.hpp" #include "Emu/Memory/vm.h" -#include "../pine/pine_server.h" +#include "pine/pine_server.h" LOG_CHANNEL(IPC); diff --git a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h index f63e2adc1b..d04e85690e 100644 --- a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h +++ b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h @@ -1,11 +1,17 @@ #pragma once #include "util/endian.hpp" -#include "Emu/RSX/GL/GLVertexProgram.h" -#include "Emu/RSX/GL/GLFragmentProgram.h" +#include "Emu/RSX/Program/RSXVertexProgram.h" +#include "Emu/RSX/Program/RSXFragmentProgram.h" #include "Emu/RSX/Program/ProgramStateCache.h" +#include "Emu/RSX/Program/ShaderParam.h" #include "Utilities/File.h" +#ifndef WITHOUT_OPENGL + #include "Emu/RSX/GL/GLVertexProgram.h" + #include "Emu/RSX/GL/GLFragmentProgram.h" +#endif + using CGprofile = u32; using CGbool = s32; using CGresource = u32; @@ -368,7 +374,9 @@ public: prog.total_length = metadata.program_ucode_length + metadata.program_start_offset; prog.data = reinterpret_cast(be_data.data()) + metadata.program_start_offset; for (u32 i = 0; i < 16; ++i) prog.texture_state.set_dimension(rsx::texture_dimension_extended::texture_dimension_2d, i); +#ifndef WITHOUT_OPENGL GLFragmentDecompilerThread(m_glsl_shader, param_array, prog, unused).Task(); +#endif } else @@ -411,7 +419,9 @@ public: RSXVertexProgram prog; program_hash_util::vertex_program_utils::analyse_vertex_program(vdata, 0, prog); for (u32 i = 0; i < 4; ++i) prog.texture_state.set_dimension(rsx::texture_dimension_extended::texture_dimension_2d, i); +#ifndef WITHOUT_OPENGL GLVertexDecompilerThread(prog, m_glsl_shader, param_array).Task(); +#endif } } diff --git a/rpcs3/Emu/RSX/display.h b/rpcs3/Emu/RSX/display.h index 8881275668..38c7e722b7 100644 --- a/rpcs3/Emu/RSX/display.h +++ b/rpcs3/Emu/RSX/display.h @@ -28,6 +28,8 @@ using display_handle_t = std::variant< std::pair #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) std::pair +#elif defined(ANDROID) + void * #endif >; #endif diff --git a/rpcs3/util/atomic.cpp b/rpcs3/util/atomic.cpp index 41b28d1d40..9ab44d433e 100644 --- a/rpcs3/util/atomic.cpp +++ b/rpcs3/util/atomic.cpp @@ -170,6 +170,8 @@ namespace { #ifdef _WIN32 tid = GetCurrentThreadId(); +#elif defined(ANDROID) + tid = pthread_self(); #else tid = reinterpret_cast(pthread_self()); #endif From 5084fb82b8043d48bb54ce919b83f4aa39479f7a Mon Sep 17 00:00:00 2001 From: DH Date: Mon, 24 Feb 2025 05:59:06 +0300 Subject: [PATCH 080/529] Android stuff 2 --- 3rdparty/CMakeLists.txt | 19 +++++++++++-------- 3rdparty/hidapi/CMakeLists.txt | 2 ++ rpcs3/Emu/Cell/Modules/cellMic.cpp | 23 ++++++++++++++++++----- rpcs3/Input/pad_thread.cpp | 13 ++++++++++++- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 92805027e3..cb0909e978 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -79,17 +79,16 @@ else() # we don't have the system libusb, so we compile from submodule unset(LIBUSB_LIBRARIES CACHE) add_subdirectory(libusb EXCLUDE_FROM_ALL) + + if (NOT TARGET usb-1.0 AND TARGET usb-1.0-static) + add_library(usb-1.0 ALIAS usb-1.0-static) + endif() endif() endif() # hidapi -if (NOT ANDROID) - add_subdirectory(hidapi) -else() - add_library(3rdparty_hidapi INTERFACE) - target_compile_definitions(3rdparty_hidapi INTERFACE WITHOUT_HIDAPI=1) -endif() +add_subdirectory(hidapi) # glslang add_subdirectory(glslang EXCLUDE_FROM_ALL) @@ -278,13 +277,17 @@ if(NOT ANDROID) if (WIN32) target_link_libraries(3rdparty_ffmpeg INTERFACE "Bcrypt.lib") endif() - else() + find_library(FFMPEG_LIB_AVFORMAT avformat PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) find_library(FFMPEG_LIB_AVCODEC avcodec PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) find_library(FFMPEG_LIB_AVUTIL avutil PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) find_library(FFMPEG_LIB_SWSCALE swscale PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) find_library(FFMPEG_LIB_SWRESAMPLE swresample PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH) + if (FFMPEG_LIB_AVFORMAT MATCHES "FFMPEG_LIB_AVFORMAT-NOTFOUND") + message(FATAL_ERROR "@#$%! FFMPEG NOT FOUND! ${FFMPEG_LIB_DIR}") + endif() + target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIB_AVFORMAT} @@ -293,11 +296,11 @@ if(NOT ANDROID) ${FFMPEG_LIB_SWSCALE} ${FFMPEG_LIB_SWRESAMPLE} ) - endif() target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include") endif() endif() + # GLEW add_library(3rdparty_glew INTERFACE) if(NOT MSVC AND NOT ANDROID) diff --git a/3rdparty/hidapi/CMakeLists.txt b/3rdparty/hidapi/CMakeLists.txt index af4d1b0f00..e1e36ac13e 100644 --- a/3rdparty/hidapi/CMakeLists.txt +++ b/3rdparty/hidapi/CMakeLists.txt @@ -15,6 +15,8 @@ elseif(CMAKE_SYSTEM MATCHES "Linux") target_link_libraries(3rdparty_hidapi INTERFACE hidapi-hidraw udev) elseif(WIN32) target_link_libraries(3rdparty_hidapi INTERFACE hidapi::hidapi hidapi::include Shlwapi.lib) +elseif(ANDROID) + target_link_libraries(3rdparty_hidapi INTERFACE hidapi::libusb) else() target_link_libraries(3rdparty_hidapi INTERFACE hidapi-libusb usb) endif() diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index 62ae150f7f..267dc889f5 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -10,11 +10,13 @@ #include #include +#ifndef WITHOUT_OPENAL #include "3rdparty/OpenAL/openal-soft/include/AL/alext.h" +#endif LOG_CHANNEL(cellMic); -template<> +template <> void fmt_class_string::format(std::string& out, u64 arg) { format_enum(out, arg, [](auto error) @@ -43,7 +45,7 @@ void fmt_class_string::format(std::string& out, u64 arg) }); } -template<> +template <> void fmt_class_string::format(std::string& out, u64 arg) { format_enum(out, arg, [](auto error) @@ -240,7 +242,6 @@ bool mic_context::check_device(u32 dev_num) return device.is_registered(); } - // Static functions template @@ -304,6 +305,7 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co raw_samplingrate = raw_r; num_channels = channels; +#ifndef WITHOUT_OPENAL // Adjust number of channels depending on microphone type switch (device_type) { @@ -482,10 +484,14 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co mic_opened = true; return CELL_OK; +#else + return CELL_MICIN_ERROR_DEVICE_NOT_SUPPORT; +#endif } error_code microphone_device::close_microphone() { +#ifndef WITHOUT_OPENAL if (mic_started) { stop_microphone(); @@ -504,12 +510,14 @@ error_code microphone_device::close_microphone() temp_buf.clear(); mic_opened = false; +#endif return CELL_OK; } error_code microphone_device::start_microphone() { +#ifndef WITHOUT_OPENAL for (const mic_device& micdevice : devices) { alcCaptureStart(micdevice.device); @@ -520,14 +528,15 @@ error_code microphone_device::start_microphone() return CELL_MICIN_ERROR_FATAL; } } +#endif mic_started = true; - return CELL_OK; } error_code microphone_device::stop_microphone() { +#ifndef WITHOUT_OPENAL for (const mic_device& micdevice : devices) { alcCaptureStop(micdevice.device); @@ -536,9 +545,9 @@ error_code microphone_device::stop_microphone() cellMic.error("Error stopping capture of device %s (error=0x%x)", micdevice.name, err); } } +#endif mic_started = false; - return CELL_OK; } @@ -600,6 +609,7 @@ f32 microphone_device::calculate_energy_level() u32 microphone_device::capture_audio() { +#ifndef WITHOUT_OPENAL ensure(sample_size > 0); u32 num_samples = inbuf_size / sample_size; @@ -634,6 +644,9 @@ u32 microphone_device::capture_audio() } return num_samples; +#else + return 0; +#endif } // Private functions diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp index 4465035c3f..8fa79e55dd 100644 --- a/rpcs3/Input/pad_thread.cpp +++ b/rpcs3/Input/pad_thread.cpp @@ -15,7 +15,9 @@ #ifdef HAVE_SDL3 #include "sdl_pad_handler.h" #endif +#ifndef ANDROID #include "keyboard_pad_handler.h" +#endif #include "Emu/Io/Null/NullPadHandler.h" #include "Emu/Io/interception.h" #include "Emu/Io/PadHandler.h" @@ -149,7 +151,9 @@ void pad_thread::Init() input_log.trace("Using pad config:\n%s", g_cfg_input); +#ifndef ANDROID std::shared_ptr keyptr; +#endif // Always have a Null Pad Handler std::shared_ptr nullpad = std::make_shared(); @@ -170,16 +174,19 @@ void pad_thread::Init() { if (handler_type == pad_handler::keyboard) { +#ifndef ANDROID keyptr = std::make_shared(); keyptr->moveToThread(static_cast(m_curthread)); keyptr->SetTargetWindow(static_cast(m_curwindow)); cur_pad_handler = keyptr; +#else + cur_pad_handler = nullpad; +#endif } else { cur_pad_handler = GetHandler(handler_type); } - m_handlers.emplace(handler_type, cur_pad_handler); } cur_pad_handler->Init(); @@ -651,7 +658,11 @@ std::shared_ptr pad_thread::GetHandler(pad_handler type) case pad_handler::null: return std::make_shared(); case pad_handler::keyboard: +#ifdef ANDROID + return std::make_shared(); +#else return std::make_shared(); +#endif case pad_handler::ds3: return std::make_shared(); case pad_handler::ds4: From 26ce38a4ac43df18957a5e0456fac01f807d7ff8 Mon Sep 17 00:00:00 2001 From: DH Date: Mon, 24 Feb 2025 07:09:23 +0300 Subject: [PATCH 081/529] 3rdparty/fusion: Always do build in release mode this library has python numpy dependency in debug build --- 3rdparty/fusion/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/3rdparty/fusion/CMakeLists.txt b/3rdparty/fusion/CMakeLists.txt index 099056a8de..c58b2dfe9f 100644 --- a/3rdparty/fusion/CMakeLists.txt +++ b/3rdparty/fusion/CMakeLists.txt @@ -1 +1,5 @@ +# To avoid python numpy dependency in debug build, force release build of this library +set(ORIG_BUILD_TYPE ${CMAKE_BUILD_TYPE}) +set(CMAKE_BUILD_TYPE Release) add_subdirectory(fusion EXCLUDE_FROM_ALL) +set(CMAKE_BUILD_TYPE ${ORIG_BUILD_TYPE}) From 2c122a4401e9e25049acf3ce56c53e17cc04455a Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 20:56:23 +0300 Subject: [PATCH 082/529] llvm: disable extra targets for android explicitly specify native target, llvm determines wrongly if cross compiler used --- 3rdparty/llvm/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/3rdparty/llvm/CMakeLists.txt b/3rdparty/llvm/CMakeLists.txt index b3d33da3c8..8723728f4a 100644 --- a/3rdparty/llvm/CMakeLists.txt +++ b/3rdparty/llvm/CMakeLists.txt @@ -5,7 +5,17 @@ if(WITH_LLVM) if(BUILD_LLVM) message(STATUS "LLVM will be built from the submodule.") - set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".") + if (ANDROID) + if (COMPILER_ARM) + set(LLVM_TARGETS_TO_BUILD "AArch64" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".") + set(LLVM_TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}-none-linux-android${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "") + else() + set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".") + endif() + else() + set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".") + endif() + option(LLVM_BUILD_RUNTIME "Build the LLVM runtime libraries." OFF) option(LLVM_BUILD_TOOLS "Build the LLVM tools. If OFF, just generate build targets." OFF) option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." OFF) From f3d988d8ab2f91cc19a14ef914a4e3a8ada32657 Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 20:58:02 +0300 Subject: [PATCH 083/529] fs::file: add from_native_handle constructor fs::get_*_dir tweaks for android --- Utilities/File.cpp | 792 ++++++++++++++++++++++++--------------------- Utilities/File.h | 6 + 2 files changed, 422 insertions(+), 376 deletions(-) diff --git a/Utilities/File.cpp b/Utilities/File.cpp index 1adce40f5b..ab89e5b971 100644 --- a/Utilities/File.cpp +++ b/Utilities/File.cpp @@ -14,6 +14,12 @@ using namespace std::literals::string_literals; +#ifdef ANDROID +std::string g_android_executable_dir; +std::string g_android_config_dir; +std::string g_android_cache_dir; +#endif + #ifdef _WIN32 #include "Utilities/StrUtil.h" @@ -387,6 +393,383 @@ namespace fs g_tls_error = error::readonly; return false; } + +#ifdef _WIN32 + class windows_file final : public file_base + { + const HANDLE m_handle; + atomic_t m_pos; + + public: + windows_file(HANDLE handle) + : m_handle(handle) + , m_pos(0) + { + } + + ~windows_file() override + { + CloseHandle(m_handle); + } + + stat_t get_stat() override + { + FILE_BASIC_INFO basic_info; + ensure(GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))); // "file::stat" + + stat_t info; + info.is_directory = (basic_info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; + info.is_writable = (basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY) == 0; + info.size = this->size(); + info.atime = to_time(basic_info.LastAccessTime); + info.mtime = to_time(basic_info.LastWriteTime); + info.ctime = info.mtime; + + if (info.atime < info.mtime) + info.atime = info.mtime; + + return info; + } + + void sync() override + { + ensure(FlushFileBuffers(m_handle)); // "file::sync" + } + + bool trunc(u64 length) override + { + FILE_END_OF_FILE_INFO _eof; + _eof.EndOfFile.QuadPart = length; + + if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof))) + { + g_tls_error = to_error(GetLastError()); + return false; + } + + return true; + } + + u64 read(void* buffer, u64 count) override + { + u64 nread_sum = 0; + + for (char* data = static_cast(buffer); count;) + { + const DWORD size = static_cast(std::min(count, DWORD{umax} & -4096)); + + DWORD nread = 0; + OVERLAPPED ovl{}; + const u64 pos = m_pos; + ovl.Offset = DWORD(pos); + ovl.OffsetHigh = DWORD(pos >> 32); + ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read" + nread_sum += nread; + m_pos += nread; + + if (nread < size) + { + break; + } + + count -= size; + data += size; + } + + return nread_sum; + } + + u64 read_at(u64 offset, void* buffer, u64 count) override + { + u64 nread_sum = 0; + + for (char* data = static_cast(buffer); count;) + { + const DWORD size = static_cast(std::min(count, DWORD{umax} & -4096)); + + DWORD nread = 0; + OVERLAPPED ovl{}; + ovl.Offset = DWORD(offset); + ovl.OffsetHigh = DWORD(offset >> 32); + ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read" + nread_sum += nread; + + if (nread < size) + { + break; + } + + count -= size; + data += size; + offset += size; + } + + return nread_sum; + } + + u64 write(const void* buffer, u64 count) override + { + u64 nwritten_sum = 0; + + for (const char* data = static_cast(buffer); count;) + { + const DWORD size = static_cast(std::min(count, DWORD{umax} & -4096)); + + DWORD nwritten = 0; + OVERLAPPED ovl{}; + const u64 pos = m_pos.fetch_add(size); + ovl.Offset = DWORD(pos); + ovl.OffsetHigh = DWORD(pos >> 32); + ensure(WriteFile(m_handle, data, size, &nwritten, &ovl)); // "file::write" + ensure(nwritten == size); + nwritten_sum += nwritten; + + if (nwritten < size) + { + break; + } + + count -= size; + data += size; + } + + return nwritten_sum; + } + + u64 seek(s64 offset, seek_mode whence) override + { + if (whence > seek_end) + { + fmt::throw_exception("Invalid whence (0x%x)", whence); + } + + const s64 new_pos = + whence == fs::seek_set ? offset : + whence == fs::seek_cur ? offset + m_pos : + whence == fs::seek_end ? offset + size() : -1; + + if (new_pos < 0) + { + fs::g_tls_error = fs::error::inval; + return -1; + } + + m_pos = new_pos; + return m_pos; + } + + u64 size() override + { + LARGE_INTEGER size; + ensure(GetFileSizeEx(m_handle, &size)); // "file::size" + + return size.QuadPart; + } + + native_handle get_handle() override + { + return m_handle; + } + + file_id get_id() override + { + file_id id{"windows_file"}; + id.data.resize(sizeof(FILE_ID_INFO)); + + FILE_ID_INFO info; + + if (!GetFileInformationByHandleEx(m_handle, FileIdInfo, &info, sizeof(info))) + { + // Try GetFileInformationByHandle as a fallback + BY_HANDLE_FILE_INFORMATION info2; + ensure(GetFileInformationByHandle(m_handle, &info2)); + + info = {}; + info.VolumeSerialNumber = info2.dwVolumeSerialNumber; + std::memcpy(&info.FileId, &info2.nFileIndexHigh, 8); + } + + std::memcpy(id.data.data(), &info, sizeof(info)); + return id; + } + }; +#else + class unix_file final : public file_base + { + const int m_fd; + + public: + unix_file(int fd) + : m_fd(fd) + { + } + + ~unix_file() override + { + ::close(m_fd); + } + + stat_t get_stat() override + { + struct ::stat file_info; + ensure(::fstat(m_fd, &file_info) == 0); // "file::stat" + + stat_t info; + info.is_directory = S_ISDIR(file_info.st_mode); + info.is_writable = file_info.st_mode & 0200; // HACK: approximation + info.size = file_info.st_size; + info.atime = file_info.st_atime; + info.mtime = file_info.st_mtime; + info.ctime = info.mtime; + + if (info.atime < info.mtime) + info.atime = info.mtime; + + return info; + } + + void sync() override + { + ensure(::fsync(m_fd) == 0); // "file::sync" + } + + bool trunc(u64 length) override + { + if (::ftruncate(m_fd, length) != 0) + { + g_tls_error = to_error(errno); + return false; + } + + return true; + } + + u64 read(void* buffer, u64 count) override + { + u64 result = 0; + + // Loop because (huge?) read can be processed partially + while (auto r = ::read(m_fd, buffer, count)) + { + ensure(r > 0); // "file::read" + count -= r; + result += r; + buffer = static_cast(buffer) + r; + if (!count) + break; + } + + return result; + } + + u64 read_at(u64 offset, void* buffer, u64 count) override + { + u64 result = 0; + + // For safety; see read() + while (auto r = ::pread(m_fd, buffer, count, offset)) + { + ensure(r > 0); // "file::read_at" + count -= r; + offset += r; + result += r; + buffer = static_cast(buffer) + r; + if (!count) + break; + } + + return result; + } + + u64 write(const void* buffer, u64 count) override + { + u64 result = 0; + + // For safety; see read() + while (auto r = ::write(m_fd, buffer, count)) + { + ensure(r > 0); // "file::write" + count -= r; + result += r; + buffer = static_cast(buffer) + r; + if (!count) + break; + } + + return result; + } + + u64 seek(s64 offset, seek_mode whence) override + { + if (whence > seek_end) + { + fmt::throw_exception("Invalid whence (0x%x)", whence); + } + + const int mode = + whence == seek_set ? SEEK_SET : + whence == seek_cur ? SEEK_CUR : SEEK_END; + + const auto result = ::lseek(m_fd, offset, mode); + + if (result == -1) + { + g_tls_error = to_error(errno); + return -1; + } + + return result; + } + + u64 size() override + { + struct ::stat file_info; + ensure(::fstat(m_fd, &file_info) == 0); // "file::size" + + return file_info.st_size; + } + + native_handle get_handle() override + { + return m_fd; + } + + file_id get_id() override + { + struct ::stat file_info; + ensure(::fstat(m_fd, &file_info) == 0); // "file::get_id" + + file_id id{"unix_file"}; + id.data.resize(sizeof(file_info.st_dev) + sizeof(file_info.st_ino)); + + std::memcpy(id.data.data(), &file_info.st_dev, sizeof(file_info.st_dev)); + std::memcpy(id.data.data() + sizeof(file_info.st_dev), &file_info.st_ino, sizeof(file_info.st_ino)); + return id; + } + + u64 write_gather(const iovec_clone* buffers, u64 buf_count) override + { + static_assert(sizeof(iovec) == sizeof(iovec_clone), "Weird iovec size"); + static_assert(offsetof(iovec, iov_len) == offsetof(iovec_clone, iov_len), "Weird iovec::iov_len offset"); + + u64 result = 0; + + while (buf_count) + { + iovec arg[256]; + const auto count = std::min(buf_count, 256); + std::memcpy(&arg, buffers, sizeof(iovec) * count); + const auto added = ::writev(m_fd, arg, count); + ensure(added != -1); // "file::write_gather" + result += added; + buf_count -= count; + buffers += count; + } + + return result; + } + }; +#endif } shared_ptr fs::device_manager::get_device(const std::string& path) @@ -1241,205 +1624,6 @@ fs::file::file(const std::string& path, bs_t mode) return; } - class windows_file final : public file_base - { - const HANDLE m_handle; - atomic_t m_pos; - - public: - windows_file(HANDLE handle) - : m_handle(handle) - , m_pos(0) - { - } - - ~windows_file() override - { - CloseHandle(m_handle); - } - - stat_t get_stat() override - { - FILE_BASIC_INFO basic_info; - ensure(GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))); // "file::stat" - - stat_t info; - info.is_directory = (basic_info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; - info.is_writable = (basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY) == 0; - info.size = this->size(); - info.atime = to_time(basic_info.LastAccessTime); - info.mtime = to_time(basic_info.LastWriteTime); - info.ctime = info.mtime; - - if (info.atime < info.mtime) - info.atime = info.mtime; - - return info; - } - - void sync() override - { - ensure(FlushFileBuffers(m_handle)); // "file::sync" - } - - bool trunc(u64 length) override - { - FILE_END_OF_FILE_INFO _eof; - _eof.EndOfFile.QuadPart = length; - - if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof))) - { - g_tls_error = to_error(GetLastError()); - return false; - } - - return true; - } - - u64 read(void* buffer, u64 count) override - { - u64 nread_sum = 0; - - for (char* data = static_cast(buffer); count;) - { - const DWORD size = static_cast(std::min(count, DWORD{umax} & -4096)); - - DWORD nread = 0; - OVERLAPPED ovl{}; - const u64 pos = m_pos; - ovl.Offset = DWORD(pos); - ovl.OffsetHigh = DWORD(pos >> 32); - ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read" - nread_sum += nread; - m_pos += nread; - - if (nread < size) - { - break; - } - - count -= size; - data += size; - } - - return nread_sum; - } - - u64 read_at(u64 offset, void* buffer, u64 count) override - { - u64 nread_sum = 0; - - for (char* data = static_cast(buffer); count;) - { - const DWORD size = static_cast(std::min(count, DWORD{umax} & -4096)); - - DWORD nread = 0; - OVERLAPPED ovl{}; - ovl.Offset = DWORD(offset); - ovl.OffsetHigh = DWORD(offset >> 32); - ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read" - nread_sum += nread; - - if (nread < size) - { - break; - } - - count -= size; - data += size; - offset += size; - } - - return nread_sum; - } - - u64 write(const void* buffer, u64 count) override - { - u64 nwritten_sum = 0; - - for (const char* data = static_cast(buffer); count;) - { - const DWORD size = static_cast(std::min(count, DWORD{umax} & -4096)); - - DWORD nwritten = 0; - OVERLAPPED ovl{}; - const u64 pos = m_pos.fetch_add(size); - ovl.Offset = DWORD(pos); - ovl.OffsetHigh = DWORD(pos >> 32); - ensure(WriteFile(m_handle, data, size, &nwritten, &ovl)); // "file::write" - ensure(nwritten == size); - nwritten_sum += nwritten; - - if (nwritten < size) - { - break; - } - - count -= size; - data += size; - } - - return nwritten_sum; - } - - u64 seek(s64 offset, seek_mode whence) override - { - if (whence > seek_end) - { - fmt::throw_exception("Invalid whence (0x%x)", whence); - } - - const s64 new_pos = - whence == fs::seek_set ? offset : - whence == fs::seek_cur ? offset + m_pos : - whence == fs::seek_end ? offset + size() : -1; - - if (new_pos < 0) - { - fs::g_tls_error = fs::error::inval; - return -1; - } - - m_pos = new_pos; - return m_pos; - } - - u64 size() override - { - LARGE_INTEGER size; - ensure(GetFileSizeEx(m_handle, &size)); // "file::size" - - return size.QuadPart; - } - - native_handle get_handle() override - { - return m_handle; - } - - file_id get_id() override - { - file_id id{"windows_file"}; - id.data.resize(sizeof(FILE_ID_INFO)); - - FILE_ID_INFO info; - - if (!GetFileInformationByHandleEx(m_handle, FileIdInfo, &info, sizeof(info))) - { - // Try GetFileInformationByHandle as a fallback - BY_HANDLE_FILE_INFORMATION info2; - ensure(GetFileInformationByHandle(m_handle, &info2)); - - info = {}; - info.VolumeSerialNumber = info2.dwVolumeSerialNumber; - std::memcpy(&info.FileId, &info2.nFileIndexHigh, 8); - } - - std::memcpy(id.data.data(), &info, sizeof(info)); - return id; - } - }; - m_file = std::make_unique(handle); #else int flags = O_CLOEXEC; // Ensures all files are closed on execl for auto updater @@ -1490,182 +1674,6 @@ fs::file::file(const std::string& path, bs_t mode) ensure(::ftruncate(fd, 0) == 0); } - class unix_file final : public file_base - { - const int m_fd; - - public: - unix_file(int fd) - : m_fd(fd) - { - } - - ~unix_file() override - { - ::close(m_fd); - } - - stat_t get_stat() override - { - struct ::stat file_info; - ensure(::fstat(m_fd, &file_info) == 0); // "file::stat" - - stat_t info; - info.is_directory = S_ISDIR(file_info.st_mode); - info.is_writable = file_info.st_mode & 0200; // HACK: approximation - info.size = file_info.st_size; - info.atime = file_info.st_atime; - info.mtime = file_info.st_mtime; - info.ctime = info.mtime; - - if (info.atime < info.mtime) - info.atime = info.mtime; - - return info; - } - - void sync() override - { - ensure(::fsync(m_fd) == 0); // "file::sync" - } - - bool trunc(u64 length) override - { - if (::ftruncate(m_fd, length) != 0) - { - g_tls_error = to_error(errno); - return false; - } - - return true; - } - - u64 read(void* buffer, u64 count) override - { - u64 result = 0; - - // Loop because (huge?) read can be processed partially - while (auto r = ::read(m_fd, buffer, count)) - { - ensure(r > 0); // "file::read" - count -= r; - result += r; - buffer = static_cast(buffer) + r; - if (!count) - break; - } - - return result; - } - - u64 read_at(u64 offset, void* buffer, u64 count) override - { - u64 result = 0; - - // For safety; see read() - while (auto r = ::pread(m_fd, buffer, count, offset)) - { - ensure(r > 0); // "file::read_at" - count -= r; - offset += r; - result += r; - buffer = static_cast(buffer) + r; - if (!count) - break; - } - - return result; - } - - u64 write(const void* buffer, u64 count) override - { - u64 result = 0; - - // For safety; see read() - while (auto r = ::write(m_fd, buffer, count)) - { - ensure(r > 0); // "file::write" - count -= r; - result += r; - buffer = static_cast(buffer) + r; - if (!count) - break; - } - - return result; - } - - u64 seek(s64 offset, seek_mode whence) override - { - if (whence > seek_end) - { - fmt::throw_exception("Invalid whence (0x%x)", whence); - } - - const int mode = - whence == seek_set ? SEEK_SET : - whence == seek_cur ? SEEK_CUR : SEEK_END; - - const auto result = ::lseek(m_fd, offset, mode); - - if (result == -1) - { - g_tls_error = to_error(errno); - return -1; - } - - return result; - } - - u64 size() override - { - struct ::stat file_info; - ensure(::fstat(m_fd, &file_info) == 0); // "file::size" - - return file_info.st_size; - } - - native_handle get_handle() override - { - return m_fd; - } - - file_id get_id() override - { - struct ::stat file_info; - ensure(::fstat(m_fd, &file_info) == 0); // "file::get_id" - - file_id id{"unix_file"}; - id.data.resize(sizeof(file_info.st_dev) + sizeof(file_info.st_ino)); - - std::memcpy(id.data.data(), &file_info.st_dev, sizeof(file_info.st_dev)); - std::memcpy(id.data.data() + sizeof(file_info.st_dev), &file_info.st_ino, sizeof(file_info.st_ino)); - return id; - } - - u64 write_gather(const iovec_clone* buffers, u64 buf_count) override - { - static_assert(sizeof(iovec) == sizeof(iovec_clone), "Weird iovec size"); - static_assert(offsetof(iovec, iov_len) == offsetof(iovec_clone, iov_len), "Weird iovec::iov_len offset"); - - u64 result = 0; - - while (buf_count) - { - iovec arg[256]; - const auto count = std::min(buf_count, 256); - std::memcpy(&arg, buffers, sizeof(iovec) * count); - const auto added = ::writev(m_fd, arg, count); - ensure(added != -1); // "file::write_gather" - result += added; - buf_count -= count; - buffers += count; - } - - return result; - } - }; - m_file = std::make_unique(fd); if (mode & fs::isfile && !(mode & fs::write) && get_stat().is_directory) @@ -1676,6 +1684,22 @@ fs::file::file(const std::string& path, bs_t mode) #endif } + +#ifdef _WIN32 +fs::file fs::file::from_native_handle(void *handle) +{ + fs::file result; + result.m_file = std::make_unique((const HANDLE)handle); + return result; +} +#else +fs::file fs::file::from_native_handle(int fd) { + fs::file result; + result.m_file = std::make_unique(fd); + return result; +} +#endif + fs::file::file(const void* ptr, usz size) { class memory_stream : public file_base @@ -1957,6 +1981,9 @@ bool fs::file::strict_read_check(u64 offset, u64 _size, u64 type_size) const std::string fs::get_executable_path() { +#ifdef ANDROID + return g_android_executable_dir + "/dummy-rpcs3.apk"; +#else // Use magic static static const std::string s_exe_path = [] { @@ -2002,10 +2029,14 @@ std::string fs::get_executable_path() }(); return s_exe_path; +#endif } std::string fs::get_executable_dir() { +#ifdef ANDROID + return g_android_executable_dir; +#else // Use magic static static const std::string s_exe_dir = [] { @@ -2019,10 +2050,14 @@ std::string fs::get_executable_dir() }(); return s_exe_dir; +#endif } const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirectory) { +#ifdef ANDROID + return g_android_config_dir; +#else // Use magic static static const std::string s_dir = [] { @@ -2112,10 +2147,14 @@ const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirect #endif return s_dir; +#endif } const std::string& fs::get_cache_dir() { +#ifdef ANDROID + return g_android_cache_dir; +#else static const std::string s_dir = [] { std::string dir; @@ -2150,6 +2189,7 @@ const std::string& fs::get_cache_dir() }(); return s_dir; +#endif } const std::string& fs::get_log_dir() @@ -2527,7 +2567,7 @@ bool fs::pending_file::commit(bool overwrite) BY_HANDLE_FILE_INFORMATION file_info; if (!GetFileInformationByHandle(file_handle, &file_info) || file_info.nNumberOfLinks == 1) - { + { CloseHandle(file_handle); break; } diff --git a/Utilities/File.h b/Utilities/File.h index 828a0384b6..2ba32f7982 100644 --- a/Utilities/File.h +++ b/Utilities/File.h @@ -251,6 +251,12 @@ namespace fs // Open file with specified mode explicit file(const std::string& path, bs_t mode = ::fs::read); +#ifdef _WIN32 + static file from_native_handle(void *handle); +#else + static file from_native_handle(int fd); +#endif + // Open memory for read explicit file(const void* ptr, usz size); From bbb682a4404ae6d6767f8f97dbfa584eb0cae477 Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 20:58:45 +0300 Subject: [PATCH 084/529] unpkg: allow package_reader creation with provided fs::file --- rpcs3/Crypto/unpkg.cpp | 9 +++++---- rpcs3/Crypto/unpkg.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp index 4ca103c78b..45fd0b9ee1 100644 --- a/rpcs3/Crypto/unpkg.cpp +++ b/rpcs3/Crypto/unpkg.cpp @@ -16,10 +16,11 @@ LOG_CHANNEL(pkg_log, "PKG"); -package_reader::package_reader(const std::string& path) +package_reader::package_reader(const std::string& path, fs::file file) : m_path(path) + , m_file(std::move(file)) { - if (!m_file.open(path)) + if (!m_file && !m_file.open(path)) { pkg_log.error("PKG file not found!"); return; @@ -119,7 +120,7 @@ bool package_reader::read_header() return false; } - if (u64{umax} / sizeof(PKGEntry) < m_header.file_count) + if (u64{umax} / sizeof(PKGEntry) < u64(m_header.file_count)) { pkg_log.error("PKG file count is too large! (0x%x)", m_header.file_count); return false; @@ -505,7 +506,7 @@ bool package_reader::set_decryption_key() } std::memcpy(m_dec_key.data(), PKG_AES_KEY, m_dec_key.size()); - + if (std::vector entries; !read_entries(entries)) { pkg_log.notice("PKG may be IDU, retrying with IDU key."); diff --git a/rpcs3/Crypto/unpkg.h b/rpcs3/Crypto/unpkg.h index 8a7c482f16..1062592e52 100644 --- a/rpcs3/Crypto/unpkg.h +++ b/rpcs3/Crypto/unpkg.h @@ -332,7 +332,7 @@ class package_reader }; public: - package_reader(const std::string& path); + package_reader(const std::string& path, fs::file file = {}); ~package_reader(); enum result From 3080b55d0279a6171cfe5070112df4d5bac20348 Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 20:59:45 +0300 Subject: [PATCH 085/529] cfg: remove string::get() --- Utilities/Config.h | 15 --------------- rpcs3/Emu/GDB.cpp | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Utilities/Config.h b/Utilities/Config.h index 24f910e555..bd05c25220 100644 --- a/Utilities/Config.h +++ b/Utilities/Config.h @@ -554,21 +554,6 @@ namespace cfg return *m_value.load().get(); } - std::pair> get() const - { - auto v = m_value.load(); - - if (auto s = v.get()) - { - return {*s, std::move(v)}; - } - else - { - static const std::string _empty; - return {_empty, {}}; - } - } - void from_default() override; std::string to_string() const override diff --git a/rpcs3/Emu/GDB.cpp b/rpcs3/Emu/GDB.cpp index 1a4724d47e..20e6c82cd4 100644 --- a/rpcs3/Emu/GDB.cpp +++ b/rpcs3/Emu/GDB.cpp @@ -121,7 +121,7 @@ void gdb_thread::start_server() // IPv4 address:port in format 127.0.0.1:2345 static const std::regex ipv4_regex("^([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})\\:([0-9]{1,5})$"); - auto [sname, sshared] = g_cfg.misc.gdb_server.get(); + auto sname = g_cfg.misc.gdb_server.to_string(); if (sname[0] == '\0') { From 94f52d6dc0e28bafd8746defa5e0a06c212843b0 Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:12:22 +0300 Subject: [PATCH 086/529] android: jit: teach fallback_cpu_detection provide meaningful results for aarch64 --- Utilities/JIT.h | 2 +- Utilities/JITLLVM.cpp | 36 ++++++++++++++--- .../CPU/Backends/AArch64/AArch64Common.cpp | 39 +++++++++++++++++++ .../Emu/CPU/Backends/AArch64/AArch64Common.h | 1 + 4 files changed, 71 insertions(+), 7 deletions(-) diff --git a/Utilities/JIT.h b/Utilities/JIT.h index fcdc59352e..6dfa9e7cd0 100644 --- a/Utilities/JIT.h +++ b/Utilities/JIT.h @@ -569,6 +569,6 @@ public: bool add_sub_disk_space(ssz space); }; -llvm::StringRef fallback_cpu_detection(); +const char *fallback_cpu_detection(); #endif // LLVM_AVAILABLE diff --git a/Utilities/JITLLVM.cpp b/Utilities/JITLLVM.cpp index b6061634bb..cd2fd2dc15 100644 --- a/Utilities/JITLLVM.cpp +++ b/Utilities/JITLLVM.cpp @@ -46,6 +46,10 @@ LOG_CHANNEL(jit_log, "JIT"); #pragma GCC diagnostic pop #endif +#ifdef ARCH_ARM64 +#include "Emu/CPU/Backends/AArch64/AArch64Common.h" +#endif + const bool jit_initialize = []() -> bool { llvm::InitializeNativeTarget(); @@ -590,8 +594,10 @@ std::string jit_compiler::triple1() return llvm::Triple::normalize(llvm::sys::getProcessTriple()); #elif defined(__APPLE__) && defined(ARCH_X64) return llvm::Triple::normalize("x86_64-unknown-linux-gnu"); -#elif defined(__APPLE__) && defined(ARCH_ARM64) +#elif (defined(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64) return llvm::Triple::normalize("aarch64-unknown-linux-android"); // Set environment to android to reserve x18 +#elif defined(__ANDROID__) && defined(ARCH_X64) + return llvm::Triple::normalize("x86_64-unknown-linux-android"); #else return llvm::Triple::normalize(llvm::sys::getProcessTriple()); #endif @@ -605,8 +611,10 @@ std::string jit_compiler::triple2() return llvm::Triple::normalize("aarch64-unknown-linux-gnu"); #elif defined(__APPLE__) && defined(ARCH_X64) return llvm::Triple::normalize("x86_64-unknown-linux-gnu"); -#elif defined(__APPLE__) && defined(ARCH_ARM64) +#elif (defined(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64) return llvm::Triple::normalize("aarch64-unknown-linux-android"); // Set environment to android to reserve x18 +#elif defined(__ANDROID__) && defined(ARCH_X64) + return llvm::Triple::normalize("x86_64-unknown-linux-android"); // Set environment to android to reserve x18 #else return llvm::Triple::normalize(llvm::sys::getProcessTriple()); #endif @@ -817,9 +825,9 @@ u64 jit_compiler::get(const std::string& name) return m_engine->getGlobalValueAddress(name); } -llvm::StringRef fallback_cpu_detection() +const char * fallback_cpu_detection() { -#if defined (ARCH_X64) +#if defined(ARCH_X64) // If we got here we either have a very old and outdated CPU or a new CPU that has not been seen by LLVM yet. const std::string brand = utils::get_cpu_brand(); const auto family = utils::get_cpu_family(); @@ -851,8 +859,8 @@ llvm::StringRef fallback_cpu_detection() default: // Safest guesses return utils::has_avx512() ? "znver4" : - utils::has_avx2() ? "znver1" : - utils::has_avx() ? "bdver1" : + utils::has_avx2() ? "znver1" : + utils::has_avx() ? "bdver1" : "nehalem"; } } @@ -883,10 +891,26 @@ llvm::StringRef fallback_cpu_detection() } #elif defined(ARCH_ARM64) +#ifdef ANDROID + static std::string s_result = []() -> std::string + { + std::string result = aarch64::get_cpu_name(); + if (result.empty()) + { + return "cortex-a78"; + } + + std::transform(result.begin(), result.end(), result.begin(), ::tolower); + return result; + }(); + + return s_result.c_str(); +#else // TODO: Read the data from /proc/cpuinfo. ARM CPU registers are not accessible from usermode. // This will be a pain when supporting snapdragon on windows but we'll cross that bridge when we get there. // Require at least armv8-2a. Older chips are going to be useless anyway. return "cortex-a78"; +#endif #endif // Failed to guess, use generic fallback diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp index f12b77d0c0..9125222a66 100644 --- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp +++ b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp @@ -136,6 +136,45 @@ namespace aarch64 #endif } + std::string get_cpu_name() + { + std::map core_layout; + for (u32 i = 0; i < std::thread::hardware_concurrency(); ++i) + { + const auto midr = read_MIDR_EL1(i); + if (midr == umax) + { + break; + } + + core_layout[midr]++; + } + + if (core_layout.empty()) + { + return {}; + } + + const cpu_entry_t *lowest_part_info = nullptr; + for (const auto& [midr, count] : core_layout) + { + const auto implementer_id = (midr >> 24) & 0xff; + const auto part_id = (midr >> 4) & 0xfff; + + const auto part_info = find_cpu_part(implementer_id, part_id); + if (!part_info) + { + return {}; + } + + if (lowest_part_info == nullptr || lowest_part_info > part_info) { + lowest_part_info = part_info; + } + } + + return lowest_part_info == nullptr ? "" : lowest_part_info->name; + } + std::string get_cpu_brand() { // Fetch vendor and part numbers. ARM CPUs often have more than 1 architecture on the SoC, so we check all of them. diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h index b0d64947ae..dff06dfb81 100644 --- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h +++ b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h @@ -37,5 +37,6 @@ namespace aarch64 "xzr", ".", "sp" }; + std::string get_cpu_name(); std::string get_cpu_brand(); } From adaf24310dbbfa910a5decca84b35353ed49f5af Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:12:48 +0300 Subject: [PATCH 087/529] add missed include to PUP.h --- rpcs3/Loader/PUP.h | 1 + 1 file changed, 1 insertion(+) diff --git a/rpcs3/Loader/PUP.h b/rpcs3/Loader/PUP.h index ec2775e0e8..286375039c 100644 --- a/rpcs3/Loader/PUP.h +++ b/rpcs3/Loader/PUP.h @@ -1,6 +1,7 @@ #pragma once #include "util/types.hpp" +#include "util/endian.hpp" #include "../../Utilities/File.h" #include From 57e7cee84ee6f4d26b9c46361c4685ea937e92ab Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:13:40 +0300 Subject: [PATCH 088/529] android: cfg: vulkan renderer is default --- rpcs3/Emu/system_config.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 35befdeb7e..992ccf14a3 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -119,11 +119,13 @@ struct cfg_root : cfg::node { node_video(cfg::node* _this) : cfg::node(_this, "Video") {} -#ifdef __APPLE__ - cfg::_enum renderer{ this, "Renderer", video_renderer::vulkan }; + cfg::_enum renderer{ this, "Renderer", +#if defined(ANDROID) || defined(__APPLE__) + video_renderer::vulkan #else - cfg::_enum renderer{ this, "Renderer", video_renderer::opengl }; + video_renderer::opengl // TODO: Is it still actual? #endif + }; cfg::_enum resolution{ this, "Resolution", video_resolution::_720p }; cfg::_enum aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 }; From 2ebf257f842fc250a3588c2ed3bb098369a53dfe Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:19:21 +0300 Subject: [PATCH 089/529] vm: removed c_page_size, it cannot be used by globals --- Utilities/JITLLVM.cpp | 6 +++--- Utilities/address_range.h | 6 +++--- rpcs3/Emu/Memory/vm.cpp | 8 ++++---- rpcs3/Emu/RSX/RSXZCULL.cpp | 8 ++++---- rpcs3/util/vm.hpp | 3 --- rpcs3/util/vm_native.cpp | 20 ++++++++++---------- 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Utilities/JITLLVM.cpp b/Utilities/JITLLVM.cpp index cd2fd2dc15..578f96e074 100644 --- a/Utilities/JITLLVM.cpp +++ b/Utilities/JITLLVM.cpp @@ -776,7 +776,7 @@ bool jit_compiler::add(const std::string& path) if (!cache) { jit_log.error("ObjectCache: Failed to read file. (path='%s', error=%s)", path, fs::g_tls_error); - return false; + return false; } if (auto object_file = llvm::object::ObjectFile::createObjectFile(*cache)) @@ -857,11 +857,11 @@ const char * fallback_cpu_detection() // Return zen4 as a workaround until the next LLVM upgrade. return "znver4"; default: - // Safest guesses + // Safest guesses return utils::has_avx512() ? "znver4" : utils::has_avx2() ? "znver1" : utils::has_avx() ? "bdver1" : - "nehalem"; + "nehalem"; } } else if (brand.find("Intel") != std::string::npos) diff --git a/Utilities/address_range.h b/Utilities/address_range.h index bb5c14ec5c..71fbd4a382 100644 --- a/Utilities/address_range.h +++ b/Utilities/address_range.h @@ -15,12 +15,12 @@ namespace utils */ static inline u32 page_start(u32 addr) { - return addr & ~(c_page_size - 1); + return addr & ~(get_page_size() - 1); } static inline u32 next_page(u32 addr) { - return page_start(addr) + c_page_size; + return page_start(addr) + get_page_size(); } static inline u32 page_end(u32 addr) @@ -30,7 +30,7 @@ namespace utils static inline u32 is_page_aligned(u32 val) { - return (val & (c_page_size - 1)) == 0; + return (val & (get_page_size() - 1)) == 0; } diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index 28b8b4e279..91bd965ee9 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -746,7 +746,7 @@ namespace vm } // If native page size exceeds 4096, don't map native pages (expected to be always mapped in this case) - const bool is_noop = bflags & page_size_4k && utils::c_page_size > 4096; + const bool is_noop = bflags & page_size_4k && utils::get_page_size() > 4096; // Lock range being mapped auto range_lock = _lock_main_range_lock(range_allocation, addr, size); @@ -958,7 +958,7 @@ namespace vm } // If native page size exceeds 4096, don't unmap native pages (always mapped) - const bool is_noop = bflags & page_size_4k && utils::c_page_size > 4096; + const bool is_noop = bflags & page_size_4k && utils::get_page_size() > 4096; // Determine deallocation size u32 size = 0; @@ -1305,7 +1305,7 @@ namespace vm // Special path for whole-allocated areas allowing 4k granularity m_common = std::make_shared(size, fmt::format("_block_x%08x", addr)); - if (!map_critical(vm::_ptr(addr), this->flags & page_size_4k && utils::c_page_size > 4096 ? utils::protection::rw : utils::protection::no) || !map_critical(vm::get_super_ptr(addr), utils::protection::rw)) + if (!map_critical(vm::_ptr(addr), this->flags & page_size_4k && utils::get_page_size() > 4096 ? utils::protection::rw : utils::protection::no) || !map_critical(vm::get_super_ptr(addr), utils::protection::rw)) { fmt::throw_exception("Memory mapping failed (addr=0x%x, size=0x%x, flags=0x%x): %s", addr, size, flags, map_error); } @@ -1778,7 +1778,7 @@ namespace vm if (flags & preallocated) { m_common = std::make_shared(size, fmt::format("_block_x%08x", addr)); - m_common->map_critical(vm::base(addr), this->flags & page_size_4k && utils::c_page_size > 4096 ? utils::protection::rw : utils::protection::no); + m_common->map_critical(vm::base(addr), this->flags & page_size_4k && utils::get_page_size() > 4096 ? utils::protection::rw : utils::protection::no); m_common->map_critical(vm::get_super_ptr(addr)); } diff --git a/rpcs3/Emu/RSX/RSXZCULL.cpp b/rpcs3/Emu/RSX/RSXZCULL.cpp index cb9592fb0e..117caa7b4e 100644 --- a/rpcs3/Emu/RSX/RSXZCULL.cpp +++ b/rpcs3/Emu/RSX/RSXZCULL.cpp @@ -30,7 +30,7 @@ namespace rsx { if (p.second.prot != utils::protection::rw) { - utils::memory_protect(vm::base(p.first), utils::c_page_size, utils::protection::rw); + utils::memory_protect(vm::base(p.first), utils::get_page_size(), utils::protection::rw); } } @@ -817,7 +817,7 @@ namespace rsx if (page.prot == utils::protection::rw) { - utils::memory_protect(vm::base(page_address), utils::c_page_size, utils::protection::no); + utils::memory_protect(vm::base(page_address), utils::get_page_size(), utils::protection::no); page.prot = utils::protection::no; } } @@ -865,7 +865,7 @@ namespace rsx if (page.prot != utils::protection::rw) { - utils::memory_protect(vm::base(this_address), utils::c_page_size, utils::protection::rw); + utils::memory_protect(vm::base(this_address), utils::get_page_size(), utils::protection::rw); page.prot = utils::protection::rw; } @@ -911,7 +911,7 @@ namespace rsx else { // R/W to stale block, unload it and move on - utils::memory_protect(vm::base(page_address), utils::c_page_size, utils::protection::rw); + utils::memory_protect(vm::base(page_address), utils::get_page_size(), utils::protection::rw); m_locked_pages[location].erase(page_address); return true; diff --git a/rpcs3/util/vm.hpp b/rpcs3/util/vm.hpp index 4d13ab88bb..a7892b86d6 100644 --- a/rpcs3/util/vm.hpp +++ b/rpcs3/util/vm.hpp @@ -16,9 +16,6 @@ namespace utils // Obtain system page size long get_page_size(); - // System page size - inline const long c_page_size = get_page_size(); - // Memory protection type enum class protection { diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp index 1aac9c1026..76e721b791 100644 --- a/rpcs3/util/vm_native.cpp +++ b/rpcs3/util/vm_native.cpp @@ -318,15 +318,15 @@ namespace utils ensure(::VirtualAlloc(pointer, size, MEM_COMMIT, +prot)); #else const u64 ptr64 = reinterpret_cast(pointer); - ensure(::mprotect(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), +prot) != -1); + ensure(::mprotect(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), +prot) != -1); if constexpr (c_madv_dump != 0) { - ensure(::madvise(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), c_madv_dump) != -1); + ensure(::madvise(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_dump) != -1); } else { - ensure(::madvise(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), MADV_WILLNEED) != -1); + ensure(::madvise(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), MADV_WILLNEED) != -1); } #endif } @@ -355,11 +355,11 @@ namespace utils if constexpr (c_madv_no_dump != 0) { - ensure(::madvise(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), c_madv_no_dump) != -1); + ensure(::madvise(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_no_dump) != -1); } else { - ensure(::madvise(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), c_madv_free) != -1); + ensure(::madvise(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_free) != -1); } #endif } @@ -387,17 +387,17 @@ namespace utils { if (size % 0x200000 == 0) { - ::madvise(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), c_madv_hugepage); + ::madvise(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_hugepage); } } if constexpr (c_madv_dump != 0) { - ensure(::madvise(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), c_madv_dump) != -1); + ensure(::madvise(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), c_madv_dump) != -1); } else { - ensure(::madvise(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), MADV_WILLNEED) != -1); + ensure(::madvise(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), MADV_WILLNEED) != -1); } #endif } @@ -447,7 +447,7 @@ namespace utils } #else const u64 ptr64 = reinterpret_cast(pointer); - ensure(::mprotect(reinterpret_cast(ptr64 & -c_page_size), size + (ptr64 & (c_page_size - 1)), +prot) != -1); + ensure(::mprotect(reinterpret_cast(ptr64 & -get_page_size()), size + (ptr64 & (get_page_size() - 1)), +prot) != -1); #endif } @@ -1055,4 +1055,4 @@ namespace utils this->unmap(ptr); } } -} +} // namespace utils From edf096fc132345441e2f523ff752344200901979 Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:20:21 +0300 Subject: [PATCH 090/529] vm: do not check overcommit_memory on android --- rpcs3/util/vm_native.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp index 76e721b791..c61708e7cd 100644 --- a/rpcs3/util/vm_native.cpp +++ b/rpcs3/util/vm_native.cpp @@ -686,7 +686,11 @@ namespace utils #else #ifdef __linux__ +#ifdef ANDROID + if constexpr (char c = '?'; true) +#else if (const char c = fs::file("/proc/sys/vm/overcommit_memory").read(); c == '0' || c == '1') +#endif { // Simply use memfd for overcommit memory m_file = ensure(::memfd_create_("", 0), FN(x >= 0)); From 7520c090875c52177adb3fac70c7d5f13782c665 Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:21:35 +0300 Subject: [PATCH 091/529] rsx: reduce shaders_cache::unpacked_type size for android --- rpcs3/Emu/RSX/rsx_cache.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/Emu/RSX/rsx_cache.h index fcbb7869a7..b219745f6a 100644 --- a/rpcs3/Emu/RSX/rsx_cache.h +++ b/rpcs3/Emu/RSX/rsx_cache.h @@ -21,7 +21,13 @@ namespace rsx template class shaders_cache { - using unpacked_type = lf_fifo, 1000>; // TODO: Determine best size + using unpacked_type = lf_fifo, +#ifdef ANDROID + 200 +#else + 1000 // TODO: Determine best size +#endif + >; struct pipeline_data { From cac068dad913d2a54a4c3b299ec1d60ed56212be Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:22:32 +0300 Subject: [PATCH 092/529] rsx: implement android swapchain --- rpcs3/Emu/RSX/VK/VulkanAPI.h | 2 ++ rpcs3/Emu/RSX/VK/vkutils/instance.cpp | 7 +++++++ rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp | 11 ++++++++--- rpcs3/Emu/RSX/display.h | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.h b/rpcs3/Emu/RSX/VK/VulkanAPI.h index 0cb493045c..b5317474f9 100644 --- a/rpcs3/Emu/RSX/VK/VulkanAPI.h +++ b/rpcs3/Emu/RSX/VK/VulkanAPI.h @@ -4,6 +4,8 @@ #define VK_USE_PLATFORM_WIN32_KHR #elif defined(__APPLE__) #define VK_USE_PLATFORM_MACOS_MVK +#elif defined(ANDROID) +#define VK_USE_PLATFORM_ANDROID_KHR #elif HAVE_X11 #define VK_USE_PLATFORM_XLIB_KHR #endif diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp index 0527376e08..5df7eec5b6 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp @@ -181,6 +181,13 @@ namespace vk found_surface_ext = true; } #endif //(WAYLAND) +#ifdef VK_USE_PLATFORM_ANDROID_KHR + if (support.is_supported(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) + { + extensions.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME); + found_surface_ext = true; + } +#endif if (!found_surface_ext) { rsx_log.error("Could not find a supported Vulkan surface extension"); diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp index ccec22a383..9c59b8770c 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp +++ b/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp @@ -8,12 +8,17 @@ namespace vk using swapchain_ANDROID = native_swapchain_base; using swapchain_NATIVE = swapchain_ANDROID; - // TODO: Implement this [[maybe_unused]] static VkSurfaceKHR make_WSI_surface(VkInstance vk_instance, display_handle_t window_handle, WSI_config* /*config*/) { - return VK_NULL_HANDLE; + VkSurfaceKHR result = VK_NULL_HANDLE; + + VkWin32SurfaceCreateInfoKHR createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR; + createInfo.window = std::get(window_handle); + + CHECK_RESULT(vkCreateAndroidSurfaceKHR(this->m_instance, &createInfo, nullptr, &result)); + return result; } #endif } - diff --git a/rpcs3/Emu/RSX/display.h b/rpcs3/Emu/RSX/display.h index 38c7e722b7..1cad84dba5 100644 --- a/rpcs3/Emu/RSX/display.h +++ b/rpcs3/Emu/RSX/display.h @@ -29,7 +29,7 @@ using display_handle_t = std::variant< #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) std::pair #elif defined(ANDROID) - void * + struct ANativeWindow * #endif >; #endif From 919cb8e05ca030174963085cc0c4310faa95129a Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:25:06 +0300 Subject: [PATCH 093/529] android: atomic: do not test SYS_futex_waitv syscall --- rpcs3/util/atomic.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rpcs3/util/atomic.cpp b/rpcs3/util/atomic.cpp index 9ab44d433e..6f1adc2da9 100644 --- a/rpcs3/util/atomic.cpp +++ b/rpcs3/util/atomic.cpp @@ -33,10 +33,12 @@ static bool has_waitv() { static const bool s_has_waitv = [] { +#ifndef ANDROID + // FIXME: it produces SIGSYS signal syscall(SYS_futex_waitv, 0, 0, 0, 0, 0); - if (errno == ENOSYS) - return false; - return true; + return errno != ENOSYS; +#endif + return false; }(); return s_has_waitv; From 976b0a8f1de937bf92ab69b931a2a41e3d058f13 Mon Sep 17 00:00:00 2001 From: DH Date: Fri, 28 Feb 2025 21:25:57 +0300 Subject: [PATCH 094/529] cpu stats: do not try parse /proc/stat on android --- rpcs3/util/cpu_stats.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpcs3/util/cpu_stats.cpp b/rpcs3/util/cpu_stats.cpp index c2a63fb35f..42c5304bea 100644 --- a/rpcs3/util/cpu_stats.cpp +++ b/rpcs3/util/cpu_stats.cpp @@ -198,7 +198,7 @@ namespace utils } #elif __linux__ - +#ifndef ANDROID m_previous_idle_times_per_cpu.resize(utils::get_thread_count(), 0.0); m_previous_total_times_per_cpu.resize(utils::get_thread_count(), 0.0); @@ -289,6 +289,7 @@ namespace utils { perf_log.error("Failed to open /proc/stat (%s)", strerror(errno)); } +#endif #else total_usage = get_usage(); #endif From 95d0cb18e46ceb46e9b2508f78e2d2c0245cb833 Mon Sep 17 00:00:00 2001 From: DH Date: Sat, 1 Mar 2025 01:02:01 +0300 Subject: [PATCH 095/529] Coding style issues fixes Thanks @Megamouse --- Utilities/File.cpp | 3 ++- Utilities/Thread.cpp | 13 ++++++------- rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp | 7 ++++--- rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp | 2 +- rpcs3/Emu/IPC_socket.h | 2 +- rpcs3/Emu/RSX/Program/CgBinaryProgram.h | 4 ++-- rpcs3/Emu/system_config.h | 2 +- rpcs3/Input/pad_thread.cpp | 2 +- rpcs3/util/atomic.cpp | 2 +- rpcs3/util/vm_native.cpp | 2 +- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Utilities/File.cpp b/Utilities/File.cpp index ab89e5b971..0d5d5dd13c 100644 --- a/Utilities/File.cpp +++ b/Utilities/File.cpp @@ -1693,7 +1693,8 @@ fs::file fs::file::from_native_handle(void *handle) return result; } #else -fs::file fs::file::from_native_handle(int fd) { +fs::file fs::file::from_native_handle(int fd) +{ fs::file result; result.m_file = std::make_unique(fd); return result; diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index 2fb7d94e66..af4d9128d2 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -2172,8 +2172,8 @@ void thread_base::start() void thread_base::initialize(void (*error_cb)()) { #ifndef _WIN32 -#ifdef ANDROID - m_thread.release(pthread_self()); +#ifdef ANDROID + m_thread.release(pthread_self()); #else m_thread.release(reinterpret_cast(pthread_self())); #endif @@ -2622,7 +2622,7 @@ thread_base::~thread_base() noexcept WaitForSingleObject(handle0, INFINITE); CloseHandle(handle0); #elif defined(ANDROID) - pthread_join(m_thread.load(), nullptr); + pthread_join(m_thread.load(), nullptr); #else pthread_join(reinterpret_cast(m_thread.load()), nullptr); #endif @@ -2697,11 +2697,10 @@ u64 thread_base::get_cycles() #else clockid_t _clock; struct timespec thread_time; - pthread_t thread_id; #ifdef ANDROID - thread_id = handle; + pthread_t thread_id = handle; #else - thread_id = reinterpret_cast(handle); + pthread_t thread_id = reinterpret_cast(handle); #endif if (!pthread_getcpuclockid(thread_id, &_clock) && !clock_gettime(_clock, &thread_time)) { @@ -3326,7 +3325,7 @@ u64 thread_ctrl::get_tid() #ifdef _WIN32 return GetCurrentThreadId(); #elif defined(ANDROID) - return static_cast(pthread_self()); + return static_cast(pthread_self()); #elif defined(__linux__) return syscall(SYS_gettid); #else diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp index 9125222a66..e2468655a8 100644 --- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp +++ b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp @@ -155,7 +155,7 @@ namespace aarch64 return {}; } - const cpu_entry_t *lowest_part_info = nullptr; + const cpu_entry_t* lowest_part_info = nullptr; for (const auto& [midr, count] : core_layout) { const auto implementer_id = (midr >> 24) & 0xff; @@ -167,12 +167,13 @@ namespace aarch64 return {}; } - if (lowest_part_info == nullptr || lowest_part_info > part_info) { + if (lowest_part_info == nullptr || lowest_part_info > part_info) + { lowest_part_info = part_info; } } - return lowest_part_info == nullptr ? "" : lowest_part_info->name; + return lowest_part_info ? lowest_part_info->name : ""; } std::string get_cpu_brand() diff --git a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp b/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp index e11de85007..4650f6bcec 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp @@ -133,7 +133,7 @@ sys_net_sockaddr native_addr_to_sys_net_addr(const ::sockaddr_storage& native_ad sys_net_sockaddr sn_addr; sys_net_sockaddr_in* paddr = reinterpret_cast(&sn_addr); - *paddr = {}; + *paddr = {}; paddr->sin_len = sizeof(sys_net_sockaddr_in); paddr->sin_family = SYS_NET_AF_INET; diff --git a/rpcs3/Emu/IPC_socket.h b/rpcs3/Emu/IPC_socket.h index 2e4cca549c..d973184c36 100644 --- a/rpcs3/Emu/IPC_socket.h +++ b/rpcs3/Emu/IPC_socket.h @@ -3,7 +3,7 @@ #include "Utilities/Thread.h" #include "util/logs.hpp" #include "Emu/Memory/vm.h" -#include "pine/pine_server.h" +#include "3rdparty/pine/pine_server.h" LOG_CHANNEL(IPC); diff --git a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h index d04e85690e..310be35baa 100644 --- a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h +++ b/rpcs3/Emu/RSX/Program/CgBinaryProgram.h @@ -8,8 +8,8 @@ #include "Utilities/File.h" #ifndef WITHOUT_OPENGL - #include "Emu/RSX/GL/GLVertexProgram.h" - #include "Emu/RSX/GL/GLFragmentProgram.h" +#include "Emu/RSX/GL/GLVertexProgram.h" +#include "Emu/RSX/GL/GLFragmentProgram.h" #endif using CGprofile = u32; diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 992ccf14a3..2e0849e3c3 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -121,7 +121,7 @@ struct cfg_root : cfg::node cfg::_enum renderer{ this, "Renderer", #if defined(ANDROID) || defined(__APPLE__) - video_renderer::vulkan + video_renderer::vulkan #else video_renderer::opengl // TODO: Is it still actual? #endif diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp index 8fa79e55dd..a4f020ffd4 100644 --- a/rpcs3/Input/pad_thread.cpp +++ b/rpcs3/Input/pad_thread.cpp @@ -180,7 +180,7 @@ void pad_thread::Init() keyptr->SetTargetWindow(static_cast(m_curwindow)); cur_pad_handler = keyptr; #else - cur_pad_handler = nullpad; + cur_pad_handler = nullpad; #endif } else diff --git a/rpcs3/util/atomic.cpp b/rpcs3/util/atomic.cpp index 6f1adc2da9..cd9a6e37a3 100644 --- a/rpcs3/util/atomic.cpp +++ b/rpcs3/util/atomic.cpp @@ -173,7 +173,7 @@ namespace #ifdef _WIN32 tid = GetCurrentThreadId(); #elif defined(ANDROID) - tid = pthread_self(); + tid = pthread_self(); #else tid = reinterpret_cast(pthread_self()); #endif diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp index c61708e7cd..8dd069d553 100644 --- a/rpcs3/util/vm_native.cpp +++ b/rpcs3/util/vm_native.cpp @@ -687,7 +687,7 @@ namespace utils #ifdef __linux__ #ifdef ANDROID - if constexpr (char c = '?'; true) + if constexpr (constexpr char c = '?') #else if (const char c = fs::file("/proc/sys/vm/overcommit_memory").read(); c == '0' || c == '1') #endif From d766baef12c075e165e6e5de4d0c8610ee61a02c Mon Sep 17 00:00:00 2001 From: DH Date: Sun, 2 Mar 2025 19:44:55 +0300 Subject: [PATCH 096/529] fs::file: implement release_handle cleanup --- Utilities/File.cpp | 42 +++++++++++++++++++++++++++-------------- Utilities/File.h | 19 +++++++++++++------ rpcs3/Crypto/unedat.cpp | 5 +---- rpcs3/Crypto/unpkg.h | 5 +++++ rpcs3/Loader/PUP.h | 1 + 5 files changed, 48 insertions(+), 24 deletions(-) diff --git a/Utilities/File.cpp b/Utilities/File.cpp index 0d5d5dd13c..c5fecc9d14 100644 --- a/Utilities/File.cpp +++ b/Utilities/File.cpp @@ -397,7 +397,7 @@ namespace fs #ifdef _WIN32 class windows_file final : public file_base { - const HANDLE m_handle; + HANDLE m_handle; atomic_t m_pos; public: @@ -409,7 +409,10 @@ namespace fs ~windows_file() override { - CloseHandle(m_handle); + if (m_handle != nullptr) + { + CloseHandle(m_handle); + } } stat_t get_stat() override @@ -592,11 +595,16 @@ namespace fs std::memcpy(id.data.data(), &info, sizeof(info)); return id; } + + void release() override + { + m_handle = nullptr; + } }; #else class unix_file final : public file_base { - const int m_fd; + int m_fd; public: unix_file(int fd) @@ -606,7 +614,10 @@ namespace fs ~unix_file() override { - ::close(m_fd); + if (m_fd >= 0) + { + ::close(m_fd); + } } stat_t get_stat() override @@ -768,6 +779,11 @@ namespace fs return result; } + + void release() override + { + m_fd = -1; + } }; #endif } @@ -1685,21 +1701,19 @@ fs::file::file(const std::string& path, bs_t mode) } + +fs::file fs::file::from_native_handle(native_handle handle) +{ + fs::file result; + #ifdef _WIN32 -fs::file fs::file::from_native_handle(void *handle) -{ - fs::file result; result.m_file = std::make_unique((const HANDLE)handle); - return result; -} #else -fs::file fs::file::from_native_handle(int fd) -{ - fs::file result; - result.m_file = std::make_unique(fd); + result.m_file = std::make_unique(handle); +#endif + return result; } -#endif fs::file::file(const void* ptr, usz size) { diff --git a/Utilities/File.h b/Utilities/File.h index 2ba32f7982..a5a4c53d75 100644 --- a/Utilities/File.h +++ b/Utilities/File.h @@ -114,6 +114,9 @@ namespace fs virtual native_handle get_handle(); virtual file_id get_id(); virtual u64 write_gather(const iovec_clone* buffers, u64 buf_count); + virtual void release() + { + } }; // Directory entry (TODO) @@ -251,11 +254,7 @@ namespace fs // Open file with specified mode explicit file(const std::string& path, bs_t mode = ::fs::read); -#ifdef _WIN32 - static file from_native_handle(void *handle); -#else - static file from_native_handle(int fd); -#endif + static file from_native_handle(native_handle handle); // Open memory for read explicit file(const void* ptr, usz size); @@ -286,9 +285,17 @@ namespace fs m_file = std::move(ptr); } + void release_handle() + { + if (m_file) + { + release()->release(); + } + } + std::unique_ptr release() { - return std::move(m_file); + return std::exchange(m_file, nullptr); } // Change file size (possibly appending zero bytes) diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp index 985b2fc74c..1ffaa33fc3 100644 --- a/rpcs3/Crypto/unedat.cpp +++ b/rpcs3/Crypto/unedat.cpp @@ -709,12 +709,9 @@ bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& inpu return false; } - std::string_view sv{NPD.content_id, std::size(NPD.content_id)}; - sv = sv.substr(0, sv.find_first_of('\0')); - if (npd_out) { - memcpy(npd_out, &NPD, sizeof(NPD_HEADER)); + *npd_out = NPD; } return true; diff --git a/rpcs3/Crypto/unpkg.h b/rpcs3/Crypto/unpkg.h index 1062592e52..d253561509 100644 --- a/rpcs3/Crypto/unpkg.h +++ b/rpcs3/Crypto/unpkg.h @@ -356,6 +356,11 @@ public: void abort_extract(); + fs::file &file() + { + return m_file; + } + private: bool read_header(); bool read_metadata(); diff --git a/rpcs3/Loader/PUP.h b/rpcs3/Loader/PUP.h index 286375039c..0732738d5a 100644 --- a/rpcs3/Loader/PUP.h +++ b/rpcs3/Loader/PUP.h @@ -59,6 +59,7 @@ class pup_object public: pup_object(fs::file&& file); + fs::file &file() { return m_file; } explicit operator pup_error() const { return m_error; } const std::string& get_formatted_error() const { return m_formatted_error; } From 8100779512e81d85dace5a2fe86f9589a94b7483 Mon Sep 17 00:00:00 2001 From: DH Date: Mon, 3 Mar 2025 21:59:08 +0300 Subject: [PATCH 097/529] hid: add support of android devices --- rpcs3/Input/ds3_pad_handler.cpp | 8 +++++-- rpcs3/Input/ds3_pad_handler.h | 2 +- rpcs3/Input/ds4_pad_handler.cpp | 8 +++++-- rpcs3/Input/ds4_pad_handler.h | 2 +- rpcs3/Input/dualsense_pad_handler.cpp | 8 +++++-- rpcs3/Input/dualsense_pad_handler.h | 2 +- rpcs3/Input/hid_pad_handler.cpp | 31 +++++++++++++++++++++----- rpcs3/Input/hid_pad_handler.h | 26 ++++++++++++++++----- rpcs3/Input/ps_move_handler.cpp | 8 +++++-- rpcs3/Input/ps_move_handler.h | 2 +- rpcs3/Input/skateboard_pad_handler.cpp | 8 +++++-- rpcs3/Input/skateboard_pad_handler.h | 2 +- 12 files changed, 81 insertions(+), 26 deletions(-) diff --git a/rpcs3/Input/ds3_pad_handler.cpp b/rpcs3/Input/ds3_pad_handler.cpp index c2cf89afec..9e12bbd472 100644 --- a/rpcs3/Input/ds3_pad_handler.cpp +++ b/rpcs3/Input/ds3_pad_handler.cpp @@ -218,7 +218,7 @@ void ds3_pad_handler::init_config(cfg_pad* cfg) cfg->from_default(); } -void ds3_pad_handler::check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) +void ds3_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) { if (!hidDevice) { @@ -508,12 +508,16 @@ bool ds3_pad_handler::get_is_right_stick(const std::shared_ptr& /*dev PadHandlerBase::connection ds3_pad_handler::update_connection(const std::shared_ptr& device) { ds3_device* dev = static_cast(device.get()); - if (!dev || dev->path.empty()) + if (!dev || dev->path == hid_enumerated_device_default) return connection::disconnected; if (dev->hidDevice == nullptr) { +#ifdef ANDROID + if (hid_device* hid_dev = hid_libusb_wrap_sys_device(dev->path, -1)) +#else if (hid_device* hid_dev = hid_open_path(dev->path.c_str())) +#endif { if (hid_set_nonblocking(hid_dev, 1) == -1) { diff --git a/rpcs3/Input/ds3_pad_handler.h b/rpcs3/Input/ds3_pad_handler.h index b6b423eff3..47dfbf4587 100644 --- a/rpcs3/Input/ds3_pad_handler.h +++ b/rpcs3/Input/ds3_pad_handler.h @@ -145,7 +145,7 @@ public: private: ds3_pad_handler::DataStatus get_data(ds3_device* ds3dev) override; int send_output_report(ds3_device* ds3dev) override; - void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view serial) override; + void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view serial) override; bool get_is_left_trigger(const std::shared_ptr& device, u64 keyCode) override; bool get_is_right_trigger(const std::shared_ptr& device, u64 keyCode) override; diff --git a/rpcs3/Input/ds4_pad_handler.cpp b/rpcs3/Input/ds4_pad_handler.cpp index 497db72e5d..5ad4f8f3af 100644 --- a/rpcs3/Input/ds4_pad_handler.cpp +++ b/rpcs3/Input/ds4_pad_handler.cpp @@ -556,7 +556,7 @@ bool ds4_pad_handler::GetCalibrationData(DS4Device* ds4Dev) const return true; } -void ds4_pad_handler::check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) +void ds4_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) { if (!hidDevice) { @@ -831,13 +831,17 @@ bool ds4_pad_handler::get_is_touch_pad_motion(const std::shared_ptr& PadHandlerBase::connection ds4_pad_handler::update_connection(const std::shared_ptr& device) { DS4Device* dev = static_cast(device.get()); - if (!dev || dev->path.empty()) + if (!dev || dev->path == hid_enumerated_device_default) return connection::disconnected; if (dev->hidDevice == nullptr) { // try to reconnect +#ifdef ANDROID + if (hid_device* hid_dev = hid_libusb_wrap_sys_device(dev->path, -1)) +#else if (hid_device* hid_dev = hid_open_path(dev->path.c_str())) +#endif { if (hid_set_nonblocking(hid_dev, 1) == -1) { diff --git a/rpcs3/Input/ds4_pad_handler.h b/rpcs3/Input/ds4_pad_handler.h index 37c51dcfe2..4fdb829d73 100644 --- a/rpcs3/Input/ds4_pad_handler.h +++ b/rpcs3/Input/ds4_pad_handler.h @@ -184,7 +184,7 @@ private: // Copies data into padData if status is NewData, otherwise buffer is untouched DataStatus get_data(DS4Device* ds4Device) override; int send_output_report(DS4Device* device) override; - void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view serial) override; + void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view serial) override; bool get_is_left_trigger(const std::shared_ptr& device, u64 keyCode) override; bool get_is_right_trigger(const std::shared_ptr& device, u64 keyCode) override; diff --git a/rpcs3/Input/dualsense_pad_handler.cpp b/rpcs3/Input/dualsense_pad_handler.cpp index 4c0253adba..794c0bf4e7 100644 --- a/rpcs3/Input/dualsense_pad_handler.cpp +++ b/rpcs3/Input/dualsense_pad_handler.cpp @@ -99,7 +99,7 @@ dualsense_pad_handler::dualsense_pad_handler() m_thumb_threshold = thumb_max / 2; } -void dualsense_pad_handler::check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) +void dualsense_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) { if (!hidDevice) { @@ -562,13 +562,17 @@ bool dualsense_pad_handler::get_is_touch_pad_motion(const std::shared_ptr& device) { DualSenseDevice* dev = static_cast(device.get()); - if (!dev || dev->path.empty()) + if (!dev || dev->path == hid_enumerated_device_default) return connection::disconnected; if (dev->hidDevice == nullptr) { // try to reconnect +#ifdef ANDROID + if (hid_device* hid_dev = hid_libusb_wrap_sys_device(dev->path, -1)) +#else if (hid_device* hid_dev = hid_open_path(dev->path.c_str())) +#endif { if (hid_set_nonblocking(hid_dev, 1) == -1) { diff --git a/rpcs3/Input/dualsense_pad_handler.h b/rpcs3/Input/dualsense_pad_handler.h index 981b8a568d..77b85f320b 100644 --- a/rpcs3/Input/dualsense_pad_handler.h +++ b/rpcs3/Input/dualsense_pad_handler.h @@ -245,7 +245,7 @@ private: bool get_calibration_data(DualSenseDevice* dev) const; DataStatus get_data(DualSenseDevice* device) override; - void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) override; + void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) override; int send_output_report(DualSenseDevice* device) override; bool get_is_left_trigger(const std::shared_ptr& device, u64 keyCode) override; diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp index 40dcbdef24..16602412bf 100644 --- a/rpcs3/Input/hid_pad_handler.cpp +++ b/rpcs3/Input/hid_pad_handler.cpp @@ -18,6 +18,11 @@ LOG_CHANNEL(hid_log, "HID"); +#ifdef ANDROID +std::vector g_android_usb_devices; +std::mutex g_android_usb_devices_mutex; +#endif + struct hid_instance { public: @@ -56,9 +61,9 @@ public: hid_log.notice("Initializing HIDAPI ..."); - if (hid_init() != 0) + if (int errorCode = hid_init(); errorCode != 0) { - hid_log.fatal("hid_init error"); + hid_log.fatal("hid_init error %d", errorCode); return false; } @@ -179,9 +184,18 @@ template void hid_pad_handler::enumerate_devices() { Timer timer; - std::set device_paths; - std::map serials; + std::set device_paths; + std::map serials; +#ifdef ANDROID + { + std::lock_guard lock(g_android_usb_devices_mutex); + for (auto device : g_android_usb_devices) + { + device_paths.insert(device); + } + } +#else for (const auto& [vid, pid] : m_ids) { hid_device_info* dev_info = hid_enumerate(vid, pid); @@ -209,6 +223,7 @@ void hid_pad_handler::enumerate_devices() } hid_free_enumeration(head); } +#endif hid_log.notice("%s enumeration found %d devices (%f ms)", m_type, device_paths.size(), timer.GetElapsedTimeInMilliSec()); std::lock_guard lock(m_enumeration_mutex); @@ -254,7 +269,7 @@ void hid_pad_handler::update_devices() // Scrap devices that are not in the new list for (auto& controller : m_controllers) { - if (controller.second && !controller.second->path.empty() && !m_new_enumerated_devices.contains(controller.second->path)) + if (controller.second && controller.second->path != hid_enumerated_device_default && !m_new_enumerated_devices.contains(controller.second->path)) { controller.second->close(); cfg_pad* config = controller.second->config; @@ -284,7 +299,11 @@ void hid_pad_handler::update_devices() } #endif - if (hid_device* dev = hid_open_path(path.c_str())) +#ifdef ANDROID + if (hid_device* dev = hid_libusb_wrap_sys_device(path, -1)) +#else + if (hid_device* dev = hid_open_path(path)) +#endif { if (const hid_device_info* info = hid_get_device_info(dev)) { diff --git a/rpcs3/Input/hid_pad_handler.h b/rpcs3/Input/hid_pad_handler.h index b6dc093983..11fa1dba41 100644 --- a/rpcs3/Input/hid_pad_handler.h +++ b/rpcs3/Input/hid_pad_handler.h @@ -6,8 +6,24 @@ #include "hidapi.h" +#ifdef ANDROID +#include "hidapi_libusb.h" +#endif + #include +#ifdef ANDROID +using hid_enumerated_device_type = int; +using hid_enumerated_device_view = int; +inline constexpr auto hid_enumerated_device_default = -1; +extern std::vector g_android_usb_devices; +extern std::mutex g_android_usb_devices_mutex; +#else +using hid_enumerated_device_type = std::string; +using hid_enumerated_device_view = std::string_view; +inline constexpr auto hid_enumerated_device_default = std::string(); +#endif + struct CalibData { s16 bias = 0; @@ -38,7 +54,7 @@ public: #ifdef _WIN32 hid_device* bt_device{nullptr}; // Used in ps move handler #endif - std::string path; + hid_enumerated_device_type path = hid_enumerated_device_default; u8 led_delay_on{0}; u8 led_delay_off{0}; u8 battery_level{0}; @@ -78,9 +94,9 @@ protected: // pseudo 'controller id' to keep track of unique controllers std::map> m_controllers; - std::set m_last_enumerated_devices; - std::set m_new_enumerated_devices; - std::map m_enumerated_serials; + std::set m_last_enumerated_devices; + std::set m_new_enumerated_devices; + std::map m_enumerated_serials; std::mutex m_enumeration_mutex; std::unique_ptr>> m_enumeration_thread; @@ -88,7 +104,7 @@ protected: void update_devices(); std::shared_ptr get_hid_device(const std::string& padId); - virtual void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view serial) = 0; + virtual void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view serial) = 0; virtual int send_output_report(Device* device) = 0; virtual DataStatus get_data(Device* device) = 0; diff --git a/rpcs3/Input/ps_move_handler.cpp b/rpcs3/Input/ps_move_handler.cpp index 3b5aaec2f7..7eb74d3e96 100644 --- a/rpcs3/Input/ps_move_handler.cpp +++ b/rpcs3/Input/ps_move_handler.cpp @@ -265,7 +265,7 @@ hid_device* ps_move_handler::connect_move_device(ps_move_device* device, std::st } #endif -void ps_move_handler::check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) +void ps_move_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) { #ifndef _WIN32 if (!hidDevice) @@ -422,7 +422,7 @@ ps_move_handler::DataStatus ps_move_handler::get_data(ps_move_device* device) PadHandlerBase::connection ps_move_handler::update_connection(const std::shared_ptr& device) { ps_move_device* move_device = static_cast(device.get()); - if (!move_device || move_device->path.empty()) + if (!move_device || move_device->path == hid_enumerated_device_default) return connection::disconnected; if (move_device->hidDevice == nullptr) @@ -433,8 +433,12 @@ PadHandlerBase::connection ps_move_handler::update_connection(const std::shared_ { move_device->hidDevice = dev; } +#else +#ifdef ANDROID + if (hid_device* dev = hid_libusb_wrap_sys_device(move_device->path, -1)) #else if (hid_device* dev = hid_open_path(move_device->path.c_str())) +#endif { if (hid_set_nonblocking(dev, 1) == -1) { diff --git a/rpcs3/Input/ps_move_handler.h b/rpcs3/Input/ps_move_handler.h index 9b1da1d58b..6584364556 100644 --- a/rpcs3/Input/ps_move_handler.h +++ b/rpcs3/Input/ps_move_handler.h @@ -189,7 +189,7 @@ private: #endif DataStatus get_data(ps_move_device* device) override; - void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) override; + void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) override; int send_output_report(ps_move_device* device) override; bool get_is_left_trigger(const std::shared_ptr& device, u64 keyCode) override; diff --git a/rpcs3/Input/skateboard_pad_handler.cpp b/rpcs3/Input/skateboard_pad_handler.cpp index 86996847d6..c9194adc24 100644 --- a/rpcs3/Input/skateboard_pad_handler.cpp +++ b/rpcs3/Input/skateboard_pad_handler.cpp @@ -149,7 +149,7 @@ void skateboard_pad_handler::init_config(cfg_pad* cfg) cfg->from_default(); } -void skateboard_pad_handler::check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) +void skateboard_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) { if (!hidDevice) { @@ -233,13 +233,17 @@ skateboard_pad_handler::DataStatus skateboard_pad_handler::get_data(skateboard_d PadHandlerBase::connection skateboard_pad_handler::update_connection(const std::shared_ptr& device) { skateboard_device* dev = static_cast(device.get()); - if (!dev || dev->path.empty()) + if (!dev || dev->path == hid_enumerated_device_default) return connection::disconnected; if (dev->hidDevice == nullptr) { // try to reconnect +#ifdef ANDROID + if (hid_device* hid_dev = hid_libusb_wrap_sys_device(dev->path, -1)) +#else if (hid_device* hid_dev = hid_open_path(dev->path.c_str())) +#endif { if (hid_set_nonblocking(hid_dev, 1) == -1) { diff --git a/rpcs3/Input/skateboard_pad_handler.h b/rpcs3/Input/skateboard_pad_handler.h index db1e3536d8..e7f15c494e 100644 --- a/rpcs3/Input/skateboard_pad_handler.h +++ b/rpcs3/Input/skateboard_pad_handler.h @@ -179,7 +179,7 @@ public: private: DataStatus get_data(skateboard_device* device) override; - void check_add_device(hid_device* hidDevice, std::string_view path, std::wstring_view wide_serial) override; + void check_add_device(hid_device* hidDevice, hid_enumerated_device_view path, std::wstring_view wide_serial) override; int send_output_report(skateboard_device* device) override; PadHandlerBase::connection update_connection(const std::shared_ptr& device) override; From 0c233c65783780af602e995ef3628126bd1ca9be Mon Sep 17 00:00:00 2001 From: DH Date: Tue, 4 Mar 2025 01:24:15 +0300 Subject: [PATCH 098/529] [android] hid: enumerate by vendor/product ids --- rpcs3/Input/hid_pad_handler.cpp | 12 ++++++++++-- rpcs3/Input/hid_pad_handler.h | 10 +++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp index 16602412bf..ff888911b9 100644 --- a/rpcs3/Input/hid_pad_handler.cpp +++ b/rpcs3/Input/hid_pad_handler.cpp @@ -19,7 +19,7 @@ LOG_CHANNEL(hid_log, "HID"); #ifdef ANDROID -std::vector g_android_usb_devices; +std::vector g_android_usb_devices; std::mutex g_android_usb_devices_mutex; #endif @@ -192,7 +192,15 @@ void hid_pad_handler::enumerate_devices() std::lock_guard lock(g_android_usb_devices_mutex); for (auto device : g_android_usb_devices) { - device_paths.insert(device); + auto filter = [&](id_pair id) + { + return id.m_vid == device.vendorId && id.m_pid == device.productId; + }; + + if (std::find_if(m_ids.begin(), m_ids.end(), filter) != m_ids.end()) + { + device_paths.insert(device.fd); + } } } #else diff --git a/rpcs3/Input/hid_pad_handler.h b/rpcs3/Input/hid_pad_handler.h index 11fa1dba41..36e7358211 100644 --- a/rpcs3/Input/hid_pad_handler.h +++ b/rpcs3/Input/hid_pad_handler.h @@ -15,8 +15,16 @@ #ifdef ANDROID using hid_enumerated_device_type = int; using hid_enumerated_device_view = int; + +struct android_usb_device +{ + int fd; + u16 vendorId; + u16 productId; +}; + inline constexpr auto hid_enumerated_device_default = -1; -extern std::vector g_android_usb_devices; +extern std::vector g_android_usb_devices; extern std::mutex g_android_usb_devices_mutex; #else using hid_enumerated_device_type = std::string; From fa5a16e9fc202af69cd945fafc69188fa0e3d8a9 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 8 Mar 2025 08:26:18 +0100 Subject: [PATCH 099/529] hid_init: use hid_error in log message --- rpcs3/Input/hid_pad_handler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp index ff888911b9..90cb5fb55d 100644 --- a/rpcs3/Input/hid_pad_handler.cpp +++ b/rpcs3/Input/hid_pad_handler.cpp @@ -63,7 +63,7 @@ public: if (int errorCode = hid_init(); errorCode != 0) { - hid_log.fatal("hid_init error %d", errorCode); + hid_log.fatal("hid_init error %d: %s", errorCode, hid_error(nullptr)); return false; } From b3f5ed55a16b0aa8a62482b7826cb25f1a15c604 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 8 Mar 2025 09:28:15 +0100 Subject: [PATCH 100/529] Set vulkan to default renderer whenever we have vulkan support --- rpcs3/Emu/system_config.h | 8 +++----- rpcs3/Input/hid_pad_handler.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 2e0849e3c3..f68d9d0d28 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -119,13 +119,11 @@ struct cfg_root : cfg::node { node_video(cfg::node* _this) : cfg::node(_this, "Video") {} - cfg::_enum renderer{ this, "Renderer", -#if defined(ANDROID) || defined(__APPLE__) - video_renderer::vulkan +#if defined(HAVE_VULKAN) + cfg::_enum renderer{ this, "Renderer", video_renderer::vulkan }; #else - video_renderer::opengl // TODO: Is it still actual? + cfg::_enum renderer{ this, "Renderer", video_renderer::opengl }; #endif - }; cfg::_enum resolution{ this, "Resolution", video_resolution::_720p }; cfg::_enum aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 }; diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp index 90cb5fb55d..291728fbc1 100644 --- a/rpcs3/Input/hid_pad_handler.cpp +++ b/rpcs3/Input/hid_pad_handler.cpp @@ -310,7 +310,7 @@ void hid_pad_handler::update_devices() #ifdef ANDROID if (hid_device* dev = hid_libusb_wrap_sys_device(path, -1)) #else - if (hid_device* dev = hid_open_path(path)) + if (hid_device* dev = hid_open_path(path.c_str())) #endif { if (const hid_device_info* info = hid_get_device_info(dev)) From db945f6aed82563e88a5f7552d6df68ae5f96d38 Mon Sep 17 00:00:00 2001 From: DH Date: Thu, 6 Mar 2025 16:41:31 +0300 Subject: [PATCH 101/529] android: do not invalidate swapchain on VK_SUBOPTIMAL_KHR Workaround --- rpcs3/Emu/RSX/VK/VKPresent.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpcs3/Emu/RSX/VK/VKPresent.cpp b/rpcs3/Emu/RSX/VK/VKPresent.cpp index b6d0496fd9..6bc09588d4 100644 --- a/rpcs3/Emu/RSX/VK/VKPresent.cpp +++ b/rpcs3/Emu/RSX/VK/VKPresent.cpp @@ -116,7 +116,9 @@ void VKGSRender::present(vk::frame_context_t *ctx) case VK_SUCCESS: break; case VK_SUBOPTIMAL_KHR: +#ifndef ANDROID should_reinitialize_swapchain = true; +#endif break; case VK_ERROR_OUT_OF_DATE_KHR: swapchain_unavailable = true; From d0c2cb7ae150c8f95288b33522f6ef9147fbedf9 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 10 Mar 2025 21:20:00 +0100 Subject: [PATCH 102/529] main: Fix some warning --- rpcs3/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp index 614de1b3f6..ed718e33d9 100644 --- a/rpcs3/main.cpp +++ b/rpcs3/main.cpp @@ -410,7 +410,7 @@ int find_arg(const char* to_search, std::span argv) if (argp[0] == '-' && argp[1] == '-' && !std::strcmp(to_search, argp + 2)) { - return i; + return ::narrow(i); } } From 3737cc37f66f9e94735ad41fc7b97f50c0b3b93b Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 10 Mar 2025 21:32:57 +0100 Subject: [PATCH 103/529] Qt: Hide interpreter_only unless it is selected or the debug mode is active --- rpcs3/rpcs3qt/settings_dialog.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 0a5fe8c7c5..cc3286d8a5 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -703,6 +703,12 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceRadioButton(shader_mode_bg, emu_settings_type::ShaderMode); + // Hide interpreter_only unless it is selected or the debug mode is active + if (!ui->rb_shader_interpreter_only->isChecked() && !m_gui_settings->GetValue(gui::m_showDebugTab).toBool()) + { + ui->rb_shader_interpreter_only->setVisible(false); + } + // Sliders m_emu_settings->EnhanceSlider(ui->resolutionScale, emu_settings_type::ResolutionScale); From 4c788abad1439403338dece1a789f4da0002e8f2 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 11 Mar 2025 20:31:25 +0100 Subject: [PATCH 104/529] Use named_thread in gui_pad_thread --- rpcs3/Input/gui_pad_thread.cpp | 24 ++++++++---------------- rpcs3/Input/gui_pad_thread.h | 6 ++---- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/rpcs3/Input/gui_pad_thread.cpp b/rpcs3/Input/gui_pad_thread.cpp index 3844d7ba9e..aa6e2a9d77 100644 --- a/rpcs3/Input/gui_pad_thread.cpp +++ b/rpcs3/Input/gui_pad_thread.cpp @@ -15,7 +15,6 @@ #endif #include "Emu/Io/PadHandler.h" #include "Emu/system_config.h" -#include "Utilities/Thread.h" #include "rpcs3qt/gui_settings.h" #ifdef __linux__ @@ -43,16 +42,16 @@ atomic_t gui_pad_thread::m_reset = false; gui_pad_thread::gui_pad_thread() { - m_thread = std::make_unique(&gui_pad_thread::run, this); + m_thread = std::make_unique>>("Gui Pad Thread", [this](){ run(); }); } gui_pad_thread::~gui_pad_thread() { - m_terminate = true; - - if (m_thread && m_thread->joinable()) + if (m_thread) { - m_thread->join(); + auto& thread = *m_thread; + thread = thread_state::aborting; + thread(); m_thread.reset(); } @@ -253,13 +252,11 @@ void gui_pad_thread::InitPadConfig(cfg_pad& cfg, pad_handler type, std::shared_p void gui_pad_thread::run() { - thread_base::set_name("Gui Pad Thread"); - gui_log.notice("gui_pad_thread: Pad thread started"); m_reset = true; - while (!m_terminate) + while (thread_ctrl::state() != thread_state::aborting) { if (m_reset && m_reset.exchange(false)) { @@ -275,7 +272,7 @@ void gui_pad_thread::run() { m_handler->process(); - if (m_terminate) + if (thread_ctrl::state() == thread_state::aborting) { break; } @@ -283,12 +280,7 @@ void gui_pad_thread::run() process_input(); } - if (m_terminate) - { - break; - } - - std::this_thread::sleep_for(10ms); + thread_ctrl::wait_for(10000); } gui_log.notice("gui_pad_thread: Pad thread stopped"); diff --git a/rpcs3/Input/gui_pad_thread.h b/rpcs3/Input/gui_pad_thread.h index 235d97e8b1..dc04fb456f 100644 --- a/rpcs3/Input/gui_pad_thread.h +++ b/rpcs3/Input/gui_pad_thread.h @@ -6,8 +6,7 @@ #include "Emu/Io/pad_config.h" #include "Emu/Io/pad_config_types.h" #include "Utilities/Timer.h" - -#include +#include "Utilities/Thread.h" class PadHandlerBase; class gui_settings; @@ -62,8 +61,7 @@ protected: std::shared_ptr m_handler; std::shared_ptr m_pad; - std::unique_ptr m_thread; - atomic_t m_terminate = false; + std::unique_ptr>> m_thread; atomic_t m_allow_global_input = false; static atomic_t m_reset; From 3a71da35a9d55e45c9408aed711d170bcaca4ae6 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 11 Mar 2025 20:42:01 +0100 Subject: [PATCH 105/529] Fix redundant forward declaration warning --- rpcs3/Emu/NP/rpcn_client.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp index 66b7a30ffe..3658a471d6 100644 --- a/rpcs3/Emu/NP/rpcn_client.cpp +++ b/rpcs3/Emu/NP/rpcn_client.cpp @@ -1,6 +1,6 @@ +#include "stdafx.h" #include "Emu/Cell/lv2/sys_net/sys_net_helpers.h" #include "Emu/NP/ip_address.h" -#include "stdafx.h" #include #include #include @@ -43,8 +43,6 @@ LOG_CHANNEL(rpcn_log, "rpcn"); -int get_native_error(); - template <> void fmt_class_string::format(std::string& out, u64 arg) { From ec5b2bc8d2f5daf29834c880dccab0bc9df7bbfd Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 11 Mar 2025 20:42:49 +0100 Subject: [PATCH 106/529] Fix missing enum in switch case --- rpcs3/rpcs3qt/config_checker.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/rpcs3/rpcs3qt/config_checker.cpp b/rpcs3/rpcs3qt/config_checker.cpp index 3cf34955c8..accab63662 100644 --- a/rpcs3/rpcs3qt/config_checker.cpp +++ b/rpcs3/rpcs3qt/config_checker.cpp @@ -197,6 +197,7 @@ bool config_checker::check_config(QString content, QString& result, bool is_log) break; } case cfg::type::map: + case cfg::type::node_map: case cfg::type::device: { // Ignored From b2ed787c3a7f857014af1df890dcdaeb6bbc33c0 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Wed, 12 Mar 2025 08:12:12 +0300 Subject: [PATCH 107/529] rsx: Invalidate program cache hint if the current vertex or fragment program is re-evaluated --- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 109 +++++++++++++++----- rpcs3/Emu/RSX/Program/ProgramStateCache.h | 47 +++++---- rpcs3/Emu/RSX/RSXThread.cpp | 4 + 3 files changed, 113 insertions(+), 47 deletions(-) diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index 7f1ea5ae27..9d70212c2a 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -533,16 +533,16 @@ AVX512_ICL_FUNC bool vertex_program_compare_512(const RSXVertexProgram &binary1, bool vertex_program_compare::operator()(const RSXVertexProgram &binary1, const RSXVertexProgram &binary2) const { - if (binary1.output_mask != binary2.output_mask) + if (!compare_properties(binary1, binary2)) + { return false; - if (binary1.ctrl != binary2.ctrl) - return false; - if (binary1.texture_state != binary2.texture_state) - return false; - if (binary1.data.size() != binary2.data.size()) - return false; - if (binary1.jump_table != binary2.jump_table) + } + + if (binary1.data.size() != binary2.data.size() || + binary1.jump_table != binary2.jump_table) + { return false; + } #ifdef ARCH_X64 if (utils::has_avx512_icl()) @@ -572,6 +572,13 @@ bool vertex_program_compare::operator()(const RSXVertexProgram &binary1, const R return true; } +bool vertex_program_compare::compare_properties(const RSXVertexProgram& binary1, const RSXVertexProgram& binary2) +{ + return binary1.output_mask == binary2.output_mask && + binary1.ctrl == binary2.ctrl && + binary1.texture_state == binary2.texture_state; +} + bool fragment_program_utils::is_any_src_constant(v128 sourceOperand) { const u64 masked = sourceOperand._u64[1] & 0x30000000300; @@ -741,12 +748,7 @@ usz fragment_program_storage_hash::operator()(const RSXFragmentProgram& program) bool fragment_program_compare::operator()(const RSXFragmentProgram& binary1, const RSXFragmentProgram& binary2) const { - if (binary1.ucode_length != binary2.ucode_length || - binary1.ctrl != binary2.ctrl || - binary1.texture_state != binary2.texture_state || - binary1.texcoord_control_mask != binary2.texcoord_control_mask || - binary1.two_sided_lighting != binary2.two_sided_lighting || - binary1.mrt_buffers_count != binary2.mrt_buffers_count) + if (!compare_properties(binary1, binary2)) { return false; } @@ -771,19 +773,14 @@ bool fragment_program_compare::operator()(const RSXFragmentProgram& binary1, con return true; } -bool fragment_program_compare::config_only(const RSXFragmentProgram& binary1, const RSXFragmentProgram& binary2) +bool fragment_program_compare::compare_properties(const RSXFragmentProgram& binary1, const RSXFragmentProgram& binary2) { - if (binary1.ucode_length != binary2.ucode_length || - binary1.ctrl != binary2.ctrl || - binary1.texture_state != binary2.texture_state || - binary1.texcoord_control_mask != binary2.texcoord_control_mask || - binary1.two_sided_lighting != binary2.two_sided_lighting || - binary1.mrt_buffers_count != binary2.mrt_buffers_count) - { - return false; - } - - return true; + return binary1.ucode_length == binary2.ucode_length && + binary1.ctrl == binary2.ctrl && + binary1.texture_state == binary2.texture_state && + binary1.texcoord_control_mask == binary2.texcoord_control_mask && + binary1.two_sided_lighting == binary2.two_sided_lighting && + binary1.mrt_buffers_count == binary2.mrt_buffers_count; } namespace rsx @@ -857,12 +854,68 @@ namespace rsx { if (flags & rsx::vertex_program_dirty) { - cached_vertex_program = nullptr; + m_cached_vertex_program = nullptr; } if (flags & rsx::fragment_program_dirty) { - cached_fragment_program = nullptr; + m_cached_fragment_program = nullptr; } } + + void program_cache_hint_t::invalidate_vertex_program(const RSXVertexProgram& p) + { + if (!m_cached_vertex_program) + { + return; + } + + if (!vertex_program_compare::compare_properties(m_cached_vp_properties, p)) + { + m_cached_vertex_program = nullptr; + } + } + + void program_cache_hint_t::invalidate_fragment_program(const RSXFragmentProgram& p) + { + if (!m_cached_fragment_program) + { + return; + } + + if (!fragment_program_compare::compare_properties(m_cached_fp_properties, p)) + { + m_cached_fragment_program = nullptr; + } + } + + void program_cache_hint_t::cache_vertex_program(program_cache_hint_t* cache, const RSXVertexProgram& ref, void* vertex_program) + { + if (!cache) + { + return; + } + + cache->m_cached_vertex_program = vertex_program; + cache->m_cached_vp_properties.output_mask = ref.output_mask; + cache->m_cached_vp_properties.ctrl = ref.ctrl; + cache->m_cached_vp_properties.texture_state = ref.texture_state; + } + + void program_cache_hint_t::cache_fragment_program(program_cache_hint_t* cache, const RSXFragmentProgram& ref, void* fragment_program) + { + if (!cache) + { + return; + } + + cache->m_cached_fragment_program = fragment_program; + cache->m_cached_fp_properties.ucode_length = ref.ucode_length; + cache->m_cached_fp_properties.ctrl = ref.ctrl; + cache->m_cached_fp_properties.texture_state = ref.texture_state; + cache->m_cached_fp_properties.texcoord_control_mask = ref.texcoord_control_mask; + cache->m_cached_fp_properties.two_sided_lighting = ref.two_sided_lighting; + cache->m_cached_fp_properties.mrt_buffers_count = ref.mrt_buffers_count; + } + } diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/Emu/RSX/Program/ProgramStateCache.h index ff1082dc36..6007ac7f2d 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.h +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.h @@ -43,6 +43,8 @@ namespace program_hash_util struct vertex_program_compare { + static bool compare_properties(const RSXVertexProgram& binary1, const RSXVertexProgram& binary2); + bool operator()(const RSXVertexProgram &binary1, const RSXVertexProgram &binary2) const; }; @@ -80,8 +82,9 @@ namespace program_hash_util struct fragment_program_compare { + static bool compare_properties(const RSXFragmentProgram& binary1, const RSXFragmentProgram& binary2); + bool operator()(const RSXFragmentProgram &binary1, const RSXFragmentProgram &binary2) const; - static bool config_only(const RSXFragmentProgram &binary1, const RSXFragmentProgram &binary2); }; } @@ -92,40 +95,46 @@ namespace rsx template T* get_fragment_program() const { - return utils::bless(cached_fragment_program); + return utils::bless(m_cached_fragment_program); } template T* get_vertex_program() const { - return utils::bless(cached_vertex_program); + return utils::bless(m_cached_vertex_program); } bool has_vertex_program() const { - return cached_vertex_program != nullptr; + return m_cached_vertex_program != nullptr; } bool has_fragment_program() const { - return cached_fragment_program != nullptr; + return m_cached_fragment_program != nullptr; } + // Invalidate caches if the renderer state shows they are out of date void invalidate(u32 flags); - static inline void cache_vertex_program(program_cache_hint_t* cache, void* vertex_program) - { - if (cache) cache->cached_vertex_program = vertex_program; - } + // Invalidate vertex program if the cached program is not compatible with the incoming + void invalidate_vertex_program(const RSXVertexProgram& p); - static inline void cache_fragment_program(program_cache_hint_t* cache, void* fragment_program) - { - if (cache) cache->cached_fragment_program = fragment_program; - } + // Invalidate fragment program if the cached program is not compatible with the incoming + void invalidate_fragment_program(const RSXFragmentProgram& p); + + // Helper - optionally cache the vertex program if possible + static void cache_vertex_program(program_cache_hint_t* cache, const RSXVertexProgram& ref, void* vertex_program); + + // Helper - optionally cache the fragment program if possible + static void cache_fragment_program(program_cache_hint_t* cache, const RSXFragmentProgram& ref, void* fragment_program); protected: - void* cached_fragment_program = nullptr; - void* cached_vertex_program = nullptr; + void* m_cached_fragment_program = nullptr; + void* m_cached_vertex_program = nullptr; + + RSXFragmentProgram m_cached_fp_properties; + RSXVertexProgram m_cached_vp_properties; }; void write_fragment_constants_to_buffer(const std::span& buffer, const RSXFragmentProgram& rsx_prog, const std::vector& offsets_cache, bool sanitize = true); @@ -228,7 +237,7 @@ protected: const auto& I = m_vertex_shader_cache.find(rsx_vp); if (I != m_vertex_shader_cache.end()) { - rsx::program_cache_hint_t::cache_vertex_program(cache_hint, &(I->second)); + rsx::program_cache_hint_t::cache_vertex_program(cache_hint, rsx_vp, &(I->second)); return std::forward_as_tuple(I->second, true); } @@ -245,7 +254,7 @@ protected: backend_traits::recompile_vertex_program(rsx_vp, *new_shader, m_next_id++); } - rsx::program_cache_hint_t::cache_vertex_program(cache_hint, new_shader); + rsx::program_cache_hint_t::cache_vertex_program(cache_hint, rsx_vp, new_shader); return std::forward_as_tuple(*new_shader, false); } @@ -267,7 +276,7 @@ protected: const auto& I = m_fragment_shader_cache.find(rsx_fp); if (I != m_fragment_shader_cache.end()) { - rsx::program_cache_hint_t::cache_fragment_program(cache_hint, &(I->second)); + rsx::program_cache_hint_t::cache_fragment_program(cache_hint, rsx_fp, &(I->second)); return std::forward_as_tuple(I->second, true); } @@ -284,7 +293,7 @@ protected: backend_traits::recompile_fragment_program(rsx_fp, *new_shader, m_next_id++); } - rsx::program_cache_hint_t::cache_fragment_program(cache_hint, new_shader); + rsx::program_cache_hint_t::cache_fragment_program(cache_hint, rsx_fp, new_shader); return std::forward_as_tuple(*new_shader, false); } diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index f33c778e62..f733a20847 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -2034,6 +2034,8 @@ namespace rsx } current_vertex_program.texture_state.import(current_vp_texture_state, current_vp_metadata.referenced_textures_mask); + + m_program_cache_hint.invalidate_vertex_program(current_vertex_program); } void thread::get_current_fragment_program(const std::array, rsx::limits::fragment_textures_count>& sampler_descriptors) @@ -2275,6 +2277,8 @@ namespace rsx rsx_log.trace("FS exports depth component but depth test is disabled (INVALID_OPERATION)"); } } + + m_program_cache_hint.invalidate_fragment_program(current_fragment_program); } bool thread::invalidate_fragment_program(u32 dst_dma, u32 dst_offset, u32 size) From ff40128df6744a4d077eb78e523c6c8bafebdc85 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 12 Mar 2025 12:43:47 +0100 Subject: [PATCH 108/529] Qt: Detach markup from dialog translations --- rpcs3/rpcs3qt/about_dialog.cpp | 16 ++++++-------- rpcs3/rpcs3qt/gui_application.cpp | 20 ++++++++--------- rpcs3/rpcs3qt/qt_utils.cpp | 17 +++++++++++++++ rpcs3/rpcs3qt/qt_utils.h | 9 ++++++++ rpcs3/rpcs3qt/settings_dialog.cpp | 34 +++++++++++++---------------- rpcs3/rpcs3qt/welcome_dialog.cpp | 36 ++++++++++++++----------------- 6 files changed, 72 insertions(+), 60 deletions(-) diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3qt/about_dialog.cpp index 9e1a58afb0..8b5eecef13 100644 --- a/rpcs3/rpcs3qt/about_dialog.cpp +++ b/rpcs3/rpcs3qt/about_dialog.cpp @@ -16,16 +16,12 @@ about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_ ui->close->setDefault(true); ui->icon->load(QStringLiteral(":/rpcs3.svg")); ui->version->setText(tr("RPCS3 Version: %1").arg(QString::fromStdString(rpcs3::get_verbose_version()))); - ui->description->setText(tr( - R"( -

- RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.
- It is written in C++ for Windows, Linux, FreeBSD and MacOS funded with Patreon.
- Our developers and contributors are always working hard to ensure this project is the best that it can be.
- There are still plenty of implementations to make and optimizations to do. -

- )" - ).arg(gui::utils::get_link_style())); + ui->description->setText(gui::utils::make_paragraph(tr( + "RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.\n" + "It is written in C++ for Windows, Linux, FreeBSD and MacOS funded with %0.\n" + "Our developers and contributors are always working hard to ensure this project is the best that it can be.\n" + "There are still plenty of implementations to make and optimizations to do.") + .arg(gui::utils::make_link(tr("Patreon"), "https://rpcs3.net/patreon")))); // Events connect(ui->gitHub, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://www.github.com/RPCS3")); }); diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 4bf4426fca..3024234c17 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -101,17 +101,15 @@ bool gui_application::Init() msg.setTextFormat(Qt::RichText); msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msg.setDefaultButton(QMessageBox::No); - msg.setText(tr( - R"( -

- Please understand that this build is not an official RPCS3 release.
- This build contains changes that may break games, or even damage your data.
- We recommend to download and use the official build from the RPCS3 website.

- Build origin: %1
- Do you wish to use this build anyway? -

- )" - ).arg(gui::utils::get_link_style()).arg(Qt::convertFromPlainText(branch_name.data()))); + msg.setText(gui::utils::make_paragraph(tr( + "Please understand that this build is not an official RPCS3 release.\n" + "This build contains changes that may break games, or even damage your data.\n" + "We recommend to download and use the official build from the %0.\n" + "\n" + "Build origin: %1\n" + "Do you wish to use this build anyway?") + .arg(gui::utils::make_link(tr("RPCS3 website"), "https://rpcs3.net/download")) + .arg(Qt::convertFromPlainText(branch_name.data())))); msg.layout()->setSizeConstraint(QLayout::SetFixedSize); if (msg.exec() == QMessageBox::No) diff --git a/rpcs3/rpcs3qt/qt_utils.cpp b/rpcs3/rpcs3qt/qt_utils.cpp index af2e031541..0094d83618 100644 --- a/rpcs3/rpcs3qt/qt_utils.cpp +++ b/rpcs3/rpcs3qt/qt_utils.cpp @@ -232,6 +232,23 @@ namespace gui return QString("style=\"color: %0;\"").arg(get_link_color_string(name)); } + QString make_link(const QString& text, const QString& url) + { + return QString("%2").arg(get_link_style()).arg(url).arg(text); + } + + QString make_bold(const QString& text) + { + return QString("%0").arg(text); + } + + QString make_paragraph(QString text, const QString& white_space_style) + { + return QString(R"(%1

)") + .arg(white_space_style.isEmpty() ? "" : "style=\"white-space: nowrap;\"") + .arg(text.replace("\n", "
")); + } + QPixmap get_centered_pixmap(QPixmap pixmap, const QSize& icon_size, int offset_x, int offset_y, qreal device_pixel_ratio, Qt::TransformationMode mode) { // Create empty canvas for expanded image diff --git a/rpcs3/rpcs3qt/qt_utils.h b/rpcs3/rpcs3qt/qt_utils.h index fbac5270f5..10427a9d8a 100644 --- a/rpcs3/rpcs3qt/qt_utils.h +++ b/rpcs3/rpcs3qt/qt_utils.h @@ -92,6 +92,15 @@ namespace gui // Returns the style for richtext links. e.g. style="color: #123456;" QString get_link_style(const QString& name = "richtext_link_color"); + // Returns a richtext link + QString make_link(const QString& text, const QString& url); + + // Returns a bold richtext string + QString make_bold(const QString& text); + + // Returns a richtext paragraph with white-space: nowrap; + QString make_paragraph(QString text, const QString& white_space_style = "nowrap"); + template void set_font_size(T& qobj, int size) { diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index cc3286d8a5..3297bc2dc9 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -313,29 +313,25 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std if (!utils::has_mpx()) { title = tr("Haswell/Broadwell TSX Warning"); - message = tr( - R"( -

- RPCS3 has detected that you are using TSX functions on a Haswell or Broadwell CPU.
- Intel has deactivated these functions in newer Microcode revisions, since they can lead to unpredicted behaviour.
- That means using TSX may break games or even damage your data.
- We recommend to disable this feature and update your computer BIOS.

- Do you wish to use TSX anyway? -

- )"); + message = gui::utils::make_paragraph(tr( + "RPCS3 has detected that you are using TSX functions on a Haswell or Broadwell CPU.\n" + "Intel has deactivated these functions in newer Microcode revisions, since they can lead to unpredicted behaviour.\n" + "That means using TSX may break games or even damage your data.\n" + "We recommend to disable this feature and update your computer BIOS.\n" + "\n" + "Do you wish to use TSX anyway?" + )); } else { title = tr("TSX-FA Warning"); - message = tr( - R"( -

- RPCS3 has detected your CPU only supports TSX-FA.
- That means using TSX may break games or even damage your data.
- We recommend to disable this feature.

- Do you wish to use TSX anyway? -

- )"); + message = gui::utils::make_paragraph(tr( + "RPCS3 has detected your CPU only supports TSX-FA.\n" + "That means using TSX may break games or even damage your data.\n" + "We recommend to disable this feature.\n" + "\n" + "Do you wish to use TSX anyway?" + )); } if (QMessageBox::No == QMessageBox::critical(this, title, message, QMessageBox::Yes, QMessageBox::No)) diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3qt/welcome_dialog.cpp index 8d6c6916ed..c3d344a650 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.cpp +++ b/rpcs3/rpcs3qt/welcome_dialog.cpp @@ -24,27 +24,23 @@ welcome_dialog::welcome_dialog(std::shared_ptr gui_settings, bool ui->icon_label->load(QStringLiteral(":/rpcs3.svg")); - ui->label_desc->setText(tr( - R"( -

- RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.
- It is written in C++ for Windows, Linux, FreeBSD and MacOS funded with Patreon.
- Our developers and contributors are always working hard to ensure this project is the best that it can be.
- There are still plenty of implementations to make and optimizations to do. -

- )" - ).arg(gui::utils::get_link_style())); + ui->label_desc->setText(gui::utils::make_paragraph(tr( + "RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.\n" + "It is written in C++ for Windows, Linux, FreeBSD and MacOS funded with %0.\n" + "Our developers and contributors are always working hard to ensure this project is the best that it can be.\n" + "There are still plenty of implementations to make and optimizations to do.") + .arg(gui::utils::make_link(tr("Patreon"), "https://rpcs3.net/patreon")))); - ui->label_info->setText(tr( - R"( -

- To get started, you must first install the PlayStation 3 firmware.
- Please refer to the Quickstart guide found on the official website for further information.
- If you have any further questions, please refer to the FAQ.
- Otherwise, further discussion and support can be found on the Forums or on our Discord server. -

- )" - ).arg(gui::utils::get_link_style())); + ui->label_info->setText(gui::utils::make_paragraph(tr( + "To get started, you must first install the %0.\n" + "Please refer to the %1 guide found on the official website for further information.\n" + "If you have any further questions, please refer to the %2.\n" + "Otherwise, further discussion and support can be found on the %3 or on our %4 server.") + .arg(gui::utils::make_bold(tr("PlayStation 3 firmware"))) + .arg(gui::utils::make_link(tr("Quickstart"), "https://rpcs3.net/quickstart")) + .arg(gui::utils::make_link(tr("FAQ"), "https://rpcs3.net/faq")) + .arg(gui::utils::make_link(tr("Forums"), "https://forums.rpcs3.net")) + .arg(gui::utils::make_link(tr("Discord"), "https://discord.me/RPCS3")))); #ifdef __APPLE__ ui->create_applications_menu_shortcut->setText(tr("&Create Launchpad shortcut")); From 25eb869d5f94ff996166fe3095c5c25527b7a35a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 12 Mar 2025 09:03:20 +0100 Subject: [PATCH 109/529] Readme: Improve build tags --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3cef1b5ca9..c6008a9384 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ RPCS3 ===== -[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=4&branchName=master) -[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3) +[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=8&_a=summary&repositoryFilter=4) +[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3/master?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3) +[![GitHub Actions](https://img.shields.io/github/actions/workflow/status/RPCS3/rpcs3/rpcs3.yml?branch=master&logo=github&label=Actions)](https://github.com/RPCS3/rpcs3/actions/workflows/rpcs3.yml) [![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.me/rpcs3) The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD. From ff21a05c960328f5b5f465d72c510a45f379dc84 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 12 Mar 2025 20:04:44 +0100 Subject: [PATCH 110/529] Always run Actions, we need them for merges --- .github/workflows/rpcs3.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 92083698b7..81cb881675 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -5,15 +5,7 @@ defaults: shell: bash on: push: - paths-ignore: - - '.cirrus.yml' - - '.azure-pipelines.yml' - - 'README.md' pull_request: - paths-ignore: - - '.cirrus.yml' - - '.azure-pipelines.yml' - - 'README.md' workflow_dispatch: concurrency: From a108ce80155825ae81296043870fed6042ed2665 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 12 Mar 2025 21:15:42 +0100 Subject: [PATCH 111/529] CI: upgrade FreeBSD to 13.5 FreeBSD doesn't support /latest and /quarterly package repos on EOL versions. 13.4 reaches EOL on 2025-06-30, so avoid CI breakage. --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6a7bdd0743..1ad1dc4190 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -105,7 +105,7 @@ freebsd_task: matrix: - name: Cirrus FreeBSD freebsd_instance: - image_family: freebsd-13-4 + image_family: freebsd-13-5 cpu: 8 memory: 8G env: From 7b212e0e573af47ba7f97ecca186bf0497672205 Mon Sep 17 00:00:00 2001 From: Attila Fidan Date: Wed, 12 Mar 2025 19:53:36 +0000 Subject: [PATCH 112/529] sys_usbd: Fix null pointer deref on destruction --- rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index 67fde17d83..c8b5b7d6cb 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -591,7 +591,8 @@ usb_handler_thread::~usb_handler_thread() } #if LIBUSB_API_VERSION >= 0x01000102 - libusb_hotplug_deregister_callback(ctx, callback_handle); + if (ctx && hotplug_supported) + libusb_hotplug_deregister_callback(ctx, callback_handle); #endif if (ctx) From f9a72e8d75a083761bd23ce4a8e8f0bb568b593e Mon Sep 17 00:00:00 2001 From: Malcolm Jestadt Date: Fri, 14 Mar 2025 16:21:04 -0400 Subject: [PATCH 113/529] SPU LLVM: Preserve sign on inf to NaN conversion in spu_re_acc with vfixupimmps --- rpcs3/Emu/Cell/SPULLVMRecompiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp index f1bb474e6f..db9cf47ab6 100644 --- a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp @@ -6835,7 +6835,7 @@ public: const auto div_result = the_one / div; - return vfixupimmps(bitcast(splat(0xFFFFFFFFu)), div_result, splat(0x11001188u), 0, 0xff); + return vfixupimmps(div_result, div_result, splat(0x00220088u), 0, 0xff); }); } else From 3d3fc2f3cd6c90dab95be045e57bd4161b2e1416 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 15 Mar 2025 21:28:29 +0300 Subject: [PATCH 114/529] rsx: Fix cache invalidation when instancing state changes --- rpcs3/Emu/RSX/RSXThread.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index f733a20847..7e908c01ab 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -2005,6 +2005,9 @@ namespace rsx } m_graphics_state.clear(rsx::pipeline_state::xform_instancing_state_dirty); + + // Emit invalidate here in case ucode is actually clean + m_program_cache_hint.invalidate_vertex_program(current_vertex_program); } if (!m_graphics_state.test(rsx::pipeline_state::vertex_program_dirty)) From 65c0d3d425eac5fdde31ea30af5529591c081e8e Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 15 Mar 2025 22:52:36 +0300 Subject: [PATCH 115/529] gl: Add support for hardware instancing --- rpcs3/Emu/RSX/GL/GLDraw.cpp | 31 ++++++-- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 40 +++++++++- rpcs3/Emu/RSX/GL/GLGSRender.h | 2 + rpcs3/Emu/RSX/GL/GLProcTable.h | 3 + rpcs3/Emu/RSX/GL/GLVertexProgram.cpp | 107 ++++++++++++++++----------- rpcs3/Emu/RSX/GL/glutils/common.h | 2 + 6 files changed, 133 insertions(+), 52 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLDraw.cpp b/rpcs3/Emu/RSX/GL/GLDraw.cpp index b2de00e3b7..33ef42570b 100644 --- a/rpcs3/Emu/RSX/GL/GLDraw.cpp +++ b/rpcs3/Emu/RSX/GL/GLDraw.cpp @@ -599,7 +599,11 @@ void GLGSRender::emit_geometry(u32 sub_index) if (!upload_info.index_info) { - if (draw_call.is_single_draw()) + if (draw_call.is_trivial_instanced_draw) + { + glDrawArraysInstanced(draw_mode, 0, upload_info.vertex_draw_count, draw_call.pass_count()); + } + else if (draw_call.is_single_draw()) { glDrawArrays(draw_mode, 0, upload_info.vertex_draw_count); } @@ -625,7 +629,7 @@ void GLGSRender::emit_geometry(u32 sub_index) if (driver_caps.vendor_AMD && (first + range.count) > (0x100000 >> 2)) { - //Unlikely, but added here in case the identity buffer is not large enough somehow + // Unlikely, but added here in case the identity buffer is not large enough somehow use_draw_arrays_fallback = true; break; } @@ -635,7 +639,7 @@ void GLGSRender::emit_geometry(u32 sub_index) if (use_draw_arrays_fallback) { - //MultiDrawArrays is broken on some primitive types using AMD. One known type is GL_TRIANGLE_STRIP but there could be more + // MultiDrawArrays is broken on some primitive types using AMD. One known type is GL_TRIANGLE_STRIP but there could be more for (u32 n = 0; n < draw_count; ++n) { glDrawArrays(draw_mode, firsts[n], counts[n]); @@ -643,13 +647,13 @@ void GLGSRender::emit_geometry(u32 sub_index) } else if (driver_caps.vendor_AMD) { - //Use identity index buffer to fix broken vertexID on AMD + // Use identity index buffer to fix broken vertexID on AMD m_identity_index_buffer->bind(); glMultiDrawElements(draw_mode, counts, GL_UNSIGNED_INT, offsets, static_cast(draw_count)); } else { - //Normal render + // Normal render glMultiDrawArrays(draw_mode, firsts, counts, static_cast(draw_count)); } } @@ -667,7 +671,11 @@ void GLGSRender::emit_geometry(u32 sub_index) m_index_ring_buffer->bind(); - if (draw_call.is_single_draw()) + if (draw_call.is_trivial_instanced_draw) + { + glDrawElementsInstanced(draw_mode, upload_info.vertex_draw_count, index_type, reinterpret_cast(u64{ index_offset }), draw_call.pass_count()); + } + else if (draw_call.is_single_draw()) { glDrawElements(draw_mode, upload_info.vertex_draw_count, index_type, reinterpret_cast(u64{index_offset})); } @@ -781,13 +789,20 @@ void GLGSRender::end() m_program->validate(); } - rsx::method_registers.current_draw_clause.begin(); + auto& draw_call = REGS(m_ctx)->current_draw_clause; + draw_call.begin(); u32 subdraw = 0u; do { emit_geometry(subdraw++); + + if (draw_call.is_trivial_instanced_draw) + { + // We already completed. End the draw. + draw_call.end(); + } } - while (rsx::method_registers.current_draw_clause.next()); + while (draw_call.next()); m_rtts.on_write(m_framebuffer_layout.color_write_enabled, m_framebuffer_layout.zeta_write_enabled); diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 8cefa0c794..c23f560268 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -296,6 +296,7 @@ void GLGSRender::on_init_thread() m_fragment_instructions_buffer = std::make_unique(); m_raster_env_ring_buffer = std::make_unique(); m_scratch_ring_buffer = std::make_unique(); + m_instancing_ring_buffer = std::make_unique(); } else { @@ -311,6 +312,7 @@ void GLGSRender::on_init_thread() m_fragment_instructions_buffer = std::make_unique(); m_raster_env_ring_buffer = std::make_unique(); m_scratch_ring_buffer = std::make_unique(); + m_instancing_ring_buffer = std::make_unique(); } m_attrib_ring_buffer->create(gl::buffer::target::texture, 256 * 0x100000); @@ -323,6 +325,7 @@ void GLGSRender::on_init_thread() m_vertex_layout_buffer->create(gl::buffer::target::uniform, 16 * 0x100000); m_raster_env_ring_buffer->create(gl::buffer::target::uniform, 16 * 0x100000); m_scratch_ring_buffer->create(gl::buffer::target::uniform, 16 * 0x100000); + m_instancing_ring_buffer->create(gl::buffer::target::ssbo, 64 * 0x100000); if (shadermode == shader_mode::async_with_interpreter || shadermode == shader_mode::interpreter_only) { @@ -547,6 +550,11 @@ void GLGSRender::on_exit() m_scratch_ring_buffer->remove(); } + if (m_instancing_ring_buffer) + { + m_instancing_ring_buffer->remove(); + } + m_null_textures.clear(); m_gl_texture_cache.destroy(); m_ui_renderer.destroy(); @@ -866,7 +874,8 @@ void GLGSRender::load_program_env() const bool update_fragment_env = m_graphics_state & rsx::pipeline_state::fragment_state_dirty; const bool update_fragment_texture_env = m_graphics_state & rsx::pipeline_state::fragment_texture_state_dirty; const bool update_instruction_buffers = !!m_interpreter_state && m_shader_interpreter.is_interpreter(m_program); - const bool update_raster_env = rsx::method_registers.polygon_stipple_enabled() && (m_graphics_state & rsx::pipeline_state::polygon_stipple_pattern_dirty); + const bool update_raster_env = REGS(m_ctx)->polygon_stipple_enabled() && (m_graphics_state & rsx::pipeline_state::polygon_stipple_pattern_dirty); + const bool update_instancing_data = REGS(m_ctx)->current_draw_clause.is_trivial_instanced_draw; if (manually_flush_ring_buffers) { @@ -876,6 +885,7 @@ void GLGSRender::load_program_env() if (update_fragment_constants) m_fragment_constants_buffer->reserve_storage_on_heap(utils::align(fragment_constants_size, 256)); if (update_transform_constants) m_transform_constants_buffer->reserve_storage_on_heap(8192); if (update_raster_env) m_raster_env_ring_buffer->reserve_storage_on_heap(128); + if (update_instancing_data) m_instancing_ring_buffer->reserve_storage_on_heap(8192 * REGS(m_ctx)->current_draw_clause.pass_count()); if (update_instruction_buffers) { @@ -899,6 +909,33 @@ void GLGSRender::load_program_env() m_vertex_env_buffer->bind_range(GL_VERTEX_PARAMS_BIND_SLOT, mapping.second, 144); } + if (update_instancing_data) + { + // Combines transform load + instancing lookup table + const auto alignment = m_min_ssbo_alignment; + u32 indirection_table_offset = 0; + u32 constants_data_table_offset = 0; + + rsx::io_buffer indirection_table_buf([&](usz size) -> std::pair + { + const auto mapping = m_instancing_ring_buffer->alloc_from_heap(static_cast(size), alignment); + indirection_table_offset = mapping.second; + return mapping; + }); + + rsx::io_buffer constants_array_buf([&](usz size) -> std::pair + { + const auto mapping = m_instancing_ring_buffer->alloc_from_heap(static_cast(size), alignment); + constants_data_table_offset = mapping.second; + return mapping; + }); + + m_draw_processor.fill_constants_instancing_buffer(indirection_table_buf, constants_array_buf, m_vertex_prog); + + m_instancing_ring_buffer->bind_range(GL_INSTANCING_LUT_BIND_SLOT, indirection_table_offset, ::size32(indirection_table_buf)); + m_instancing_ring_buffer->bind_range(GL_INSTANCING_XFORM_CONSTANTS_SLOT, constants_data_table_offset, ::size32(constants_array_buf)); + } + if (update_transform_constants) { // Vertex constants @@ -1011,6 +1048,7 @@ void GLGSRender::load_program_env() if (update_fragment_constants) m_fragment_constants_buffer->unmap(); if (update_transform_constants) m_transform_constants_buffer->unmap(); if (update_raster_env) m_raster_env_ring_buffer->unmap(); + if (update_instancing_data) m_instancing_ring_buffer->unmap(); if (update_instruction_buffers) { diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h index 1c84233934..8b2caaf194 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.h +++ b/rpcs3/Emu/RSX/GL/GLGSRender.h @@ -105,6 +105,7 @@ class GLGSRender : public GSRender, public ::rsx::reports::ZCULL_control std::unique_ptr m_vertex_instructions_buffer; std::unique_ptr m_fragment_instructions_buffer; std::unique_ptr m_raster_env_ring_buffer; + std::unique_ptr m_instancing_ring_buffer; // Identity buffer used to fix broken gl_VertexID on ATI stack std::unique_ptr m_identity_index_buffer; @@ -117,6 +118,7 @@ class GLGSRender : public GSRender, public ::rsx::reports::ZCULL_control GLint m_min_texbuffer_alignment = 256; GLint m_uniform_buffer_offset_align = 256; + GLint m_min_ssbo_alignment = 256; GLint m_max_texbuffer_size = 65536; bool manually_flush_ring_buffers = false; diff --git a/rpcs3/Emu/RSX/GL/GLProcTable.h b/rpcs3/Emu/RSX/GL/GLProcTable.h index 783701e4dd..8f42995a9d 100644 --- a/rpcs3/Emu/RSX/GL/GLProcTable.h +++ b/rpcs3/Emu/RSX/GL/GLProcTable.h @@ -183,6 +183,9 @@ OPENGL_PROC(PFNGLUNMAPNAMEDBUFFEREXTPROC, UnmapNamedBufferEXT); OPENGL_PROC(PFNGLMULTIDRAWELEMENTSPROC, MultiDrawElements); OPENGL_PROC(PFNGLMULTIDRAWARRAYSPROC, MultiDrawArrays); +OPENGL_PROC(PFNGLDRAWARRAYSINSTANCEDPROC, DrawArraysInstanced); +OPENGL_PROC(PFNGLDRAWELEMENTSINSTANCEDPROC, DrawElementsInstanced); + OPENGL_PROC(PFNGLGETTEXTUREIMAGEEXTPROC, GetTextureImageEXT); OPENGL_PROC(PFNGLGETTEXTUREIMAGEPROC, GetTextureImage); OPENGL_PROC(PFNGLGETTEXTURESUBIMAGEPROC, GetTextureSubImage); diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp index 79286bd69d..dfa18d37e6 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp @@ -28,30 +28,31 @@ std::string GLVertexDecompilerThread::compareFunction(COMPARE f, const std::stri void GLVertexDecompilerThread::insertHeader(std::stringstream &OS) { - OS << "#version 430\n"; - OS << "layout(std140, binding = " << GL_VERTEX_PARAMS_BIND_SLOT << ") uniform VertexContextBuffer\n"; - OS << "{\n"; - OS << " mat4 scale_offset_mat;\n"; - OS << " ivec4 user_clip_enabled[2];\n"; - OS << " vec4 user_clip_factor[2];\n"; - OS << " uint transform_branch_bits;\n"; - OS << " float point_size;\n"; - OS << " float z_near;\n"; - OS << " float z_far;\n"; - OS << "};\n\n"; + OS << + "#version 430\n" + "layout(std140, binding = " << GL_VERTEX_PARAMS_BIND_SLOT << ") uniform VertexContextBuffer\n" + "{\n" + " mat4 scale_offset_mat;\n" + " ivec4 user_clip_enabled[2];\n" + " vec4 user_clip_factor[2];\n" + " uint transform_branch_bits;\n" + " float point_size;\n" + " float z_near;\n" + " float z_far;\n" + "};\n\n" - OS << "layout(std140, binding = " << GL_VERTEX_LAYOUT_BIND_SLOT << ") uniform VertexLayoutBuffer\n"; - OS << "{\n"; - OS << " uint vertex_base_index;\n"; - OS << " uint vertex_index_offset;\n"; - OS << " uvec4 input_attributes_blob[16 / 2];\n"; - OS << "};\n\n"; + "layout(std140, binding = " << GL_VERTEX_LAYOUT_BIND_SLOT << ") uniform VertexLayoutBuffer\n" + "{\n" + " uint vertex_base_index;\n" + " uint vertex_index_offset;\n" + " uvec4 input_attributes_blob[16 / 2];\n" + "};\n\n"; } void GLVertexDecompilerThread::insertInputs(std::stringstream& OS, const std::vector& /*inputs*/) { - OS << "layout(location=0) uniform usamplerBuffer persistent_input_stream;\n"; //Data stream with persistent vertex data (cacheable) - OS << "layout(location=1) uniform usamplerBuffer volatile_input_stream;\n"; //Data stream with per-draw data (registers and immediate draw data) + OS << "layout(location=0) uniform usamplerBuffer persistent_input_stream;\n"; // Data stream with persistent vertex data (cacheable) + OS << "layout(location=1) uniform usamplerBuffer volatile_input_stream;\n"; // Data stream with per-draw data (registers and immediate draw data) } void GLVertexDecompilerThread::insertConstants(std::stringstream& OS, const std::vector& constants) @@ -62,10 +63,29 @@ void GLVertexDecompilerThread::insertConstants(std::stringstream& OS, const std: { if (PI.name.starts_with("vc[")) { - OS << "layout(std140, binding = " << GL_VERTEX_CONSTANT_BUFFERS_BIND_SLOT << ") uniform VertexConstantsBuffer\n"; - OS << "{\n"; - OS << " vec4 " << PI.name << ";\n"; - OS << "};\n\n"; + if (!(m_prog.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS)) + { + OS << + "layout(std140, binding = " << GL_VERTEX_CONSTANT_BUFFERS_BIND_SLOT << ") uniform VertexConstantsBuffer\n" + "{\n" + " vec4 " << PI.name << ";\n" + "};\n\n"; + } + else + { + OS << + "layout(std430, binding = " << GL_INSTANCING_LUT_BIND_SLOT << ") readonly buffer InstancingIndirectionLUT\n" + "{\n" + " int constants_addressing_lookup[];\n" + "};\n\n" + + "layout(std430, binding = " << GL_INSTANCING_XFORM_CONSTANTS_SLOT << ") readonly buffer InstancingVertexConstantsBlock\n" + "{\n" + " vec4 instanced_constants_array[];\n" + "};\n\n" + + "#define CONSTANTS_ARRAY_LENGTH " << (properties.has_indexed_constants ? 468 : ::size32(m_constant_ids)) << "\n\n"; + } continue; } @@ -104,12 +124,12 @@ static const vertex_reg_info reg_table[] = { "gl_Position", false, "dst_reg0", "", false }, { "diff_color", true, "dst_reg1", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTDIFFUSE | CELL_GCM_ATTRIB_OUTPUT_MASK_BACKDIFFUSE }, { "spec_color", true, "dst_reg2", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTSPECULAR | CELL_GCM_ATTRIB_OUTPUT_MASK_BACKSPECULAR }, - //These are only present when back variants are specified, otherwise the default diff/spec color vars are for both front and back + // These are only present when back variants are specified, otherwise the default diff/spec color vars are for both front and back { "diff_color1", true, "dst_reg3", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTDIFFUSE | CELL_GCM_ATTRIB_OUTPUT_MASK_BACKDIFFUSE }, { "spec_color1", true, "dst_reg4", "", false, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FRONTSPECULAR | CELL_GCM_ATTRIB_OUTPUT_MASK_BACKSPECULAR }, - //Fog output shares a data source register with clip planes 0-2 so only declare when specified + // Fog output shares a data source register with clip planes 0-2 so only declare when specified { "fog_c", true, "dst_reg5", ".xxxx", true, "", "", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_FOG }, - //Warning: Always define all 3 clip plane groups together to avoid flickering with openGL + // Warning: Always define all 3 clip plane groups together to avoid flickering with openGL { "gl_ClipDistance[0]", false, "dst_reg5", ".y * user_clip_factor[0].x", false, "user_clip_enabled[0].x > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC0 }, { "gl_ClipDistance[1]", false, "dst_reg5", ".z * user_clip_factor[0].y", false, "user_clip_enabled[0].y > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC1 }, { "gl_ClipDistance[2]", false, "dst_reg5", ".w * user_clip_factor[0].z", false, "user_clip_enabled[0].z > 0", "0.5", "", true, CELL_GCM_ATTRIB_OUTPUT_MASK_UC2 }, @@ -152,6 +172,7 @@ void GLVertexDecompilerThread::insertMainStart(std::stringstream & OS) properties2.emulate_depth_clip_only = dev_caps.NV_depth_buffer_float_supported; properties2.low_precision_tests = dev_caps.vendor_NVIDIA; properties2.require_explicit_invariance = dev_caps.vendor_MESA || (dev_caps.vendor_NVIDIA && g_cfg.video.shader_precision != gpu_preset_level::low); + properties2.require_instanced_render = !!(m_prog.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS); insert_glsl_legacy_function(OS, properties2); glsl::insert_vertex_input_fetch(OS, glsl::glsl_rules_opengl4, dev_caps.vendor_INTEL == false); @@ -188,7 +209,7 @@ void GLVertexDecompilerThread::insertMainStart(std::stringstream & OS) OS << "void vs_main()\n"; OS << "{\n"; - //Declare temporary registers, ignoring those mapped to outputs + // Declare temporary registers, ignoring those mapped to outputs for (const ParamType &PT : m_parr.params[PF_PARAM_NONE]) { for (const ParamItem &PI : PT.items) @@ -237,7 +258,7 @@ void GLVertexDecompilerThread::insertMainEnd(std::stringstream & OS) } else { - //Insert if-else condition + // Insert if-else condition OS << " " << i.name << " = " << condition << "? " << i.src_reg << i.src_reg_mask << ": " << i.default_val << ";\n"; } @@ -261,21 +282,21 @@ void GLVertexDecompilerThread::insertMainEnd(std::stringstream & OS) OS << " gl_Position = gl_Position * scale_offset_mat;\n"; OS << " gl_Position = apply_zclip_xform(gl_Position, z_near, z_far);\n"; - //Since our clip_space is symmetrical [-1, 1] we map it to linear space using the eqn: - //ln = (clip * 2) - 1 to fully utilize the 0-1 range of the depth buffer - //RSX matrices passed already map to the [0, 1] range but mapping to classic OGL requires that we undo this step - //This can be made unnecessary using the call glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE). - //However, ClipControl only made it to opengl core in ver 4.5 though, so this is a workaround. - - //NOTE: It is completely valid for games to use very large w values, causing the post-multiplied z to be in the hundreds - //It is therefore critical that this step is done post-transform and the result re-scaled by w - //SEE Naruto: UNS - - //NOTE: On GPUs, poor fp32 precision means dividing z by w, then multiplying by w again gives slightly incorrect results - //This equation is simplified algebraically to an addition and subtraction which gives more accurate results (Fixes flickering skybox in Dark Souls 2) - //OS << " float ndc_z = gl_Position.z / gl_Position.w;\n"; - //OS << " ndc_z = (ndc_z * 2.) - 1.;\n"; - //OS << " gl_Position.z = ndc_z * gl_Position.w;\n"; + // Since our clip_space is symmetrical [-1, 1] we map it to linear space using the eqn: + // ln = (clip * 2) - 1 to fully utilize the 0-1 range of the depth buffer + // RSX matrices passed already map to the [0, 1] range but mapping to classic OGL requires that we undo this step + // This can be made unnecessary using the call glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE). + // However, ClipControl only made it to opengl core in ver 4.5 though, so this is a workaround. + + // NOTE: It is completely valid for games to use very large w values, causing the post-multiplied z to be in the hundreds + // It is therefore critical that this step is done post-transform and the result re-scaled by w + // SEE Naruto: UNS + + // NOTE: On GPUs, poor fp32 precision means dividing z by w, then multiplying by w again gives slightly incorrect results + // This equation is simplified algebraically to an addition and subtraction which gives more accurate results (Fixes flickering skybox in Dark Souls 2) + // OS << " float ndc_z = gl_Position.z / gl_Position.w;\n"; + // OS << " ndc_z = (ndc_z * 2.) - 1.;\n"; + // OS << " gl_Position.z = ndc_z * gl_Position.w;\n"; OS << " gl_Position.z = (gl_Position.z + gl_Position.z) - gl_Position.w;\n"; OS << "}\n"; } diff --git a/rpcs3/Emu/RSX/GL/glutils/common.h b/rpcs3/Emu/RSX/GL/glutils/common.h index ba8aa78cd1..be6d340ad7 100644 --- a/rpcs3/Emu/RSX/GL/glutils/common.h +++ b/rpcs3/Emu/RSX/GL/glutils/common.h @@ -20,6 +20,8 @@ #define GL_RASTERIZER_STATE_BIND_SLOT UBO_SLOT(6) #define GL_INTERPRETER_VERTEX_BLOCK SSBO_SLOT(0) #define GL_INTERPRETER_FRAGMENT_BLOCK SSBO_SLOT(1) +#define GL_INSTANCING_LUT_BIND_SLOT SSBO_SLOT(2) +#define GL_INSTANCING_XFORM_CONSTANTS_SLOT SSBO_SLOT(3) #define GL_COMPUTE_BUFFER_SLOT(index) SSBO_SLOT(2 + index) #define GL_COMPUTE_IMAGE_SLOT(index) SSBO_SLOT(index) From 225d0b948245689d70fdc87367bdae42b6dc589e Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 15 Mar 2025 23:15:29 +0300 Subject: [PATCH 116/529] gl: Support transform instancing in the shader interpreter --- rpcs3/Emu/RSX/GL/GLDraw.cpp | 1 + rpcs3/Emu/RSX/GL/GLGSRender.cpp | 10 ++- rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp | 78 +++++++++++-------- rpcs3/Emu/RSX/GL/GLShaderInterpreter.h | 11 +-- .../GLSLInterpreter/VertexInterpreter.glsl | 4 +- .../RSXProg/RSXVertexPrologue.glsl | 6 ++ rpcs3/Emu/RSX/Program/ShaderInterpreter.h | 29 +++---- 7 files changed, 85 insertions(+), 54 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLDraw.cpp b/rpcs3/Emu/RSX/GL/GLDraw.cpp index 33ef42570b..8606023ebe 100644 --- a/rpcs3/Emu/RSX/GL/GLDraw.cpp +++ b/rpcs3/Emu/RSX/GL/GLDraw.cpp @@ -814,6 +814,7 @@ void GLGSRender::end() m_vertex_layout_buffer->notify(); m_fragment_constants_buffer->notify(); m_transform_constants_buffer->notify(); + m_instancing_ring_buffer->notify(); m_frame_stats.setup_time += m_profiler.duration(); diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index c23f560268..bb360382d0 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -778,7 +778,10 @@ bool GLGSRender::load_program() if (shadermode == shader_mode::interpreter_only) { - m_program = m_shader_interpreter.get(current_fp_metadata); + m_program = m_shader_interpreter.get( + current_fp_metadata, + current_vertex_program.ctrl, + current_fragment_program.ctrl); return true; } } @@ -836,7 +839,10 @@ bool GLGSRender::load_program() // First load the next program if not available if (!m_program) { - m_program = m_shader_interpreter.get(current_fp_metadata); + m_program = m_shader_interpreter.get( + current_fp_metadata, + current_vertex_program.ctrl, + current_fragment_program.ctrl); // Program has changed, reupload m_interpreter_state = rsx::invalidate_pipeline_bits; diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp index 5d30ae5ab3..f043947f1f 100644 --- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp @@ -46,7 +46,6 @@ namespace gl void shader_interpreter::create() { - build_vs(); build_program(::program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES); build_program(::program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES | ::program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT); } @@ -55,14 +54,13 @@ namespace gl { for (auto& prog : m_program_cache) { - prog.second->fs.remove(); + prog.second->vertex_shader.remove(); + prog.second->fragment_shader.remove(); prog.second->prog.remove(); } - - m_vs.remove(); } - glsl::program* shader_interpreter::get(const interpreter::program_metadata& metadata) + glsl::program* shader_interpreter::get(const interpreter::program_metadata& metadata, u32 vp_ctrl, u32 fp_ctrl) { // Build options u64 opt = 0; @@ -95,13 +93,14 @@ namespace gl } } - if (rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_DEPTH_EXPORT; - if (rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT; - if (rsx::method_registers.shader_control() & RSX_SHADER_CONTROL_USES_KIL) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_KIL; + if (fp_ctrl & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_DEPTH_EXPORT; + if (fp_ctrl & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT; + if (fp_ctrl & RSX_SHADER_CONTROL_USES_KIL) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_KIL; if (metadata.referenced_textures_mask) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES; if (metadata.has_branch_instructions) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_FLOW_CTRL; if (metadata.has_pack_instructions) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_PACKING; if (rsx::method_registers.polygon_stipple_enabled()) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_STIPPLING; + if (vp_ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS) opt |= program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING; if (auto it = m_program_cache.find(opt); it != m_program_cache.end()) [[likely]] { @@ -115,7 +114,7 @@ namespace gl return &m_current_interpreter->prog; } - void shader_interpreter::build_vs() + void shader_interpreter::build_vs(u64 compiler_options, interpreter::cached_program& prog_data) { ::glsl::shader_properties properties{}; properties.domain = ::glsl::program_domain::glsl_vertex_program; @@ -126,6 +125,10 @@ namespace gl RSXVertexProgram null_prog; std::string shader_str; ParamArray arr; + + null_prog.ctrl = (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING) + ? RSX_SHADER_CONTROL_INSTANCED_CONSTANTS + : 0; GLVertexDecompilerThread comp(null_prog, shader_str, arr); ParamType uniforms = { PF_PARAM_UNIFORM, "vec4" }; @@ -141,14 +144,24 @@ namespace gl // Insert vp stream input builder << "\n" - "layout(std140, binding = " << GL_INTERPRETER_VERTEX_BLOCK << ") readonly restrict buffer VertexInstructionBlock\n" - "{\n" - " uint base_address;\n" - " uint entry;\n" - " uint output_mask;\n" - " uint control;\n" - " uvec4 vp_instructions[];\n" - "};\n\n"; + "layout(std140, binding = " << GL_INTERPRETER_VERTEX_BLOCK << ") readonly restrict buffer VertexInstructionBlock\n" + "{\n" + " uint base_address;\n" + " uint entry;\n" + " uint output_mask;\n" + " uint control;\n" + " uvec4 vp_instructions[];\n" + "};\n\n"; + + if (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING) + { + builder << "#define _ENABLE_INSTANCED_CONSTANTS\n"; + } + + if (compiler_options) + { + builder << "\n"; + } ::glsl::insert_glsl_legacy_function(builder, properties); ::glsl::insert_vertex_input_fetch(builder, ::glsl::glsl_rules::glsl_rules_opengl4); @@ -156,8 +169,8 @@ namespace gl builder << program_common::interpreter::get_vertex_interpreter(); const std::string s = builder.str(); - m_vs.create(::glsl::program_domain::glsl_vertex_program, s); - m_vs.compile(); + prog_data.vertex_shader.create(::glsl::program_domain::glsl_vertex_program, s); + prog_data.vertex_shader.compile(); } void shader_interpreter::build_fs(u64 compiler_options, interpreter::cached_program& prog_data) @@ -295,31 +308,32 @@ namespace gl } builder << - "layout(std430, binding =" << GL_INTERPRETER_FRAGMENT_BLOCK << ") readonly restrict buffer FragmentInstructionBlock\n" - "{\n" - " uint shader_control;\n" - " uint texture_control;\n" - " uint reserved1;\n" - " uint reserved2;\n" - " uint texture_handles[16];\n" - " uvec4 fp_instructions[];\n" - "};\n\n"; + "layout(std430, binding =" << GL_INTERPRETER_FRAGMENT_BLOCK << ") readonly restrict buffer FragmentInstructionBlock\n" + "{\n" + " uint shader_control;\n" + " uint texture_control;\n" + " uint reserved1;\n" + " uint reserved2;\n" + " uint texture_handles[16];\n" + " uvec4 fp_instructions[];\n" + "};\n\n"; builder << program_common::interpreter::get_fragment_interpreter(); const std::string s = builder.str(); - prog_data.fs.create(::glsl::program_domain::glsl_fragment_program, s); - prog_data.fs.compile(); + prog_data.fragment_shader.create(::glsl::program_domain::glsl_fragment_program, s); + prog_data.fragment_shader.compile(); } interpreter::cached_program* shader_interpreter::build_program(u64 compiler_options) { auto data = new interpreter::cached_program(); build_fs(compiler_options, *data); + build_vs(compiler_options, *data); data->prog.create(). - attach(m_vs). - attach(data->fs). + attach(data->vertex_shader). + attach(data->fragment_shader). link(); data->prog.uniforms[0] = GL_STREAM_BUFFER_START + 0; diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h index 551fa9a8cf..62075dbb4b 100644 --- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h +++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h @@ -59,7 +59,8 @@ namespace gl struct cached_program { - glsl::shader fs; + glsl::shader vertex_shader; + glsl::shader fragment_shader; glsl::program prog; texture_pool_allocator allocator; }; @@ -67,10 +68,10 @@ namespace gl class shader_interpreter { - glsl::shader m_vs; - std::unordered_map> m_program_cache; + using shader_cache_t = std::unordered_map>; + shader_cache_t m_program_cache; - void build_vs(); + void build_vs(u64 compiler_options, interpreter::cached_program& prog_data); void build_fs(u64 compiler_options, interpreter::cached_program& prog_data); interpreter::cached_program* build_program(u64 compiler_options); @@ -82,7 +83,7 @@ namespace gl void update_fragment_textures(const std::array, 16>& descriptors, u16 reference_mask, u32* out); - glsl::program* get(const interpreter::program_metadata& fp_metadata); + glsl::program* get(const interpreter::program_metadata& fp_metadata, u32 vp_ctrl, u32 fp_ctrl); bool is_interpreter(const glsl::program* program) const; }; } diff --git a/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl b/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl index e41fda1782..e60bc51d92 100644 --- a/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl +++ b/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl @@ -368,11 +368,11 @@ vec4 read_src(const in int index) case RSX_VP_REGISTER_TYPE_CONSTANT: if (d3.index_const) { - value = vc[d1.const_src + ref(a[d0.addr_reg_sel_1], d0.addr_swz)]; + value = _fetch_constant(d1.const_src + ref(a[d0.addr_reg_sel_1], d0.addr_swz)); } else { - value = vc[d1.const_src]; + value = _fetch_constant(d1.const_src); } break; } diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl index dfe7252ca8..b188b224ba 100644 --- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl +++ b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl @@ -70,6 +70,12 @@ vec4 _fetch_constant(const in int base_offset) const int corrected_offset = constants_addressing_lookup[indirection_offset]; return instanced_constants_array[corrected_offset]; } + +vec4 _fetch_constant(const in uint base_offset) +{ + // uint override + return _fetch_constant(int(base_offset)); +} #else #define _fetch_constant(x) vc[x] #endif diff --git a/rpcs3/Emu/RSX/Program/ShaderInterpreter.h b/rpcs3/Emu/RSX/Program/ShaderInterpreter.h index a397aa2cb3..5503a2870c 100644 --- a/rpcs3/Emu/RSX/Program/ShaderInterpreter.h +++ b/rpcs3/Emu/RSX/Program/ShaderInterpreter.h @@ -6,19 +6,22 @@ namespace program_common { enum compiler_option { - COMPILER_OPT_ENABLE_TEXTURES = 1, - COMPILER_OPT_ENABLE_DEPTH_EXPORT = 2, - COMPILER_OPT_ENABLE_F32_EXPORT = 4, - COMPILER_OPT_ENABLE_ALPHA_TEST_GE = 8, - COMPILER_OPT_ENABLE_ALPHA_TEST_G = 16, - COMPILER_OPT_ENABLE_ALPHA_TEST_LE = 32, - COMPILER_OPT_ENABLE_ALPHA_TEST_L = 64, - COMPILER_OPT_ENABLE_ALPHA_TEST_EQ = 128, - COMPILER_OPT_ENABLE_ALPHA_TEST_NE = 256, - COMPILER_OPT_ENABLE_FLOW_CTRL = 512, - COMPILER_OPT_ENABLE_PACKING = 1024, - COMPILER_OPT_ENABLE_KIL = 2048, - COMPILER_OPT_ENABLE_STIPPLING = 4096 + COMPILER_OPT_ENABLE_TEXTURES = (1 << 0), + COMPILER_OPT_ENABLE_DEPTH_EXPORT = (1 << 1), + COMPILER_OPT_ENABLE_F32_EXPORT = (1 << 2), + COMPILER_OPT_ENABLE_ALPHA_TEST_GE = (1 << 3), + COMPILER_OPT_ENABLE_ALPHA_TEST_G = (1 << 4), + COMPILER_OPT_ENABLE_ALPHA_TEST_LE = (1 << 5), + COMPILER_OPT_ENABLE_ALPHA_TEST_L = (1 << 6), + COMPILER_OPT_ENABLE_ALPHA_TEST_EQ = (1 << 7), + COMPILER_OPT_ENABLE_ALPHA_TEST_NE = (1 << 8), + COMPILER_OPT_ENABLE_FLOW_CTRL = (1 << 9), + COMPILER_OPT_ENABLE_PACKING = (1 << 10), + COMPILER_OPT_ENABLE_KIL = (1 << 11), + COMPILER_OPT_ENABLE_STIPPLING = (1 << 12), + COMPILER_OPT_ENABLE_INSTANCING = (1 << 13), + + COMPILER_OPT_MAX = COMPILER_OPT_ENABLE_INSTANCING }; static std::string get_vertex_interpreter() From 9f3eb33d8044c27716ef808a10b0c51903c5fd09 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 16 Mar 2025 00:10:01 +0300 Subject: [PATCH 117/529] gl: Double instancing buffer size to improve frametimes --- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index bb360382d0..c7f7f277e5 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -325,7 +325,7 @@ void GLGSRender::on_init_thread() m_vertex_layout_buffer->create(gl::buffer::target::uniform, 16 * 0x100000); m_raster_env_ring_buffer->create(gl::buffer::target::uniform, 16 * 0x100000); m_scratch_ring_buffer->create(gl::buffer::target::uniform, 16 * 0x100000); - m_instancing_ring_buffer->create(gl::buffer::target::ssbo, 64 * 0x100000); + m_instancing_ring_buffer->create(gl::buffer::target::ssbo, 128 * 0x100000); if (shadermode == shader_mode::async_with_interpreter || shadermode == shader_mode::interpreter_only) { From 14575f3efdfff18e2a14cf88f4aee8d7d81da873 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 16 Mar 2025 01:54:39 +0300 Subject: [PATCH 118/529] rsx: Always initialize CC register in FP interpreter --- .../Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl b/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl index 58510363ca..0af25a0150 100644 --- a/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl +++ b/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl @@ -531,6 +531,10 @@ void initialize() vr0 = vec4(abs(wpos_scale), wpos_scale, 1., 1.); vr1 = vec4(0., wpos_bias, 0., 0.); wpos = gl_FragCoord * vr0 + vr1; + + // Other + cc[0] = vr_zero; + cc[1] = vr_zero; })" R"( From 023221bd3b2866cc639c5855ca1a5f60c5b3dc22 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 16 Mar 2025 01:55:34 +0300 Subject: [PATCH 119/529] gl: Reimplement driver capabilities detection in a more sane way --- rpcs3/Emu/RSX/GL/GLDraw.cpp | 2 +- rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 2 +- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 6 +- rpcs3/Emu/RSX/GL/GLTexture.cpp | 2 +- rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp | 2 +- rpcs3/Emu/RSX/GL/glutils/capabilities.cpp | 211 ++++++--------------- rpcs3/Emu/RSX/GL/glutils/capabilities.h | 15 +- rpcs3/Emu/RSX/GL/glutils/common.h | 8 +- rpcs3/Emu/RSX/GL/glutils/image.cpp | 6 +- 9 files changed, 78 insertions(+), 176 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLDraw.cpp b/rpcs3/Emu/RSX/GL/GLDraw.cpp index 8606023ebe..9d2bf887c4 100644 --- a/rpcs3/Emu/RSX/GL/GLDraw.cpp +++ b/rpcs3/Emu/RSX/GL/GLDraw.cpp @@ -155,7 +155,7 @@ void GLGSRender::update_draw_state() gl_state.depth_func(gl::comparison_op(rsx::method_registers.depth_func())); } - if (gl::get_driver_caps().EXT_depth_bounds_test && (gl_state.enable(rsx::method_registers.depth_bounds_test_enabled(), GL_DEPTH_BOUNDS_TEST_EXT))) + if (gl::get_driver_caps().EXT_depth_bounds_test_supported && (gl_state.enable(rsx::method_registers.depth_bounds_test_enabled(), GL_DEPTH_BOUNDS_TEST_EXT))) { gl_state.depth_bounds(rsx::method_registers.depth_bounds_min(), rsx::method_registers.depth_bounds_max()); } diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index 1731772911..3f65be3bae 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -54,7 +54,7 @@ void GLFragmentDecompilerThread::insertHeader(std::stringstream & OS) } else { - ensure(driver_caps.ARB_shader_texture_image_samples, "MSAA support on OpenGL requires a driver running OpenGL 4.5 or supporting GL_ARB_shader_texture_image_samples."); + ensure(driver_caps.ARB_shader_texture_image_samples_supported, "MSAA support on OpenGL requires a driver running OpenGL 4.5 or supporting GL_ARB_shader_texture_image_samples."); required_extensions.push_back("GL_ARB_shader_texture_image_samples"); } } diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index c7f7f277e5..6101bd70c1 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -151,12 +151,12 @@ void GLGSRender::on_init_thread() auto& gl_caps = gl::get_driver_caps(); std::vector exception_reasons; - if (!gl_caps.ARB_texture_buffer_supported) + if (!gl_caps.ARB_texture_buffer_object_supported) { exception_reasons.push_back("GL_ARB_texture_buffer_object is required but not supported by your GPU"); } - if (!gl_caps.ARB_dsa_supported && !gl_caps.EXT_dsa_supported) + if (!gl_caps.ARB_direct_state_access_supported && !gl_caps.EXT_direct_state_access_supported) { exception_reasons.push_back("GL_ARB_direct_state_access or GL_EXT_direct_state_access is required but not supported by your GPU"); } @@ -198,7 +198,7 @@ void GLGSRender::on_init_thread() backend_config.supports_normalized_barycentrics = false; } - if (gl_caps.AMD_pinned_memory && g_cfg.video.host_label_synchronization) + if (gl_caps.AMD_pinned_memory_supported && g_cfg.video.host_label_synchronization) { backend_config.supports_host_gpu_labels = true; diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp index 36b4ffafa6..a0711d52d7 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.cpp +++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp @@ -631,7 +631,7 @@ namespace gl { const GLsizei size = layout.width_in_block * layout.height_in_block * format_block_size; ensure(usz(size) <= staging_buffer.size()); - if (gl::get_driver_caps().ARB_dsa_supported) + if (gl::get_driver_caps().ARB_direct_state_access_supported) { glCompressedTextureSubImage3D(dst->id(), layout.level, 0, 0, layout.layer, layout.width_in_texel, layout.height_in_texel, 1, gl_format, size, staging_buffer.data()); } diff --git a/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp b/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp index d049359b84..5c1f0d0447 100644 --- a/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp +++ b/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp @@ -162,7 +162,7 @@ namespace gl void buffer::copy_to(buffer* other, u64 src_offset, u64 dst_offset, u64 size) { - if (get_driver_caps().ARB_dsa_supported) + if (get_driver_caps().ARB_direct_state_access_supported) { glCopyNamedBufferSubData(this->id(), other->id(), src_offset, dst_offset, size); } diff --git a/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp b/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp index 9a5cbf9c12..d6a51beb09 100644 --- a/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp +++ b/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp @@ -3,6 +3,8 @@ #include "Utilities/StrUtil.h" +#include + namespace gl { version_info::version_info(const char* version_string, int major_scale) @@ -20,20 +22,8 @@ namespace gl version = static_cast(version_major * major_scale) + version_minor; } - bool capabilities::check(const std::string& ext_name, const char* test) - { - if (ext_name == test) - { - rsx_log.notice("Extension %s is supported", ext_name); - return true; - } - - return false; - } - void capabilities::initialize() { - int find_count = 19; int ext_count = 0; glGetIntegerv(GL_NUM_EXTENSIONS, &ext_count); @@ -47,146 +37,61 @@ namespace gl std::string version_string = reinterpret_cast(glGetString(GL_VERSION)); std::string renderer_string = reinterpret_cast(glGetString(GL_RENDERER)); + std::unordered_set all_extensions; for (int i = 0; i < ext_count; i++) { - if (!find_count) break; - - const std::string ext_name = reinterpret_cast(glGetStringi(GL_EXTENSIONS, i)); - - if (check(ext_name, "GL_ARB_shader_draw_parameters")) - { - ARB_shader_draw_parameters_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_EXT_direct_state_access")) - { - EXT_dsa_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_direct_state_access")) - { - ARB_dsa_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_bindless_texture")) - { - ARB_bindless_texture_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_buffer_storage")) - { - ARB_buffer_storage_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_texture_buffer_object")) - { - ARB_texture_buffer_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_depth_buffer_float")) - { - ARB_depth_buffer_float_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_texture_barrier")) - { - ARB_texture_barrier_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_NV_texture_barrier")) - { - NV_texture_barrier_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_NV_gpu_shader5")) - { - NV_gpu_shader5_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_AMD_gpu_shader_half_float")) - { - AMD_gpu_shader_half_float_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_compute_shader")) - { - ARB_compute_shader_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_EXT_depth_bounds_test")) - { - EXT_depth_bounds_test = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_NV_depth_buffer_float")) - { - NV_depth_buffer_float_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_shader_stencil_export")) - { - ARB_shader_stencil_export_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_NV_fragment_shader_barycentric")) - { - NV_fragment_shader_barycentric_supported = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_AMD_pinned_memory")) - { - AMD_pinned_memory = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_ARB_shader_texture_image_samples")) - { - ARB_shader_texture_image_samples = true; - find_count--; - continue; - } - - if (check(ext_name, "GL_EXT_texture_compression_s3tc")) - { - EXT_texture_compression_s3tc_supported = true; - find_count--; - continue; - } + all_extensions.emplace(reinterpret_cast(glGetStringi(GL_EXTENSIONS, i))); } +#define CHECK_EXTENSION_SUPPORT(extension_short_name)\ + do {\ + if (all_extensions.contains("GL_"#extension_short_name)) {\ + extension_short_name##_supported = true;\ + rsx_log.success("[CAPS] Using GL_"#extension_short_name);\ + continue;\ + } \ + } while (0) + + CHECK_EXTENSION_SUPPORT(ARB_shader_draw_parameters); + + CHECK_EXTENSION_SUPPORT(EXT_direct_state_access); + + CHECK_EXTENSION_SUPPORT(ARB_direct_state_access); + + CHECK_EXTENSION_SUPPORT(ARB_bindless_texture); + + CHECK_EXTENSION_SUPPORT(ARB_buffer_storage); + + CHECK_EXTENSION_SUPPORT(ARB_texture_buffer_object); + + CHECK_EXTENSION_SUPPORT(ARB_depth_buffer_float); + + CHECK_EXTENSION_SUPPORT(ARB_texture_barrier); + + CHECK_EXTENSION_SUPPORT(NV_texture_barrier); + + CHECK_EXTENSION_SUPPORT(NV_gpu_shader5); + + CHECK_EXTENSION_SUPPORT(AMD_gpu_shader_half_float); + + CHECK_EXTENSION_SUPPORT(ARB_compute_shader); + + CHECK_EXTENSION_SUPPORT(EXT_depth_bounds_test); + + CHECK_EXTENSION_SUPPORT(NV_depth_buffer_float); + + CHECK_EXTENSION_SUPPORT(ARB_shader_stencil_export); + + CHECK_EXTENSION_SUPPORT(NV_fragment_shader_barycentric); + + CHECK_EXTENSION_SUPPORT(AMD_pinned_memory); + + CHECK_EXTENSION_SUPPORT(ARB_shader_texture_image_samples); + + CHECK_EXTENSION_SUPPORT(EXT_texture_compression_s3tc); + +#undef CHECK_EXTENSION_SUPPORT + // Set GLSL version glsl_version = version_info(reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION))); @@ -228,17 +133,17 @@ namespace gl // Texture buffers moved into core at GL 3.3 if (version_major > 3 || (version_major == 3 && version_minor >= 3)) - ARB_texture_buffer_supported = true; + ARB_texture_buffer_object_supported = true; // Check for expected library entry-points for some required functions if (!ARB_buffer_storage_supported && glNamedBufferStorage && glMapNamedBufferRange) ARB_buffer_storage_supported = true; - if (!ARB_dsa_supported && glGetTextureImage && glTextureBufferRange) - ARB_dsa_supported = true; + if (!ARB_direct_state_access_supported && glGetTextureImage && glTextureBufferRange) + ARB_direct_state_access_supported = true; - if (!EXT_dsa_supported && glGetTextureImageEXT && glTextureBufferRangeEXT) - EXT_dsa_supported = true; + if (!EXT_direct_state_access_supported && glGetTextureImageEXT && glTextureBufferRangeEXT) + EXT_direct_state_access_supported = true; } else if (!vendor_MESA && vendor_string.find("nvidia") != umax) { diff --git a/rpcs3/Emu/RSX/GL/glutils/capabilities.h b/rpcs3/Emu/RSX/GL/glutils/capabilities.h index 70ac5e9ae2..756250430b 100644 --- a/rpcs3/Emu/RSX/GL/glutils/capabilities.h +++ b/rpcs3/Emu/RSX/GL/glutils/capabilities.h @@ -23,13 +23,13 @@ namespace gl bool initialized = false; version_info glsl_version; - bool EXT_dsa_supported = false; - bool EXT_depth_bounds_test = false; - bool AMD_pinned_memory = false; - bool ARB_dsa_supported = false; + bool EXT_direct_state_access_supported = false; + bool EXT_depth_bounds_test_supported = false; + bool AMD_pinned_memory_supported = false; + bool ARB_direct_state_access_supported = false; bool ARB_bindless_texture_supported = false; bool ARB_buffer_storage_supported = false; - bool ARB_texture_buffer_supported = false; + bool ARB_texture_buffer_object_supported = false; bool ARB_shader_draw_parameters_supported = false; bool ARB_depth_buffer_float_supported = false; bool ARB_texture_barrier_supported = false; @@ -40,7 +40,7 @@ namespace gl bool ARB_compute_shader_supported = false; bool NV_depth_buffer_float_supported = false; bool NV_fragment_shader_barycentric_supported = false; - bool ARB_shader_texture_image_samples = false; + bool ARB_shader_texture_image_samples_supported = false; bool EXT_texture_compression_s3tc_supported = false; bool vendor_INTEL = false; // has broken GLSL compiler @@ -52,9 +52,6 @@ namespace gl bool subvendor_ATI = false; // Pre-GCN cards (terascale, evergreen) void initialize(); - - private: - bool check(const std::string& ext_name, const char* test); }; const capabilities& get_driver_caps(); diff --git a/rpcs3/Emu/RSX/GL/glutils/common.h b/rpcs3/Emu/RSX/GL/glutils/common.h index be6d340ad7..f99c3590a6 100644 --- a/rpcs3/Emu/RSX/GL/glutils/common.h +++ b/rpcs3/Emu/RSX/GL/glutils/common.h @@ -27,24 +27,24 @@ //Function call wrapped in ARB_DSA vs EXT_DSA compat check #define DSA_CALL(func, object_name, target, ...)\ - if (::gl::get_driver_caps().ARB_dsa_supported)\ + if (::gl::get_driver_caps().ARB_direct_state_access_supported)\ gl##func(object_name, __VA_ARGS__);\ else\ gl##func##EXT(object_name, target, __VA_ARGS__); #define DSA_CALL2(func, ...)\ - if (::gl::get_driver_caps().ARB_dsa_supported)\ + if (::gl::get_driver_caps().ARB_direct_state_access_supported)\ gl##func(__VA_ARGS__);\ else\ gl##func##EXT(__VA_ARGS__); #define DSA_CALL2_RET(func, ...)\ - (::gl::get_driver_caps().ARB_dsa_supported) ?\ + (::gl::get_driver_caps().ARB_direct_state_access_supported) ?\ gl##func(__VA_ARGS__) :\ gl##func##EXT(__VA_ARGS__) #define DSA_CALL3(funcARB, funcDSA, ...)\ - if (::gl::get_driver_caps().ARB_dsa_supported)\ + if (::gl::get_driver_caps().ARB_direct_state_access_supported)\ gl##funcARB(__VA_ARGS__);\ else\ gl##funcDSA##EXT(__VA_ARGS__); diff --git a/rpcs3/Emu/RSX/GL/glutils/image.cpp b/rpcs3/Emu/RSX/GL/glutils/image.cpp index 0e25301afe..bb6439cc05 100644 --- a/rpcs3/Emu/RSX/GL/glutils/image.cpp +++ b/rpcs3/Emu/RSX/GL/glutils/image.cpp @@ -201,7 +201,7 @@ namespace gl } case GL_TEXTURE_CUBE_MAP: { - if (get_driver_caps().ARB_dsa_supported) + if (get_driver_caps().ARB_direct_state_access_supported) { glTextureSubImage3D(m_id, level, region.x, region.y, region.z, region.width, region.height, region.depth, static_cast(format), static_cast(type), src); } @@ -246,12 +246,12 @@ namespace gl if (!region.x && !region.y && !region.z && region.width == m_width && region.height == m_height && region.depth == m_depth) { - if (caps.ARB_dsa_supported) + if (caps.ARB_direct_state_access_supported) glGetTextureImage(m_id, level, static_cast(format), static_cast(type), s32{ smax }, dst); else glGetTextureImageEXT(m_id, static_cast(m_target), level, static_cast(format), static_cast(type), dst); } - else if (caps.ARB_dsa_supported) + else if (caps.ARB_direct_state_access_supported) { glGetTextureSubImage(m_id, level, region.x, region.y, region.z, region.width, region.height, region.depth, static_cast(format), static_cast(type), s32{ smax }, dst); From 5ae05e26c4cf1a777bdd9498179daeb42547ecee Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 16 Mar 2025 03:38:18 +0300 Subject: [PATCH 120/529] vk: Implement instancing when running in interpreter mode --- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 12 ++++- rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp | 68 ++++++++++++++++-------- rpcs3/Emu/RSX/VK/VKShaderInterpreter.h | 19 +++++-- 3 files changed, 69 insertions(+), 30 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 8e834d3081..dd9d080ecd 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -1912,7 +1912,11 @@ bool VKGSRender::load_program() if (shadermode == shader_mode::interpreter_only) { - m_program = m_shader_interpreter.get(m_pipeline_properties, current_fp_metadata); + m_program = m_shader_interpreter.get( + m_pipeline_properties, + current_fp_metadata, + current_vertex_program.ctrl, + current_fragment_program.ctrl); return true; } } @@ -2007,7 +2011,11 @@ bool VKGSRender::load_program() // First load the next program if not available if (!m_program) { - m_program = m_shader_interpreter.get(m_pipeline_properties, current_fp_metadata); + m_program = m_shader_interpreter.get( + m_pipeline_properties, + current_fp_metadata, + current_vertex_program.ctrl, + current_fragment_program.ctrl); // Program has changed, reupload m_interpreter_state = rsx::invalidate_pipeline_bits; diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp index b31e8121e4..94deb013b1 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp @@ -12,7 +12,7 @@ namespace vk { - void shader_interpreter::build_vs() + glsl::shader* shader_interpreter::build_vs(u64 compiler_options) { ::glsl::shader_properties properties{}; properties.domain = ::glsl::program_domain::glsl_vertex_program; @@ -24,6 +24,10 @@ namespace vk std::string shader_str; ParamArray arr; VKVertexProgram vk_prog; + + null_prog.ctrl = (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING) + ? RSX_SHADER_CONTROL_INSTANCED_CONSTANTS + : 0; VKVertexDecompilerThread comp(null_prog, shader_str, arr, vk_prog); ParamType uniforms = { PF_PARAM_UNIFORM, "vec4" }; @@ -45,14 +49,25 @@ namespace vk " uvec4 vp_instructions[];\n" "};\n\n"; + if (compiler_options & program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING) + { + builder << "#define _ENABLE_INSTANCED_CONSTANTS\n"; + } + + if (compiler_options) + { + builder << "\n"; + } + ::glsl::insert_glsl_legacy_function(builder, properties); ::glsl::insert_vertex_input_fetch(builder, ::glsl::glsl_rules::glsl_rules_vulkan); builder << program_common::interpreter::get_vertex_interpreter(); const std::string s = builder.str(); - m_vs.create(::glsl::program_domain::glsl_vertex_program, s); - m_vs.compile(); + auto vs = std::make_unique(); + vs->create(::glsl::program_domain::glsl_vertex_program, s); + vs->compile(); // Prepare input table const auto& binding_table = vk::get_current_renderer()->get_pipeline_binding_table(); @@ -85,6 +100,10 @@ namespace vk m_vs_inputs.push_back(in); // TODO: Bind textures if needed + + auto ret = vs.get(); + m_shader_cache[compiler_options].m_vs = std::move(vs); + return ret; } glsl::shader* shader_interpreter::build_fs(u64 compiler_options) @@ -201,7 +220,7 @@ namespace vk builder << program_common::interpreter::get_fragment_interpreter(); const std::string s = builder.str(); - auto fs = new glsl::shader(); + auto fs = std::make_unique(); fs->create(::glsl::program_domain::glsl_fragment_program, s); fs->compile(); @@ -228,8 +247,9 @@ namespace vk m_fs_inputs.push_back(in); } - m_fs_cache[compiler_options].reset(fs); - return fs; + auto ret = fs.get(); + m_shader_cache[compiler_options].m_fs = std::move(fs); + return ret; } std::pair shader_interpreter::create_layout(VkDevice dev) @@ -359,10 +379,6 @@ namespace vk m_device = dev; std::tie(m_shared_descriptor_layout, m_shared_pipeline_layout) = create_layout(dev); create_descriptor_pools(dev); - - rsx_log.notice("Building global vertex program interpreter..."); - build_vs(); - // TODO: Seed the cache } void shader_interpreter::destroy() @@ -370,13 +386,13 @@ namespace vk m_program_cache.clear(); m_descriptor_pool.destroy(); - for (auto &fs : m_fs_cache) + for (auto &fs : m_shader_cache) { - fs.second->destroy(); + fs.second.m_vs->destroy(); + fs.second.m_fs->destroy(); } - m_vs.destroy(); - m_fs_cache.clear(); + m_shader_cache.clear(); if (m_shared_pipeline_layout) { @@ -393,21 +409,22 @@ namespace vk glsl::program* shader_interpreter::link(const vk::pipeline_props& properties, u64 compiler_opt) { - glsl::shader* fs; - if (auto found = m_fs_cache.find(compiler_opt); found != m_fs_cache.end()) + glsl::shader *fs, *vs; + if (auto found = m_shader_cache.find(compiler_opt); found != m_shader_cache.end()) { - fs = found->second.get(); + fs = found->second.m_fs.get(); + vs = found->second.m_vs.get(); } else { - rsx_log.notice("Compiling FS..."); fs = build_fs(compiler_opt); + vs = build_vs(compiler_opt); } VkPipelineShaderStageCreateInfo shader_stages[2] = {}; shader_stages[0].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; shader_stages[0].stage = VK_SHADER_STAGE_VERTEX_BIT; - shader_stages[0].module = m_vs.get_handle(); + shader_stages[0].module = vs->get_handle(); shader_stages[0].pName = "main"; shader_stages[1].sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; @@ -496,7 +513,11 @@ namespace vk return m_descriptor_pool.allocate(m_shared_descriptor_layout); } - glsl::program* shader_interpreter::get(const vk::pipeline_props& properties, const program_hash_util::fragment_program_utils::fragment_program_metadata& metadata) + glsl::program* shader_interpreter::get( + const vk::pipeline_props& properties, + const program_hash_util::fragment_program_utils::fragment_program_metadata& metadata, + u32 vp_ctrl, + u32 fp_ctrl) { pipeline_key key; key.compiler_opt = 0; @@ -531,13 +552,14 @@ namespace vk } } - if (rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_DEPTH_EXPORT; - if (rsx::method_registers.shader_control() & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT; - if (rsx::method_registers.shader_control() & RSX_SHADER_CONTROL_USES_KIL) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_KIL; + if (fp_ctrl & CELL_GCM_SHADER_CONTROL_DEPTH_EXPORT) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_DEPTH_EXPORT; + if (fp_ctrl & CELL_GCM_SHADER_CONTROL_32_BITS_EXPORTS) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_F32_EXPORT; + if (fp_ctrl & RSX_SHADER_CONTROL_USES_KIL) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_KIL; if (metadata.referenced_textures_mask) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_TEXTURES; if (metadata.has_branch_instructions) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_FLOW_CTRL; if (metadata.has_pack_instructions) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_PACKING; if (rsx::method_registers.polygon_stipple_enabled()) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_STIPPLING; + if (vp_ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS) key.compiler_opt |= program_common::interpreter::COMPILER_OPT_ENABLE_INSTANCING; if (m_current_key == key) [[likely]] { diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h index 0820f7f020..d359ca343e 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h @@ -12,8 +12,6 @@ namespace vk class shader_interpreter { - glsl::shader m_vs; - std::vector m_vs_inputs; std::vector m_fs_inputs; @@ -41,8 +39,14 @@ namespace vk } }; + struct shader_cache_entry_t + { + std::unique_ptr m_fs; + std::unique_ptr m_vs; + }; + std::unordered_map, key_hasher> m_program_cache; - std::unordered_map> m_fs_cache; + std::unordered_map m_shader_cache; rsx::simple_array m_descriptor_pool_sizes; vk::descriptor_pool m_descriptor_pool; @@ -55,7 +59,7 @@ namespace vk std::pair create_layout(VkDevice dev); void create_descriptor_pools(const vk::render_device& dev); - void build_vs(); + glsl::shader* build_vs(u64 compiler_opt); glsl::shader* build_fs(u64 compiler_opt); glsl::program* link(const vk::pipeline_props& properties, u64 compiler_opt); @@ -63,7 +67,12 @@ namespace vk void init(const vk::render_device& dev); void destroy(); - glsl::program* get(const vk::pipeline_props& properties, const program_hash_util::fragment_program_utils::fragment_program_metadata& metadata); + glsl::program* get( + const vk::pipeline_props& properties, + const program_hash_util::fragment_program_utils::fragment_program_metadata& metadata, + u32 vp_ctrl, + u32 fp_ctrl); + bool is_interpreter(const glsl::program* prog) const; u32 get_vertex_instruction_location() const; From aea1efd5f25af3436f2b42703490a3641888e9a9 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 16 Mar 2025 03:48:16 +0300 Subject: [PATCH 121/529] rsx: Fix instancing constants lookup layout when running interpreter --- rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp | 3 +++ rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp index f043947f1f..406ece755c 100644 --- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp @@ -131,6 +131,9 @@ namespace gl : 0; GLVertexDecompilerThread comp(null_prog, shader_str, arr); + // Initialize compiler properties + comp.properties.has_indexed_constants = true; + ParamType uniforms = { PF_PARAM_UNIFORM, "vec4" }; uniforms.items.emplace_back("vc[468]", -1); diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp index 94deb013b1..c0a713ec00 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp @@ -30,6 +30,9 @@ namespace vk : 0; VKVertexDecompilerThread comp(null_prog, shader_str, arr, vk_prog); + // Initialize compiler properties + comp.properties.has_indexed_constants = true; + ParamType uniforms = { PF_PARAM_UNIFORM, "vec4" }; uniforms.items.emplace_back("vc[468]", -1); From a1fa8dd70120856bd8c027293be99dbac3b1ad00 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 16 Mar 2025 18:28:04 +0300 Subject: [PATCH 122/529] config: Revert default shader compiler to async with draw-skip --- rpcs3/Emu/system_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index f68d9d0d28..eeebd7d132 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -130,7 +130,7 @@ struct cfg_root : cfg::node cfg::_enum frame_limit{ this, "Frame limit", frame_limit_type::_auto, true }; cfg::_float<0, 1000> second_frame_limit{ this, "Second Frame Limit", 0, true }; // 0 disables its effect cfg::_enum antialiasing_level{ this, "MSAA", msaa_level::_auto }; - cfg::_enum shadermode{ this, "Shader Mode", shader_mode::async_with_interpreter }; + cfg::_enum shadermode{ this, "Shader Mode", shader_mode::async_recompiler }; cfg::_enum shader_precision{ this, "Shader Precision", gpu_preset_level::high }; cfg::_bool write_color_buffers{ this, "Write Color Buffers" }; From 42ba0b62713e3ff1a95af6d7999b2108e195da7f Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 15 Mar 2025 14:00:29 +0100 Subject: [PATCH 123/529] Qt: Use localized game icons and titles --- rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp | 6 +- rpcs3/Emu/System.cpp | 39 ++++++++--- rpcs3/Emu/System.h | 6 ++ rpcs3/rpcs3qt/game_compatibility.cpp | 2 +- rpcs3/rpcs3qt/game_list_frame.cpp | 90 +++++++++++++++++-------- rpcs3/rpcs3qt/gui_application.cpp | 72 +++++++++++++++++++- rpcs3/rpcs3qt/gui_application.h | 5 ++ rpcs3/rpcs3qt/main_window.cpp | 4 +- rpcs3/rpcs3qt/main_window.h | 2 +- rpcs3/rpcs3qt/save_manager_dialog.cpp | 9 ++- rpcs3/rpcs3qt/trophy_manager_dialog.cpp | 11 ++- 11 files changed, 197 insertions(+), 49 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp index 0fc2cc5052..bb82cefffd 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp @@ -1382,9 +1382,11 @@ error_code sceNpTrophyGetGameIcon(u32 context, u32 handle, vm::ptr buffer, return SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT; } - fs::file icon_file(vfs::get("/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + ctxt->trp_name + "/ICON0.PNG")); + // Try to get icon in current language first + const std::string trophy_path = fmt::format("/dev_hdd0/home/%s/trophy/%s/", Emu.GetUsr(), ctxt->trp_name); + fs::file icon_file(vfs::get(fmt::format("%s/ICON0_%02d.PNG", trophy_path, static_cast(g_cfg.sys.language)))); - if (!icon_file) + if (!icon_file && !icon_file.open(vfs::get(fmt::format("%s/ICON0.PNG", trophy_path)))) { return SCE_NP_TROPHY_ERROR_UNKNOWN_FILE; } diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 391fbf1dae..68af9e4ffa 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -771,25 +771,40 @@ std::string Emulator::GetBackgroundPicturePath() const } constexpr auto search_barrier = "barrier"; + const std::string locale_suffix = fmt::format("_%02d", static_cast(g_cfg.sys.language.get())); std::initializer_list testees = { + m_sfo_dir + fmt::format("/PIC0%s.PNG", locale_suffix), + m_sfo_dir + fmt::format("/PIC1%s.PNG", locale_suffix), + m_sfo_dir + fmt::format("/PIC2%s.PNG", locale_suffix), + m_sfo_dir + fmt::format("/PIC3%s.PNG", locale_suffix), + search_barrier, m_sfo_dir + "/PIC0.PNG", m_sfo_dir + "/PIC1.PNG", m_sfo_dir + "/PIC2.PNG", m_sfo_dir + "/PIC3.PNG", search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/PIC0%s.PNG", locale_suffix)) : disc_dir, + !disc_dir.empty() ? (disc_dir + fmt::format("/PIC1%s.PNG", locale_suffix)) : disc_dir, + !disc_dir.empty() ? (disc_dir + fmt::format("/PIC2%s.PNG", locale_suffix)) : disc_dir, + !disc_dir.empty() ? (disc_dir + fmt::format("/PIC3%s.PNG", locale_suffix)) : disc_dir, + search_barrier, !disc_dir.empty() ? (disc_dir + "/PIC0.PNG") : disc_dir, !disc_dir.empty() ? (disc_dir + "/PIC1.PNG") : disc_dir, !disc_dir.empty() ? (disc_dir + "/PIC2.PNG") : disc_dir, !disc_dir.empty() ? (disc_dir + "/PIC3.PNG") : disc_dir, search_barrier, + m_sfo_dir + fmt::format("/ICON0%s.PNG", locale_suffix), + search_barrier, m_sfo_dir + "/ICON0.PNG", search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/ICON0%s.PNG", locale_suffix)) : disc_dir, + search_barrier, !disc_dir.empty() ? (disc_dir + "/ICON0.PNG") : disc_dir, }; - // Try to return the picture with the highest resultion + // Try to return the picture with the highest resolution // Be naive and assume that its the one that spans over the most bytes usz max_file_size = 0; usz index_of_largest_file = umax; @@ -1600,6 +1615,10 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch, g_backup_cfg.from_string(g_cfg.to_string()); } + // Get localized title + m_localized_title = std::string(psf::get_string(_psf, fmt::format("TITLE_%02d", static_cast(g_cfg.sys.language.get())), m_title)); + sys_log.notice("Localized Title: %s", GetLocalizedTitle()); + // Set RTM usage g_use_rtm = utils::has_rtm() && (((utils::has_mpx() && !utils::has_tsx_force_abort()) && g_cfg.core.enable_TSX == tsx_usage::enabled) || g_cfg.core.enable_TSX == tsx_usage::forced); @@ -2176,15 +2195,19 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch, { sys_log.notice("Title was set from %s to %s", m_title, bdvd_title); m_title = bdvd_title; + + const auto localized_title = psf::get_string(disc_psf_obj, fmt::format("TITLE_%02d", static_cast(g_cfg.sys.language.get())), m_title); + if (m_localized_title != localized_title) + { + sys_log.notice("Localized Title was set from %s to %s", m_localized_title, localized_title); + m_localized_title = std::move(localized_title); + } } } - for (auto& c : m_title) - { - // Replace newlines with spaces - if (c == '\n') - c = ' '; - } + // Replace newlines with spaces + std::replace(m_title.begin(), m_title.end(), '\n', ' '); + std::replace(m_localized_title.begin(), m_localized_title.end(), '\n', ' '); // Mount /host_root/ if necessary (special value) if (g_cfg.vfs.host_root) @@ -3899,7 +3922,7 @@ std::string Emulator::GetFormattedTitle(double fps) const { rpcs3::title_format_data title_data; title_data.format = g_cfg.misc.title_format.to_string(); - title_data.title = GetTitle(); + title_data.title = GetLocalizedTitle(); title_data.title_id = GetTitleID(); title_data.renderer = g_cfg.video.renderer.to_string(); title_data.vulkan_adapter = g_cfg.video.vk.adapter.to_string(); diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index b74e78ff10..c3a7815201 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -141,6 +141,7 @@ class Emulator final std::string m_path_original; std::string m_title_id; std::string m_title; + std::string m_localized_title; std::string m_app_version; std::string m_hash; std::string m_cat; @@ -279,6 +280,11 @@ public: return m_title; } + const std::string& GetLocalizedTitle() const + { + return m_localized_title; + } + const std::string GetTitleAndTitleID() const { return m_title + (m_title_id.empty() ? "" : " [" + m_title_id + "]"); diff --git a/rpcs3/rpcs3qt/game_compatibility.cpp b/rpcs3/rpcs3qt/game_compatibility.cpp index 6a698d9936..e672cdb508 100644 --- a/rpcs3/rpcs3qt/game_compatibility.cpp +++ b/rpcs3/rpcs3qt/game_compatibility.cpp @@ -321,7 +321,7 @@ compat::package_info game_compatibility::GetPkgInfo(const QString& pkg_path, gam { if (const std::string localized_title = package.get_title(title_key); !localized_title.empty()) { - info.title= qstr(localized_title); + info.title = qstr(localized_title); } if (const std::string localized_changelog = package.get_changelog(changelog_key); !localized_changelog.empty()) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 4f699106d6..c52a5e4d6c 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -8,6 +8,7 @@ #include "persistent_settings.h" #include "emu_settings.h" #include "gui_settings.h" +#include "gui_application.h" #include "game_list_table.h" #include "game_list_grid.h" #include "game_list_grid_item.h" @@ -573,9 +574,13 @@ void game_list_frame::OnParsingFinished() sort(m_path_entries.begin(), m_path_entries.end(), [](const path_entry& l, const path_entry& r){return l.path < r.path;}); m_path_entries.erase(unique(m_path_entries.begin(), m_path_entries.end(), [](const path_entry& l, const path_entry& r){return l.path == r.path;}), m_path_entries.end()); + const s32 language_index = gui_application::get_language_id(); const std::string game_icon_path = fs::get_config_dir() + "/Icons/game_icons/"; + const std::string localized_title = fmt::format("TITLE_%02d", language_index); + const std::string localized_icon = fmt::format("ICON0_%02d.PNG", language_index); + const std::string localized_movie = fmt::format("ICON1_%02d.PAM", language_index); - const auto add_game = [this, dev_flash, cat_unknown_localized = localized.category.unknown.toStdString(), cat_unknown = cat::cat_unknown.toStdString(), game_icon_path, _hdd, play_hover_movies = m_play_hover_movies, show_custom_icons = m_show_custom_icons](const std::string& dir_or_elf) + const auto add_game = [this, localized_title, localized_icon, localized_movie, dev_flash, cat_unknown_localized = localized.category.unknown.toStdString(), cat_unknown = cat::cat_unknown.toStdString(), game_icon_path, _hdd, play_hover_movies = m_play_hover_movies, show_custom_icons = m_show_custom_icons](const std::string& dir_or_elf) { GameInfo game{}; game.path = dir_or_elf; @@ -624,8 +629,11 @@ void game_list_frame::OnParsingFinished() } else { + std::string_view name = psf::get_string(psf, localized_title); + if (name.empty()) name = psf::get_string(psf, "TITLE", cat_unknown_localized); + game.serial = std::string(title_id); - game.name = std::string(psf::get_string(psf, "TITLE", cat_unknown_localized)); + game.name = std::string(name); game.app_ver = std::string(psf::get_string(psf, "APP_VER", cat_unknown_localized)); game.version = std::string(psf::get_string(psf, "VERSION", cat_unknown_localized)); game.category = std::string(psf::get_string(psf, "CATEGORY", cat_unknown)); @@ -635,23 +643,6 @@ void game_list_frame::OnParsingFinished() game.sound_format = psf::get_integer(psf, "SOUND_FORMAT", 0); game.bootable = psf::get_integer(psf, "BOOTABLE", 0); game.attr = psf::get_integer(psf, "ATTRIBUTE", 0); - game.icon_path = sfo_dir + "/ICON0.PNG"; - game.movie_path = sfo_dir + "/ICON1.PAM"; - - if (game.category == "DG") - { - const std::string game_data_dir = _hdd + "game/" + game.serial; - - if (std::string latest_icon = game_data_dir + "/ICON0.PNG"; fs::is_file(latest_icon)) - { - game.icon_path = std::move(latest_icon); - } - - if (std::string latest_movie = game_data_dir + "/ICON1.PAM"; fs::is_file(latest_movie)) - { - game.movie_path = std::move(latest_movie); - } - } } if (show_custom_icons) @@ -662,6 +653,30 @@ void game_list_frame::OnParsingFinished() } } + if (game.icon_path.empty()) + { + if (std::string icon_path = sfo_dir + "/" + localized_icon; fs::is_file(icon_path)) + { + game.icon_path = std::move(icon_path); + } + else + { + game.icon_path = sfo_dir + "/ICON0.PNG"; + } + } + + if (game.movie_path.empty()) + { + if (std::string movie_path = sfo_dir + "/" + localized_movie; fs::is_file(movie_path)) + { + game.movie_path = std::move(movie_path); + } + else if (std::string movie_path = sfo_dir + "/ICON1.PAM"; fs::is_file(movie_path)) + { + game.movie_path = std::move(movie_path); + } + } + const QString serial = qstr(game.serial); m_games_mutex.lock(); @@ -720,13 +735,7 @@ void game_list_frame::OnParsingFinished() info.hasCustomConfig = fs::is_file(rpcs3::utils::get_custom_config_path(info.info.serial)); info.hasCustomPadConfig = fs::is_file(rpcs3::utils::get_custom_input_config_path(info.info.serial)); info.has_hover_gif = fs::is_file(game_icon_path + info.info.serial + "/hover.gif"); - info.has_hover_pam = fs::is_file(info.info.movie_path); - - // Free some memory - if (!info.has_hover_pam) - { - info.info.movie_path.clear(); - } + info.has_hover_pam = !info.info.movie_path.empty(); m_games.push(std::make_shared(std::move(info))); }; @@ -837,14 +846,21 @@ void game_list_frame::OnRefreshFinished() const Localized localized; const std::string cat_unknown_localized = localized.category.unknown.toStdString(); + const s32 language_index = gui_application::get_language_id(); + const std::string localized_icon = fmt::format("ICON0_%02d.PNG", language_index); + const std::string localized_movie = fmt::format("ICON1_%02d.PAM", language_index); // Try to update the app version for disc games if there is a patch + // Also try to find updated game icons and movies for (const game_info& entry : m_game_data) { if (entry->info.category != "DG") continue; for (const auto& other : m_game_data) { + if (other->info.category == "DG") continue; + if (entry->info.serial != other->info.serial) continue; + // The patch is game data and must have the same serial and an app version static constexpr auto version_is_bigger = [](const std::string& v0, const std::string& v1, const std::string& serial, bool is_fw) { @@ -861,7 +877,7 @@ void game_list_frame::OnRefreshFinished() return false; }; - if (entry->info.serial == other->info.serial && other->info.category != "DG" && other->info.app_ver != cat_unknown_localized) + if (other->info.app_ver != cat_unknown_localized) { // Update the app version if it's higher than the disc's version (old games may not have an app version) if (entry->info.app_ver == cat_unknown_localized || version_is_bigger(other->info.app_ver, entry->info.app_ver, entry->info.serial, true)) @@ -879,6 +895,26 @@ void game_list_frame::OnRefreshFinished() entry->info.parental_lvl = other->info.parental_lvl; } } + + if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path)) + { + entry->info.icon_path = std::move(icon_path); + } + else if (std::string icon_path = other->info.path + "/ICON0.PNG"; fs::is_file(icon_path)) + { + entry->info.icon_path = std::move(icon_path); + } + + if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path)) + { + entry->info.movie_path = std::move(movie_path); + entry->has_hover_pam = true; + } + else if (std::string movie_path = other->info.path + "/ICON1.PAM"; fs::is_file(movie_path)) + { + entry->info.movie_path = std::move(movie_path); + entry->has_hover_pam = true; + } } } diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 3024234c17..077e05ca68 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -21,6 +21,7 @@ #endif #include "Emu/Audio/audio_utils.h" +#include "Emu/Cell/Modules/cellSysutil.h" #include "Emu/Io/Null/null_camera_handler.h" #include "Emu/Io/Null/null_music_handler.h" #include "Emu/vfs_config.h" @@ -66,6 +67,8 @@ LOG_CHANNEL(gui_log, "GUI"); std::unique_ptr g_raw_mouse_handler; +s32 gui_application::m_language_id = static_cast(CELL_SYSUTIL_LANG_ENGLISH_US); + [[noreturn]] void report_fatal_error(std::string_view text, bool is_html = false, bool include_help_text = true); gui_application::gui_application(int& argc, char** argv) : QApplication(argc, argv) @@ -228,13 +231,13 @@ void gui_application::SwitchTranslator(QTranslator& translator, const QString& f installTranslator(&translator); } } - else if (const QString default_code = QLocale(QLocale::English).bcp47Name(); language_code != default_code) + else if (QString default_code = QLocale(QLocale::English).bcp47Name(); language_code != default_code) { // show error, but ignore default case "en", since it is handled in source code gui_log.error("No translation file found in: %s", file_path); // reset current language to default "en" - m_language_code = default_code; + set_language_code(std::move(default_code)); } } @@ -245,7 +248,7 @@ void gui_application::LoadLanguage(const QString& language_code) return; } - m_language_code = language_code; + set_language_code(language_code); const QLocale locale = QLocale(language_code); const QString locale_name = QLocale::languageToString(locale.language()); @@ -307,6 +310,69 @@ QStringList gui_application::GetAvailableLanguageCodes() return language_codes; } +void gui_application::set_language_code(QString language_code) +{ + m_language_code = language_code; + + // Transform language code to lowercase and use '-' + language_code = language_code.toLower().replace("_", "-"); + + // Try to find the CELL language ID for this language code + static const std::map language_ids = { + {"ja", CELL_SYSUTIL_LANG_JAPANESE }, + {"en", CELL_SYSUTIL_LANG_ENGLISH_US }, + {"en-us", CELL_SYSUTIL_LANG_ENGLISH_US }, + {"en-gb", CELL_SYSUTIL_LANG_ENGLISH_GB }, + {"fr", CELL_SYSUTIL_LANG_FRENCH }, + {"es", CELL_SYSUTIL_LANG_SPANISH }, + {"de", CELL_SYSUTIL_LANG_GERMAN }, + {"it", CELL_SYSUTIL_LANG_ITALIAN }, + {"nl", CELL_SYSUTIL_LANG_DUTCH }, + {"pt", CELL_SYSUTIL_LANG_PORTUGUESE_PT }, + {"pt-pt", CELL_SYSUTIL_LANG_PORTUGUESE_PT }, + {"pt-br", CELL_SYSUTIL_LANG_PORTUGUESE_BR }, + {"ru", CELL_SYSUTIL_LANG_RUSSIAN }, + {"ko", CELL_SYSUTIL_LANG_KOREAN }, + {"zh", CELL_SYSUTIL_LANG_CHINESE_T }, + {"zh-hant", CELL_SYSUTIL_LANG_CHINESE_T }, + {"zh-hans", CELL_SYSUTIL_LANG_CHINESE_S }, + {"fi", CELL_SYSUTIL_LANG_FINNISH }, + {"sv", CELL_SYSUTIL_LANG_SWEDISH }, + {"da", CELL_SYSUTIL_LANG_DANISH }, + {"no", CELL_SYSUTIL_LANG_NORWEGIAN }, + {"nn", CELL_SYSUTIL_LANG_NORWEGIAN }, + {"nb", CELL_SYSUTIL_LANG_NORWEGIAN }, + {"pl", CELL_SYSUTIL_LANG_POLISH }, + {"tr", CELL_SYSUTIL_LANG_TURKISH }, + }; + + // Check direct match first + const auto it = language_ids.find(language_code); + if (it != language_ids.cend()) + { + m_language_id = static_cast(it->second); + return; + } + + // Try to find closest match + for (const auto& [code, id] : language_ids) + { + if (language_code.startsWith(code)) + { + m_language_id = static_cast(id); + return; + } + } + + // Fallback to English (US) + m_language_id = static_cast(CELL_SYSUTIL_LANG_ENGLISH_US); +} + +s32 gui_application::get_language_id() +{ + return m_language_id; +} + void gui_application::InitializeConnects() { connect(&m_timer, &QTimer::timeout, this, &gui_application::UpdatePlaytime); diff --git a/rpcs3/rpcs3qt/gui_application.h b/rpcs3/rpcs3qt/gui_application.h index a09e7bb895..bec8424da4 100644 --- a/rpcs3/rpcs3qt/gui_application.h +++ b/rpcs3/rpcs3qt/gui_application.h @@ -69,6 +69,8 @@ public: /** Call this method before calling app.exec */ bool Init() override; + static s32 get_language_id(); + std::unique_ptr get_gs_frame(); main_window* m_main_window = nullptr; @@ -90,6 +92,8 @@ private: void UpdatePlaytime(); void StopPlaytime(); + void set_language_code(QString language_code); + class native_event_filter : public QAbstractNativeEventFilter { public: @@ -99,6 +103,7 @@ private: QTranslator m_translator; QString m_language_code; + static s32 m_language_id; QTimer m_timer; QElapsedTimer m_timer_playtime; diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 9c5562d6a0..42301d2f42 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -2413,9 +2413,9 @@ void main_window::RepaintGui() Q_EMIT RequestDialogRepaint(); } -void main_window::RetranslateUI(const QStringList& language_codes, const QString& language) +void main_window::RetranslateUI(const QStringList& language_codes, const QString& language_code) { - UpdateLanguageActions(language_codes, language); + UpdateLanguageActions(language_codes, language_code); ui->retranslateUi(this); diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h index daaf2848aa..4cd7bc8498 100644 --- a/rpcs3/rpcs3qt/main_window.h +++ b/rpcs3/rpcs3qt/main_window.h @@ -111,7 +111,7 @@ public Q_SLOTS: void OnAddBreakpoint(u32 addr) const; void RepaintGui(); - void RetranslateUI(const QStringList& language_codes, const QString& language); + void RetranslateUI(const QStringList& language_codes, const QString& language_code); private Q_SLOTS: void OnPlayOrPause(); diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index 07b3f071e3..735d07217e 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -2,6 +2,7 @@ #include "custom_table_widget_item.h" #include "qt_utils.h" +#include "gui_application.h" #include "gui_settings.h" #include "persistent_settings.h" #include "game_list_delegate.h" @@ -405,11 +406,14 @@ void save_manager_dialog::UpdateIcons() m_list->resizeRowsToContents(); m_list->resizeColumnToContents(SaveColumns::Icon); + const s32 language_index = gui_application::get_language_id(); + const std::string localized_icon = fmt::format("ICON0_%02d.PNG", language_index); + for (int i = 0; i < m_list->rowCount(); ++i) { if (movie_item* icon_item = static_cast(m_list->item(i, SaveColumns::Icon))) { - icon_item->set_icon_load_func([this, cancel = icon_item->icon_loading_aborted(), dpr](int index) + icon_item->set_icon_load_func([this, cancel = icon_item->icon_loading_aborted(), dpr, localized_icon](int index) { if (cancel && cancel->load()) { @@ -428,7 +432,8 @@ void save_manager_dialog::UpdateIcons() const int idx_real = user_item->data(Qt::UserRole).toInt(); const SaveDataEntry& entry = ::at32(m_save_entries, idx_real); - if (!icon.load(QString::fromStdString(m_dir + entry.dirName + "/ICON0.PNG"))) + if (!icon.load(QString::fromStdString(m_dir + entry.dirName + "/" + localized_icon)) && + !icon.load(QString::fromStdString(m_dir + entry.dirName + "/ICON0.PNG"))) { gui_log.warning("Loading icon for save %s failed", entry.dirName); icon = QPixmap(320, 176); diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp index 1c525809ba..555f2a6f44 100644 --- a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp @@ -4,6 +4,7 @@ #include "game_list_delegate.h" #include "qt_utils.h" #include "game_list.h" +#include "gui_application.h" #include "gui_settings.h" #include "progress_dialog.h" #include "persistent_settings.h" @@ -579,15 +580,18 @@ void trophy_manager_dialog::ResizeGameIcons() ReadjustGameTable(); + const s32 language_index = gui_application::get_language_id(); + const QString localized_icon = QString::fromStdString(fmt::format("ICON0_%02d.PNG", language_index)); + for (int i = 0; i < m_game_table->rowCount(); ++i) { if (movie_item* item = static_cast(m_game_table->item(i, static_cast(gui::trophy_game_list_columns::icon)))) { const qreal dpr = devicePixelRatioF(); const int trophy_index = item->data(GameUserRole::GameIndex).toInt(); - const std::string icon_path = m_trophies_db[trophy_index]->path + "ICON0.PNG"; + const QString icon_path = QString::fromStdString(m_trophies_db[trophy_index]->path); - item->set_icon_load_func([this, icon_path, trophy_index, cancel = item->icon_loading_aborted(), dpr](int index) + item->set_icon_load_func([this, icon_path, localized_icon, trophy_index, cancel = item->icon_loading_aborted(), dpr](int index) { if (cancel && cancel->load()) { @@ -601,7 +605,8 @@ void trophy_manager_dialog::ResizeGameIcons() if (!item->data(GameUserRole::GamePixmapLoaded).toBool()) { // Load game icon - if (!icon.load(QString::fromStdString(icon_path))) + if (!icon.load(icon_path + localized_icon) && + !icon.load(icon_path + "ICON0.PNG")) { gui_log.warning("Could not load trophy game icon from path %s", icon_path); } From 6e080044a0954cb422be39e281f770ab4a207ebf Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 17 Mar 2025 12:41:52 +0100 Subject: [PATCH 124/529] Qt: fix code style of some variables --- rpcs3/rpcs3qt/game_list_base.cpp | 8 +++--- rpcs3/rpcs3qt/game_list_frame.cpp | 44 +++++++++++++++---------------- rpcs3/rpcs3qt/gui_game_info.h | 4 +-- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp index edc33634a8..a29388480b 100644 --- a/rpcs3/rpcs3qt/game_list_base.cpp +++ b/rpcs3/rpcs3qt/game_list_base.cpp @@ -73,7 +73,7 @@ void game_list_base::IconLoadFunction(game_info game, qreal device_pixel_ratio, const QColor color = GetGridCompatibilityColor(game->compat.color); { std::lock_guard lock(game->item->pixmap_mutex); - game->pxmap = PaintedPixmap(game->icon, device_pixel_ratio, game->hasCustomConfig, game->hasCustomPadConfig, color); + game->pxmap = PaintedPixmap(game->icon, device_pixel_ratio, game->has_custom_config, game->has_custom_pad_config, color); } if (!cancel || !cancel->load()) @@ -197,17 +197,17 @@ QIcon game_list_base::GetCustomConfigIcon(const game_info& game) static const QIcon icon_custom_config(":/Icons/custom_config.png"); static const QIcon icon_controllers(":/Icons/controllers.png"); - if (game->hasCustomConfig && game->hasCustomPadConfig) + if (game->has_custom_config && game->has_custom_pad_config) { return icon_combo_config_bordered; } - if (game->hasCustomConfig) + if (game->has_custom_config) { return icon_custom_config; } - if (game->hasCustomPadConfig) + if (game->has_custom_pad_config) { return icon_controllers; } diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index c52a5e4d6c..30e35a9392 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -732,8 +732,8 @@ void game_list_frame::OnParsingFinished() info.info = std::move(game); info.localized_category = std::move(qt_cat); info.compat = m_game_compat->GetCompatibility(info.info.serial); - info.hasCustomConfig = fs::is_file(rpcs3::utils::get_custom_config_path(info.info.serial)); - info.hasCustomPadConfig = fs::is_file(rpcs3::utils::get_custom_input_config_path(info.info.serial)); + info.has_custom_config = fs::is_file(rpcs3::utils::get_custom_config_path(info.info.serial)); + info.has_custom_pad_config = fs::is_file(rpcs3::utils::get_custom_input_config_path(info.info.serial)); info.has_hover_gif = fs::is_file(game_icon_path + info.info.serial + "/hover.gif"); info.has_hover_pam = !info.info.movie_path.empty(); @@ -1168,7 +1168,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) const bool is_current_running_game = is_game_running(current_game.serial); - QAction* boot = new QAction(gameinfo->hasCustomConfig + QAction* boot = new QAction(gameinfo->has_custom_config ? (is_current_running_game ? tr("&Reboot with global configuration") : tr("&Boot with global configuration")) @@ -1179,7 +1179,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) QFont font = boot->font(); font.setBold(true); - if (gameinfo->hasCustomConfig) + if (gameinfo->has_custom_config) { QAction* boot_custom = menu.addAction(is_current_running_game ? tr("&Reboot with custom configuration") @@ -1243,12 +1243,12 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) menu.addSeparator(); - QAction* configure = menu.addAction(gameinfo->hasCustomConfig + QAction* configure = menu.addAction(gameinfo->has_custom_config ? tr("&Change Custom Configuration") : tr("&Create Custom Configuration From Global Settings")); - QAction* create_game_default_config = gameinfo->hasCustomConfig ? nullptr + QAction* create_game_default_config = gameinfo->has_custom_config ? nullptr : menu.addAction(tr("&Create Custom Configuration From Default Settings")); - QAction* pad_configure = menu.addAction(gameinfo->hasCustomPadConfig + QAction* pad_configure = menu.addAction(gameinfo->has_custom_pad_config ? tr("&Change Custom Gamepad Configuration") : tr("&Create Custom Gamepad Configuration")); QAction* configure_patches = menu.addAction(tr("&Manage Game Patches")); @@ -1260,7 +1260,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) // Remove menu QMenu* remove_menu = menu.addMenu(tr("&Remove")); - if (gameinfo->hasCustomConfig) + if (gameinfo->has_custom_config) { QAction* remove_custom_config = remove_menu->addAction(tr("&Remove Custom Configuration")); connect(remove_custom_config, &QAction::triggered, [this, current_game, gameinfo]() @@ -1271,7 +1271,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) } }); } - if (gameinfo->hasCustomPadConfig) + if (gameinfo->has_custom_pad_config) { QAction* remove_custom_pad_config = remove_menu->addAction(tr("&Remove Custom Gamepad Configuration")); connect(remove_custom_pad_config, &QAction::triggered, [this, current_game, gameinfo]() @@ -1588,7 +1588,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) }); } - if (gameinfo->hasCustomConfig) + if (gameinfo->has_custom_config) { QAction* open_config_dir = open_folder_menu->addAction(tr("&Open Custom Config Folder")); connect(open_config_dir, &QAction::triggered, [current_game]() @@ -1675,9 +1675,9 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) connect(&dlg, &settings_dialog::EmuSettingsApplied, [this, gameinfo]() { - if (!gameinfo->hasCustomConfig) + if (!gameinfo->has_custom_config) { - gameinfo->hasCustomConfig = true; + gameinfo->has_custom_config = true; ShowCustomConfigIcon(gameinfo); } Q_EMIT NotifyEmuSettingsChange(); @@ -1700,9 +1700,9 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) { pad_settings_dialog dlg(m_gui_settings, this, ¤t_game); - if (dlg.exec() == QDialog::Accepted && !gameinfo->hasCustomPadConfig) + if (dlg.exec() == QDialog::Accepted && !gameinfo->has_custom_pad_config) { - gameinfo->hasCustomPadConfig = true; + gameinfo->has_custom_pad_config = true; ShowCustomConfigIcon(gameinfo); } }); @@ -2041,7 +2041,7 @@ bool game_list_frame::RemoveCustomConfiguration(const std::string& title_id, con { if (game) { - game->hasCustomConfig = false; + game->has_custom_config = false; } game_list_log.success("Removed configuration file: %s", path); } @@ -2084,7 +2084,7 @@ bool game_list_frame::RemoveCustomPadConfiguration(const std::string& title_id, { if (game) { - game->hasCustomPadConfig = false; + game->has_custom_pad_config = false; } if (!Emu.IsStopped(true) && Emu.GetTitleID() == title_id) { @@ -2556,7 +2556,7 @@ void game_list_frame::BatchRemoveCustomConfigurations() std::set serials; for (const auto& game : m_game_data) { - if (game->hasCustomConfig && !serials.count(game->info.serial)) + if (game->has_custom_config && !serials.count(game->info.serial)) { serials.emplace(game->info.serial); } @@ -2591,7 +2591,7 @@ void game_list_frame::BatchRemoveCustomPadConfigurations() std::set serials; for (const auto& game : m_game_data) { - if (game->hasCustomPadConfig && !serials.count(game->info.serial)) + if (game->has_custom_pad_config && !serials.count(game->info.serial)) { serials.emplace(game->info.serial); } @@ -2667,15 +2667,15 @@ void game_list_frame::ShowCustomConfigIcon(const game_info& game) } const std::string serial = game->info.serial; - const bool has_custom_config = game->hasCustomConfig; - const bool has_custom_pad_config = game->hasCustomPadConfig; + const bool has_custom_config = game->has_custom_config; + const bool has_custom_pad_config = game->has_custom_pad_config; for (const auto& other_game : m_game_data) { if (other_game->info.serial == serial) { - other_game->hasCustomConfig = has_custom_config; - other_game->hasCustomPadConfig = has_custom_pad_config; + other_game->has_custom_config = has_custom_config; + other_game->has_custom_pad_config = has_custom_pad_config; } } diff --git a/rpcs3/rpcs3qt/gui_game_info.h b/rpcs3/rpcs3qt/gui_game_info.h index 60f89ed9da..be6d49a864 100644 --- a/rpcs3/rpcs3qt/gui_game_info.h +++ b/rpcs3/rpcs3qt/gui_game_info.h @@ -15,8 +15,8 @@ struct gui_game_info compat::status compat; QPixmap icon; QPixmap pxmap; - bool hasCustomConfig = false; - bool hasCustomPadConfig = false; + bool has_custom_config = false; + bool has_custom_pad_config = false; bool has_hover_gif = false; bool has_hover_pam = false; movie_item_base* item = nullptr; From 5b540aed73c008f9b282116376ed6ce910aedb54 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 17 Mar 2025 12:55:09 +0100 Subject: [PATCH 125/529] Qt: Do not use gamedata icon if game has custom icon --- rpcs3/rpcs3qt/game_list_frame.cpp | 100 +++++++++++++++--------------- rpcs3/rpcs3qt/gui_game_info.h | 1 + 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 30e35a9392..99dcd5b151 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -582,8 +582,8 @@ void game_list_frame::OnParsingFinished() const auto add_game = [this, localized_title, localized_icon, localized_movie, dev_flash, cat_unknown_localized = localized.category.unknown.toStdString(), cat_unknown = cat::cat_unknown.toStdString(), game_icon_path, _hdd, play_hover_movies = m_play_hover_movies, show_custom_icons = m_show_custom_icons](const std::string& dir_or_elf) { - GameInfo game{}; - game.path = dir_or_elf; + gui_game_info game{}; + game.info.path = dir_or_elf; const Localized thread_localized; @@ -599,13 +599,13 @@ void game_list_frame::OnParsingFinished() return; } - game.serial = dir_or_elf.substr(dir_or_elf.find_last_of(fs::delim) + 1); - game.category = cat::cat_ps3_os.toStdString(); // Key for operating system executables - game.version = utils::get_firmware_version(); - game.app_ver = game.version; - game.fw = game.version; - game.bootable = 1; - game.icon_path = dev_flash + "vsh/resource/explore/icon/icon_home.png"; + game.info.serial = dir_or_elf.substr(dir_or_elf.find_last_of(fs::delim) + 1); + game.info.category = cat::cat_ps3_os.toStdString(); // Key for operating system executables + game.info.version = utils::get_firmware_version(); + game.info.app_ver = game.info.version; + game.info.fw = game.info.version; + game.info.bootable = 1; + game.info.icon_path = dev_flash + "vsh/resource/explore/icon/icon_home.png"; if (dir_or_elf.starts_with(dev_flash)) { @@ -618,13 +618,13 @@ void game_list_frame::OnParsingFinished() if (const auto it = thread_localized.title.titles.find(path_vfs); it != thread_localized.title.titles.cend()) { - game.name = it->second.toStdString(); + game.info.name = it->second.toStdString(); } } - if (game.name.empty()) + if (game.info.name.empty()) { - game.name = game.serial; + game.info.name = game.info.serial; } } else @@ -632,52 +632,53 @@ void game_list_frame::OnParsingFinished() std::string_view name = psf::get_string(psf, localized_title); if (name.empty()) name = psf::get_string(psf, "TITLE", cat_unknown_localized); - game.serial = std::string(title_id); - game.name = std::string(name); - game.app_ver = std::string(psf::get_string(psf, "APP_VER", cat_unknown_localized)); - game.version = std::string(psf::get_string(psf, "VERSION", cat_unknown_localized)); - game.category = std::string(psf::get_string(psf, "CATEGORY", cat_unknown)); - game.fw = std::string(psf::get_string(psf, "PS3_SYSTEM_VER", cat_unknown_localized)); - game.parental_lvl = psf::get_integer(psf, "PARENTAL_LEVEL", 0); - game.resolution = psf::get_integer(psf, "RESOLUTION", 0); - game.sound_format = psf::get_integer(psf, "SOUND_FORMAT", 0); - game.bootable = psf::get_integer(psf, "BOOTABLE", 0); - game.attr = psf::get_integer(psf, "ATTRIBUTE", 0); + game.info.serial = std::string(title_id); + game.info.name = std::string(name); + game.info.app_ver = std::string(psf::get_string(psf, "APP_VER", cat_unknown_localized)); + game.info.version = std::string(psf::get_string(psf, "VERSION", cat_unknown_localized)); + game.info.category = std::string(psf::get_string(psf, "CATEGORY", cat_unknown)); + game.info.fw = std::string(psf::get_string(psf, "PS3_SYSTEM_VER", cat_unknown_localized)); + game.info.parental_lvl = psf::get_integer(psf, "PARENTAL_LEVEL", 0); + game.info.resolution = psf::get_integer(psf, "RESOLUTION", 0); + game.info.sound_format = psf::get_integer(psf, "SOUND_FORMAT", 0); + game.info.bootable = psf::get_integer(psf, "BOOTABLE", 0); + game.info.attr = psf::get_integer(psf, "ATTRIBUTE", 0); } if (show_custom_icons) { - if (std::string icon_path = game_icon_path + game.serial + "/ICON0.PNG"; fs::is_file(icon_path)) + if (std::string icon_path = game_icon_path + game.info.serial + "/ICON0.PNG"; fs::is_file(icon_path)) { - game.icon_path = std::move(icon_path); + game.info.icon_path = std::move(icon_path); + game.has_custom_icon = true; } } - if (game.icon_path.empty()) + if (game.info.icon_path.empty()) { if (std::string icon_path = sfo_dir + "/" + localized_icon; fs::is_file(icon_path)) { - game.icon_path = std::move(icon_path); + game.info.icon_path = std::move(icon_path); } else { - game.icon_path = sfo_dir + "/ICON0.PNG"; + game.info.icon_path = sfo_dir + "/ICON0.PNG"; } } - if (game.movie_path.empty()) + if (game.info.movie_path.empty()) { if (std::string movie_path = sfo_dir + "/" + localized_movie; fs::is_file(movie_path)) { - game.movie_path = std::move(movie_path); + game.info.movie_path = std::move(movie_path); } else if (std::string movie_path = sfo_dir + "/ICON1.PAM"; fs::is_file(movie_path)) { - game.movie_path = std::move(movie_path); + game.info.movie_path = std::move(movie_path); } } - const QString serial = qstr(game.serial); + const QString serial = QString::fromStdString(game.info.serial); m_games_mutex.lock(); @@ -709,7 +710,7 @@ void game_list_frame::OnParsingFinished() m_games_mutex.unlock(); - QString qt_cat = qstr(game.category); + QString qt_cat = QString::fromStdString(game.info.category); if (const auto boot_cat = thread_localized.category.cat_boot.find(qt_cat); boot_cat != thread_localized.category.cat_boot.cend()) { @@ -719,7 +720,7 @@ void game_list_frame::OnParsingFinished() { qt_cat = data_cat->second; } - else if (game.category == cat_unknown) + else if (game.info.category == cat_unknown) { qt_cat = thread_localized.category.unknown; } @@ -728,16 +729,14 @@ void game_list_frame::OnParsingFinished() qt_cat = thread_localized.category.other; } - gui_game_info info{}; - info.info = std::move(game); - info.localized_category = std::move(qt_cat); - info.compat = m_game_compat->GetCompatibility(info.info.serial); - info.has_custom_config = fs::is_file(rpcs3::utils::get_custom_config_path(info.info.serial)); - info.has_custom_pad_config = fs::is_file(rpcs3::utils::get_custom_input_config_path(info.info.serial)); - info.has_hover_gif = fs::is_file(game_icon_path + info.info.serial + "/hover.gif"); - info.has_hover_pam = !info.info.movie_path.empty(); + game.localized_category = std::move(qt_cat); + game.compat = m_game_compat->GetCompatibility(game.info.serial); + game.has_custom_config = fs::is_file(rpcs3::utils::get_custom_config_path(game.info.serial)); + game.has_custom_pad_config = fs::is_file(rpcs3::utils::get_custom_input_config_path(game.info.serial)); + game.has_hover_gif = fs::is_file(game_icon_path + game.info.serial + "/hover.gif"); + game.has_hover_pam = !game.info.movie_path.empty(); - m_games.push(std::make_shared(std::move(info))); + m_games.push(std::make_shared(std::move(game))); }; const auto add_disc_dir = [this](const std::string& path, std::vector& legit_paths) @@ -896,13 +895,16 @@ void game_list_frame::OnRefreshFinished() } } - if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path)) + if (!entry->has_custom_icon) { - entry->info.icon_path = std::move(icon_path); - } - else if (std::string icon_path = other->info.path + "/ICON0.PNG"; fs::is_file(icon_path)) - { - entry->info.icon_path = std::move(icon_path); + if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path)) + { + entry->info.icon_path = std::move(icon_path); + } + else if (std::string icon_path = other->info.path + "/ICON0.PNG"; fs::is_file(icon_path)) + { + entry->info.icon_path = std::move(icon_path); + } } if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path)) diff --git a/rpcs3/rpcs3qt/gui_game_info.h b/rpcs3/rpcs3qt/gui_game_info.h index be6d49a864..984f8eb7bf 100644 --- a/rpcs3/rpcs3qt/gui_game_info.h +++ b/rpcs3/rpcs3qt/gui_game_info.h @@ -17,6 +17,7 @@ struct gui_game_info QPixmap pxmap; bool has_custom_config = false; bool has_custom_pad_config = false; + bool has_custom_icon = false; bool has_hover_gif = false; bool has_hover_pam = false; movie_item_base* item = nullptr; From 58327ca23cc90a6ece12664eb06942786b45981b Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 17 Mar 2025 12:56:02 +0100 Subject: [PATCH 126/529] Qt/optimization: Don't look for PAM files if the game has a hover gif --- rpcs3/rpcs3qt/game_list_frame.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 99dcd5b151..698ffc6bfb 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -666,7 +666,9 @@ void game_list_frame::OnParsingFinished() } } - if (game.info.movie_path.empty()) + game.has_hover_gif = fs::is_file(game_icon_path + game.info.serial + "/hover.gif"); + + if (!game.has_hover_gif && game.info.movie_path.empty()) { if (std::string movie_path = sfo_dir + "/" + localized_movie; fs::is_file(movie_path)) { @@ -733,7 +735,6 @@ void game_list_frame::OnParsingFinished() game.compat = m_game_compat->GetCompatibility(game.info.serial); game.has_custom_config = fs::is_file(rpcs3::utils::get_custom_config_path(game.info.serial)); game.has_custom_pad_config = fs::is_file(rpcs3::utils::get_custom_input_config_path(game.info.serial)); - game.has_hover_gif = fs::is_file(game_icon_path + game.info.serial + "/hover.gif"); game.has_hover_pam = !game.info.movie_path.empty(); m_games.push(std::make_shared(std::move(game))); @@ -907,15 +908,18 @@ void game_list_frame::OnRefreshFinished() } } - if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path)) + if (!entry->has_hover_gif) { - entry->info.movie_path = std::move(movie_path); - entry->has_hover_pam = true; - } - else if (std::string movie_path = other->info.path + "/ICON1.PAM"; fs::is_file(movie_path)) - { - entry->info.movie_path = std::move(movie_path); - entry->has_hover_pam = true; + if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path)) + { + entry->info.movie_path = std::move(movie_path); + entry->has_hover_pam = true; + } + else if (std::string movie_path = other->info.path + "/ICON1.PAM"; fs::is_file(movie_path)) + { + entry->info.movie_path = std::move(movie_path); + entry->has_hover_pam = true; + } } } } From ae83c28bc8ae78196ddf5e3ccd5b52e336858f37 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 17 Mar 2025 13:06:21 +0100 Subject: [PATCH 127/529] Qt: Simplify hover movie code --- rpcs3/rpcs3qt/game_list_frame.cpp | 25 +++++++++++++------------ rpcs3/rpcs3qt/game_list_grid.cpp | 7 +------ rpcs3/rpcs3qt/game_list_table.cpp | 7 +------ 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 698ffc6bfb..b46ef985dd 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -666,18 +666,20 @@ void game_list_frame::OnParsingFinished() } } - game.has_hover_gif = fs::is_file(game_icon_path + game.info.serial + "/hover.gif"); - - if (!game.has_hover_gif && game.info.movie_path.empty()) + if (std::string movie_path = game_icon_path + game.info.serial + "/hover.gif"; fs::is_file(movie_path)) { - if (std::string movie_path = sfo_dir + "/" + localized_movie; fs::is_file(movie_path)) - { - game.info.movie_path = std::move(movie_path); - } - else if (std::string movie_path = sfo_dir + "/ICON1.PAM"; fs::is_file(movie_path)) - { - game.info.movie_path = std::move(movie_path); - } + game.info.movie_path = std::move(movie_path); + game.has_hover_gif = true; + } + else if (std::string movie_path = sfo_dir + "/" + localized_movie; fs::is_file(movie_path)) + { + game.info.movie_path = std::move(movie_path); + game.has_hover_pam = true; + } + else if (std::string movie_path = sfo_dir + "/ICON1.PAM"; fs::is_file(movie_path)) + { + game.info.movie_path = std::move(movie_path); + game.has_hover_pam = true; } const QString serial = QString::fromStdString(game.info.serial); @@ -735,7 +737,6 @@ void game_list_frame::OnParsingFinished() game.compat = m_game_compat->GetCompatibility(game.info.serial); game.has_custom_config = fs::is_file(rpcs3::utils::get_custom_config_path(game.info.serial)); game.has_custom_pad_config = fs::is_file(rpcs3::utils::get_custom_input_config_path(game.info.serial)); - game.has_hover_pam = !game.info.movie_path.empty(); m_games.push(std::make_shared(std::move(game))); }; diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3qt/game_list_grid.cpp index 5b6e4c3410..fa71407bd1 100644 --- a/rpcs3/rpcs3qt/game_list_grid.cpp +++ b/rpcs3/rpcs3qt/game_list_grid.cpp @@ -48,7 +48,6 @@ void game_list_grid::populate( { clear_list(); - const QString game_icon_path = play_hover_movies ? QString::fromStdString(fs::get_config_dir() + "/Icons/game_icons/") : ""; game_list_grid_item* selected_item = nullptr; blockSignals(true); @@ -109,11 +108,7 @@ void game_list_grid::populate( } }); - if (play_hover_movies && game->has_hover_gif) - { - item->set_movie_path(game_icon_path % serial % "/hover.gif"); - } - else if (play_hover_movies && game->has_hover_pam) + if (play_hover_movies && (game->has_hover_gif || game->has_hover_pam)) { item->set_movie_path(QString::fromStdString(game->info.movie_path)); } diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3qt/game_list_table.cpp index 49aa7962eb..a1b0f06b86 100644 --- a/rpcs3/rpcs3qt/game_list_table.cpp +++ b/rpcs3/rpcs3qt/game_list_table.cpp @@ -216,7 +216,6 @@ void game_list_table::populate( const QLocale locale{}; const Localized localized; - const QString game_icon_path = play_hover_movies ? QString::fromStdString(fs::get_config_dir() + "/Icons/game_icons/") : ""; const std::string dev_flash = g_cfg_vfs.get_dev_flash(); int row = 0; @@ -292,11 +291,7 @@ void game_list_table::populate( } }); - if (play_hover_movies && game->has_hover_gif) - { - icon_item->set_movie_path(game_icon_path % serial % "/hover.gif"); - } - else if (play_hover_movies && game->has_hover_pam) + if (play_hover_movies && (game->has_hover_gif || game->has_hover_pam)) { icon_item->set_movie_path(QString::fromStdString(game->info.movie_path)); } From 4b31e34ea43642afafcc35e732295742aa654e60 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 17 Mar 2025 20:31:50 +0100 Subject: [PATCH 128/529] Qt: use white checkmarks in Darker Style --- bin/GuiConfigs/Darker Style by TheMitoSan.qss | 10 ++++++---- bin/GuiConfigs/check_mark_white.png | Bin 0 -> 5429 bytes 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 bin/GuiConfigs/check_mark_white.png diff --git a/bin/GuiConfigs/Darker Style by TheMitoSan.qss b/bin/GuiConfigs/Darker Style by TheMitoSan.qss index 233fc47781..47270a211e 100644 --- a/bin/GuiConfigs/Darker Style by TheMitoSan.qss +++ b/bin/GuiConfigs/Darker Style by TheMitoSan.qss @@ -68,7 +68,8 @@ QCheckBox::indicator, QListWidget::indicator, QTreeWidget::indicator { margin-top: 0.0625em; } QCheckBox::indicator:checked, QListWidget::indicator::checked, QTreeWidget::indicator::checked { - background-color: #FFF; /* White */ + background-color: #000; /* Black */ + image: url("GuiConfigs/check_mark_white.png"); } QCheckBox::indicator:unchecked, QListWidget::indicator::unchecked, QTreeWidget::indicator::unchecked { background-color: #000; /* Black */ @@ -86,13 +87,14 @@ QRadioButton::indicator { border-radius: 0.270em; } QRadioButton::indicator:checked { - background-color: #FFF; /* Green */ + background-color: #000; /* Black */ + image: url("GuiConfigs/check_mark_white.png"); } QRadioButton::indicator:unchecked { - background-color: #000; /* Red */ + background-color: #000; /* Black */ } QRadioButton::indicator::disabled { - background-color: #af4949; /* Gray */ + background-color: #af4949; /* Red */ } /* Combo Boxes */ diff --git a/bin/GuiConfigs/check_mark_white.png b/bin/GuiConfigs/check_mark_white.png new file mode 100644 index 0000000000000000000000000000000000000000..f9b94ccb8791bb478c9be7f6af7ea177dcdf3438 GIT binary patch literal 5429 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 Date: Mon, 17 Mar 2025 22:22:50 +0100 Subject: [PATCH 129/529] Fix warning --- rpcs3/Emu/System.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 68af9e4ffa..45d6e33e1d 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -2200,7 +2200,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch, if (m_localized_title != localized_title) { sys_log.notice("Localized Title was set from %s to %s", m_localized_title, localized_title); - m_localized_title = std::move(localized_title); + m_localized_title = localized_title; } } } From a45f604cd859cd0272c1936fa4517b9f60a7f7ec Mon Sep 17 00:00:00 2001 From: Vestral <16190165+Vestrel@users.noreply.github.com> Date: Sun, 16 Mar 2025 10:36:50 +0900 Subject: [PATCH 130/529] Fix discord-rpc build when ASLR is enabled --- .ci/build-mac-arm64.sh | 2 +- .gitmodules | 4 + 3rdparty/discord-rpc/CMakeLists.txt | 39 ++------ 3rdparty/discord-rpc/discord-rpc | 1 + 3rdparty/discord-rpc/discord-rpc.vcxproj | 78 ++++++++++++++++ .../discord-rpc/discord-rpc.vcxproj.filters | 54 +++++++++++ .../discord-rpc/include/discord_register.h | 26 ------ 3rdparty/discord-rpc/include/discord_rpc.h | 87 ------------------ 3rdparty/discord-rpc/lib/discord-rpc.lib | Bin 1913378 -> 0 bytes .../discord-rpc/lib/libdiscord-rpc-linux.a | Bin 1086906 -> 0 bytes 3rdparty/discord-rpc/lib/libdiscord-rpc-mac.a | Bin 676280 -> 0 bytes rpcs3.sln | 8 ++ rpcs3/rpcs3.vcxproj | 8 +- 13 files changed, 158 insertions(+), 149 deletions(-) create mode 160000 3rdparty/discord-rpc/discord-rpc create mode 100644 3rdparty/discord-rpc/discord-rpc.vcxproj create mode 100644 3rdparty/discord-rpc/discord-rpc.vcxproj.filters delete mode 100644 3rdparty/discord-rpc/include/discord_register.h delete mode 100644 3rdparty/discord-rpc/include/discord_rpc.h delete mode 100644 3rdparty/discord-rpc/lib/discord-rpc.lib delete mode 100644 3rdparty/discord-rpc/lib/libdiscord-rpc-linux.a delete mode 100644 3rdparty/discord-rpc/lib/libdiscord-rpc-mac.a diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index c9c60de240..1c5a03ef22 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -116,7 +116,7 @@ export MACOSX_DEPLOYMENT_TARGET=14.0 "$BREW_X64_PATH/bin/cmake" .. \ -DUSE_SDL=ON \ - -DUSE_DISCORD_RPC=OFF \ + -DUSE_DISCORD_RPC=ON \ -DUSE_VULKAN=ON \ -DUSE_ALSA=OFF \ -DUSE_PULSE=OFF \ diff --git a/.gitmodules b/.gitmodules index 9f453de899..ecfa049147 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,3 +100,7 @@ path = 3rdparty/fusion/fusion url = ../../xioTechnologies/Fusion.git ignore = dirty +[submodule "3rdparty/discord-rpc/discord-rpc"] + path = 3rdparty/discord-rpc/discord-rpc + url = ../../Vestrel/discord-rpc + ignore = dirty diff --git a/3rdparty/discord-rpc/CMakeLists.txt b/3rdparty/discord-rpc/CMakeLists.txt index 423c2d6cfe..a576bb21f3 100644 --- a/3rdparty/discord-rpc/CMakeLists.txt +++ b/3rdparty/discord-rpc/CMakeLists.txt @@ -1,36 +1,13 @@ # DiscordRPC + add_library(3rdparty_discordRPC INTERFACE) -check_cxx_compiler_flag("-msse -msse2 -mcx16" COMPILER_X86) +if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE)) + set(BUILD_EXAMPLES FALSE CACHE BOOL "Build example apps") + set(ENABLE_IO_THREAD TRUE CACHE BOOL "Start up a separate I/O thread, otherwise I'd need to call an update function") + set(USE_STATIC_CRT FALSE CACHE BOOL "Use /MT[d] for dynamic library") + set(WARNINGS_AS_ERRORS FALSE CACHE BOOL "When enabled, compiles with `-Werror` (on *nix platforms).") -# We don't want Discord Rich Presence on the BSDs and other OSes -if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE) AND COMPILER_X86) - if (WIN32 AND NOT MSVC) - ExternalProject_Add(discordRPC - GIT_REPOSITORY https://github.com/discordapp/discord-rpc - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} - INSTALL_COMMAND "" - ) - - endif() - - target_include_directories(3rdparty_discordRPC INTERFACE include) - target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC) - - set(DISCORD_RPC_LIB NOTFOUND) - if (WIN32) - if (NOT MSVC) - set(DISCORD_RPC_LIB ${CMAKE_CURRENT_BINARY_DIR}/src/libdiscord-rpc.a) - else() - find_library(DISCORD_RPC_LIB discord-rpc PATHS lib/ NO_DEFAULT_PATH) - endif() - elseif(CMAKE_SYSTEM MATCHES "Linux") - find_library(DISCORD_RPC_LIB discord-rpc-linux PATHS lib/ NO_DEFAULT_PATH) - elseif(APPLE) - find_library(DISCORD_RPC_LIB discord-rpc-mac PATHS lib/ NO_DEFAULT_PATH) - endif() - target_link_libraries(3rdparty_discordRPC INTERFACE ${DISCORD_RPC_LIB}) - if(APPLE) - target_link_libraries(3rdparty_discordRPC INTERFACE "objc" "-framework Foundation" "-framework CoreServices") - endif() + add_subdirectory(discord-rpc EXCLUDE_FROM_ALL) + target_link_libraries(3rdparty_discordRPC INTERFACE discord-rpc) endif() diff --git a/3rdparty/discord-rpc/discord-rpc b/3rdparty/discord-rpc/discord-rpc new file mode 160000 index 0000000000..171b2142ac --- /dev/null +++ b/3rdparty/discord-rpc/discord-rpc @@ -0,0 +1 @@ +Subproject commit 171b2142ac8acdf016c231e36dc7a8d48daff19c diff --git a/3rdparty/discord-rpc/discord-rpc.vcxproj b/3rdparty/discord-rpc/discord-rpc.vcxproj new file mode 100644 index 0000000000..2777c4e9df --- /dev/null +++ b/3rdparty/discord-rpc/discord-rpc.vcxproj @@ -0,0 +1,78 @@ + + + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + {81b0d6d6-84e6-40c1-8dbd-47cbcb3051ad} + discord-rpc + + + + + + StaticLibrary + false + false + Unicode + x64 + + + + + + + + + + + + + + + + + $(SolutionDir)build\lib\$(Configuration)-$(Platform)\ + $(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\ + + + $(SolutionDir)build\lib\$(Configuration)-$(Platform)\ + $(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\ + + + + TurnOffAllWarnings + false + %(PreprocessorDefinitions) + ./discord-rpc/include;./discord-rpc/thirdparty/rapidjson-1.1.0/include;%(AdditionalIncludeDirectories) + MaxSpeed + + + + + + \ No newline at end of file diff --git a/3rdparty/discord-rpc/discord-rpc.vcxproj.filters b/3rdparty/discord-rpc/discord-rpc.vcxproj.filters new file mode 100644 index 0000000000..9bac920a6d --- /dev/null +++ b/3rdparty/discord-rpc/discord-rpc.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {719448a4-8eab-4e75-b6b7-687e2b217490} + + + {7c0d57b3-e2ef-45c2-aa2d-2765e5c73279} + + + + + Header files + + + Header files + + + Header files + + + Header files + + + Header files + + + Header files + + + Header files + + + + + Source files + + + Source files + + + Source files + + + Source files + + + Source files + + + Source files + + + \ No newline at end of file diff --git a/3rdparty/discord-rpc/include/discord_register.h b/3rdparty/discord-rpc/include/discord_register.h deleted file mode 100644 index 16fb42f328..0000000000 --- a/3rdparty/discord-rpc/include/discord_register.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#if defined(DISCORD_DYNAMIC_LIB) -#if defined(_WIN32) -#if defined(DISCORD_BUILDING_SDK) -#define DISCORD_EXPORT __declspec(dllexport) -#else -#define DISCORD_EXPORT __declspec(dllimport) -#endif -#else -#define DISCORD_EXPORT __attribute__((visibility("default"))) -#endif -#else -#define DISCORD_EXPORT -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -DISCORD_EXPORT void Discord_Register(const char* applicationId, const char* command); -DISCORD_EXPORT void Discord_RegisterSteamGame(const char* applicationId, const char* steamId); - -#ifdef __cplusplus -} -#endif diff --git a/3rdparty/discord-rpc/include/discord_rpc.h b/3rdparty/discord-rpc/include/discord_rpc.h deleted file mode 100644 index 3e1441e058..0000000000 --- a/3rdparty/discord-rpc/include/discord_rpc.h +++ /dev/null @@ -1,87 +0,0 @@ -#pragma once -#include - -// clang-format off - -#if defined(DISCORD_DYNAMIC_LIB) -# if defined(_WIN32) -# if defined(DISCORD_BUILDING_SDK) -# define DISCORD_EXPORT __declspec(dllexport) -# else -# define DISCORD_EXPORT __declspec(dllimport) -# endif -# else -# define DISCORD_EXPORT __attribute__((visibility("default"))) -# endif -#else -# define DISCORD_EXPORT -#endif - -// clang-format on - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct DiscordRichPresence { - const char* state; /* max 128 bytes */ - const char* details; /* max 128 bytes */ - int64_t startTimestamp; - int64_t endTimestamp; - const char* largeImageKey; /* max 32 bytes */ - const char* largeImageText; /* max 128 bytes */ - const char* smallImageKey; /* max 32 bytes */ - const char* smallImageText; /* max 128 bytes */ - const char* partyId; /* max 128 bytes */ - int partySize; - int partyMax; - const char* matchSecret; /* max 128 bytes */ - const char* joinSecret; /* max 128 bytes */ - const char* spectateSecret; /* max 128 bytes */ - int8_t instance; -} DiscordRichPresence; - -typedef struct DiscordUser { - const char* userId; - const char* username; - const char* discriminator; - const char* avatar; -} DiscordUser; - -typedef struct DiscordEventHandlers { - void (*ready)(const DiscordUser* request); - void (*disconnected)(int errorCode, const char* message); - void (*errored)(int errorCode, const char* message); - void (*joinGame)(const char* joinSecret); - void (*spectateGame)(const char* spectateSecret); - void (*joinRequest)(const DiscordUser* request); -} DiscordEventHandlers; - -#define DISCORD_REPLY_NO 0 -#define DISCORD_REPLY_YES 1 -#define DISCORD_REPLY_IGNORE 2 - -DISCORD_EXPORT void Discord_Initialize(const char* applicationId, - DiscordEventHandlers* handlers, - int autoRegister, - const char* optionalSteamId); -DISCORD_EXPORT void Discord_Shutdown(void); - -/* checks for incoming messages, dispatches callbacks */ -DISCORD_EXPORT void Discord_RunCallbacks(void); - -/* If you disable the lib starting its own io thread, you'll need to call this from your own */ -#ifdef DISCORD_DISABLE_IO_THREAD -DISCORD_EXPORT void Discord_UpdateConnection(void); -#endif - -DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence); -DISCORD_EXPORT void Discord_ClearPresence(void); - -DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply); - -DISCORD_EXPORT void Discord_UpdateHandlers(DiscordEventHandlers* handlers); - -#ifdef __cplusplus -} /* extern "C" */ -#endif diff --git a/3rdparty/discord-rpc/lib/discord-rpc.lib b/3rdparty/discord-rpc/lib/discord-rpc.lib deleted file mode 100644 index 2f75226ca6f8e1d0d78186df60612c66efb825e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1913378 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

Q{-8 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ªWg{N>xTDad*uxvwl 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%0AbjX>+Qs09i@v)s#fn^VsZR-lHfil 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%0Am?w%g!#vLJDd~a34a3gyw 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

nu}4NOj3AsNIuS@t^JTGSWKjY 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

GVW-V1F`#}w?!3J93MGEk{7}N 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%0AOKKA3qnx#y@62R_YQJ*ma-9a_g_z5eR2 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�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 @ro6E|9>X_AAGMk>--qu+z+sS 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

S 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 diff --git a/3rdparty/discord-rpc/lib/libdiscord-rpc-mac.a b/3rdparty/discord-rpc/lib/libdiscord-rpc-mac.a deleted file mode 100644 index 4da36ac6ab1a3001c8318aa41f50cb807009a1dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676280 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

7vU%}u5EezUZ2E!rtwO`7h^F9VUf6idn?-@kj zVGt|+I7QYyi^1-d3=$_YNX8iST*6?_Z4CB)oxvH;F*x%T250?=!9MTJ6xrDaGdSl+ z2In>~IBzY3^S3j&Ajsgt7=w$>X7ItQ8C?7%gG*j#@FDRDiu1!$8C-S*gUcHjT-n0l zs!j%1?_+Sy?F>Hl6$aP-gu(UyVsOKhTPU&{XEC@b5AAXF!kZVc?-L8JB;PHsM+n^d ziz^6xs)lK|9mC-EjSN10JcG{!8GJU%;Lbe^?mCab-5+6a&vgtw|0xDvxQD_2e2Kw* z-(+zAlMKH29E1OTg~5ZfFq~Vx@XMd!41VQbK(1MMtTFLcg2x$C8E!NVXSmhyGkl-X z$Z(r+BEucVE`}!<=QBLX_!z@ejL$MW)p&?u(0Gzz$asliyYW|s5o5|HDZO3B0){bT z4a42W4u%P%lVQ?0pJA_Y3&Xv}gAC6w9%s1Ec!A+L##;=}H}XG4@#4N4h8G(P7=FlD z!SKUIGsDY`5W}mCGZveClu6=NsE-xy~x{H<{X!&i+@F?`KihBzcGBrDEKVJ|8L`PhW{~^Fch9O3=Pi?h8|BR!#vL!4D&sgF`VGJmElCs{R}60 zzQfS#d68j(=kE*)JtcQiIz^sE3@3Y5F`VLQVOZ?h$*{z89>Y@4HGr!Z#y`WLd-~_d zw_951{%{629L3<~1_qyMVsP83 z3_jD#;Io%9xbtQPciqdN^DzdI7Z~jPGlN~;dnxMZ3Ver0v3|g*YupEJ1lEe4lNdVnJP&=CwStz+=vEetM;Fu39Z1|R(dgR8&H;F_lxeC%}w*Bbvz zv0QgJgX{eaZa9v?jUfg%?PKuq>lobpKMX$ceFnGuhQX~99;8@4Nyq8XYcFDO+ZqP9 ze}KWK`xx9oC+Ai#{LDQJKKmGhJO9q$F7KC!_POZ{?yhEV&vpi%Pcity|i7qBFDrQ3!%AG?KCxCUg#ESyvO382u3RiRx=rpyK z-*YDXHj1^yru0vRn3$b&yV}ssUtjcv&R3$)HxWpqK6vdV*D-mQvn?-l>4@bZGOvP`0$h1`E??i`d+9oc<2+Y(hsq%K+G6^cg}0N+Q?yij zPn-F9FfZ5M6X%k5h4wZdMc$RghvH^Bggx$P@~+~9;60|AyvMM&Y0(1Cl!yTwmv`lZ zXTN<9h^vc9iG_KE1kV9~;%=-in|DWuc@t+FVjKSEoabHs7S%&7ez_jnkyl{JFG_pC zV$4~PZ<5W~d?3ZVjdKif1ODb*>b;U#O(^Ih*z&6%-$m*W779&H0{q6p!d70!|Ya^G;q5|HP=lfJD$ zG@MdNgp)UjhAwu!vxEZU{@z*`8NC?(NDGXRV=>(SS1?(N;p9zU3}@V;_kpkElRI1% z!%ceO(;(Xx!!5#6D-~J{XF>zvD*kVyv`knGUk!wvW-W#jzo@uqlVY7xXk(R&;ia2V zsi&cEWrYVFPtmOBAlGd*^kO&_K%3?43}AHZ83O{Bo@PEnp~*zw}3Vm!%cyS@^iPr<}E^A zXfd4eRA!O6Y9?m?VJX!x7Q_Fr4II{D_)H35Erye~@XyG!C|SJSWig!TWfVop7SJ;m z!_Dx8%vABM)rMXS--=L%m(wfx5W?!k@bDVNQc;j#mf4i0lDom87sDs6HS}WmHMUru z0*hV@zeBUkDR|Hp%b&rb7sH#@DQVGSIA`=|mKLogvLUB6M!6XNNc#NTF^c7DUJ{p%Wg1xYV)!&v zqq!K)8J$ikP0J9SUJQSAISh?`G5jUuNgVp~2HB_5V)$=?DWnK2eHEosRw5iNITL{m z8#%ODE`1$U$V<){>%t{hER}q;vm;9pi=;Qw%ZEpe|MU{mOS0(9Ay0gj>Xk|&W2#N?UC_A{ZXbfSoI-o#QM0NrM z64IRoL`V=ZL4+uXK?NcM5)?J=!4;Qra2d_$IK~|X6hslX@qgcQZ*^A(oqy(gzOSCA zZk_v{_nf=bt$T0n^o7CHR!egdFC5>pa?o30#R&1ac(H5B9wFF3@P+lOO=BL`*z?r0 zR-#43I&K)<%a!74%I*80w?5zOI+a#8O~gaClQ0hLiG2`v`_y;P{?_-`S$cM|z@TGSBM-ESIKc&^2}jaXY|nQ9RHB^R?P zj+No3fqNOyOFlr7d~|!@I@7SOm;65*m4E$+D2Ge+Tw!$ndrfJUe>0N*E;)|;ce#N? zNB+%L;r!bJIrHDmKh-n}v0^e)&z!X4U3lltW*p596xrFfIx-!=&c0&Wji&Jp)-KPb zHG34g`~0@(#-B@*JMqJsE`T#EBjV7mtgEJ*#&y$BcjIKY4v(#>2~EU=P{%O`tPZ7} zhIqjI2$i2X8SSVw4j(Q%u>!v`wyG{P2RMY)U+3;f1GRLH+6UFyIVPt)YQMnYYC zc$rdD$uElESmOFoWh0Aux`9mw%R^X^CsHem!(o!kxRZ|?! z)F(P6N2c}{>rCw{wlgI?2|F#L+vhkiT{F-rPt=`qx{BmogN~R-BoxvSr#y}3(2mNH zt})mov|Q=F30o3dt};9;A-Akbc$+OyMb=8h+ejp_25O$kx4h#M#2uRKCTM!jgz zBosfGk&UKum3$Rqob$H4=QpHeCVWYEDLh@{I|VK8N?r>Br_e1oI|#{d0zFRjJ_nkV zGRrh_u(rHkx%X1(c=D}VJ(NvYyF6s_ku+1TGe{qqo+v0kZf>M439^q2UvuEoFEU=( zkHPSogR4U^NKuc$INw73?;e7Qeg`%3h=1e_R6YQ6YgBIdz>4I?ezJwR>9z-?F?g9f zZkpo_@H&8UhcYPx)nLDX)_p=-gFL>tFglC!OgyfFa^o^jHQq#f4Htv@87Zq!6=~QR zF&$FYL(G6^&Krnnsxj2ea^q~m;A2VVD8ro#`B}=@3C5TJBCdq7uOU9}Ed+gyF=&H^ z+q`NHHVN_8l}IS?DKt4EF&NVXRg7u5xS0@xV-lcis3*4iW(Zhr1QxRxL66B$T z!yJgqeQAa<{w650@jzs}$Gr*SkKn|6jS0U(W&z?8heA1_eX5QoUCL-TJDNO#rhO2N zPcsu<&V|?H!H6v+(&BZ*HJY>n$Rk8gvw6=VcAQ9i^&ZokVjYi64Z#}U;dO`g7$8fD zcGlLdVxheih+GJ{6GDP9mYCFAf^qd06d+-!E8YDtgaJ^v+8FM)Azw+kZ9?|@ka1Jo zaGjbk0g!hx0_??M*gOH)J$TGsY~t14xQ2Vf7;0FtPzRlu7kJa z1hi+h11~@v-^n7HGzh4@0~K#N5a$jYAl93JsvYRGeg~+%1I4=43&>*g9Z1aHf$yO_ zMvSYo`%?;V?K<6Xf6YQtJ|koDF~~m3JqpdqJO;Zm(z6WLz`_SmhLUCXVHO@yptXca zWroEXwV1j!6i#v&jcLVNrOV--*!?3_O}9M_j|X>w;)KVW;64iiZ)bZwhC9=ifm^nm znC6}Yc{kj7liIqcK>ix@7H@LK4<@J-GKzz0y@&)kV=`dz6Ht1FOX=bU2zUb}vUyb;L z9AY^QwC3Bq5#I(ynJdfvD7GuHy0Q(o?+o2jj!tlQ zhunBN@G&FYmFMGMQn&=`8e5pO>H@>4#p<%m1ZyfPKj}flUL$h7jl6}}VIntZB>p?b za6w-zE@awTHmtjmyPSIwOynmJtR0MsM9iWTU`Yd11Vq8_Cs^+wI+0S!XON~Mx2JSS z`4-|rh~}Juw_?-VyfiYdT&BjAv>Tuv=4|TS4T}X0oDNNnND>_HhE%-W5l{+H3XCL$ z(Ol6oYVnnGi-($pUkVyIlmZek8VC~O*F!D7&K+3ED8GPet)(OwgOmpleGJvyqC?6a zh${XUi}VajFvY>iZab`e*y4IXwB&fGF+aHU182hGps`Z2OfvEt=Z4rvJbig zYWf>)o+Wd_WDZDhcZMw117Xnt;I(Qlb)9qoazGsEXjt6mfk9B`h{Pb5fkn*X3$hm5 zR!k}y)NULwu92SD>~U^n7ZWL9F{dH86+uQ+y*SA8sM1_TJ;~uP48Ccxp~U< z72sCq8}7>>e@nSff_scDUy$aW0NHyZ@C)0zueasC8SXsD>BReCXMO|2>#gq*UMrt0 z^cv6@mJ4AH`!_2U(zO~rP2^6(=tjm_2vROY5Q5KE=M3Z~qt#ie#|7M~r|NO(wAI-O zZuYn$_eyhfw~O4ntr2q{45jSnd1A|T*>?boc^tvLuy&o}iLKX)p^qY8+W<~^0orM% zX{3AIZ$a!g9VI)%aKF;mFkXc|{mg_L_+ZfA5RXgm9kAhU zg$=7Sy+@k617ucb`dMw=Js=;a)1Ddbb0BlSrJtSa9s)UL2IO8-CTBzLI}LL0Ddv<3 zh`_s%-r*DrnBl$`Kq{FX6O4g3B9f5qa~EM-K$BAqnO!iC>8HgRlG!Ct#-*R)E63LG ztwCt|LXz2P$g#e=sW%e0W0M9r{ajX$+Cka-0QMz#p0^zmH4+a1aPKCY%Ukr(jw>Lc*)?ly( zeu#ZxwoY^(!j=wNrx;U@L1uniCvh)jw}HrBzLF{TzTKcPYe3R!_;>(xU&s5C!KozgStqYXe5|u|Z#LJd=Hfr~0eo}-tM5<(o0FNaUF;qPG!*)UE zcj{u%k_>+)@HeRI$%B_$&8Y z&;P_K*o|8iSbcpQEW^(Se^z7lUFd+l&68LIMw^Gh>gQxJ4~E|lyq3Bl4xQnD7|?}# z0AJ*QCEG>|Y5pTUs`c-=9bQ@v1yvgK6&|)!hpNq9s7Bz>_g$$hj5cEtV@K$-G}7uC zWM$r9448W%BwY;Q$~A`ZE_g=gvrso_zIHL~Rzj$$gxR_AY3&}cBj?4Zr8gk5Zw@r? z#v3zV5`J-f`fCs}<^nB=$4E60(?Lc`5vd)70g{n2L_S31x;#XdAoB0F_>mqXOA$E( z8QIUsP4UPA_feW}XnZSu=>Wtvwf@TZSydY&d8K+Y<$9Vpend!Pe7XpkBeu52`@us%!>1k ziue8e6urkjjgtajB18Nkb33RBzMS~<-4H%!VJG4Zu7?GkpwQj9K(9t29s&9$Gj&aT zoRR)CV(EE^T?>O}#b8prpgdH3lVPyeHpr#HtBCPP@y&wj4Mcco_+}&W0U|sWd~;ZX zA0d|Jn-`z{H3X@&`QUtOM;4$4PatxD*7>YKexbw|j9AB*v~=u@G+%+kxX@|57{(c( zoQht>R|Mm<9%9fZKD{@Dj)X6SL0?4p{IqXSe2USGvK2|kI;;&qNuhTCm@*wD)^SeJTdl-8km%2u2{pKcrAHs=z!JtHQS z2kYXIko`J|mu>DC;f`63(f>;5d&G2+)f#pJ1Mb08Hvikd5%-3d@g|QO{~6=4xQnD7toRb;1cy+&x8xtARDY8 z!+-t)oDWTc?)H;)YoPlctFJbeyWbQ${8I(c#C*UHI7|%x6hJQ#-W~Vtr4<5x zC<<;1C`kC>D0ms5FA497f{y?iyBP2zQSdc@_7Sd+g8u<%KoQ{Aqu@&bJxKWNDEJvb z9fN>BiQ22(096qFDvDhN=sUuP9Be%Z{|tO$2)Z8}I>Ub>psPj!J`v0Q%HGd!0REWp zFHs5fDaId&vjLwMH=cV-wTjfoS7Gwb(Wz^UejJsUZsXnjQP56mcvBr*4eswj*MvCzoAQ= z2D^LX90wUiIYL#p;h%|yFRbTIV)1y?tZ!`A5hsfWv-Gc;bv1ew@pbGZmLx0vk^dE& zb==7kf;d#H3zuqNKRH>FB?s#Xo8@&m$|x*Hii2*_zS^F|ij*5;^L zCQdB|%my^VrDm?uzp0Mpc3U^a71`NdiiSVqX8ehlZ6)N?u{9a~9k#Bbxz4Ky1JK`! z@urg#y$?F~3OIhq#m?EzXBr@ZA9f|-K((9f7pw8fIT`7q=gg76VN%-^_zj+HTb5Q=wN%2ntES6uo($M|b zb+8qdy)wb>7UO@$w*1;j@wdZ~J&yz6cg^#v+w~F`#R ztM<^&Nr*H)|C=CexdKTHbPx>xx!8keF!z_cBh}$$`3(OZw$5s<(}Z6@n0OnEZ*X(e zw;Rh;Kmt#7_e0NXSJXkUUm^R<82=ayoeyL6&35n34O9G20BVQ&^v!Wkcfef$tsp$t z&6$vP=&uCyJ>fhzCqp*;Z$Q_f+4vT^IUlm&S%CgVc!_%;Ha7e($b)YOe6yoo^e;*- z1HP5IO7Bs4I8s)QRA7;9pT!;nc~*&3_E|Rd+zQ(y3!^ zagqr9IqIt1>>ljwzYgfab%58oorl+OKsyQ7I6Z}DbcX*io3PDEV0%HESg(zDJ9S}W z-DWr1tjAAcNeA1~RgG4U)wevJwrZ4XxfIB^L{}&@(&4o=ZaW;4O++J+Bo@K7UyU!<9#ij=J{AV zglWF+2s3==AZ##v1F$JGeZ#nk@r~go&Nqph1m6s9(tP>cWcY5v#_-*W(Cb@|(Br!o z;iIN+H#YCa`u1Y8&h)*-O^oj|ZsL5$u{j>^b3KDQUQ>?KacsR14C}a^4!@$n;rGl8jUyPBjB?pCM!p z{0v+3)ZD~xu}vF@v$WTDvHlqtt$5A78^9C_yn=P=wZ_2s!K|X;?y1=F(w=XGA)jp% zd1TtjwTzD-g4(^^)WO@ZBD29>rPsC0e3ZzOS$$rE*(ze?~w`PKy zhfeZrAUlZGI?>%ghSFc1+~JAj#z;O2RUTE(I#kgaGLrgSgkQ#z^s%XK1bL)fpDRac zOgS+h9G7D;SN>vY!`wg*&d~{ZM3}}r^In>ua5CegMiO;A~b!)2xELJ5XSm$ zM;PbZgwW;Nj?irkd;yy@-%oNuX*9~_!y~%k#_Ic7E(pnmsmsiSz8`?>JKIdi1yS9i zXdzI42c)Jm3Lm8L8(4`g55Zc_eTSHHS&QODsoGqEcRI29E;cQy@@Wu0c#O`IpiA(r z@T7kTVKJ1xhdoAW0F%wnXtm1I<@-yqy#r5%mq6>iiS~Z;GM(T$&#eHQx-Ny#`POSb z-a9~)P0M$uM-549#KUiZ*$#boMZtx`^o(zVzJMs~jN^dWj(z;RpmHz=vpt#B-R)tv z6|84`hoO_X*(T49rMAvUT@Rkj>hN8@#hB5_tnMBs#eWR2%*|>%yk_C>>fOkEr=B|> z)x^o$Z65y$Y-OId*-2(@6xrY6a!t6;N!T1AthEVSoP^0Y*&b3kp2+o>N{_z>=4&!% z+vXq}{+)nj&Q|LviFXrx7^&ge=xUGuV$AD=_ds)=BK!A((2o~hb~p%ze+ZyQ2=8>l zEu>lO_DHKRRO}%Y^Rfo?cPIPE4VKt%(3S@Nh`{X7SH4f0h(=`$OhyQ#RVEC+f!vDh zqYzRk@Sy9^7e~}bcjI2Jzl)pqWq2#a|DNIIZ5fdp6WqKj(+?9c|3A{)k8jfQ`)%FN z+wun)?!Q82-{${k_xOK7_IEcEu7Zu+n^C=k!q3w91SpO8&q&3=Myio~5HTKS{);Cg z?j$DlzDHd~@{iXr8AeheU^ZO;b=pVLGe8n+fK0Kywn1zvk*(^aZ;GU~0LWgV+vkMS zGLqi_!ZRZOE+@D3X53W6>aSDXxAHI*$R47*9cXp~kobFnzO2emospdagcsNSZ>XYr zq>kQElm*OCq6LZ+{_iZBLnBw+dHLO#-H?wE3wlsIZarnIX#}v2?7$;`4j!)M#r2UL zcr$x09+*w9gRZ08+O`LAT*GcaTTAdgrFx{lpk??xUPq6#*VAQa7Qolh6VyTLeT1#e zp9M_1z`uH)1>n?md5QctG#@u#5S7a_`*qjzf_S)gl)gOkrtW$ad>F7?WO>hXVmTcP zoca(>IOQVCa~?k*j*yEijZTVx!Bl;bu7cU@p-y0j&;H<RSb~a4D~alh zUFF$4zHXTIQ4i$UbRQps8;QugZ?BQk`Yglv1##cv_{6c;;B%R8^Vm?aJ5(At$KJY6pgM`QiLCj_+py`L1o5s23qL;?hm#bd8=PnXP~mRm#Z2vScP`RR z{>V1C`y|!ytJF_QefKKWmpn|i!GV$DN6G4-_7x}p4IBQm)OTNVR&rlU{mRj|C6XEC zAh`xA{%pv%^(0k7K;I7di|Ugl*$%fbS+<8&Q2X+eKe$%k7}(LAl|1e`{AXYiSUXQr z{S~THCPVe$NvdJj<1z?UdMJn_oBS+Pzfx6ql2zX+=zCF-zDHg{4)K75?9861p2b9i z$(unqPVrH;3Qb7%qKlK+)?*PfT{8=ylKOm-RjmxXQv5t=M9)ea^3t0jWB=b#6Mt~R zYqNbYLZELBFzUQ~~6nYTizS|(eC zCM26^O{!%^%yiAnfJ(JYR<$zlO7ZQMDeZyYA}!PWgNp5pK`2Umj4l?1aMG;Z;TEO2kXLnrSBf8wUO@;LRtPP)u&( z=>V=En9n(x2FC!H))im@4`mH50C*>viyh!*0K6;NDHsO5E5z}Owk8zOFkK`21T>tU zb}Cc(%|2}_P^_JnHqWzh?vp53T&JPFSFtsG?;|vQ#}LN&((mIr@Yx9Cd?OILeEhVP z+qVi~yzdc&3BG?J^!VaYaIf!lgo(b92$OvLNL8|LDZ&(A4Z>94GYHdse@A!79@qZAisH1f|M&2AA=hjhrEGe@C-p;lX(TnC# z3Q!6N##5Mxw-h7g0;mRG%rCW$8IDbSj73T=g8_-A#9I83DQ)0(u`52|b>P+cE96W)W5#%xl0hZEYhQ>5P z8y9CuZCwd@Qp_go`Gkxcrd1(^hmhAJehHdz#*Jxa_!>_JUW|&rADWD5W!yrh&d(Y~Z)@r=h}IU~8+^^y0YB>_6Ho&OG$K$M}R8R^~viOu^E`tCAs{u1(YYQnN?V==FN{&>^j1)HK*hi7S z@)Yh3e)1@zB892(X{wA>79ZQ3XT+k8upGr|TAkM7z?*_UN+!6*yR%_Y2EcW-5zlYK zxNsVLGvbD^0B>X3+I;?`ptJTe6-rkQU#k2VD7H5qRNLGiu{9QY-o&L3&FxL@czHiF z9WdXv%)l1q?bW<`8X%cq*D;x<54_!>~uB<+qy*|A*prD02_QY?omOFXmF64fgKt1dt( zAkuG$=8Q*lQ4^X5mnX5B)_Lpj@^KBmHZ%|8_JAkwx+(zQ=on9IrCsO97^|E&ThMXm z^96oicFY%LupfIh*wQh_<0UK*Vn)D4Y%a=rkteo6Kh_=q7BdsUZYnPK#5Ue+$TE+L zAOd;yq>m@IsoE`y+o-6uEe7Eonzc&NK*fg)Pzu*zyv?E&Cy2F0nZ(ukp4gAIt22Pb z46zj#cw#@%icwTdK_Iyr09SXYH0D!rGXthE5V_Kdb;NcckTfpz#D1z>)l>0`ZP5=F z>y)cTVux&tzMk06w8gJfobnU`rqLf3>yU;r$zmqBwe;i^RWI!qK4HY7Zf-kekJCfEBQurs4K>URW(yPIvWMxni z1^or+Il!p3=R5?1sihQ!LP)| z^aF*T>klN}iKs{naz(*8hP>lg@()~i?J(w9Y~s=^zMN|fAfHk|0!9O)h&@8>cuGla zvAf3Mb>Gz2`{~`aJjSpVQa6G+PZD%|ZK1;6mHb-1wH3O+2C|-lWNo1&7z1k$qxbn> z{;{{Y`F`qJo(kRl$Ik$3s5&=KqR|4{d+=p6@#Rqs1Ck` z_TzV$8lIQJ%$mpWOUR61GB!O&$e1ZX8Rp{gBKqhyelfHOZM*qP{6(Wn}! zgFUFaB3fkx&m}rG8r25NKURQ+@dW~_6G9;svZa@?Nsfj zY6mCD5ntM>k*Zxh&uOkI{+OzJSX$2)6gPXPLpFkk7+EFzQ+5&q!*h)2ZR$2}@B|~( zVTuv_oj^^b4Tw!i{0~6Og2~)0m1^ayWkzW$0;^RHOZh#eUeD|7c4VYd8jI|K#M1$s zP4G#_Zs|i{rKBc@Z1}j9W6{f7M27VY!ZK5=!X(2ph^BW-F%(&fC>DvAKz9Y!-V3Fc z85qG)G^mn2!oUcQBXCEAkvIXs^)xHucgnpHP4Gri*YG3eUWbEOMAtRv&L?_jxRAP6 zDI~f<&^zz3_n}m-wF&VtrO>I^{!B3=UHQx zA*P-qWBWdc7iOgJ=zR-f-?QY)lJ8UO+456t*kJlS9U})a17nGKklKq)IpXDMt|jJC zLc^k<9|>I^1^q@SD*}17b=;4@{~p1ShL_NoC@7WCj3}rzp+!;9se~Skf-(sGBMRz9 z$czaW!Olrf;+rB=Z`XTKWQ(m}iFrPicR7@Vfe#?QG=c*fN@%$QYB?Op7_9wP$A;_D z%l`y{9UyyMgzeoRsWNv<%!yP!;ZW*IyNIY7}%kp@*WNI|(J9T-)~%e=dqzOX#I2=s`k7QP3VjB~j3mgxa5+ z#$MuQG{f!P{SuY_W=d4#>%_aBjK4+v(MYv#qdD@`kO;}7)IRXz;&KR6ZbU3)p54O98cxPQRz-5^i>ozmC*JG zB%==sGMD&P2d)p$0^)B*a8OGL{T2l+Cv>S9K03i#MQB76w1!Y-6jV(pI|6xi4ctTg zy$BA6TL_Jdg0>Ty6$RB1DvW|2AygLyJxS<;DCjvtv60T&&dEOFH4&;^-G3v#(Shp< zdzbjK2#%b8KnTBr;Dk<>?-N4R5y+Q~g{1!Pk_jON({3+$-L)|w( z{x{_nBiy$@?!N<9AR~5J) zC5JxO7P_CX`RmKw&qL;qIr>*u8Wv~Z1J4JN)<4HR09z^jc*A{>Z7~6NAl`!;ePYCt z7}kMkKwYVjy0>ECy3Aw(>Xb<&QKfVNI1_&RUzySi;(Uk$hRe5-mOxBB+ZrOaBr99C zO?8@QO@QixyFnYvEX(!aSchyH!Pn^dfEbs9Y*_q9MDQ)52P0^Ue-KDCz2r!~(Kech zC8ZCnsnoP_WKz@%cCx622yZgmg3)%Fc{(<7UcSuit;M)yW`Bs>c?rwROf9A% zCles|-|>fDmzdX4xvN=byprS+a|V?UDrIyLZALyBJ_jR`<6tp$hr%^y1aBhnjX09P zp{k(j2LU2z;%z|JQFB~C@hv+(xRL1Z5$Y0iGm$uz6DPivczSa@xRdaYvdiR>fk+Za z0*Mbp|0Fs87O>gH1eJ;Bs6QM|%-e1kcNC9?;Hy;q5>d(gl2IeLpQ>LYsxe{}K$s(@ zjnw}p29ivRe-ZGg=4^OAXY5O9+eYvkM!pLBGJ?kld>sK={7fLmly+$(n!loTVD0}M zU8{>ftW_g11!x;;PDE=|LYVGS7q6;OES8w36H@=KcX+zl>`6S;q@N{bA4Xc6;hk>W zYz`!3h^r;$rHptZe&yJ?oZ!v~Xt%b}#A744kaGyS6eu;k#LOk+j_{C=8wjofWZ0qX&fPH?5Llzm44XA!K7fWbZhE?yi4 zy!_gW5gbA^NLe{ddGTS~e+76+$CUjLM?*{+1DHKO7H_K8p-FcAtwa3&e4R;VS z&%RT$&>(I`r0=DdyUVfNjU9LC6^8pZTh5Ggue0SV6Wp6@IV;J%)s{!4xp&%fb}RQI zwmiD6`)OMq)6V^(EsxD`zX6%u;icocyBi_1FS+!p-bSzqk;`smHq=nh>y;d`zal>E zWc(=c1%k_^PwClhqo1i<6m6tBiC~;z8kebE9c`!eDb(kSsa!I(U8WP?{)a9*Qne%6 zM0@K_)pfEXrT-81B5=K=EJ4_z5xjt^DZ=H&Sv@KYB6>r_xpH$UQPtk1i>KZQUQTqn zBeiS-^P0P~h%OY=!JS03Qm%?f!P`FymliXLPZdJ7i&rna5mj&&(cL_2aiaM|ZL#l0koz0WRku*}sNCOZu3Ae~S)?+lH-a08u82nUypUfUzbq83 zGJ@NQ-W-i;gNLY6eSjpcQh1zbX=I-$bT856(WrLw3RSD6iApl!i%}!-O{l)ZI;C3XcmoSO9!jk4i$F7v6`6wxS~#XvVwvn8UDW+vGP-VfDf zOTq_{>`^1QgXpp_Y6Kr9uqq5_+7m>pB7UWK(td(_sapTXl|of@Gb@!F{9@d=?9M+_ zy-(F$5mlrNiToG%A*z>3289#J>fw5}=kE~a@TX?MAIQ8`4ghA)2>wFgHpwbcBZ%Kg z8<))y;LOKq+zVk2e{&b~P&HGW%S2YBQ9=@Z8uhaTm25O41=~^|6ur!*q!eNw%%Ey+ z#B>+DN;C2*|8x~Rlcbdq`*)g=xCe^QCus)D5*$SF!N_iqbAsSyL^p=frRZ)m3C)*U zkroxaia=4Aqx-c5-PFt%a6OoYB|8ZpJu)s`DCkZ>DFz=PI#Vi6_G)l9f!PAQBeZ`Y z%n|NmROQj7S5(1g2+WHBiTeP&MQ}l+K1Gt9CJD^T8;LAoxv3?ekhl19ex zfw1ZsL!f|AIb);}%4b{!A#)0X)|aycxQ2o?sWX4%P&Xr_ShX{jE1_n_8VFdjzHW!f zfwtfVsmkvLN;|ff6v|6`K*;QiV1%Y!09w*6I<769tyndsi^Ip=2!&NG&`2;O0q{x0?Z|IA%tyO|0V!bWabviOhGWZ@LAg``Ldoc_EHqg& zgVU98B)AYl<}w8DY5tAiCk5!ZCbUtpszY0qP#JoN^rsLU()3f1gre7mUIuPty@#+z zrlf7ORL+?AzR(FMAT)$xJZgW1QXpiuM{t$qe?@P-x$94a1}oN)&Ofs&Z1d_+2_-ZoY8l<}L1k#>JAEtjW-(W17$93_3v{$D9ldQA!YiryprQ{;eeY;t)4tD+w$O6`c8 z@yWCqTDg%**`3wFL&`;E@Hk!YI4{*K*_}(7!MdOv=$YJ|uW7C9&L!0D3+lbu5Y&6K zJ{aDcKWKVnZ#D(>-fRr&y}3UawKsc?Vgc~bC04yR4+Qnzl-)hVNq8%UHC$PwYM41J z&}zxyTQNNRjx4qt++w@IEe>aKv*t&#SYD*FSXN{=xWzh)SqXS}@B?je26O0+V+IZs zwt)gdQ=uP1=Gh2-)U;&Mq<=Y4I7qRM6b^@gC955F&RN+MagMJVCoA$u?HQCe}FbYT)?sQPaE|A!PQLUSR)W%g9LkKvMQ5u18y5UUIjLXph!W}+?4`HY5DeG+ z4`8F3aMOZAiq*K_xDxg+h`|%VQtel1I;&mLk1PmR`wXpgRC~T%?fKzq=N}olII2D0 zuJ(Mp+VjKJ{+^~gsy*MX_I$hA^X+QSVhyESrBaX@Qlo5RzElzM%p??s?+SDAVvUk(Y7>5&~) zowrP}D)Uw=p*-&{(zB7obWM-!u-d#3ljcL-C0e-zxm3r=zPw$^MMK`>biw0fuVzJd z*pWQF!w%%>9oCc=-eCtdJ+i~f=jk0*Hc#)c6M0cPtW!WL%5dzk%6WQ+$sWDHNq9+m zmHmn!6ZNH9EjfHi2GZJjI*T>)bQY`Ug|oOr^CMYou(MciXR&UcbE5uFZ6O2cQ5kM( z=IV)h_1y48{e;u845W2)^+dgPuAZpNDahm;RpQ;)#NDe-L2L}?ec@A(<(elYQ>P#` zb9Bk7=jf7E&Iy;SPV*xrtDmDQziy7M{MtFrk~L`yDVaJ2!B?^MtbInr(MPv%~G0{r}b4q(IdLkL`UkHb4QP zVMcfWDA6?h2i2aW%+LeCff;%LXqpio0PfawDV7WXCuT$jfS0w_F#uH0)B`}}Og#XU z&kPR$M>YQg)}@?<)z8!eK;29|0MyP54*Lny?mCg_p({xdS9aHk$SJ4rR%+Bmag~eS>bx;08p<@q=wW0 zP&dojpSz_m~UZfzrODy1}f5pctp_n^a-jI|R;@Wn_?q6ZrSx72YT{8Z-rs21s}gg zY}&5Yb`1GS<4(n*@>NRDBTz3I<-Rnn^+XHH%{*b+g+1>LOh>YIL3hiPNRoVA)L2v* z#k?BKm%%G;&I_!@xw%z@AW#5Kjz|nDOxy@H?u2AkLb1~1m9%Y;ZZR)!iw0%^ezF=DKgXc;z@pj{gx}75OY9OLR zpJ6oF?A8@Ckl3oHN?&GNJpqDvUFkcFr^;LGBhN*1;DX;@@;YB_>1R~7H(Bh=CCGtI zz?lVcT;|GQ9blV%7q~Kl8QBM7F5$%c5HKB#1>2DA&HA@Bw*v}PEUC(V*Xpr zbaC^bDrCLjzPM?+dYP-u!ze7@+b|Pm><4_Cc|InMUF0R;UZw_xd_Kr$xJ~(IkeN_J zazAp_vp1|EZFWA)sCFo@3+DpK`Q>l;MTyyfTIRyB!?bRP0y#0^+JuM~j^%JV3w4b5 z-)PkxL8aLgW%UZJ&c`nzP2+5b)j71PGN*Lm{s*oaRNR|}A^)RHSR~)>?#{Laxh@_# zkiUtoG4C>K&xBDrsLH4(ji!Rw@-A~YDoFkL>ULb4g^Z;Jt7$Dp23!}LRc1_AM8}1# zBS|iIB)MEAS!Mo{X)O)2Z-u0Opf#^XyXQ%vX*~eNOm#Hn@X+8BV^P08_G}n#X z<4hadxs%j(+6-)s`~rm2T#&HP#5J8wfGOkCHfD|1{0lMDTFJ6xnP|!NrC+nLW|G!AePgXzrtMUB_z+6InWaB`yIG?(%&=*_LNv!j7op+p z0)Iq!BD;t}{&f+e?jrJcJt&&pxu`Q7u8%N!z4#9)~x)HeXlz3`!K=b{K5(*TB~nZN?Ef zzBP7SHuH{c<~D4N{6h#cxm&TU!5ZI|JD0h@_8Jq(WIo=Ef-FH-$iiWp|AyM;y^k%H zDzk*;covqbhFElCUWP}s#&g)1*2mD^t_Ej0ZkYT0Jpe~*+HIi4pT?}vkz~QCO8DtN zWdYUcRjIv)YcHntJzK*p6UWG3gD-H0FEaV57Q|l@p|^@5o$U*}<{_E1We1We5pI4nUi5HVCeuoaP4Q2*kN(FnkDxv>Uc{ z3?ewo4aqUcn+wi^@E6UKgRqp|DnsF;(5b|+#DA?j4#OTv@Qp>A(zYgI>(q*Et+tgK z8Lw?$g}qDWlMNwVBhQ9(jns!!jf~|i63Y^-sF7M#BTFMSViTlBR;+8JrdZX;S?s5gH8MiG3D?NJ zV%ik)rb3C)ulxs~4VYw$O4oO7<>R7$BDoi*}xv?*u7qyu8|*0 zbQ?KRqT0w;ECZI=SWzRDsz%mFYQ!eUK)#;N%1d>Pl$C~SQY@Jm8H%a zv05@Qebj8Ax0=#$jX0H3s@hUVjTA+j(zY&Q>(q*Ey|x{>P22I_B}!NxY+|>2pUFQf zkNm4vK7u?!S*D7=B~pBwAjRME$McvEwG&-DQ!J;OIfeyh#&_|aG- z<40Yj;5I>yggVxCrF|rnM~;Ly1eH zY{DQATyN0p$tU>f+DT7v{`>@gn`TJ{_eUT8PMze>KK$32`?VR{r)iyo{lkZGT;FkW z%F9LHb1!|zGZ!>&b*l3H>$xDWGxOSEgGHH6gxTdZ{XNR`cbbOJa!hrWQ(+c@IScb_ z^ZF*cEf+!RJ`h)>69*;mSL*6F>J{cifP}jGur3)ci+=S+J~nDrhVjzI%TtW0Tu zs{3^j*|7NM^$PP`+w9;<6^U%f58x}zYTInwe`mHR zt-T>jACo&~4XoaT3%R1lahzS3T++idzQl1&kBuyHQE%Zm6l;z4)CK;$ZP@C|OIhs@ z%1UQL$Sg&0uV!&PNF1CXM;dD!LS<<+1We$zVDop))(;QMSw!1j!x1!qN+?BImM_c~Epy+wAkmy$rz_ zn%k1xARQO7X0gqiq_)#$U@Oadv&4%^l#dAV&iLT&>9}8?xJfm$YBO8=ss`J%e)$B4 znWqem6W5vYSkFaGa%pdxG|o%KYUGXDCJ#1f-nqZxI7y8649G?Po`;9OXgwQpVuFYH zdj~L<3iDK?{%~icmHVmPgbE<3%TFETe{F`vU(}<0+SFVAoLXUC4%V#G;c$1D6}h;i z{@n*(bHKV588F`qvwmAI8Cq&JTsf4>$?WvGALPo`Xk@V?hXX9Xa z*j73NLS_iTd78vcLI>V{sxM_NLU^q74zlh=FkG{6L<HhdQmrxwG7M4u}R6G zh_M%|D~nG!X0z5ZdpFay>?)%M>l%wZY(iljR$Q9;9Di3qHJ)^}{Z4a#25D%VSWOF8 zR|kRDVn19oWe_(EH9<)F0`n!P+Cqf`B9}XY7hdHIqlI5l%dv5t!;BQlDOXHYft+8U zp5*kxnAf1095YO7BAov7I&mmha@ms^cbQF^)I~_Rc3Xjjhalk%W=vJcz=J@$b5$ho z-hSY)4_cJg2_cr};li|@glFCX8^!Fhb7FpZ$rp2u9i?;uxAcN|O)0$~PDdjx?PnW& zVXUrJbCJH0vDzkZ9Cr0(VTbAyp!&#EWUBVUeoqGLY<&(e!g>1hn`Uw2>MuJmJehFn zWU$UvlL@Ktj-6qFWh++Kfd5e8vyW)zLtvWLK~%{HSTlU=p*XO|p(-+bEin7#eISp- z^e~^B%vc99G3e*CVyq*do|YbT11|fP#TbG12XNh;Z);c=UCD!cV6tf>VUBL{8Dn*a z4TzejP6pIHt1WIBwu@;C`3^IwQ%ola>eG`IW_*e^<`c*NwQ=BOBwuCrPe!VIC_^Ro znD|wyZ>f4Yta?jSD`ADM^%T=sfwLv^1i)~Tt=>2bFYh5Y%2(U3bibU`J%&$bBjdev z#-D-f3UfpY?PV~S|GSqe^BPv!bQr4y%b4KXtxy{!@;JEqv}1+Y285cyD=+SAJ8P#wk}(R;57wg!4eN&_R>41PYOg=1ZZzw7P-D3> z7EY}(Z7>XDbrmh_hUzcrs+4Q6aTRll(h$;*s@I3~qv~~`@T2N)Y5HK$)nmDhA^oWO z{*ZoDeP2jDs=m;~3^(m`<-bJ?{DZ@gqg9FFgo>OBU;AtTvGP;f;F?Y*IhaGyN*9zYqqfAwF?cR-!X-qF86(NO3p= zPij8es%{I_C6WVPsL)v`FVR`Z`T;3?r!CH)g?`Ydn9UqXRTrl~$jm^H(j9s%;#fWC zQ_L35iYV>}fs57oFnYnSuVgoL454`*;_9fhAjw4Y%vYt)>prqAKANj!Wj8NdC-DJ1 znbv$59KOymY;jb?{gm3$w&;PqU3kwve=ZVvPMeK}nYSyeyaFhz{0?k0??v#Ird$Nd zncs8zne(FJWWTAlxgV0-{jgztp}8sK9+IglO97j_L25f~B(_`v$KzSj8XWiL>9`Kk zit#H^E>-0Bno#7FQ!x|1D)Dmjj+Rjn%{~vzmHin>h%Gp{7Ty55!sq&XEQ=@mj#jPbzwMV91a?Oe-HaK}1 z(HHG2ahT_9)Gne!2QoU`a|WZFHDAK`NIPCv+LiIk6`jpQb`l$O_;4WP85=?{L>==BqV z-Wcj0hf(6WaB=EUyJ4OKNt$lgjh>EB8J2v?_tY&RlRRJWTt~jEoJ-dg=Ci`dXOvN!aV=1V2>j z)6ThfBd>u^5m+pBg?T{_(x-xD#b**(us+nPe`#EDCYn`iUhUDx=u600 zcMJ8`tuZE09g$g=@c4r5vEcuX$H3-nx-IUFUa~hb`Ze9|>1i6Rhvgzc2~FetdLWLh z_j(HPUJVGE7fN+B{8X_jM2Q(GM2R#A^&RO7bJaOI$%!EUKTfj3Y<-?-)S~LmJCRx| z?u5xWhI^~*)&aZ4_h+WC%yE1GMX}(*e`6`Po2^X;`;{h&QFFVl}7B9g<4q!)ReF)61ENPVT z>2Ry}Rj4+8^fpJNZ^z%@I^M%- zQcb1GoX4Z06O@jli&L1cr^``cXG9+%JK^Bgb73(q$^ser(bmj~*5JJM0`QlG(G8I7 zjBpH4pYmUntB1ByP82MD3G;*E<~h?Y}LHaWy!UxYtb7%gYWMU$+=qlWRGPH-n2z>eoIl?5CSA(R(%fsi>A zf!Py!EH`28y2%4&O#w$h2-OAS$@(!X!oob#=z2FulY4oU{D5)-GkBT;f4j9OQd-_9)zes5B1PJc@FlHIp?aF6Q}}{tk05+U zYX^k2`xkq$BQk0FiNkZ3SDARzVlg$cjw6FvXTu1~<`_wskD{Mg%+VXdk;T1~aA5HO z2$>@g6l#6}_}#uBy|RcyGlcS@B}ynOx|Q^4$ii|>XSo!;x@akIBa3<4ptYP}K`Z47 zsdC)|56@`zIZW#lrd3zO@ft#H(f3NIDKd^BtriFl*lCe|6P@iV;#dozq3A{>)E6xv zomo4s>AbkuP0m^O>#UW5(xMk&EQOe^Kud3BL5`&mP88h-A)ih%G)q99*7?YjV$}yZ zy5jA(x*)&3Z)A2x=yR0O0jm9tenYi3UTO#x7yHJCDey%AY}27viahzHbM52at8-k zq-AW>PW8^A(<4RFGO~8UQN31Q2tM`>&-a^(ICw*7EaHdl^X0J7G--X@I|q~xNhfnM z#))q=<2^v=zGz;|Ar->@Vtz(Fb1eejIbvb##76Z>2Z}j{g4I;KldMZol{QNXCcV;; z;z_LH%qKwUt9`7d57CyDaD;`A6UA@S$JYq1(=6$`q`#>w;kXJ`c}eVXuvWsO&61Ra zRb6sFQ_4yMhum4lv*g{m##unVE46Pk~6PSTA0KAv9CtjCEXAb-N z5)RBp=57lguGHFYT8neS=K$j@YUmr>@+|Ou2u9|t<9OoyTu4}W&!#2bdBoW=hwM?f zlCuO`z5g{v&(01lzN)P)g|i)89|O??OeGR3<>2SVXYIkhTNM?&FD zovbV`)|o0R)|omH3TG;GzNCuN#&D);i*=@Iio=+QI8#oo%G8O1aHdXHRu<|^l^5zvl|?djr%uU{sk%a)soFw2Q_WAttIQWiWBR~P zHmM1iOfCZh0+?O@f*^NB4zA(tgSzJoOl;IwX9hqt^Q_=CAbki`jz|nFM(;LzbKu3o zyGyt$W}3!x=TDT21oE&@cXhiYSEfk!{|3AKVF<=*EB2c$U&8TF$QPin&AT33PJ}n$ z>bJ?SFR8pvg%th7_6~Ft73P##I5)-RIFtVsQ`9O*`c0SRLvDaGi@zhoJ1jPJ%b!y# z%wND-Nr(L1SHvOgJI&S_{v*txvH0PmoCn)6*N-7IT`{)4JEZP?(r|C$wwSfJIMjVW zM8?ek*ljd>4`PAw`G6#tTD#_%#yYI7n-;!%8m|3lr{7dsrArGGyh^wkS6jE30sZQkm0W4b0 z^iJ6NT=+Og>(N@&2L|G*_8kh{q0(tM6xz&menzpzX(A74zP=q-)pRJtdV$nn$8QuN-qq6vQu+TTw48~GQlY_AflKNyH~D zVs+ufc7+qG4JY=4rfYw7+TUYge~T}1_8$Kv z=opP(BALs`q~S`~s|fqQ2`!;@V{9&VuC_Yybx5A}dY^A|y4MAIRw(5GHZQ`(c z@Eq;waOBDJ?wZyDG~7Z)qdlx1J&&t8a@c`-skAQ#gn3ICIzpo9b`u99Di4$>EXaIjsH0&SA|rQ8^qm0$Ib7fYtR0 z9M(B<=u}D$>+KvaWa*xavgOgc|8S&uPOTU>qP@Th7wTyoavFa~;|52{POTX4vr{%k zey1(jV6pQLd>xV(biQ~!m(DktFSlaPb{ZaF%URx@z2t2OO@6CN^`cpj>|T<$jO|{M zvLSX=W`0YUObVM!hlFc9AZ#+XVYi!`%n#Av%nGwjzG=Klgm2G=Z!fEa_AsG8yzOhT zZC98FY-7Gl`(GR5D)&Oun9lV1j<`yz4J7;C@69p_^#!5A^e@s>z9{}D)WBL8RG1%v zI>!gE{8&{h=5RiTAbFj$lwwJgi&iSHE19%B2{6rM(uPHD6`orFjW04Q+7?KLbt4FYT@Z8l z!OaSDXt8PB&cgBAFs+F3lNidPEg-wyY=?|8>4z~Y%u`CVT^zp8^IzLlnfp;0CO;CR zlIRaf{R1(u1!-5A2eB7Te%eRrCy1V^3bXSP(|Ckg<%g#tHQ4Mq4Ca|%$vf#e3_N(U zR6F3OsQz~cRpt&KQs=j)ROVvwlv?y782qPVg&A6guc@&d{JN5&O1qV8T^YL$B(OfS zS^T=vpRlUT*7U=#6e$KDz*Bw3GRMqnSegG9BHcCTqaN57#9CPSz%V*h7Z)SH{{0-A|;4!D$*_fNmF^C zQaj-15B_%tRb~MXK7K_;WtwRrUx{l?qYb-se$*x6Ho9h=`D(svy4|52@G~#}yMrpT z9V?UHby4|x2~zZ~;jcf@rJ|SkJ9IfdNY+P`1e1W#Dsu!hCcnd>JjLNrD8*c4OvFCM zf{8o^z%Ec+w-M(in7Z2cPzU4m$e5j>d9MoZW^f9zX1vbX6Q4ZWim6h@>j}6s$tTaI zVy2w&SFOw4PTd=fjl4v=;jqca(4L^`P5z-AX&lkYXC#f^;r~0P@u>Ey(y(JHjYq|6 z>Ll9Z-FB?-nk!x(*Iw(i@m`QE6U%LEeTm?AkB=E%3So3$zp zmGc)=8uQ8~1I2=)8EH&S#dA>Cq6T?|g_r8(H4G@6hH7 z!&rmOe}30wb_TM=WfxY{I)aM$n3d7&0m4iE&mJJmFlO)9{vQ(m{~vL00#|bu{*T|= z?cS~;*>^&ADoH}fo^6CAd#O~Ul3PLuA%yHZ8C&+OLzc465?L80oD|(TspfAXl zB0aC%kjdz@@0;h9zfLOndF2FkCbJRUTZ{V|ZIid7Ld(AG;3HME8iDfy)ZTSKY3FMk z1ZbU1-TWB(tG4`Lgj6GaIY$BlYVZEYu>tmsnn=4UeV`)g5v<8f<^!^PAHm9Dg5M-Q z>%ixb;3M76B0YbOt;=s7!KynH)Nl&`6OUkhO;T{T7)hfDxr>0>yJiWs>WUD-_z*cg zKGl%PXafJ{@u{zq3VwVlI+MBFl?q#e!cL$?@(j7r>A@g?tF0!XegxgmpwkaGw#oqL z7`L~GZ?V6%cp4`jX*h#MD)-i+Eye?+`d$&i=Dt$U=b;FC&}b2z6M}!Z=78F}dP&?h zy#^*f(O3p?p_ad9hV8@gbVZj2_~$JsL@W{V{S7RYkWa1@`YQ=6qa9&qvc=|#xl`476SpvwSV(l>Ibq9d3t3_R7|w2-z+#yt_==tLErj2LpbAPu??pnCzj zz469!{X`dzAZ1mpO;S+3NLN*BQ@vEt8O%e--U|2JHe8E4BG4mc*@uD$boh_5f7^iJRW`{uPWM|=`2Bu`h)HY=mtd^WumEcUqnxBmD4rz%Tl9@t}pc#+@{ z2_AV>mdSLmBG4@d-8|6!AF6BwGQ-gY0=4%8@W=p>p!PN^qgI`nYE%W8 zfohF9nTdp6YhqMEd&O8nKehv+{C+hJ*HR4Eo+#xhmjHPLUSl=li6h?f;nfj zN0QpR2{P(1NPL}1QTZhEj^MFYZHIic@Gci`z5uE!c?=l}Z9x9$WXMiVNRa?$9}%Bt z(27yys{BK9s%WZ$N?J~-y+u zw;)r`O&B}#sd-tlq!#Kxs9ZHNnX@%SK<#}W*;;*5mZGfb7Su8Dpg3nKCS|dys8%I^ zRZ2YciwcZJA{;$hp!RkJ&G`Q!jU#8PEM*&xY-?aevdsvi^<`O#w209qq= z98i02CE6{$w&B5WbZl%QBuSeHbW^Z_F58^RbX|tOZA|0_BJrT|?Fm#PP+gy}o2Y)o-)W|z z4kW0uCs2(*l{MiuQ9Z$5CR6E&>Jr^dl{>(`bnXLSeZq$%NC-Mw-s0<-vVa!f z%_If2cskP*)Z#xe&A+wy?_Y~#s>MHjBUJt^ZWSl#T_uZ^e~Xu6Dp|1nTl{-<#3aE@ ztS@8H+}=g7VQo$42pbWy-RoU%Fk1PIFa8E$GV-2{?GEV;rqT;Zy_(04?JGOR8R#53IcBsX1MZK;ljy3*>uVkaEEFV`ctE(r|RI$}Hm5*&} z>pbM+s*XBu`M8>^E>J$M?yehw<6V%lq@9Ouw0vBnt1eEasp+Xpl#grq=$6RGwS9FP zar|Ko^41AfdDk3<3c91Jeavv=;|e*8(!(e{u#hj|ua<7A@}7x7yeM6=O+>8ua!ftlHc<)h88(+^2>XEEib|^*%u+>e_VZW zEZ^6d)JTLkv471)gdehR%qfm4QE!J^!TxRb|6pIF8vl>96vx$C3BNx30UeAqUmwYL zm&o^h^q}(%IQd=&5ikk*VbPAWo0q^!>KtAcOr{aUv{t*=0;GV!!(L=+)Xojc^hC zl{dqsWKN?voU}?II@SPK38=oXD}-aBEdp2rHb60eMw(JUX@E#!^^#u^ekH&bs18Vr zBKWlc8c*s1WJ?VJXP_}a`N?i*U?6*F0Z{w91FeC!Kzo4Nz7x;|=mvBLdH~))AD|yF z0PqKbfe-+FOce^yt`s_$iZ%mA0Wkp9&eDpKmJKw^#R2G!ssvyLKpPw+8@bsyMlV&( z1JFmM{d9_7h~s6zN?D91nvQuz+>Q7;2A)9eq;X+_-}z+;BVjq@C8uA z7|Z~=##;!$4FW0~09PHP{McnzVYgI;?L-wenxwaQh*nus8fZKwn@m5C8-M zLBKE|6c_#sTAjIDmM@!=DP^#6t=vvOgPs5-<-~1S|%Keg*tBe7u(Z z_3$_HaSD8#FsW#g*#+zc_5o?YkHB%@6mS+e2b>3p?*;gmfXhGza1FQ)+yZU`KLdAw zd%%6*A&?0?0-gZbz%$@C;1A#(@B#P)sLb#Kw15t<0Q5j%pa@VDumR}h5hVeVr!@RB zz$D9v`r1+`d%(@dZI-%!U+6=(%@3^~Uky7S`ngZ>E0fio{=9m4OJUUyRm`R}Y%=2a z^e<_>cSN^rywv4b5zk$#N}8{!Fz@Kk+Z#8UQ|#8vW?NSV$8Fp{ull}H7lvk)t>Aa_ zu}fIFMveBz4C?mhs9_$zZGF&wUG)CRyBy1=lx)8#dwz}I6Yg&^pWU#f%g19YrWBtu zGQD2XRj(WO;&s>0H~PJK!diF3{9?C?R9#zib^G5+Kl^aJYPGTp%M6|!)@4ftN6(#? zthc<`-Fs{B_3M5c!meK2+p}=izyUv=EWGYU>*Ai>yS7<6V#%`$4_!`}mFv{v^ol9J zPu8B>w<2wP?Pd{^96ET;$ep%q{rHEc_w=0VXA>P$J=YCo|8cJ0BpaJbHRD@O9o{Ux z*0I6!Jdgi4C9%Y#iyK~__WbDh9c22|H=vu(#k~Vwxq7?x^6K7o`Ioj9!*-S}Hf7%X zmJKW1oBMgty90klH(y-;@;dK_wZF_=zA15E_tI0h26XFlG56sgu1lH^ZW~_iLx(M~ zWkwqAdE|C+bXI(rQlFwJ58M zU#A?6To*iRZi1Di<>6gnnn0(59o!{OjKFZARGN$c*o?c+is5_3C_lmZCqit$S4J+V?#?eo;65Evxjv zrI&aAxc$k&5|-60e{WZ*z2U&3#tBxzb_W-&Y|;0h86%PE&taJ+#camM4ys@Vj|ZcmC)0Q!<-QduddF=3shV0gdCwwSwJ9P8*TMe7-x_!v0cWAlms$EAj z$Cl_9u;g7t#i4_38+{(};#5$;)Y!Gf*UZ~j{n0N$GrilLZ$7wt#EnOL7o_z4rToEn zW-Iy~S=Q;c@3te?&U_rXqIT&~x1-Y5#M*vpcGWQO?d!2mci65fd8P9G153^gQd z!K!+f!~IA1?&7=ew_C-+%VoJ7Z{^eDap^Vl_B5?*JjcTFC-B#D8=2(vLDz&4kdD`T;SG~N0<_35iOIXqMbCVrSKm2&^ z*|qV}_2wqV9++db+2@Bw{dQL9mso1avi1ERg0Ks@-Z|BahH3zQa;q++1R@-%Pb~ZtTpZ*JsBa@%OB_ch0i)Z&Q!%Qx`To zepl}5^O|>7#g@93buRSXwJ7_?wq+(So*ee1QnZtq)h`Nd<0npC#FzouyAsOIidr)_NaXNmZ6(;nBeR%I_Ju4!o3FR`~x_pR;2 zt%8Q1+cM?G)t^3heBHCC`Team%2!B^*#Gq9=bMd&3 zJLg>W`Z(s$$brWjL`A)saC=~L-v>Xo%X~es*oIO)`@ZtaY27EHQc;{om3F(*@5_Q} zUVqLF@Q;s9^_l;+Xv=}U8n){FvP00O$ccAyTmMp~@5FAo*1ha~3axAr@95E?^2H6^ z`}8O_p!$>!6I$(Cc|LStZs8)O(#q+#mFv0f#?`1v6_=~4l}fOx>k`vH_hv1pqS;QZ z<}}??biu$^e*0QB8}i3nj}V78#lx+GzQ4G$YK2R$Cr@|YcWG|(fbYyZyEVLj<*;VE z=H0Zpt(O1tWZ2a*+mBT4`X#VJp9?nEe;YJ=c$1{#UmPY(*zMZiX=Krktx62+>aX7V z_=@&cEvI&#gDm&g`^`3G=Y)YRJFc1gaAk?J{rgO}xcU6Cy}rRh-^+a)4Rh`?q~>2v zT8B>-+ck4ro2Me(Y<2+bb3~C{D?T0 z8b5z|cJtG!>#zN{FR_`vVZ7V%wYm37u1Sev;cNVRuL?5o)k;ZG;I9q(giwb`ZY zmv%Fn%<$@UYxw3$&wkib-Eg{1vFwSdc&Z__#Xu-m@%I1URL(QE#DZ~wN}(w;r*Rq6Q# z#96p*v?(5V*r|o{PfePcdwg2tH1ArreY31(&9fUl@4a{QuruB7eEh7Bbsuvjp=sER z%By#8aNcvi*^tYx4ldaL&Lh;mnzd8L#Tj-#G~H&m`CN;gJr0~WHR4H$Ct*Gk52xCguhJ_3btVp0*P54Zt7Krj#kBmhf+lfZQ#3wQ&Vmq8w& zKHvs)1qJ}2KrE01Bm=3yN#Ht=1>^#HoB)*tY6Gr-2jBw)12I4XuoOrE4ghC?+dwvu z3+Qn|?hLd8e1Kpe21o=}0(*fBAREX9^f*y33)BW&fv&&+AQXrN5`mS#HsCOD5x58F zDo6Kv;%yB2p|qf0+NALARV|3WCOW?4Nkmm0Y{)K;0r_maX=EV4LA&B0GU7zpsIoL z06V}LXa{%!0e}HW1XcpufWv@mO|%OT02qKQ;0<723w!`Oz!_)=55Ddfs3BXby1vm_30GU7zKzB^p0JeZ5;0|~Kz5u;`A`VCb zl7Unp9moJOfgFG~K`H|E0XLv4FaU@EXtON|NCr}YlfZQ#3wQ(AG(fq4Bj65r0=_^5 z5CVMAFJKEe0`7n(;0r_maX=D~45R`lf$IRhkRTVZbAWz;U?2ua z09FF2Kst~CWC6KAVMo*ts1LXSU4a2WC=d%I0?9xskPc)3nLrLuxFPZa^#M1aE8q*P z2lfJIf!jbfkPFy4L2e)!NCnb?3?LK80n8i09sxVR8E6N10l`2FkN_+NQh@6~HjoPx z#s-xw;0kmF4g(i~OdtoK%_|$g7H|Z*0&zeRkPPevP6F3~96;p)dcYQN1l$2HARWj7 z=#p)HzzygM3;<$)1YjwU0vrZ1fK1>cP}mi^0-S+%fEN$|7=U;n8At`vfeauEcmtR> zh1~J%z7@&>L@mpDC~b&gzLig%y4)LVUKenu0aKnC&*ufca#-0Lmy*b5g>Qr zG};ILuD;l}%f-Ik2gvwIN>aVW1`_dXTt%(&1IW>1SajriR0^to!)6zSZ}k)5Hf=?j zf8)j%a+PX}^pL+r`tUT7K4!59(@T?ya>o-9w(2G1X-y*25GoVJDYXR#&Vjm13 zcelLYHSaeOrh6udOP|t$7d>e~M-7>`HS4_Gxg~{0RENS?sZLo6rL&lrQXz zprd!SQTPVyXN0FHH-@gf!_hbG=*a1c6qGiPDJ-W?JtXLBFA?dVH;XpA51kd_Hlw>C zC=azGxy>s@o_^d$afO9l{COYc&}J*#YRv0&^p0(34C}u5U@2J@?knIr^3(g>{#upz8OfqKwll#{q1ZQhK*VBAsrxpzv&#+c#6tcQ_%^ z>2rycZpaW}^O7Q*@66jsWN#gzqY(hMLXP&wDcleBAV>EwQ+OixTY7ql!i%`ycEMcvH9g&BL}9t_Xorb#6*a}8 z{%99!(_24c|2iGE30aQ-b0F_gpc8Cw3_y-<(<`F81GnF&G>B zKE&Spuei2_eAxiG%y0VK39L71%(p-vtP7CqHAd)Y4YzYI?ic%bZ0w14BW`j(n~1rH z!q1OTZnO!@Ess&FqeQwFk8yM_DAC_7FJx+2RHR#7m$IuiVNRfwl9&s~HE1EiFF9<} zP1w!XW6?d`fRuUXlsDR>+sKLGmK};0DDmX!E?-wn&Jxe8`Pl-+H4w74f48uRH-Hdjj%2I(;cA{g3PE4w8fY=T!@r2RuO)Pubq_X+x&^Tg-=OV?pB?M0Q9gYw z3S%$XCXKz_k(V5O(}IrV@leaQVa2vakE~L9F4NN+lPE0DA1yIX5l@;gZu6XR20Ep< zB+%(^Rf2h(yWk>pE3c$P@WlhlhZa6 zdF8$wuu+5$K$qk?K__%H7j{5yc6E_1p9j+C<0-w=Pg1gK+X% z$>+WF%_ZUy0DB@=D^i3@V_YIPm+9wo9q8L1ME{2Q?V2URbxug+DthfL={^>EF9yo% ztb09=5prLqN6U$i+*j#q+fo?oM{*xv8x`TxnsOyT>&ijAwtRF$tS|q(Db|=;jP10} zEQ9f#)|zzyT5r|_Xw6v_;}5Mn*8sHk91qa?vo1hu&=CNwLyJNNa^7u(-I<}zzhca& z%5z_1d(kHPqsDy)$3a5w^8KW&s{Uof!xXXoQU3wL_Gxb<9(j7Dqb|o$CUiyTJ?>bq z)45L?=DyY!#5vF(PsDl1DYV&rtj}pYU;P;$w}L+9^B$V}Y;A?C^g?ess`WvXPY?W2 zIE`&u`rr-1=P{0wqo<}QeG$)jWe*7(z0d9Y%0-0d^LRiHgcJR*yykRD6zv-Y`Cmf* zSCE@rCfb?kk)uuQA`qX}&^XR*IRDMNn^FbJYDJ<{jOkOI=lJ|?~ zacoLY!kUa6y#a-e68QaAhr;4WwIRYw~2Il--_OdLG%aN4l->;cq-c+-q0we%VT-d zI1!fD`VJEXfBAf~&NpMn$o_&pljpRUZ*1wbpGcR_%jlVGlIH~1nZ8{?VcP#C_pZDs zPu|P)A1l&>*zW7D6zTH*VdOXCz;^}Aw?FZDggnoEH;c*Y=@kaR;*$2TX)aI{6mzzc8I3z<(SA$Pq1$74mp-o>HV+YH zuk1%9#p?L+@3-O)TZmgg$^z#-Ax`j)EM+ndU~po(&f3KC%1nGZrh%) zAxf9+r}13T{$KAqu8kFC()xj1Mue#60rc?^JcrX)Hi-|773Atd&ouv$o^x5(r_+VL zLyifZA7s6I+hW}TTDm?!`zR}rejK1{1+=F^*9&N0h0gEgHJ|nOLhcvbZ|P+RRK9#J zO5eYsFkRCicd~(~7hPkL_gvl}p4yA%Re7AH7Y$H8`8Ol^Q5;4QJM1o-W_D1aB-f~iZ&5p zc|Wb>H|wP)g+<>VfT0Xh$(^8q>+qjLf}ACu1up7S}p zyiTOg7m}XJ!`@Z^8tPhaei#0z?N_G4)*5^34I06*9iR-sOgh7ITq+~2m6S? zu)8YNI-t`%kZ{HY=}#CTc_(@?OhRoKKQ8@*dL@tm7ywUzf4v zb4+=k$c%M;*H@Hz9X3Yo^9nY$ipN>{auo5Py=8Li*iIu@&b6pNrRPGwTX_ImNk%>H z05xGJLjYIUi2>*gJDCOyfSoJ_!tP*S5|{=%Ne70aUA_mhU@KK%CqDwAuobdHZ|G!aYiAl;Y5m+7?L*i3zFkL8Ss~<$L>jrZ z0irzlI$fLIdE4?jcvGF|{FmGwHxZWCw3V^HV2*eib7;Jwv4+MOa`fFS$}6v5==Dbw zrn!>by;g#kJSNizVJU^Km60=FF4E=wC;ILY>74FKkncq(jx}0Y#L*fp3!rmMvRgXO zB-^EPO|oA)-y|ERb562jI`1S~rgKlSXFC5Ro2GT%T!8jyXw0L18hP9shW&;@C~M16 zTqi)g&ja5!;N=f21CI#U!F=%81CXPyHdB3Q4}o0m!eTF+u1V6IKz&x87pU*j+#p}e zvf#ByBF`7}nOou|UqiG*Jt-_-L;10SuoXJTqeaqTG`I%yRQ_M*FA4| zOrkwSa+QjRzWMca|23EkN%yqxAfG2L<+(z>XJnzBkRiWo#Xh|DmaosgvK2DO=hzoa z^nH41G095%6y!Sdcvv=53aaSIU`m(okNFEiQdpj&={0N=me=R>Ju0$SnjdLyqsO0B zbnSOO+JW5Z@`A5?PYJ!wfKq60mz*=~h{~aL^RTBm^%Zhz)}1`IXqO84CTF0MG$Ng8w zu%_X)`x8`#>O=P((Y-FNXupBLHQ*gE6z40mfV$Q3d34|ukPZ0Q;jKLYxjNjA^7S)s zmS--@LvJ@G%Ht@PT<`s&{#zD`@IIl;|u){FEWXW~rfHso6HUbK9k*mki< zm#;x)ai5|69C>eI%0NLQ@AK|K-yoj7(upIkvDW(c>$P+bI^~hqt@JuY3e)vGayrN^25YztXyd*08iTp>-^+PiQSmYZO|~(mI9Kw6s>CbuFz|Xl+Yt7FyrZx`o!b zw05C&F0Ef^txIbdTJOs182W%J)sF6QBll^n2+Mmojl)G)J_o0lw~&3%wJo}?Mc1_G zdKO*FqU%`X=si_*B#%Y*7-K0c?>o_3Unwl_bJ-OaV*#D(jedj#IC}jHl|$Fh=-SyW zfUcR*^)mTdnOjBitT)~JM02owJ~1ZUcuqn0aeRGV@o)3=xA%O|$5Kev24?h+YttBe z=|~=TcW6ZTR~}F36*wd}^>gau)W4~3Q@@t`^yeuek4riT;kGpq`jXem6jwkU6Uq9AAzAGxlX_I72`MEdnVs!CO?}ma^Rj` zDW{N=YDmxA$~1bU5x%9NEJQ~<$k)K9v6AXy0Yq#~usXkfe(`DzoD&Vb60B-;D4nrA zZs+H)a>4Jqhuf>-K$8R{1F1kdkO5=@IlxPRc((<}UBh~d!fwzfx!;gL;hOPMP|8DL z4-r(|MVnICud9g2;_y%oH?1J@=WxX~G!x-n!vwute+)+|s9#l5L`&D#NJko#7WK7~ zVr4yO5u#&R2c$PkfaZy!0ERv(y%hYid|VEGd7v_23seVc0rh|efIZ*{I03}lnSDAY z=YlYXWR*M6251jZd7a9n@*g8@Gvfa8Y34+cU2Qb#Bd21Ei; zz-V9$FbAdm+92pj{B11A9Ddm8>3;4E+sI1gL|DD5iz>%d*$A&?0?0v-cdz*B(e zeue)6cm@0hkUhQz-T;*T7XIJBN8mF+!-odIa4fyM0K`FeaG786!LrHMOFnXM(`W6DKc;1#?a^&Z zZp+K`-2Y!Ek8Gpo{X9yQKfH8iT*(2!kDS~zKaLB@HvIAK!Jm4w#l4GN-)ktj_@~yIGp4n$II=pn-W@pZP>&A!;{MY;A1r!MPh zb-R&!t&T;0Yc=+_eP*g3>X&Nu)aIr2?!iNxf6nT9QT^r5D=ULmjfuTEe?{Rni`JHG zTWZshzy4}c{lSCXy>cR6wrL)xuI!td7NS~aer>0!<^CMs>0^Iw_{%}>*(E!^uUz@Y z&IfguMQe8@4v%$+i&+@kc;T$EE57*cd5^LV44KyWMovE)f7?Z|8+R_Y{McTbQl#mX z$7u_%1$l;^f+xWxhxuqk= zT3ID^Skd9u4C{$uqlN_?ecQeL&y^GRrAE7-I+XNwa9i67FXu*%JiO<`g;Hf3e~I|Z z^{%E}SYfZzL5D6ljUAX-H#?`(n)gM8pzS z&`#s(e9C*{ko1TN`|GT|;?QhZ>#E0&oSxw|+M?_sd-EN)3Y(AX9v|CBpLkRo_Nr2Y zCT~ht+5AU|;-?qfURJNy(-}VDEm}_KKYMkTHN8~>_sqMr;e3~;%`P;LF8(;mxpXVF z<w=+ohX*UFrPx`iu9#2nQO>HleL0tdR!drE40NyP z)Xb)O(}0hODPymHKlWnP*F{T>t$u2HwQ;Y*D!OK>e?Lm^H&~O|v)Hm$m{QnlD^G@AJ-UaeJoroy*p&u?Bq=s{!VOJ zG1`2=yF|}=f%iR+z5CSMBY3KzoOh}3I=6S9urjuLwQ1Jt7QDujnKuoVrSH!?v*OXn zq9fMyEIGLI)Yt{HX2l)pfB*RV=*l*ytajbr+%#?84vrMhqX}b|+;3}fmnFS0cW5i z&<_{^!~qL{jle6k19bp5 zpgS-GmHXp zf`GBWY#BfAfX09a&>si`CIJh9O+XrO3CINg1aw$f zl>=G>UO*5q7MKkr1ABnez|X)-;0sV33$Yr2E6@cP1dIgYfhE8e;0TZb`~uK5@VfiFODoYT|*T!EfIAP@u00#*a3fuDhwz!#u+CC~$|Ku;hL zhyi8+tASm>N#GXn9QXv-U?Eu@XaRTv{y;P^16T>{1danY0P`x?djaYKEdWno7%(14 z0@eZhfpfqgfVnN`fx18oz!UHXqJh=GF5o0^3wREE0&J>69>4|Y1PlPefyuxkAO*+( zegQrK^t^I)zy;_83;@D`$-p8Y1vmuU0I~raESReUE01ysL1{MJ+z#-r#;1Tc! zu&~2A3}^tj1HFKuz!)GA*a#d1E&>mM*MPPL#tfhy&=T+gh659TdBA$$2jDz#AIJeT zH8ExYbpSV@J1_)@0u}?Cfy2OM;2H1{C|V1)4$Q;?)?9_>1f8Yx;1i7{Z&5GF%kYvs zB&$C36zA9UvSM_tphP9*XpT6enbHb7_CyN9dMl#3Br8-Mzlf-`JxbID6sZRFLY#wu zB{{=%5mh)wiRv?3oM2fFQrNp47F5j|2-%S_ySbop?5$9p{3NLA?^bwCM~9^nTUm+9 z;P7BK5!EwNp{l77QHdbs3Ke-TqEfafRBw=(cp<;EaS88LmWW!1KF%4VPl>4hE(%rm zcOq(Ovck)vrHGm{LCIM9M-kNvV;}QMULxv9-*qxWad5S51yzc_!i(O~NOC#VRLfe8 zIw~^IyC$IMHxQ5YJa;iCW%AMA6G4xvGa?fK=kJ`U?9=YzMuK zc2K09plT7XP-%LhS0Q65WJHBF3$Kck6sq4t^5~<#T-mj#Bo)~=N{X@;_KpbYb}f>? zsjec_ueC*;%NX_dyt9aUWVA#&m!gbIpe%07V{H4I1C@f4STanQ_S&8b8 zW+h&;x+}bjvAxpi9Q*ewA2baVkOW!WP^+y*Vr`R8!oq1X8_ z72Oz1EY(;LaFftECq+#{y_ib>PDJ@7D^X`T>Vq-r^8-P(2QAMf?%}EyF;cZGE~uC5>kH$5Rni0`n%b?|M;0tu|8KLo<@}+v_M)KX9w8Hnz$Y z&PdOuGp`*yiu5*)B0*<_fwutzXkvV0$?M)r@@9G|x}aT3DwAF=%iP9v!T^par$~t^ zXR_o?#X!g^b%wTy;BNp?b8AUnuX+kW{WQUpzL>`?(+hQ?a$X2x9I2exBpyMV%(>nu zp-uYYDNA#;g~)h6Nuhe3DWZNhHr7L?8WN#o?8VIxWwZsKqatIhv3stDMo7deGbQ#1 z6O~e?AetnuH(05}jmzS&Nh67>T~CELi@VBz2}=3V??nEC$qLmw7zwd_2vu?QieXf3 zh^U=`kjfEE^yxGF5hRPt#LwI4rd*miXK5Qv@h21637IO_KTMKW9@EkD^Aaa%Pei2?B zR2`B1g|}9CV|z=H-wW@$@ctBDac?QDiSWh?uX!ISGC+7AglFd?MGh0*!huq#nz7Xj z4HiaK1>|gvW-cP?A>`nwR1`~xn}i{>o-MIKgsOqJARZ1GxYg+0%+!$dvgXo6gJtS1 z(Y6hYMydW&L^WNm@EXdSu^rQtsJ~wbs);aRmZc+#A@{9)g+z529%9ISX7zX&)#K1r5ZjEAh*wWhIFIKZw77x7 zc@KBJC*ev|>35?1&}1cJ-`gT;uu(l7+lVNac}guiW;0cJg;&*HLYBX0NW2ypJ7@~4 zr1Wm3lt>=Uo{L&i^=9+H^Lv28a*D5D*#N^6TJMqw^p4q}Ms0`9Q>img?+ zC35S~w}6oUfYChZnGVYT7<|}%?u`>N(+7WEy{()xYBhq2);gT=7?Mc-4#pBS`$g301qzkLPa^8~ zCQ2>49v4ycP9d)N!&M?GAYLi)3O7jOWQCWZnxMK-RG});QdB6|*xvQgjYuwfojpt6 z^@ND}#Zigs0}`S-U~JrknTakS|7NJPCiMn!TzwA-f0^+&p(>I6k|g|@KKU4{Xd zK{0UA)rF{)yDL;7??lEO$qKJyTQ+BU%Gd-R7fdfppnA1M zm}@`AR~()ez1Vk-QkYkkAT~5p^3O;Y7Zmp{k*NHaN!~=^9Tnak;k^@H@#PA?<=sRT zRo)7}Nlir&ql1;P-@-*it*NJo_yp$$B=zsTl&EA@1ihobG?L(=cvQ^_P@=qTMTSo> z2~fSOs-*nYR+Lf?CdImO2oR+_?4y)2i3hFNfeO`{cOv7RWQA951tI+PB2rWtto>0~ zU$BL@uarVJlm-0RD4@BE;O2qPm})01l0>DCC@}kx zm&IYpMv`1rdn)3+<_GZfMuoZ*7x^{*3RM#xiLB9$xReX`1yx~Vy?XKpIc|Vb@Yt4u z>evJ&s>VAJH9A>gPoIh)i7Og693G+8T12G}m#BJ#OWtI#fh9OhlDsC@1zc7dX3y^lgQ+(R7RjFG6eO;(7@u|Zz1r$pVYE=tka zDVm{s;Hlu-*dt?E#-7veO7}D2!109@L#D2JBZCQ9r|OcoBIUSy#)%DErcie6EVDVw~K(mP*gMY z5iW5*Is|M^WmQCo2Q7p6FsuO{eMX$Kj%G1t8O0cZtH#9bil@RY9p*<-J+UTc$?jvE zrl^)73YGaO5mntqiQ4{7L_JAXN<0ctDB~Mnh1W^uwaGZxTelKa6XF!AchEa!d>N>) zuUSNh+Q8U7s_hq4SBx5?H-k_{`dA68r)3)vRS#=r)nsf z?`kR1JmoRIHB5ucoc2giRfo(R)%Kl;nr*EARgTiFRjM)Ry`XZ~rbL}(Udu#>K-sGO zoH579tDKw2xHCzqW##cgmuoSrvf?bz&q?}G#@_d$ouHcDTM>0Q3sKG}#LZ74W0T#A zT;p+v2l47`H0TMe>MBq*6iRL*_xFCr63?Fyyy(+DELR$Q;?>+&$ygWKq*VIq5qK?y z$C_LlAqw76QHi=eU*va#&u!d?&884+m^0REBdF++HjbL`Mnvr~jwvdhXcmBqD-pIt zl=xFsMdGX+k#RdZKUcyZ?CJ1noHU;GiC6NU^@VO*Wcj9RQn-4#witjd=$I}Pm#PI zrYqGu#I{#;w-VKlwdZQo-la#PF#0qUYi|rHPlxmcSa8mrrsR)0BZ%L+C}I?6qu;Yd ziK@u8j2NI~+{7)ZOI8dG1;9DRNuIQ!ha*z-KU_qd2*T#c@<)hxlkz3~OL{7& zTZy*M!#|yEqL`q|lb-o6>5_>e?;j@e%Uf#6CeoA5MMAczbXuaqJrG`N;oi`Aeuau!FKoX)dvo^-m!f!qm^k|#Z7kq+ z(MhCF!K|F0e)0ZO$#FNyQ@$;ypBH3#(sMZdsEPE{K_UU?W#sbYj~gr!OpZT(B7LXu z^5oCpbW`?~G^F7C?*1a(RDS6`a*!N1QGRBCNHC>8=@acB@iLL$7iW^>OpT8@oNj7- zq>q7;Gu6K{IsL96Yb`v`vwfroix}KvKu$^5$BX!!5aF{K3MvsL{W}g50aNw&{Fn3y zP7f1ol=9ng`I(%4=$rHboSr;fB$!&iWN^AE`Evdxzinv2^>gQROF@=LKc1Y<(?Fi| z2u^QrB7Zukn;f4xori%u{B1`F#tnq0=r^AA=gH|FCdyCdbW`<9<@9$Z@~3jcI-5w( z;dCCR^U5DCGWHUlBL7O3KaSH=Oz?N)1*oa^_vG|uCh{k7`uuOo-^=AYjuZ)1P2~6G zbd&v?)2o}vZyPBRikV1v=X6u~BRGA!iTu*{JdxJUM7rlFkzh)H5u9#neUoe`IDa~) zw=z+_^o$PDOxcGc&H>2<2rrNQBy&2Czl!~2a{H;GMMfTGmGoRrkKlAu`c3Bah9=6- z88fV2u?R8e=?_6HBo*Br}Hu*PyOA;iHuE5QkB_mb{Ud4p`Ih>B2GIDw9pEN;aG?gAPNu-So zN!QvU-TO_gVv zt~ib*mk+;%NXRKK%H?*;x7@>^ljSRjUl!=n{{ugI)GnCivqc`sFIs@oznC_1P^t=*u*-V#Q0NqK@`BoD0Wt*TQTPCL->)BPZbc+?{2-?W@ULOIn z`LdM-p9eT5r`IeO5&77Gn+EpG^aa^p0O-=0j`tDr)n6j$QkZUwC_Z1hy`XcfBE%|R z0Np*%)n+Xef*ro2GdbK z$>me-;jj4d{#U;8Wq~fqRn&9034Wx%!q|(g-Bi%gewgIsay_S5BC8{owrRNlyWK)c-p{-<0`$t0&@1b{@=h zyx*qM*UFzS(O(CBZg;_#_uo|d>Za*mLJs`^K~MW}l9TI~Py1FZ1bM;*eL?GxcA)cR zy7SET+xkiN4?2B>;CHkDx`m)iX1Y@a&>aSy$4J4ipz%Embm@_TZf61f3R{BTC_!hc zpHMxVL6^yN1@RjIx?sb<^NRnE}Q8J znxF6tw#qYF$XC$()D?8DqXpeX6M81QO@tlhFr7SZ=r1e~8D)Fq{6v2k^vN+InfD1* z`dj(alb)_aj^r_dzB%*B&mKR5?f}yjq))rT(C5FdrvlOP|Z6%d{c>Zz{J=u9S z(;s3v^}X_^m)ak4#Ecd7s#ie0=+%~SOjl67KK@63c18XhzpkK@^)P_W zm*wMqg?#OECFp#Zu06BMuN_Z*C0{}F>dUX>@g8^9!%HF1V57VBINXCy7^3}AC+XXedsj;8BAZ* z1YeS~unpD=OqWmqoipg%$BW`jtt*J%0ML0bT|wuK@&A$Ewy*e2FF?NQpiAX)+Z90f z5p=hiuAp|YgYX$lXKMXT_3a9}+Y|o1oeji~>3H8YPd_AnD?yjdbf)Z<=uUzzhv@=L z)R*kW9CqM3QOGCHi~68B`PvQ9JA*!$=>wUszI*=kQvGofoWk@4*@XdgsZ7_^2D-9w+z)WhDY<;)3jm$% zq<^=IMB>ME)e5M`-mmx-r008}tIhm)|2E%xn3pulH=}@Z>w_-gKk)McT^!RDG#|x+ zF6KYfcl}rV3L3vIekI?K0_yPwbQxT3LHlhLOQHWUT|whRJJ4nR2f9$u-Tn`B3qdE# zS5Uc!L3ft<6|`>70$s#pVSl{OoUa`eE{*=qbiALOFP$^!GN%ZB1WAu)Tl^@kTCzysDMC+QDa6q4301aM+W)@s2o~HM1+R; z`x!#Q!$vvy_=g7s+WSRBIJ6B9GX#biMme+#j1CM9j|hx(@CpwP^$+$7k?Gn64)u!) zHQ2}a8|0LKl;dBoo^#9+GG&E$0gMX-BSdc?gdq;amSwlkPf2hkaCL(au zKjR1I6Bp9R)#d+6g}LzmE4&QBA&~(QevyVT4v~HlApyfig@-k0Xy4FSVPm{QU}R)? zq=UWv|MQanpBISMHUvh7!7TrOsI5}?|NCl7Ei8)thn0P0@3_U8#|L5L_Q5oYC~+gA z41qC&4IDdIj3gmpL4!v{MMQ*08ZZi}1`ifgL;OYsQkZ-7VDx5t|A+{c26y-y0s;bu zf{Qs`4K^xh@W`mZs6Ygfi7`hxKf>Ktl zKeGCT(m-kmkECRrT1v?cU1ZK90u6phz&Q=ZSJXW`lIlJxFfzn1G-Rwa#v@r$JrpS@ zC3C2YvaRA^{~L1Ju(iU^e&ckp22A=MS> zvVQ$SgTf<248c-6xuMBJ!Z1ydeTe2COsxg!g2JR6FojWuNYoz^;Z##OrfL`hFkZ{? ze2nORy4xT5G)A!NJtYB&bejV z!W!S7jyZZXxGHkVG*sGXf2cNWl#~WZC@kq4`HVrqL?ki85kp29{0xfek{QcX!G4kd zJS4^V!&rtZ638|^JaCK@2fK!Phen0@BPUEog=;s3%pBvWb?~@DOSQIyr9MroGOJ!f zIV!1jvfQRs>APqfNd9+P8%zCUZC#y@R;6>$RRcRdc+q7jYvs7m0YMnlbQZxw@ z^|qFsr5GRlo6(TN>UHi79r1|t%X<@ zO6{yIr0c8Gyd3YNt*p~5HlqxkwOU<2tyMoHz1BP(Kh)e@TM8tqG@WMQ#Lik9I@DTq z)|PhDR&awDMRb}yY9F1C=F#|}+A2Ctve`{-MQ|yko1)V^6r9(Y>4zdxe^YaRJak)9 zr`c$xU#%^!Gjl8s{#|sM3lq$o)ml#-aV(_M90bS7kg|4v5TVdC)FKLkrD-b|w6?nL z(qUzT)>@~5D0sfiT-_IX2*0VVWSNDADxP%^@g7tJ9nz6;#lH zNH+!QH-OO;aL}je^ewd7KaI6oK4B>8(8yA=R;q(N>QKy0^LLC{HBpD@7NQRN;#3Lg z-(33FqVkeDAB{=V7MX`yIB9OEUn8!FX6uB`LE6%&omLkQ8Gljh&r(ZUYF14kMcL?H zf8EF)I?b!j1{7?1L`RZyf_bJeV~XvQ@YP$$ufs9_ees9|4Q#t)Uq zZpvgUCZP8)nNZd*AXRCWPu!-pw%m?P2s~50hOJML07TCijINp36q3jKSgA1v{L8J+Mb=YgWR-MQbX!TY0D$Fgs!Ew zP+zUOpLuDNdSQH;*1ex*n47Q!6&g>U1@(3( z?qr^`$NP}E=`_MG_&&1t4jlBA}8bLm(s{pWLq@NT^(&zqH=~pY#(*Px_ z{tZ_EgPaNVucQk6`M*(t1gQdl{MQO>P%0qQ55sxI(rZjgzmBAT`M)9kTuJ)pM(OoQ zrl-|yd1ZgfvYUS`yZ)v;mSU(S(VrMa$Gocy$Ga%)0XRrwsOEbOrXK2Bv7rFp$OuZ8Iz{I&0e*w4HD;RO@5V4wMecV|py6 zyNLl3J>V8s10B_9KuR@e{wGmy=2H!fiD_nOlH6vR(HK@Vg+Y1MsL+DPl~eydu3Tc- zbYIK%kFn(h33t&b9FHv+9;jDaVAMt_q**gf=Omg$G^@v(MX9y*r2)IHCR3;Pk*ASu zlJ4_NBdxKH!ZcC?I#ubOVsUp!8tV62nAv|l)YF1Rt@-z9BnnfDas*vRq zOuJ`dl~tpDs0sTA61e3Ka-a?3=x=cDIk$SQA7x4a*+r~ z5C$fJVC2w%xJk$X5ps}&Lrn+?qnV7+h$85^FL{&DhNKI1bpNd5=wk^sX6d3jm2^!fG4V56~8ZS@=H6^BLrSLr^ z!RH`Tc|0^|gi*C1)C@^NU3BW5f@3JUL^(MaHgLWP`z&iJ>{+=H-mM=cEr|V+)Iq6| zygoA(*Z_|<}80(uPBG4dHqMYd1n1o>0WIQCM!mj*!OxFn^N~;L_ zu0W8ePB1BVuL52nwg_+%e^^QWHB3o0=b%zI<wPz^!>sj6va9Yg1(BWdQj~-S`9s@ zjsk74DO?l>!(dFN>tQrW*hY@We89FF8(CJ+egiC}FLsPq(J4fvDQIz@;2yNS`J)mv z&ImgUn%zh3i%EwS_zfi}+^8;8zAT5UNjKH2=fQ3Ekc@5s2)OoBsfDzaPC`A6ZjFdc$xAfETc&IPz-GzP1{AZ z_f;M>(gcWB+$(8wRRSd(5Z3ePDr^#Qj`5&6@-A#ga@4U&YCP7M3+vS0sSt4*TtKA? zal(^=FQZ<+*_R}z4V|*0NgaTzNf3JJF*Olfr;?(ThkHRn8Z)r#LCEvCPNbAdG>qC? zme7cg6B}}vBu$hX_p29R%3W@%gKL46yTguQ6MfM!b+~d>lX{+VCAs@1brz%|d+A;e zxC=^a0!N6}x*$ooq{jvyRQrT%t-5uM+TT1>wMtuzJ%uXRPUFx5LQWGlPto8gH;3XEH*XH<)!OoDE7<92)hdFKgwg3&zH)|kM-IQzdn9Hnw+#BQ)oQd zeLYC}(>Q~Esd-cIa2(G36cjYUsE(kSLvmm(JZC=&Mks$Tk(^|@r*eELg#mFvmxT&> zZ%2bf_HH2!!gJ=h9H|!81?`hB=uE8OVul}Aua*kC*?uO zQYZf@*SfxjyN;ZzsOwiKID509>%*z*A1ocG#yPrfeYk3YI3=jpU3sZDj*0~7uh2LS zpOo)|;Ol}Fb)eFak8{MKum>1&NWH2YgElE3gf^pbTte=d`>Xm z*e@tm&pha&KK|Tkyoo)$Id-ztQy>0t^owz1Vp4uRD;71FL`6H;YTi{=cednY=Bm(x zIImPn>Ev(e9yKDwd?A|YuC#=noe7GyOD%weRVN8Gx<*;(D5HCgsI$G)*p0 zzU)D3sAeFT7!Z?|_8{f?d>Tu5Ts;%>e#xURP8F5bAUSsr2UiLcf1^7*tx?$?T8VkM zx1f?u>xIyy;J(To8TAOda4dDY!%nB=KQrp2Qj_vw5De|nG73VBNU+tu-a9D$*BKTM zm{EB~SVIt27`WQQ<>=(OA?68~UE?qzVR-i$o3JauDvN%SKu5|`MXq|3BHPBr zW2@+FQfV_#NZC^vXRh=iMMtiZTTPrvlW0MA!dfrELK6~Vu0l<^OA&HC))<6HIP*1C zAyDh3d|(P1ZxopbIu>BgE~MyR#%FyHY#DGSf*Lq&^<;<3>{-e_irD7SdTCOY!*fql z5D6uzLzNE=6kg#HJojUS=@|d9l}U%@V(q3C1-ESGQy`a0!Pz|s&iZ_T;Q=2~j);Mc z6eYq=)*E4l?I1+={sF@7O71}faZ~E$(GXULK2Z02x>Rq|0R&t9O}X%OmFjTfh!~!r zM2#o4!28i^7F36d3)MkXLeY36xX>xaMU;VfZh~nm@=D~&XBInu#Ea(rFcECBelXGA zV;F+7kQ};6GfG+sZqi6A;Rs%i^HVoL6+P#wVb?>hO69$B95wvOSWjsYom2CJO$Sg| zqQ;8mrHIBlvDcupWFaP0JP-%Um1;BuhbEObC=575d9ZQcM)LH=W@aw*U!qRnCPf=v zH5tcEw*0atclkCs$+yYTV2)ii_p$`NeovgBYrWRSMoasb+dwbMXbS)pVeVDRfy@z` z863)Ajux?*qXWgDN(|gW+~WXk2`({>!f}nsiR4(ir!^W$u?2_5!-U4^+|Y*Hgd8=D zngCJQTr{HP$LsRvLH-i;64Nq7&V8Y0#Fa2$Ui05E%KNU$rgA#B3R2!N(i$0rwA{eb zZiNm?dMdjNIFMJKz&$lS-K3Q@ltLukEeM3{-+)eejCM>o>-Z3{5Zz^1w~97R@&rfB z<0c$|iKrJhBYRgW50{f`5~nzU*ur`Jli1=mnc!zqJa;B&Hd7L%^)xXdy_}q)-CI|A zPaxSr9>s5_3Ytfl9L@}LxhryT#$B#?Cgt}a7o(~iqM1)T1S1sep{{;GjsspE2et4v z*e@dJOH#*TcxVH0NYn^=f|M(HiLi#6h6ah7qU0j_HbL`E6g%9j;C@X=P+~v$#ktBe zU_L~dN1gHP4--wwCF3A=sPblciSVB5gAT%XCSf*<1icdK+4t7)5D#F z{8$J%IDnAqwBuMKsGU&LXzJlUanIhsWc`6;PpoegSNzlAJTp>^5F;SQY zAFt3#PDX7pDKp3-XDLqwp_bNHj3ucIr#TRz1bp8{R3JJZ;56q zu~eV&gA>!c7#(BH!wgZj-Jtuut5zuMo)uWAf9O&kGo5oaR&qI^FAE?(0*fZlJYc` zG~~R696JA_Lt15z+K*z!U~CcU5h);GABiL$RRIy5oZ)zl;#QTmcPa=r$><*C;&~wC zfP+bSTkyo8BUM4TNzcoyReRv>2pYn1EhI}nh6V0B2)0KGwgq%7Sc?>_NiYc{*lw?2 zMATWZ-5$Z3Sg_p?3<1VgkkgZ0c!moS;qjF!)v%3@OD~5c+oU9PsK%1KBqgEKw7@Fb z>Xn3uI!m(EBgrc)$yTYN-GZmDiq=RK(O8ZbcR*jI4defb=V){{KrVV(LZx^_=2r;tD{ncF02rNLBf zclj|oi5@TRNnmB7gTo|vmj^KyE7c3dDSJ2!RhbzL7Hw6!*ZN+Y!rH>3Tzl%EK z)GM3RC_L6zsm`xdGn3R}+=)(7tHj<3V~NLDrbE|t*rF{IY_Y;!ii;rJb`+<3cqo#R zYtu_1^Xx|_vKMw55| zBRFUn9g+qsPu?tokp029SA!n)F*(sQ+=j#kTJ8tY9Bv@d2253M$_XBdhTp!~Y*nAY z4H1~utHBo{XP04<8VAYZO{t<6Pg4)@Ffmb2r$;ZrWu6eaPNn`RgCLvoCC+W;;Wt_U8Qq8MWZ?07D$H{;Ts{;8~*({bUJX0Bt-AjC> zXgQabsY~Wau62g5Cx#waW zdWV>=5LvxYv%ln{nx+eJcN?%j4Ec`iL+g_4bQZk9IyIE?L(HY}ZZkXv9irf%Z3KZl z=J>k2o;TkV1P{f1XF7WsMEBjM!BFIVHM%281`=#qs`k7A&Ztsy%uz3)7Vvx@0X?-! zr-t-YvO#$PS`Ek0U4*((sbm^>inEU}Xd*V5=?pMv52z_fy9ak2FAOm+6uiYD9Ck^e zrtffXZn+pL$XRoNFeSXzlwWI!$S_CcS-6foZzAWr_w4UMx(C>p`(fD`+Rx2{=OoDU7Qa8v`p)F zWp|yK{&yM6R;A@)%wfL&S+<9bL~(W}-NN1UQ3p_CbjE{Vn8qImpuJ%s7eW*oBRm4q zy9sG}{MdM%^pLngMJ1*>)7==>mRp)Ie_`1Q9jpl zl;KC4(15a)pEpib$0Ch!hu)3`VTdO}uvB_r@$WaGuhRta;~0tgbX6zbv49+)UQMrT zoCo(Y2oIW2A#Mv}0mkDe1BAKDQ|lniIpywR_{^DPJF}$i?Ck;LnGu4=S*F6|iQCp< zlwKxg2AR{p)iID`EJTkPr%oA1kD5`r zoz9}~=!Oo$ZH_l7jfL#J_E>ag@nRvH#j9E__JZ@!y*l7{F^31xYYXEs{RR#5$CBScY>7rPb(m)<|Htna`?8XFjL_q?k>hT6k0JVU-i(u!~&!t z?llBCv?$;OnG*CI(I8R6>MDbWQ*INEIVn!Sdkz3O_1EJK2(!!s$hH?ZV-kC_n>7cnTmVR(7w0_Jx<&%L|`NDL5qN9kGumt91oeDTq1AEZCQmL(3Ga_ zVN5E8ophj70`INdWEKI6sV-N4EOP}8B?R4mBHNGjI7#&(Q{B}y6^?vAS%Hzlbo;+1R8V)k zv1K?^E`Adv++HT}&@BeTEBKYV&A_*Sj{|oBzr7iM(*n2;_&D$x;2(i^0XGBlfM6A# z0mR=-2@eCl0~`Rvdy@ToFv8YF`W*Z{+xt-dIsUK&(R~agy0;i#V|*U?5Xy6bZs1!h z42BPZ^}vULcQFkhmF`2JF<_rC&3@6Q0K{w5&RZ(zKSu?k3XTmWnY_6Ne$!hbB3_zxhm z!rupCh{AUR*8wYlZvmGB$$lpSKLEBB7!3FqUVyLXf%Abx7Xz#UzMqeu2n8+zl3bZU zlIuFg6vl8azm(I18T&Kdktg{s0j7daB9Pj%0q-PSB7Petyf+Yk^C$e%#RdbahVKC0 z1zZm#`kR1IdH8JLa|XlsNkEb-9!PRUGLB^I4*VG9@82lv?*o!Oy#ibd{3ECD=d=?D zmk^!-bO9#XJEA{>Xkodd_BtBb#q_<+A6F39-HgGf$T?`)xtOI_z$UuJz zJp4rsL0}^AF<>~b z9ypZKK|q=p|NNbt7e|0JFFpWb=)-RXQoS32WKX~2^aLQ)iv-pJF9uS*0YIv^`v&Qk znt)Wl9!U1Qmea*Rs-FX-`g4I)e>#xr_XZ{dN5iQ81{?w0O$ehPyz?3Zy=UD2t{D<% zg7^*OPXQAB;zWbt@4y@&>2D(Neb_++a3Rtc166||>;hmj(ner!q`!0Ey>q0$22%O^ zzzs;h%jv%YUqiZraUx@HU<&fFS)iXl4*O}U!LS$Uoj@bfj{&KjwLofT4UqWE2ZFvf z5lHpN%XC;Qkm~dJ{{N%{4N1bM*1Ii{EaQ(o3>VJyLM1KHC^qV>TIHy-}dKsr@0FywU$myZLPmvzX>1!v6 z-{=XO1Vj_zR|1Ej9W#*HIeC?A=RF|RdyCUOfI~s|<3w5Sd*FpgZwFGn=Yb?&E$~yM zt2vzxBzb0YdPRc4Z~^LN1F8MFKr7NyfW&7akoa7|I0`rf<^6$)DDTDjUrdmE-v<)? z7T~8Se~#0IK;oCq=?R>^oYNNpX}mtT(qQ;2@J%3%{~q9Uq&EV$10Ui12Y{oHt{smb zY6aa=AlY>m@LpgVkm^sDn0F8x? zp{$pYe<$#5U?T8Y;LVqbABXHeAE<(F3gcwpQz$>5(-uaB^Y0m9Fg%I!>PrpuQ%vD$ zz+lvm0@8RK7-lg14*9PGA#d0#KpLOj7s+um0|z1B2&8fN48|LZ^aqT)85k=AAls!zpePfzwd!pA^#ho1?hKz z=wkS5zPK<@ zDBw#-p9`e==P(|IlBoU%K&syiY()A=AdSoIz>k0hz>k5K18JOw0{0^Q4F-|)|2dH8 zcL9lh6Oia`2M$O2HX!ug|3=QA1-u0LGdSPI`Tc=JAIkaP4U~L71QPvwK;qNH`Sn1e zzmM~8;rv1%$rA&ldJ$aSm&fZ@mk8};E z%Ynpi9-|eAsTDR5NPN#>3w?Z8>U+kog=*iAs1Z%cu%0jB_|{fV3&0Yp3#)*HAL`6tl`rE$Vef6ONAYaq#k zBUOPP1F63+0*%No2fm5)Y#_CJFPzR!;9WqHuLgJx(yM_qZ}WgO&*|@zQ+Yh&#X!>Q z1wfMf9GRbY7)osg{VTwI!25yE01pRYl7g-U2$K(c3OEz_^sB$bw;o7*)&pUx;dgL; z1rR11elw@@fIE;*mFc`|fTX8LAj#VwNbpa61s6aQvAG!@IzXf$w46z5q!2IS+U((xJfFC_jhu zkD?MxIP4Jc4dlNMOarz6X?@!S%trcgAWSvvcHm;9Zv(;0w+BHz~?7Cc>W3rYHv(#zA$}GT&6eSi-o3F@@2=IEs<@qbnxpMj$}oarzTA$bSP! zs`!ve27f{opBrEos5}`V;Ik2`~-$U@;=9SC*xwqsf@iDzY3G| zuQJ}vcmrcRV}Hg!43_jO8Rsxw!1%B8WqAu@9pm+k7czc0NYdTQn9n$r@yI|~zKgMe z@fOA@j2AL?V1iP=pJJ?GT*R2fIGph$CJxbWWxSg)im^B2(Q{c2#tOz%#(s>S_Lp>9 z81G_CX1tj3(|%0Hco$T+I259r%lM;3rr%(ElJPdi6vimVqrD{kn~e7|u4Ig43}O7%B+j^^A)cr!o#;{6Ud)?=wEhSi>007|i%V zkfh(r_yA)G<8;Q$8HX7q{nyYo>3acV6yv#!Cr(QL_cz9R#?_3OjB$+J8IS%X>%GDF z2xAH3b&T6)+{6o_3W&AT^IpYk*2*&P=|M*hYdxh~H#%x9hW8+~-cL(EA#yO0a zGlnp>e-!%D;b9}nixMhDEVw*yoWJ|am?qk z{5;0bKa=V8jEfnsWDI3I@~NcT$+&`XP@ByEEX1t5BnDJW1(Trxs!+)3cw=({LaTQ|*<7CFcjK>eidhaqm z!RThpW4xL%k}-twAcAM=|I3W)8CNo1&p4jZ%6MYGtoIhYm7CF3mGRd_Fyb{ThfnY?8o@8w`Be&j5`@0V{|cQGEQKm z!%C9(i+vKC81H6`X57>&%a<{Jj?F98Yhiqdv5av(qnU9cHbX>z9-|Q$g!DiDCh?Cz zD!+@sdd4iq7)A@@vDYNs%Zzt3mNHIZ9Kv{XucUv8 zv7T``V=ChnjC~oue3jc_yo)h|F_|%*F_f`=kF571<86$K7^gD!V?5L%>Ho_3Fk>;} zWX3SYle;DT0mdzi_cCTOMl<$e{Pq=DZztng#u7$5;}FK9yCnTK#`TOhG0tYRG4^5n z_GMXbJL8>oqghF)n0G zVC=>C@k^3^FXIc0_cAVGyo&LB#`dkU-WJBk7%yhLZ@oBIF;y@wWSqem!#J2xVf^x5 zS#KX>BjbaNw*tFie&=y|BrpVN1!x5BUMKMh#@iW}GR|bYoUsSvzI$Z77lFjDj?-z3 zQH)>RE$MRWBwB8jc<(|fcNydA9GPCksAS1>Nv6b^3nU&%mpCL%q6tX-J9ob1d-!^Z zdl@$|u4bIc7{fS#@yB_x-iM6a86RR?!u_wuV7rn`RRbpJyEwsL+m=Ql7`Fs3smFj^T6jBPzwKE?*d3dVHC1V$_4 z03fv=3M9Db-8yG7XR{*I$g+S_0 zI_D=aS{V(DZ6FrqRqT17iha zIwReuB0ecV;*-GnRz?G38<+}t85oJ`1(SL5#ZAc4MkLtB#24SpI)%(RHsazJ4%)pR><@}0aU($%lD6z<(s*@Vj$9x zy^wBH;Z)T zHmn*f(``d#`q4p1Lth72Ujta4X6BFEIHG<9cjvjwkcPoNuv*ri$MkLFIPkfZ_)-7w zk?CoiZsl|d(|^kJFzlY`DOY)$Ptw8!b#py!mi9Qc;fA6W3=}}z2nbYr}uT;OyD$7$@zo8e(bT-PU zeDg4wzJvK4;QFa#zmUgTCCj6kK4QE~PbK*=hSk+F{W7ld44#QlG7o|7LVnYJ-FVbB86Z%hSTF2?r27V$PEYmM@c{BWr_;CFO_$B(#b5Isz zg&`qRroZNN$3-$7879lE88RKp=~hl}V*0uTviyCtL;N=XPNp3f$aKdIGX3Nb=Ev!i zeJR~69(p5+#}Qvrx^1DPuRy#i(pfT1zeP;xgqvmhKg^$Q&eP{}=!M#E;Qo(RWSSNc z`aB6;Q+ewxGJS17$*)i*4Igv+9pFo!7rFg9nKb-`+qYU}Ml*CT+RKyaG4MYmUq`-7 zZ)N@wH_9|U4@Bjgxt!Kzs^2_RmVYkjD-01MWcpQ>H|0_;2Z;X5Bt0V{(ljpg`TIGN zUmN70&tgtjV4q5#f5T2h|6wQe`9lwxriXgzQ^4|CMap3Kf%Q>WE;Gy;J&(^r8vkyx zJd)ELJRWx8J-(rhm`+jwqDr9c+(voWAN3 z*`LB{HevVdvCd2kSeN(GXm-Ri3`CFOZ&g0w6{+6CI6!y(&Iv=1ky_7n2-#j?qD&vO%5*dG>GPJbC$v9SrlB6uzZCYr7PCxmzD$-MW_c>O{Xelh4V-Rd zdyg0;=}S4C&gnxuo`u|AKa8U#q{2{FE$QzZi03Yi@W)n}u17gc&hz;M<@)rCe(4Gn z>dTujU-jwTgM8CHuzu>x51#Lv{sZLIm;VU=s80`oz3bB>pf`Q`1HW{vU;Xv)zk2#c zzxEDcob=_be)Jb(zU#{){rb}f1FA2la{zsMu^+$Bf_%%(utz=pN%#wW`a8e+vr(uo zzuPa}+fQG|{Koe}#7p}6Q~bu4o}<>6UkG|F4C(q-4 z^4#agztxXliyyrq4Zla3S-29vAvtfxtdgj-G+Sg;UUpG&HhzjTtz>y_F@F3qEjxc< zZhm&+%ISHr(e~+iQMO2Y+hStHwSD?ZTU11Jlr17YJ|ZSQKF$^s7iEh=S!6uQVr|iJ z@wVvLcrcEQv5kq0h@r}3P!ty#5g8X39TO239Tyo57BR#(ii&J;(fEvsqOX{E6po3Y zmZQOTWo%Szv@I$&GBPSII(AHaR0KHMql>e%v+S}TW3G}vZ8|B^zG8*wnJ34_In!;C z4*cZllI)^n`TCS8_WvT~WAjf|cwe_AC~&ElMI3%ZQ~XG8%&Zb9 zC^0f(O74p6EWgT$7`KS%IJ@0GW^y)u)Usfuy^}04Q?v8&L#UaP`R7&>XUs~Ao-=z& zTw_eoEN4 zF zZNzL*GYd1l3rH-iwJ=*N^(&0l6-mKuaad5Ya_LvI)0So6*QpmQ$+ku03%`gTgI*$A znK#2<1)ATo&zLr6$uc|q9Lpow{{I;TXq}j6i__NU#C+(6ezH3oJ&hWc7NOB_xDz9O zTRpZkpMK!kM+LGZT9>bL?`P2@W-Y?+yvykokBK%N(N@VK%{aVMHi#6k8Mh$LtcU{BwGi5}h2Ow7X&FJZWDg`%r#{5XEvMH<{f#*#F|{uz>@3#*eZXIaXWWy|b8OK3xj zQUAHzcRKB75p`7bDTd(!wR#X}NiYOGMBfSf|#r6>NJt<>h^*8?*o{Z2!BhnWuGs zyFq}LgI%Q9=KMm-kOM?pCGX(-P6h1kJ8esCDH%Apn3-J+BlDE|$332cQ~CZtL;*a# zhwNvzu^u|9Dj8TzwrP{ucaCe>tX7(Q`l;lt=I;aiDh7xPJ#{7TSjpIv>$Sww-oSh6 z`WwOj9p~Yzmj9vi&>GgM^{hFM&b-gqd1x&B=9QMMliFuqY2{s*=OnGX)4bCPPC4%a z5Cxid8rjdyJB>~|YKSeup%X^}iDM!AOkaKAv@b1lMMfG9@>b-Q$kd9og-Z$+ zVD-m-3-P4Lo;U9l>zHnfWgnB5vEsT6s*{(UhjR~k^cYRY5K}YqvS(#y7HOGrvkGx& zftLLXY!oK)j?s{&?R4Y;BOhxPGhca7;gcEXO=(qUmgY~wUU31A1x3YqJ|~Z7>39jI zK?h&6R~BaDm?e^1k=jr3=y$)3W#! zwx}?3bY@|pf#QwKJRp=SP~$LbQE5q5!SZ|>!HnYK?4pviq7q8s+!v9pc6v)0`OEVN zX84&$%ymV%B{+1Qwv3DYk6q#AQ!-_lck-O+v?M08qSAgf8=Hp>RDxkm%UrZLEhi&) ziRhYFK3kx`mxP#>dE;r3qM-n!XUoyqZ2H~tEYI#($YzV9;8+ZcJjE+qvJxWzd2(|} zcG@x1fu`J3r2G~(O`WHN0h6X<=zbQI@wp2BHw>aH3*VO0K-H#nWJv7MFOt zmCYrwT*9u0v*Qx^_J()Fu|yPO8OY7a&6HBbP0lXj(VS9%lho||5*VQ@i`B;2uOxDe zM>})!;W>*li*gs>rd3`Z2AUMa93o>pbhEmq(ry$+h|siPd0Mf&Rgz6cV%K<`Vnb}h z8Qjm1;k3r)J+0A*Z4q*RKB=H^CAJtiuFsn}aW-Zj%kNiii~Ko?NZiCcH4of^{5gt9 ze}dn_)7WC+{bcX8LwN4=Z_*m>4brKXIE>NS@mmmMCkbanE|9EGcw5Z3-`LwyQ@S2| z*4J3*2FICn2lB?0X|vM=ou9;>JDM|7W@!X+jT zc_2^e#Mx5kC}uYFn=)-yq^!#$8Mly5`LKdwfz2<-&&4vEm^D2wCW@H+|9Q&;_Axtc z=4_k4j!t_EPr=@@JgE6sus{&_Ygt6vf2|1K`f{`*ZJv3nt)N{WP}*%ath8x`d^0tW zHago_rX9+Ix9F_7fV4IptrU?@U?xQ-o?`bXPC=9GI6uC6cG~2^t7k{(ZCYbt`z0)N zGyH5t?E3lZ=c~`&9jr*tS~xRfc^3`<3&C&IzU*Vbtv(`L+yNK1rgB^Uc!so16qKxD(@p-=Hl4dfB>ol?A0F`!lF7d^v7 zP9O!fZBcwsB9~{kDY8|`U0E%jC(Inhko%0@VL`G zga2*Q&s;`3 z&XUq%`%D^K8{cN5M-oI7DxO^cElH5Z&$q>8l?s0OiL=wNRPYq-S{57bFk}^o6NIcZ zlIv&M^0s7)pkoKQWYVy#8Esa0BLEn?Wwc9Y3<6rT3!)9yrN;4zbVLYFEtTtsE{S{J1q^5 zla}OW(y1Zk`17k{J|nqOx=ZrwffvJs#GUvp%*@oyDSv)1F~4E5yN27rPxh1>@Po88 z3_5mDOKh>C#Gjw`UZa)kZN6Q~r?J8789pBmzc`ug&yRkbgg$t!M0{Gok3|(}(xv{B zmbRdnU)2%WX=#%u&YtL{sN->5WHfp*_58fKvKa26SVTZf?Jr*_%a_Y`(gykTAAenf zUqODc*I@klRdD@Ayr)B-lzV*jCv&~uX=!-{S>hg4T25&`ox}L{H*US8#cLMgV}4NT zZy4-_`ij>vd_GtTvKN#tq}wPWAN;PHICF}JCV}}~^uEjr1wX%!PnR`*SPul5KflbS zQsW;plc<$4Jqq%%tpwzkv0y<__A;6uzVb~hlJ%da36D?jn`Bz1#CJe`x%oN5clh(` zST5`TmyN1F~3K9MJ zeRNdTm*4oUgYUH~PmlfhWfao0J^8o=Kwa|Z_c8O+-oJk8H2D=QxKRwSKfgPA%jSo% zIKLa{BM#;IWZ>qUSH8lGOn-jQGQT?JS9zNJN^sLLP=BxLBbz^r_W9j%PFE8GUDU!4?4z5 za`RAG-aJY2i~hTuzvqZQk1xyU+cV$rMu<%N&W{uGCBM6;$~t?pWO^L{eiAQ%0PkoZtJ{eKhx597bKcH;81KXV+e zLyoGWp$=Es35UDv#1X3LsM-~J!^@T-7y*5`ETdnpA(9rW!zG-7!(GbNYGXu^%iiH| zbx0@737f+i0{nsqOYCS^bE^wZl=h!{~4&AE^lizXRTk1J#t#=BR2$ zvAwOm{^ZG%M6p{mjQk^%kIvgq-0*UpzQ3dohkJtTw*PgDSeRrdb8<#ohOB`o9(_SK zQlE~hRRau2bXe9zNLf3oR+tsb8gjyDlTzqRKTbK^jsfl!=@2%{;o5z2A5l2maheDn zEmO^)G*sKaLCaQ6-qlA#5nedlJRE2b{c&weSx!B55>T5Cm-A9wvgX#p!ca&#D8#T( zj1m~|EC8Wkc4sPOW!%0%jE(JN5~p8sBLFo>32&R~=aaoysw>IAff7NG)B6~ym(i49(2x)j87 zy!vWMpf@ei>WWY_ImTOnkqH_8uZjNFYT=8Z;go zb|;^3#P6{<@nR-~-bEIE!^;qvlp!jJFaP-}GX4G6>Z5fC%5=Qt{5W#*C-nIFHUhVk zQanvsacNnDzfeFjQ$kGAH6-zF=MP95+F!vuXfz{(%(V6d@?hdb>TqA_aJ?bK7-pW>H2VwD2!Y*BYQnW+H~kV0 z=96290k@24S@mVG!&TcTL|C^OV7V;;RUEbIHUhUS%IsI|Fz!7085{}sK#UB;C$nVP zp{up!nC)+&mMEqo=SEE;6t6(BqqhG_0=H0tYhpUgJqxxYYt%M)$lcrM+QZzV=M5T# zrssEkR4e%S3ML7$lsM~9xBW3MeT(Q$Fl9)29PW5IAfBmHErr0;p(`;+GE?lil1?MqGuB!fv`AvI>ob)*s=_$Nu-^$r@qM4mYjJVAUN9FXr98YUe6c zkqc9exE^M-ywHq^NK@&CmxVl*A>`st9{uU$$yxY67}rJkpVN6gOrRxD!~m{2ZCJ}Y z;Qa0rT_`(%_yKF&oFjszqqb}hWoU_3M{VgIEkUHMB4K-VV)dSl#>v(87GBRN5JKex zlD4Wj6bq5K21$**#p8)C=!%XO&34j))GdV!92UTxB;4?FPN#T?;sb8ZKVFLP>92cE zM@uC+PW;2-yx*~UxAejAo9?nBSme-9R$p2b+~p)&M3kha@$*7)qXCR^tcmK zL(XaHAO2(mMzBn3Xty0+ii{2y#v1!cIeb;SBG426@zKU6Kzvp$c%C{w6QRuNvNr18 zSqag8f2t4-()-J=#jh?hB#OH<`w?+$AbO8Iy5<~YbKF2Zg#l6R|D8FCMJABhy6pdH zr@&WOquYKEX}A49Y>IyIrWR|;n3Q8gN6S>P!2r_SfZd(IQec&VG50?ifir9mMn=&v zMaXVs#qXh9i}Royh7NcZ!9WD1I}kw7KqJ(KrP^D`HocV($jYsW3Chla+ zf*tAG4M@0-p#g~g1}0E5N}3a0&0-RHC$viKX^uf=i@8lvmc7H3e6*eBkS9g_JkwCC zhD_<5^!^~7`sXVB9!*1~$!*hVJA(+uO<7o>lBFa3Y7N(yzfTqVb)YNu69d+Lkp zJ#c8mn&~5WGlnKbYhUXPGAV|1Vx2QIUP@wfu;8+9)@U|wA)n)VLj=d}vd!q_MnBH( zzwPyeTqNPYOENEcuv_4Wmq_(5$Rc=+coKS79&k zR%I}4I}XJh@vr9TU5hLEpeWSqTk1<2FZQusFDWYP>3?o~&MrTwR9l}@gy;@e@Gx;9 z^xr5>9K3oTY5%@@NA=Y`QAdss*^;Mk2!Ch=a7AK*nn{&FcBDLETduN-d^e6XTt%1C zg6g~fCw|Zo9}%!WrUR7(d7k3m9{t!L86P!UWcIWt`42!^v_}kl&SO0Gt$8v`0?=qV*0*;&F_t<#h|V~yj;bFqn#o;`CR>S|=YirQJ^v%xd7Pt)4&)A7*5GeJ zk*kE0Hao^TLM`idR?j(HV?XQ(vgwbAX$0;>s393fX2wb=L`4ab6nhxk8)S?Dy~klo zVAa(l#!fmt))=)+l!MXP9<}%nikA%pKEI^-;&87Tz_yMfIgXg622soxGHlfQvqFkn zT&4IA`^9;uu;W^?nzBZ*z?W{OxE{+Z`r06cs1<7ms2h;KfqM>eH)!2+WQMffT3&a`RjQ5$n*0VdM8V7l&EU+6Oj-JV{QwYe==>2`dkI*hHP zR&AFehO+DNJKgx5{j0;>EpY$1-16eoUKi6{VLF6cx1-`y>|l4u8ou*S=tKH!QijlX zXAPW-?m`3O@}Ysd5cfa>Z$cY_nwMUChvh{_uhpN@(LSc2h0a3AexU&S5wW@S8X2iu zI2=01#pY7yU;W01PQt_(A&}IKkx;C=w9UI!#4Hlb{O#lC=SPZW55m6ZPmTl8~&?k=ISU_4T za-m1w_j`;sQRtnf1lrHpcy~qH1jmRyuAQz{?|upMlNOQE4%eKc z)C^5+_nf2B6YvD8fW*G*fksdMi6-5ZsN%ZT?5MgD_8(wzY=ZJJem5@07>uPoU2V@s zWa-AQD|?F2`j6eEndESAuv1G0N_#jNUa)@?L&W1H7EoS*J`_!L@@G{?J^XW8ruI^C zdPv=Yiz=0IE9OBPPdOT6%@nZd(k9{&w?hOQt`Lk|geNX~ha2>t|Dl?`HDwDrR1FQ} zFB+-Gbjs*Y zg@dmk9dW#pAR8q+z#1h+vMZ-jARB&n5gOiun`~%!k$=O|3OWlNCF|ZtbzhZr$N1Nk z?Yis-p-{;O#)Jcwu{iQr(;Xsu#sQ7nepD`Ux_H>Lzrz@vux!7&=ZHPN^7{8j%qJpAkoNgY^+}Ey^NP>2 zXjVz7g%8lKwO~@WzVoPw`Pydf9G#qE{r0W%?Ma*x(A4sc)s{i!(EQqLXg*JB{zhc^ zYTixfHtgQ~{0aHrTCs47HHg$I=WSW5r;D|vG$mREPw8U4_Nm1iryI|mDZT%A!a24~ zF_T?EB#c5ix}~!Z$LgcaRHm;67bKowD6J4Z@B|L{v$|w#6+WjxF6RnNw|3e9;=VL) zY1N7}lAsl3Tj)p>A#W|6vB~fP*BhZV$)7zYd>>J`=g3@#Yh582yPQjiJ+X6(OP9SG zw~D9;yNNm?$5DR@m?68Y4##2@iLMo?iLSyF#ArhPYUg5&MUA-hbZDOtvQvlBHF9)- zt{qh;LTTX;7RA<-NL6dcJ77kzrpcKEJ*SXSErqg0yFzHOQE6}`KhRz!YLspC)r^+J z?n%onYY@f0@iossN7V$1i?oeWXZt0)mo((vI?uE8ETNekK+}_=>pefjwP=w?oOZfA z(e(VS9%H2QPi=mAZh~=yH`%j(hI;6kR(9Gmf&Kk`A?U?!4$(X2DcXRht9D0-rFTxF ztX+%g>@MX5f+)x#6GC?G0B2R(UlbWN_7|g1>U_O?g2CR1#}~kyw)u`Y;E5J{GadZ2 z+Z0k!S*!16ww->i$fuPyAyT#d1#aa9%l19AgSuyD#j%t4cYLR|AN_>b;y^7Xb2p&rTgc`eC5@Yu0qgrlk+YpTK#f3u(%M9}-jC;sakoATY2n^TDiin z6+RlMwm-`39_8^}cUt572-kYVM+hF@k_;N=m|_7vzW_A-7tNnyd^ZSo+v(Jm$5(e6 zBg(vAo-wGluV*RN`$+L~<9j(;@v`$?VU_7>*3g6z;){c_IdDSaOh^kyJH?CI`U&44 zszrP5_6AOLC=9m zHGL1ocGmt8kp+W;kKn)?D&Qjv-Vb^XB>nxF*I$YajBY1L{C0d1?1=BM-0i!3@!|2! z3xt3>eh0~1G~%^Ammte4pjguBTzbc6!4MDbxO{+P#6E`+3lpx~GX^+Zdt}ggn)`qM z@sNR*-v1|f{JHS|7-H57@>}WPMcnV4vq$$F07Phpi`DO|z4tELT*)6ot$SFcncwf$+R(1%!WTOvfc_Pm0$U|)Oi*zW|( zc6kKoTh8{Y-H)Xs^{Sl_bT1Z`hnCuehUc)q=f!pnY=hTZ5C3ku>7gsv?q^f~J>y4# zC$ofao9NmzvFgZ$7?#P{JX+RJcp&D!+x}tIk?URdcPwjO@yW}WgQ{z2i(D91%i#8a2$z~&$u9|gv|EVS`;-VB zMWSxAC=Ael&HtS4{M6Yyb~oZVYKvt%0_oHAcT``mZ#NDsOb#4YIdED9#OO{5g-gQ> znKD3(nD2b`v`_1i#oN`KHe$2;#j4qJn z)uIsxKL{o+0W|HzI)>HaXA?X2% z?X>st)agV*^Td~=+Wv8k{bQd9;|0k=E}&GR6MG%Xr0L*-8j=&|qGFZ|bkoq=SNq-4)r2g&wI$%b?x8TJilBpJ;d zKgr;RBK+f>)3BG4fcA2o6#e+M5dBRl`iw3_rx(A-5>9O|npFihDPb?zfeS{0B!Iop zGvM0h<<}a`a*PR#=3MIEJFYu6=OV2DCyaEB zbCm|1{XyPs)CcjLrtUFE<}1oXYt_z$8iyKj>9eNwKrdSC4`82fXg6zOd1OQI+8~uA zj}}EiBiP{u1w3RgP8F-Z#EIUVI!AnRU4rG_-3b-PPbM7St(`IrlUjOOs3+#UYlN1z zBh?h+qa|(6uJd+>E~}l_Qbt$QbG+1a$<$zN zs1X&(KAxEZWhhD?GND1K9@5A z94)tb65WL02x;dbK?~n@oVg@ufLwb>RWO+3K%is+# zOayN;iW0v;T&GFP%HjtSd=$e$U4?9K8MQZ4ws#QM0ovp7q31f}y9K9UE`qvTe0%lF z)U>73o{!KjeB=^UM{8BLm(iGLUG{8#&Tu)ATK8#&yT4i(YRvLvbbqew{vlkSjqcwV z+^PHR*CMaQeh_`~c8a|$JzsIExV-B=Y`dDwHs&wW(T6nIhoN2c0nJmxr#*y!#N728 z!Y$-7b(?!BmuFCYIw8h#fyP5t`uV}9BY)B8_AB&yBF?`|K@Y&7p`f+XprA!kK?W!* z&>)k!m&R;&P zuV4%@tXmT?tmSf8M0?qKj9&YkR(otN@}z17~6V zxn8z+9G2E}uT)hQ+78g(8LvOdnji5FqGr8oUZH2Elj=C_1>ds>_>1>9yy`0tz5>L%tB-b&hu7^sbsJCYO1DuE zjlE|aK6ycRHs%g0>`5q5hxLoU=K*wbZ;Gh<)Z<;!ee$1V(OGNZ>N)R zQN7xExkg_jE@_Wb-(ufD7Yr%S5e9^p#faNJ&x-Di?E z%XBSXs@0GZQc_45QC&NnuKgvvM5C{9(xpy9BCm1Mw~vIa=;7+J4X?lcdJoIpzJc%( z6m2$gVYTyO;^*|!$S`CIGpTXXrD!kC@*p%qFUZAm% znxv$r$uPS1*Cf3X&rQ;$PLo7ljo0}IyZ zYn*hcGcY2raniSs*e3GyjhLzQ>EVdC*U9H5e4hNf6P?;@bZn7SM3!7v?Nq1%e~Sx3 zrs!~ulP-k-a_$m&ji}@!z-aKcT&iYbbNHR5Jh?8%vS3dRG8P~s$1)$+x4e4H(mS~U zDl@jz88;7%z0P55cGLz}&>&-cPhgVrIQ>BL6_hv|qf2RzF8Yf=?&pcjVZ?KWrFGs3 zUPBcE>HoOKN$Q`Hn*RSu*Z%tdUZbyZ(xp!SL|)^hZ=dc<{bLH#XW-B1Us4en>Hj-w zz+eBzkjY)AOCf-q@kCxDD)|V&`u{x6Pye4G zG18VbZw8nSUucZwa8Obkjze_qKO6@&`Wh!)>V|{JYn=4$qm4Oe^q3`7{m&SI$qhM{ z(R=(o??;-TY>C2?aMwTgwn&#g%-MC#x{@4I%v&&UxGp;m;G5nK;JWaX;r5fP%UE(#j3H{h%1R|x2jS?2DbDTYbtJOGy5(f7O!(WM;Y zW0uQypk6J}9kZnF5fit4tVY`6yai5x#+evyC(~nY`!$jpCtZ4WW+&ktiB^zdlJC*z z5JA#4vI@b{LsIQ*(I}*eP*O9I-E{45BClxlHBP$JnFx{BIO&_Ts5`4V)zY=g%Z@I6 z>S^OYj`|ey7A6>te>}$jlK|td>vf~XbUQ{(GYCZ5lrJ>nXA%MI@7o&%kIxW;aGkfR$ZKCJl;poYY(#yww#RWP#I14CrL5a8GbRCgmdhf&Zp3~s=)e_3tYp(C~EU&NXXmhHYxc6#}N}aw>$&2(PnCsOV z4W>U`^Ym{KuStMb@Y|k^3+~BnT7?=XU6Nn1p;R;>d=Tvbnf6vMEnRwiP&155TK=^l zmQkBLfrN?ST@b29Q;26mEoDGHf*gk>zu9tWPiho_%?<=MJze5@KCW*epK2F@&2I6Q zh7^CKSES{{8%YE*bmhHmugj{{ZUf0zY@Ck zx4&YIzQ#$HI{PE?8Yg}G*xzEk53hC>dF#_9Prh1u=jFK20@nV_0BiqJt)7&VlA4@_ zbnP!^fkt2Bq)VNgL|)^hZyz~HG4h2QpB>{O(6Oo(;*y7hE~V)1bwq)E&N}MC>TUE* zv9#s(yTQ<3+c_Ew*$YZ)y~w6(|6XKi^fgYp)b)bMYn=4$(+j^@m8sQl_dE^I{y62e zLdA{I_!=n|WtTIHT%6Z^FVHGVK`E&TnnBn8f~ITqHBP$J2}b$_a8ZJxIUy7ZBcSL?^{%nVlRVVJd8 zt=9vZF2VE@A`0Q;2>-HZZLYU{y7XyZzba=UKJYf?e>Fwpa>`A0szz1gq)VT+xUXBV zB%rTx5u&e80-8n!=&NQVaDFKo)9vD!RL`cG^8HlgmD(Z6c$BZ!SkyS_(nl`64$|O8 zygdA_Jf4FBBwO=H`QDuOMY`S2OjwA~W8V-xL2DPjny!(Rs-FT#$LUDunmP;;xj&)D z>ZJY370|fH<(!UEvB0{w(WU4i#mx~KBNU2+aQt-3g|_}UQN0udmNg^5($R=7`cw!; zSV78nIBYv;B|&K2+i4|Mv@a0FS`P805~!9~v1*49E%Cx1*2N|L0a8*!`+1mp$L$Zo z(T+kPi6NMAtqZ)h=+aZ`L(t0AFIQaA@ggRNsE?<4>l{C{I!K7dI&N~Xmy|9&q*^s)MM(~mC>u22l=w4E0I?50qg+rCCTHq#HREw_1i;ISFHMIc_S^t@!! zC~5?_pMdu-5~@3JKLO9WegkXMZdiBVdHHYR-w-!0b=vMvl4w-)=PIl1Uu%E5(x7`+ z-s=7P7@_nhXYn_V#XSr8+K5$1qrD*Wj8Xo%7u@rpH%NS+H}`+P32lSX5%Kpo`{e@2L(Q8F`8h%Gxu*2Bm7+Y?&tfzOEYp z@c-ER61b+0?f(gc1dJF2RIJwGu2GgC;DQ@s6jT%ecWn$11c3yTfJ>{Qwkm30?fzPA zYxl+4+Swf5j}N&sbLPybQQ5qq_ZjE~Ccpfzmfnp*=D67r!pM$EyHQq5KQRW})E`p1 zidy25=otX<8cX7bi;QqDIc)7X(}q_(_kN_!4W}@E${Sq1=kE)A=vlKO2D?jjxXgJG zZ)ywPWx|~(7Z)P5J0=nhDIG>=#Jw4?>63X6zI-8IG7$&(=|Q|4fENRf(Sa_$EhD}8 z^t7PYE$6>6w;$1atUCwDFGkVzIhcQS%MUX|;93hVc=8?n<)E7;g@`|j3&38LqH!a?xK?Jp<<$+AS5+NalB{+8xMZz| zvxn@skgPZ0KT3R%8WpvWU$y~jPk_brvg2qvp3fDO;FnA*e@712Ytvmo=&s@L;#!oE z=s*yPy2Hk`2~-N*;kc15C&i_0mJ__NNEt4b;g>(&mofjen^bY5&kb(8T=~wj{Nv^O zvoYI{JGY8Hq=&u}NAA(~7-=lH$(LRp-=D~9OZRV%-C+42T>ygS%r-tORATl{4S^7T zT4XDq|B&>jl$G?3I5NP#EKUZ?$&rR@gFtc@ez(f17bNbwz~#d=G_RjqhLFw!z~2F7}rg3ZI;-uF?G(dJXAT zNzcb2N_km{Qe6NH0P#@eftMjqlEXLha)EZ64>C+%*IRCp*>~{I55c}` zz`k2HSbX0iKaG07j!L55Q9V&_hp6{r_`MZ8{dy0UsrIrS!%Pyj{@x>PHs&8(b&RSK zbpTw#O}_l)#G~>p=*Lcj_D+KK{2rj)BWQmNeiiMcDSY^S5<%c?b^#>bOSZ~44-x1n zU#vNSw-3A%8%Z9!@^Yl!E?z2GZ@F0z(oad5XuLci<#0&4$QP4`fJ4$k(0oKolGiS1 zB(&R9Oa}HW7j=IMesA3&RzmqaX%NKimIv3r;sJfeN>%gIAZjhR527AV1W_vmQKlw{ z5-qd*l!^Knl~56d5Igo19!fQ#JfEh3qJ4>LD*bpGaz%_pHGTxE_pBAwC{0xJ_DNcl zK(463Q_}@#tpM@?Qp5KCjHNHXcA76g{O0%aSi|SS^^v@${r|u>iRSH-?@#r7 zz1N@eLQo!NUUbV+9Ub81!Uz~tCN2=0b`TR`A)mB*{)?QX>GMvFOe>#2H6Wopf5LcM zhuSOeugUWZWumeYp8%4t-^DG!J}ZRdXj?S#H`K&ikSFGGa}w1}%qJ$aIKTzJ{GJ&w zVNvAzu%_oHqcO&M=b!X_1Pinr9jJifLkYNZ5|dG_@e&LA7q}wk2pH2h=D&~S2VSek z9O3Qo{P!i_nx9jRo4O#S7@vn4FD1JWe>Xn0(enPWPnD=_HQqQC-eAIeM8UJE@yb#KfonfK%Yoh*5%Z??B`2p|2}~apTWbGw#VqLZrKq<@Ll#G8K#a-;jdw zyV?DFI7O&fwI6rX@ja`<$L_~s9=uS0LcnK!Exj*}ckFRX_)6nCVkB}pvC;BF??2&R zzt{NWcS0KJyA`XJ|L`aF7mVwMd-3)j)p6A5r+x6HT-F>J72V(yajc`15%M>#n~69H zb??!(BBLWd_)4rUFt4Tyxd(X=wSVHG{Hue!?R_U&1CmY79=>$M4JO^x4WtwsD~LKC zoT#=<5(U0A85bDgZBld{vRf$Y0cHLyv^M%Pw^ztofRDb4;pzF3WF>f^ z^mMf_<>OLS`Vz$du&}|R28#9o=z3b>SKaZkxJYm; zR(o>4!+o-cq>d;d@nxvYf6`aTa2icWPheTe^Pvkrq3i)Z%)`p&n=p7<4wvsA-7cal zF<|2&pvrGtkj}?-z@s2bSgZ=Hwj66}WMd3SIu1p;<{1svVsGJY8!=CzBs5$jT9gI= zD5lp8>7Hr&@P(W|u3w%K$?spLPK5|zI|U+;rybciA+qt6=e4P{lEpv~+lV}yeC~C)OikHm?X$bJH$xBChYxX8kS>Y4VswC{9XdVQJ#(P|W24pg3 zV5J-=?|$`PLEi|Z`X`_yG1x1O39@i4M&tNIQTP&+jN*s_=`&+s%Mq~f2#zX^Cvk>K43laO4dmB< zr2C9vqLlAz+^<88NlfW_<6Lp+$i@ag7b)i&4Pk&0P<1*VK~k$&};TW zX&jIkp>D4N;urX>*8gO#3&%m2uNitHu2w1#f_4O&A4cZAA4RA-5VS}ge)4^$WIhy2 z0bIqk_X}W>8ihrOZsf9v0pb|x6z~QgJd~5+!f?8ub|c=%%hsa%i95ro!F=?iyyHjv zi>g*T_4}hSUz1k^lmQ>sB}?Ozu%n>9LLUFV^4(N>X;0E#xCLB%SCRLvleHJ!7ykEZ zFQ^EqrMdl+8jW^!l=0dqioTZXj9qTPl=8P?}U>5K}t`1U0iKJ9FY8ZhzV4; zB;_O_Qb&G3)9^9O5YH%0;Hys*eGroTpwnWzuIR%Oi4(eHR20Tu_?y$q3I|PG&J0HlubSX z^63?Hq5FJF4_3bVducSV^By85Hp+Tt8g)A~eJA=##MM~O(04^QEhL8QCbr<{3l7L& z{{P6-cB@__i$i(iTjh<5+U52{|Ky)$re2Tf1yFL^t$AT|IX;@!SkR77I7l=af?*{} zSjPw>cNGc+qH&XNRtgd#L76Zg`sq7ftyANNJZE4H<`?!r1elkh%7l;ByOIEl856eJ z8pF!>k7?IYECrNWixU^3)~jAk-9RlT4k7FEEzGh}u&?{@mOC(X=Fo zDPVLWxyMA$k=Hb2jFYtyFICi!_#ya}kefB0->WYfK?3Tp;y2|l)_<3bATN)S7JNSZ zmLk}nTl$ChCCqK~pucVSr9cMX!H?1VRA%zf-=A9^ZfIcPbbOD|c@F+Z9+*4X?G(BK zzexNZq`(&ZMw5sBeQr9*f$>8mLG zM&qXu6#cp7W}*kiMKG5h^hciQ_}z=2f+wYq04y;Gobnx~hD$slV)-9=XsNcCLRS0+ zk%#^`Z8XvnedF;{mx%=^>x17+HQdX?WdQR(^3Y&ThHrN<&?VJv6i35@Jk(}|1fUua#r#hxkJ^a;k;j4G zEfl&MKZOznm-xv4$n$s@W7knA474?nhyG+)Ab%!3=#M;|@Qb5r6D{W>)SdGHp34E? ze@ZzyGK4(D{AvQwq>K#q{Ezb>30^Yu&BssS0puYLVUmZQe+_3W6@}3C3hF^De=vbQK zvej0WEp$5_N#u<<`zlDRXWO0Db$bUxu=vYw3mAN^=A$=QgWVKU?VIr#@H8B zI+y@j7S-9RkwigpRk+nD#@jt2YLeZtz*8aRU~!az5-Em!c@7UF(Xb|$Czn^-7Pu4p zBvt`94t|myw;j3IZ8gm8v6WU?lPNK3*ROx#h!Ju+YK8Z@0nwAyRxhtkQ+_rMNX!K%dtu=9g z+}Oqa6HSSw&N_#Ox+Z5dgi7LXu?s50w>qA_qNd|))o%Z|aw$#-D)V8(+#Y>dH5Xkf zCw0j<=}!?#bfaRYB%B3xo@QazX=y4q?-*cbncHI(otd|3u6;>5vpBelZE^K!r*gp> z(o94_trML>aL}AeEEN0`ipH<0E5>(g^4j=lWNeBG}6s7 z2AVb|S~9}Z9{FKMu_f%HKR#XbPNQX2?0G3)^nKdW{q4_xIb#07^5v#&LuZZbKd#r# z$o1b|Vjb7X5%JJNyRR6x^@VXgKDqtCxbO=Pf4Sw*ALCZ%?|0e83>yDQ;?h@tj;$Eq zrE*5j?oKz1zyGF=rq^G2ZTz_tw*IhgwLbT@x%e;wCR|sx;<|n$#^rxHdt}+O6KBl7{=59;KToXLt##b=e#)e= z-#_!|r^iYsb=dj+x#xfS&q-aj*4|ck?yHk7vz4!_bcN^t`17b^;Zug>yG~sC$+IPn z{PDjIZTHykH|KX=cHm$ApLjd}#(xeQ=eZ|(a@mcaZa=Vb%;XXKKX_|T^5V&DhhDX* z@|Sxi-;wjd|5kPVc=BaezEOAcEgh#k^k`n(#z~W=w2yE1^;`F?n$q#w_IDiY^6->7 zf4+I>shhu=a_v(WfBcB0d%?<-zVG$EW?F&u*W**a{cS@*m+LdH=gWglAruX zm-ND+_wK22^{6b|KdXO~vFgUca}PgiKX&u$g}o;Cd+L^rkwrUf|Gjt9y(5d-E}!vD zrzCgLl({>O&O32OQR%M3C3Qc2P}Hq<|GcO@vBkY74Si^1#rWdn8`s@@@0jJq%lBQ` zdq>^_#dCl7*^%)6=f&9J zxB+D^)qXdv-QkQ8e;n*RJ$CY%gCj=Inf_ADYd7|Zylna(S3W;Jb;5JgM-1CN>+!9> zOfT;hxBJJNQfD-L)2Wa9#j+Vkj$Z$*@%L+IY`XuMAN!9yG~?TOgWM11YiCwvu+80V zLuWoWhW$|asB`9H{TqgS{Q503P3ha7fA_%QnHkx+OWOb1Zr0v@Nnd?AH)qy&t`oQQ zPG2%>$EEegl2R+y8J)V=hb|ARql}y3+Fw1@4TdY%D2s{JLjPxGaBBQ7i;@iSFo*ZiQGLdL=kNQ?+53%W`q+N>^`+!S_gveO<)fa+IB=Qmt+|&D%o+B)t!?_Q z|Gj?TSKB&vXxT;c%q4fRi?03bL3_y??6W_+_1IE!QR27Oq8|^H+;;TK!FQ%bl)ifN zXO_a1!%FvFd|%ZSm)4f1E!Z+{$*x;V{}?@H=JX@)l-^j;|9=?+W6GX?=6g@h;IU;( zcBK}^Tb7nhKk|6_tgG)U%WRu@s- z{n^~X-g&p(wq(WZC(rwjeT3oC6K}oVqrB}a4?KKu{fzQUS6M&(bKxcBKkt0(KOdGn zQ$FPSgrdrt$3}d%e9yoIZ%pWU-#>n^EoeOV>)8)1x_ZG^z3%v~Tf2h`;uc5F zczwO5;_WM692ogkMn&|n-v_^Fud2u$`$x$Q=iO8>`^_hQy?DW!757irv24NKHkJ2H zzUQ7JyGK{fE_wUygfBdm-wk^?`oqM#E8iNstzu*Gk;=By4~)6DGJfHuRm)!Qd{N#) zw{BK$;%6%tM&3F&DgE1B3)@_B@es{dM;A^ye*4-KEEy!!c{pC5fJ zeSh`f-6uBp4Ew#hr+dq=>D|+6zM3-Th3$8h*L?oT<&SkN-da=pN>;`{9{g8L+h;aB zbANZ8<5E}Bpl)|(Ij&vs+lPe{7CBa~`t_PGw%+FW(Duvn?%MYp1D8MkpDRC(an^6G zG7aluabCGb_fTZXGUtfcUW+WtcRCMttaId!!&sQ+w|h$ed?xMwwjX(hKjmKe!ITblhWiRWeB+i0 zbqi`PH`s4)sCznc@#H^VeX#Dk7vn$vJ^ahMxBi&4W5t-n`b{IZ&FofGT%R)ez<)kl z&{+SNZP~&P_dZqMVfm(;2fXur{p_tN8|z=~x43rAuSvz>*2R6&p4b{+a>e4EE56=$ z?XUxj=icx|`slnr7XSQAO!oudq%GO~eR2O`cP&_QTk74r)?ab`k_G2asLi@de{98L;NVv3o9!+Y_!aE#i67Lg_;}9f2~+OAdBwY~LtQ^9etX5{ zOSPYNF-5Q3^Ui9=)L~;*_TSv|#m^4ZuN>sLXZU#++_Q4qfv+z9{@_O|F^}SZ*|oLR z_QXk(rspTt+g)y~1`~%SrzWQ+_A9NnITj=hO+_Gi(9q?Hyr^P2MK-N;H!vVtv ztv*X@Ynvr&Zi#ZIINeKwz5_{Dkis%@ z$Ye)lksBuVVIGFp6DJK-+UZ!3Sm$t8E^ydk+k=rO zNO|e7Gn82hkQaGqvG1|NxhWX9t>g9)(+=D1v&qs(1ltFp7~#kNWhw_&+!oet0` zaTADjC}>a`$nh!J>5wp()8WmR5mBWTHW#zi*5;vfRD=wEtlH-Ga2rVu*(jAzzGSR) z+Z|=&xD8W+1O|l34NEz`1fL=tZv{kx0#pGDQ9Oi|L9vDsqXzkik1PZQ6H7T8ePex_ zAE_t$Cx=~6G`#Qx$wQWmz_JyY2oj|dhQL_SxP|7l39z<~m5i#a$pDExQ>?RC;Bygm|jkTBC>Z(25PLX4)wUt(Sma-yeI83OBQA=IqhQb86J?)7#R-WPJfS5Af-rBpaw zvZdB1KXaPeM4vag$SRj$f!{ndNK+7!IZfRN7W|pbsxmUCxosuYcFRI0Jic`ZO_@WB z>>gpCMzM;YN}lLtUxu6_M9XeRVB+~wYD;{rLj6TP4=g;%FJ}qU76|7 zb6m~x2Whi9#E=T~i}F#1Wvt9u2R1V&6A~sw3ev|)Wm&A@+W~ILWG{CIu?5il{eiX` zSUunD;YLfUa1aSn7p#^ebg0R8J5;jWu5>NF@u75`Qh6K1icX^Jh%kqJ2@L=MSml~q zSshH(WB7)Om6bpxDarw9RT{)!Hq~*N`P_JJsbRu%GTgzErJV*rJ_^#t&dCy_Q$2yr zczvCV9i%r^Ld*RC5_3Hw|SZ3!Pt|JJr0>NpT_{ za{L%~s#$m&?97uMw&n%-M*=1$ClR$iBFQ2k1GRC|< z8{=ab*C6(4JMEgfaa@9L-PPKbRy#4N<9m8sE15IZ6EimrF0yJ7TfJiVqa7*X<2yFO zOZz&)CzO`(^U{SE`!LWO!mrw`6=3Xk@)-XuP%(>;iBNF;#3<808AejUZ?o0E2L!_{ zt;f6#66%yJ``FUJA|a86+eDM#piBa<(C~8Fsq&fIsE1p%9`p|QKIlREyE>IxSz)?^ zDGArUR>qrwa|(k9-^j$6SdDd4UU^y|wGJR?o(vrZC zVlyjF^Jx`7p^#@lyv6b+m89~Sj|}CEJd1geMG~+fR<=T_Dlf=i+~o2?MTM+fp-Y0z zheB1XdVFZ%qBATtwVtKut=w&Cek;Rk3)i}G38ufYews6{#jDNFm4NBue2M5iP(b`} zO$)PP5DpVi^W&UK3zv*(1SX&LSO66kWm;hp;UVvE%N27A(=>$6VvNDT8%tr)U@NCf zhO{($yrfK#Noh4^&|)^&P!BGl29f7xSsGzW0@DDinPJm|&qjs=Fl-ng!-l!AA>pjC+Dc2YF<_MutRCBfU@H|t zuX+{MECdcrB;#KT7MN&i$-?@K#Fju)Y-S~uWtA?mt7ohBX#rO5bS<{I%6x&9j@mkp zFUXpM&87u7(9NvHwZfW8hEyxIiNrRZwSdkq;%u}PMg+SHryK38*5kr)Qwh$`HzGc$ zT(Zf0@5$|v1=UyarI~}Kk`>??8r6ku0`riTEVQ;3>P%ii3>eT7^{lB;6`7RO5=Ekx zl`T;Ys>aJv4NjqvmD*}cwYS-@>q@T@kdX7mMwt?{dT3|VcVZhFifSrV6tzsFPEwUP zU_^_wZ=R~iBwl35o7%nzCaP2`l#AH{OL0+#)nZYae#8hdV^>s0P{lOd12e3T{%@8+ z>~u%hrtFR(9%Ea$SQ=?tx=4(-J~Q*CySSO`oo6#ZNwS#gmBkh)nU7K}P!1oOTA-ZM z8IR7U#ZGHHI-7#{cm&3sk~Tb>g7`4g5-mi7OAC}!LnBH{Fb=~=pp7dudctAnMai?u z?x#LZo{ePS1PWD9E_Hazl!`Ms>QYCxOsUl#pHhdnhy*S0EtC&AA@A>HbVfjKQxlBq z@?y@V_*$a()RNUlCL^h3s*cT_mQfARsU*YP^n1#Z#5YdQa3TQ(5jdqi)n+`Kf}tZ? zr(mdw)+rd8qIC*}wrHJ#xyEP-Vd6TWB?>w%MQ}FV1B&3U+RPks`!=2af~j3>=PG_b zz0?9^;I(_HbUMDRgj$>synU_Q^nk6pQsxb|I4whQv`k_O?JE}z6rY!)l@C~wJT>xuyOKS?VnIA@x zxOP%1VH20BRHYGX8IfKwjsJg9iy$XnLaq>f*)6@SrdrvDeuz>I-L!NYN#||k!@B(7 z6N$S@b;)OS&-QFEZST@DJ7l>}32E+4D*O;tD7|R0tyXZ1e4#2OA7cha3Ua6jwbVCP z!^83#q)#o4=pJ3levWg{a+8 zBYORX7sT&33tc&5@D@5RhdiO;+z|PiL0(eulX%S~)o3ODk^(R4q_0q%ty)H{#Cu1) zDCr%}5VcfBo;#19ALMSR+6i(u4QHQteaI84a?nPoO=dbTi2FiS655C=A{8aPAuMYw zf6wsnLomM^jMvbm5lr%hs*W@$OB!GDg|JGzpc1@K$cqe7LG(JmbdDKs1k3(V@z4J> zcZjsT*{nL6jUFDdV#GREK7$>iVtmZkx)$ehbr3z^5i@O6$#iF z2vN%iD<=fi@!4C*w8BDMh_jBNQaE0lI4#PXT->${3AA!=vHDVBROgnd8kHnUY>BpP zvK{{hB(xmQo8&^#kWjXIP!oKJMv6eYdW#eU&Ysj@E+5Yh5izG_7XKU40{IJ(J`ZZb z4#gma3AZv)Rs5lv+6`4o!1R$H&yuVz(kXut3OwB}MRU_gv%k8ATQ))?-a|0)myJHM zH&mSciwiQ&+NdPojug6SzjEP4Xc|L(qeTe%5x=+sl!s#SE$1BqvNJ-vG?DJG2oYb@ z#D{|KUg|@@dG#e5A)85huc`>~WX)Sph$p7rf|{HZhHxFAy5S;3T8i)aV~vefMu!C(`FGTi+sw|p+QeEW2gg=y}DLWG=ImCM}C_&yJkiEF{5StWKzYvUI znV8d};qZdE@Pw!s+J>NZ68GYgFGK~=bRG49Y%Gy#gj;Mw!#dg?pqij8T(~UzLs*z3 zhIE6uN(@6F6vRX!h2>Nh_fow=p$n-uE8C5VKUAfeGn69Kwn?* zv`;~N|HdB}vOYtDyG6Q?*QfG+zz~U(nbeVAQI-OlTL;2J#siv4i5*S14-0%@q2d4y zpS~qo3aD4hhj2w)o^laK0D7nhGovIvH!rj;=52!8Cb1A!K|@t?8p;rsMqczuxS^1w zpofws(NBq{rqwP;SI}CS7FlP8Vgv#cvfcE}7I9!!2`U%s_n?M7SvVas~Rd4v4P~M$H%kF)NnB{ z=2yDilj-XzsubRs94GFEY$~dz#x}*3Q|GE)I>rShZTF}V`TT$~&vA0RB7ExIWe8okO5%ydU23bf=Lur*4Qh3cK8Qti_yYL?T)ZgZ1|s@o6&OvVO|5g%SJ#}5e4DE( z5Jk#b`Jjx7L(=CVoX#*zT&q_soeNH5gwp zueFy}mRFV*Ep>QoOSpV6XL-5X4x#c@b7nIa86jlpImA%fti>nDPJ)*?h35rK;W-&@ zX?+RsWsu`~aM!zm5v0s8QBicoFmyik9O`hLBEr7mEA-287i3cf6M4hItSsPu~6tUEmXLO~NoM z@gdA7+=_&ygAlGb71ituXg$(O>uG_j*6|kgfWWya&2d^wD+Wxk{l>l)lzd@6R4sSG zE3_nEumzt0lc~CeMvrvq4H0rkpj6{$3lbr{(?L$F5itmRN7xI)v(-pQm-fkmY?8HH zV`P8>d=HJgt;UN?Wq(b0T8|KA@6Ega+bX?eD6DAGo1wIgRKk>S>+wb`$7oLi^t6`x zfCb27b9s-!szR+s)1Zm=r4n14!k{P?^4NY?{H;cgIhD5!Hw$1C^afguq9I_4 zAcymZds~edVKQpXg;Xm4EGyatAL^p7x8vKaJkV+^QCZ_SAzmYCEt%D1+j@FS7p7O#07SGC^ZjV#hYQx-~?EhgfD$` z#}6|Y)J024k3Ap?*K$_6D}u*yyF&0NF#ZPqGXMRqD7>MHXCM^`7EJ~vn>`x}(m`hnKc)J32&BEd|Yhm#q zX`|LR!{O#r`G}Ev<`?*p^T6)aR8RIP>$LR%G=ZIOtTH=3t?F{(+mYB3EUM$59b^TS zwf3B9r`ukJO>|pXj??9;tMyO!oq1zp$kUxZtVq=QwMZ$_cA09d^WtAdT9>M|DnyuD zwAA>*w4{cp=@N;u9TGwO)f9hP)#0KFCym88jIuyvDUD5>O=5uHUb??7-{!7jb>I?x z1JHvbKb}EpaLX#|@mz#0Y38!muxb&mmRx+sx}4!rNsns&fUa|UTpni`7BSor!EzCl zoa!?1MZz+EkCce2mK@2gQ`~C)r9_Mx_+BC_wb8nYmAmYACe~P>OTcU;s4Zx)FRAn} z{;*oei?Ph^z}X4+Qnv?Hkem`XmXf6vY>}H%S!WNjmAIEMJXke<@F&2i@RB9O23~i@ zYtCv)sxd>WDe*WLm$JpB5J)g-ajC~yQv#@)z;1-$L5S7ZYf5XEl0*0JQZ*?E$050; zc%^~|;SzF9Ek_cLLk>DIjsR;(xr?^VG6}K5HO)5E?y!LzYh`)fO!@+v#ZpjTS;OF=Oa1;wptS~={vx|`_$qVI@Ho@(5 z$VU@+CRl|dQ9l2a0cAl4&=f#{df%tHu1qBJC$5-hE7Y_EQa9GGifI{{LFx#oPbEQp zoT8gLndk5q7A7ugXI2oG1K*_b3PcuUpLGY(da9MM`~}&T zv4PFiT-`w37`|3B!=G z5#g&XXvF5ka!b;gt3r$V`n)`h4xANDx008;62rk9;*#pKKk5Z*kYPm~tsY!PhV14Z zc}{`VYA``i^hPEc9ylZp3kxO|`!{;9Rzd^PZnt0C1jR%@3dC%#RuscZ6N2PBj0Po+ z`j0fGd$oPg>`;<|s@{rfuA0#HJLr1hT|W)Kmy+VLBUGJDI@KZRpnofh+`%PKS$FF*VJ_<}wNgjG?mX zAu}#4qH380{eQI(qTvlM2-c|1eoS$2yB>CqR(KDDNI;)y7Lc{qskuvi-GxZn5d~tUDl!h>_PklRoYx0oh^Q4ws z{<`w)YHAK>ETNJEF2ZZ>Vz`=Z<^xh`8AVlt}N z-Z5rUP3CmAnzEUPese0HtqAi1?UX}v{pF0YIR_SOwW|jbPRQBv=B?gq`S zx&k{i*Bo@mi%;KBk2q(&HZZ6AW=_NB$%GKm%2J&sCy*h!FN0P+lbqPS=DTKRcj&@A zk~v+K3-DHUbwJj1DThy4zN3*cVK8IH;DdL1^_ojgo{|20<= z%_UZM;$?`xL2GeB{;#o`Xe^-%rBlm)gVqw1{9khgZ?3^~G`z0H{#T1SX^*W0Yt+d& z8JU(-Vc}mN9JE~=QXe`yubwUB_;j_F9Q2ts> zb2GV~-+5?v)dv%xmf`a03L7Tn5DHvqXDjC&rujEVl)dr>)ThxTIIg1mxpg%mMVfxyN-)QS(G7vb{F zyb}JxnZ+UwZr4k0sOV2?9s1ACN|rXLsMLnHv}>16bBMRu%A^J3U)YKH(98Kt7Gi$F zrHPz^^p(JKDrzL}*p)ak*mlFIr*7sA9bu@#1*++!SWad|mnJ3)!5VBX(+kLyN?pmb zHtfq*`b_>N^IuPu%>1kYH5OgWf_I~Xjc}*M+G4!X=BA8J@3xMBMoIN%M0}MiW+5gH zRpL&G<@l0;#X{3TE|5yvvtoQRi(oU(q3ASh2rr$-EG@L>ZG+Q)TBpkWkJUFDcSC#D zSR4lB?-ThBN6N@|iYpD}M2tKPNC#xq{RsY3Ka)gzekVB+BeGZbC$F~l=_sdjY$)(d z%xSX$H~y1?Xtvpi-~ujCXxW27!Ym;6Bh^ek?a^XjV!5r_ZI_&ptkTWYd9xKhA20dWO&i8vL>bahFEmg$-wUKI*KPC0+9I zcVU*e)x!UXcI!1>I$d4jZ)j-6_R7SYF$+9&cZl%#YW`LvjNc{VXOL+{a+H(DCAc-O zu9nrp{xHQ6c$G~nk|-VM;K%-&v-_zGpBWg;&RmgV{1R5tF@I$h6-r(`*fcSstHCEb z<~wYdnrwB(XFG~v<$$3PcXLd3x^Q_0F7_&|yBi-Ia- zRsg48KF+ zXzootM?kES8!VsAQr!J29NGV)1Pf>N6*~XS6P*H*Be|5h;;$8PNH{+rp{Bj2ce}WV z@OCksy0mMrnTAS+rL*vMd2z!GS%$C#M?1#C<22#z3_1cZrj1r&haecC)#Sz1bVj^E z#OwMYzH2mNdKF>>W0751UL2)};<-uKZIU&PcH!+PX@Mwak z1EF0q$Qj-_onsq~96KhN`RCKV7YG??FrdiT7>*Rz2aJgC2)`(iu?|K+I(ERLQwI%W z34J(TXASDa*g4%18jR#!C?|tqB)nZY4AnU|jCc|u>fBA#Ee#0gd22nY^YG4T24Y2` z7dXT~Slv~C2m-e9Z2Y-WD-F|bwyqJdO^hMep0Rx zBG*zdufH#dF_XgQ2+;ym+yI41C}*HL31dnA2^dTEf<#-Tq;MuPmYT{vM4MS@cjTF- zCX`AXq%MRAP47euma3Ye)yUpV-?Av}V1+9P3{i46NDY9phx!7kO@=A?C_K;dg1oF4 zE)mAD7#pEgku{QPM|B%T^<`{yGP+Z&ZZvw0EYl>>*`h;@>P!tB230X8f`ui>7>wnl z`vk}GTtT8G1#-vOxQ=jypp91(LtM%YL)>t9@)Wwjg9(w0L?i(uP4puPjZ7p>QYZj` zv3!3l!kMg)#c`&L;dLw^No>?0erg==7D5;cd65PxvdF7Hh&RP@-eqx)cHnG3SYn3F7VNCwQ60VIy=h}d~@8U=EG2j0uA z$xO7F%;Wi90*L8?W}6Ho5Ybg41IoCfBv7e=tIskyhG2G7trO3g^ROH&RRtHws63Mh zQB(zSgP2MUQz=vDXh*7#{p^MYh6{ZPeMSC(HdY2mc#XSZbLj z{AC1?JJWWH{4e>mU4b>2Fwcu*QSTx)QrlVk4cs`Q^&F<{fJmZI+eOPbu|H5i+g|r8 zT&9aav_^Laki&Ea_``KElpAZ)3r-g0kv0}SgANbYb_|}S1RP|@BS4!HJXhkU&A18K zMNcMR+qHPEC9J{GGdW-zo>YW(hyb*C41j|K7|N3omVxSQ*iA&Wc?aPH__V{k(enUf z5yYU88xf;5=yKsQT>+jN-5fl_SUYMjQ3Nw;ff^N#LNpqKHWn`BrD?}vy1`F1)3l}b zY&!-Is*@(#a3?TWn<@l|e2tNpzJmid0zg&J#HfHf0HA7U+ABbHHGV}DRYMc&jeZkh zQA^goGvdQEu|x%@*7yh_Tl_2VzC&1Z+aH6YkL(ct5kOY_BF<}H0Y|Sj zQfqfKevfA-1Mx?+Rr^iwMre)Hs0q}j?KcCU({v{PIX&?h&AMy>C{oWsT?quq@&-=) z$&5LG#gYIRi||OGpny@spQ}Ot+P2=ft=sDeG0l0_Nc8qhpxmr!Xb4LTYhY~ua0G9g zujy_?;0+4gKEFZJJr$u3DRf5#Liq@NNufJ8H)wiLuEx7G(LVyhdTzfAISW6F{{-c< zqv#uZod>6Pe>~>vkLtVaN6AdnXZHf=>nw0(c2q-T-&YWtN})MXF@4{W19PJi`hJ1H z8{H5yFDkL`_G-rdF#v({qYC;h!VFOVqh1qz9ZEM$?}7(q!JEu59X{5dql86DC_!Tl za_o&%hyJT5(*y~|OqU~QGXT^r@>ax48F5ro>>|dN1E?RSjw3W?x(adKT!_0-9d{SS z4R{@c!yL>O^k3>tCgAKKyrdMpD<6!P+{;uE0;vqKLCH_)dThEd*E_wEC<)NV;9!@3e!T`vSyh6;gGAuvYkCX;SVQ#MonvGWxm^ROzpPddD`PR|TLGDUT!jVCl@Zn@C%>i%N6BLlxD> zN3rlh1lAj)qC3n$tMZ;Yu#P}60>t`rgxIKXfpHGdm}wm_ILqRqdI6x0V*^N=-9YQY zuk@_Q2?BpoU=2{rB&9L>(fYnL zqaf+gX9H(4pgb@}ukAYnfgg#&9DSrpCG`k1??6mD{bW5y(V>6n3-m1MQ9%3X5Gd4B zZx8~OoCL`A1TE4>#{yM=lkNa00fgv_^;BSVC+cMxTKyEgZox+6uB*i}TDOFr5cpm| zjnvQ7_Z-%2>wozb&z8&iy(-yw8FirFW07=12DQI|vU;{bIh%k;}c$`4}IH*8IqcKu~Et6qf z;|jb68Ai;L@Yc#Ou3-h>oCO)YYIk_`6F*?3Zy@aopoQ z7;|?*{D83j9}a{2sua&m-yq1l|My{8&~>5#4CG~|iFoq3-_&uuHB5KOak_9-I$mQ_ zS7;rM4qb=cZ4)no+^%+J_BfTcYs%fQwP*Uk4F9mVh}UsKv$;sL);aCaW^3@ zd?e!T45#K7>6pm?5Kf3Q{avag%;W~>O#}bUT6X@d57uC}uRk zJAA;M0lI*|_xga>0Q5P5@ACnF3(%BofOqrCwl1S2hn;f@DMTis^JpuFVG^D#(tLkLr zzM#7>W>oE?=seLH5PSdu3sgrg%hO`zYoCT#d3XQIxJ)Tq{iY1JVSvs zZjzMO&uT1Ak_zhu8LLf%s*W5>RpO+4DX)Y8EN>k%Ujf#`sF8kXgfx^j`2b@*J*xfMzKPQn!ik4+=0r&-)h`pq6?iYZzwg>32syH#unWhy>aUVp`NGz#q zDxR6{N8EX_NcT}h1jZz(f&*wi(3`-0!b~yK7`u!7pQ=$zH30LJUqp=JDLHKex}f=v zbpUqXFw@I&$}iO@rUBD2A|i?Yzy7pJa=jS{`v@UIr;;+2fc-2Zv{NIfuA)Mg{4jg zm+LCxW%jcHjS!Z@gl!5l*=A$)jGw+nM{^)qVZH#+fH?p=bTkc;!Gi$0n!rvS&4gs| zjR1wu1-Mp6lOY)#4bUP2*Xd|JB!e#i=-&ihrL$yt!QTLsKM&xGRea(0A!aHD{2_{4 ztBxbenCS_?&pRJ+>(p^#Dcle6jTEM~91%nKul)8?&f~^x(06yf!`(Mp*pxxlG$x_UFX}HWM4% z57GS$kfLSHgk@IV_)Vh}o ziedu3T!JfBbu~sErQ9em*su)<(NJr+OoC*+iVzLeh8rkbP4oqnZ&nvTXk0hksfJns z`44C`?4+Vp)Ud1@5!H<{eo7VPOAs6O36Lfb(nlHt#j)YMUZ06-T}&mn>0uD-KEoHJ zXVfuOh}nUk;TsYkFDqEee=s|K7%^<{4yX8njL zPWE_Jlt0;hKr$zLibOUWac*1cEpx(jJ>X%wfp}_kgYgX0W#bvH%g0lzn~7(Ht_)8d zi&_CEM*lOnNIee{^kX$%S=Rr;ElS+7Wzj?qx(dkpWKHy&L@VER8puJzR3I@Q67Ufc z{9WL)q}!32FP=wfJ_SJJBBK6KG+Z`WEY*fMtE8eqB`GYvB10BK5nX zV2kS}+2S@u^}iQe%=)XMG|}H9)^LK-n;rv<7kG747-mfBxc+IFx9YEv@R?~ef_%z& zZIl?(^hm%=j{wZ4jMw>q(=c7+Q^qZl4VGhP?gW@m8Mh)|kwHI97x|R&`Y0k>fTbzp z9f;$TyBngqo-4<(0c}w-pB7#cWg3JjA)glBs75jE0GLniwndTALzSzcJ<&bD23~UW z$E8uGY)q{9H0>reGEpOtO$TL!Ths_0k&%Qj88a%L!)91Td^ptCv3^cj%( zr0)(DGBYjcAWi!2RMo`L4lT&M)7gJSnSPV;?()YI$fgTA!v2h({vH(qGyM#ZvlGBO z)Zl?!EbfouQo%&%0TD6~2iQpJwQLk=Vb<$T2v^kocxa-Bq*BCl@Uy7>0+O;93GReQ zr4aUZc;d-Joi2I^dij4a-loR%(!K(hcB5k6W?I_W;{L;tTH4qeKOFFPVzdV;B>%e! z+Sg?Ndx_fj;V0b|^M1b`-@qT!PZM2=G<d9BX?n zAhbUb^NOhIaL%JQ1j;HRsEr*cyz*~S)l@Nj zDJ$kN>_gxev#d#+VXntf-V?xa2hU?U;<`ME_=YC)XnPsr`(Zi~^H5MSmhH#p@Bu`x ze{C3%N>*ooQdc3q(+j}4G)OVnN}hiK_=3MW{4~?EUjqm5>(G_v|JlPgVt;QWg6HCR z#U&h%jS0K#LfVGt(3RVYM;CM!@KHR2)a$VGi(j8^q$q*Agf=t!bfe)QC+xD?9fuJ* zk3w93)0Bt}KKCBXc;Y@wBvjh=iTjdiv z0b*^gMTpup?wj2}5qM9)C$@urL+n_-s$)@+Pm_4A7f<*X( zfPo!P96~$e*S9CJgK9(j0!qk3wdvba@Zr!ho{+8QDHFg%BYu6)ky6%ndRG;yzUUna z@szChGH9kq{o`W%N`z+BN3~InUwfna|3bR!AjXZ}h&7n-V5Uegn2%pCN2LRxj_com zIQ=UUJ~Lg4Ah!k{k_M`wJcll5I&Ka8mo!ib@ErhiYv9{aSNEihIe0)pAIYZoOqA)@ z6v?J{SdC&@oeFd_ihf6xp`mXU$Q{rC4Z`=i_eYrwz~T12f2)!UJkvFZ<2JlcqR0#{ zN;eQ!#KX*UQ--i-qfGtMq!gb9q?pzV$wUfe6nZYo^qidHOLdA&Ezq%UItAV5v&H8cPdK*YN->Z+$bx%vjVb`E|0eHsUM!Y%43Mdq+32^Zp>qM@xLe6~F6GGeL)Np1;t8$~ zh#GhvV^`s)zga{b2Q>yuU!rycYIY+($8#Ziip!9Ja$|g;`4qVav9GYfcY#wR zneTfgGlD7z$&5v3@{`OcQhkbKQpnJbKx)an89i1=W&)x#(JCxz8c8y{LN5x*^kT8B zivSgpsfKASp*7nZ-~6LNWuQ9!HdrOc8Z1QTrh>VDa5hGf6UggGHQ^xAk~YyukcwY>7XhO;5^kFe0A>@=L-T40 zXait10T)wOmVlc9c$k1oRlp|!pvG>0fdVvK#WVg`j=9hqL*=rz9csm5rhS8;x9t!B z@Hu_{DV$Bc90MCjg=ofpML~D7ggAJa;wDrr;OXH7rb&K#4>N19{Pj65LI> zCtVL*J{9jCwgdo?ghwU+7g2PiEUu?W!IJXVFm@Y$arZ?;B+JM%;A1211y~!mHA43w zJWTf-o*LcTc!ue|!82T^y@;4^#4|#74xTz)A3XIsGoF#UEIgxh7ChVNrs8Sv9&3tw zLz6TQpm*_$dof~-QZV@pLdS!Ji~Mo@C?`0;HlMZ!ZSj* z3s0Ty4LtR_pYe>;by-WLkHE8yZZ@6M`QBGBMN@6;edk^qb ziTOFWp1<8j5x8 z4G0St7#9MKnZ_XtE*%5I)&ii8W65!MLNM`*OAQM`td~ZXtiKE67k+WI5kW9hnyOav z#rHzt+=p~~gO$*9x|E%0?fa4LmD5Z24$|y=0O{U4y>x4L!A$lb()CkI!Cy6-I1-Ya z`4BYA!$_QedWC+5G><=mbeEl8y32Pnw(wD;tI?iLVSR95e`FQ9|QnYC#j!b54} z#%ftu|Bn%h!z)EMN|WCqP!w?w=voSARs{4{H-irKF=P1nKo4h-xjIOko~vE z49|i;{)*_;NMWF4tj#n)h^z5e6C-&HYx7S4h+*;9sDSSQKx~QsC!aD<9;|IQ0Ok;I zi^!DAP8%yAHxcxDDn!ckZUDX_Am2Mu(a`q4fSOUm_!}kE!3a>x#NVW(7c$g#8KA`N z_?txre7IF+QEWoOY7K!VZtg^Eg7FDI&Gf$igeeX`{cH`LahwEm5}mt6P_c*6ULngr zK9CaOT@w5>(_h*S=HeF@si7n!w(yeVP7b?l=JCS_Mrn?B=fMIpp~bb4W2dyG*tQzt zhtl56Jm^{E8@VftQ|vPiCDkD64g4Y>^6its`W%}WgLxDEku+$gFMnRDpToC)4qiXd zUP}j%^$yM(@AeH#AXB077g#kC$Vk-w3e+J|)0zDIb(eO`NC%*eU17dRAfNY57%ht* z0%)!t!q}}nPA0R6$oL6>l)&5Oy!KUa^pWi^f}@QzKGOyn&`c{mhuxyftEXVhg=WTfQz%zg#uffx< zUDyCZyBF4jcF|!22;p)pNZJ|0m^lpynsyIEijXym%ID#SG?Dv6xPpft)I`3{!&8^@ z@B}f;WTNpB$@~kj3z>mX(~)8qfS?tVE+y#>%xTc&ZEew$mY(% zO72uG<4*NP?l`t`rc`UD0i-&!kudta>pY0GVW3y8hN}~N2bD{IJ3B*z(S7UR4es22;tTZEy_HH*K#59SwBRq9DP!_~! zloJTXY7OhL3o*tDP4xMQWvTQ&Bkh1U#IV5wDG%e&#Nlvh%hH&IjK<1=;gPD0#vvm@ zH)8v75@jSp*&<}1)M7}@$^+JaB7rHLY9MSWY5}6?z=LtBIPk!u{0}@d0*MYh80X0c z9*i`PGEzOgZ$`36W+Xls=^er;^oXU0aWP6u;6aLwrJ#`(O~%a>LB3e>8EIiLg&wi= zFn*)OV;7-t-xK8HvE);g+Q8yzoJni|`ucckjZx%njHlA*bt&T}BfXbdv=Cr=4>MM$ zDV}cxzwq}MewyinG2RzniI?Os?o6v|04@OfsbNv!4VwrHJIRWk z3c~nX9-Xbg=7Xu8B~Yg^{((7$(E(@z`C`cz%V9KEFw#mRmL4nXj3xoe1ST-R8Z#;aRuKKsy&=m05cCtai3{;x=FuN zTosQ)qM6?;5J~sILAIlhfn9N{c`1;0%7NZiJEf&J>rC(JD(~SQ1YdX{L&Fki`_D*I z8U9M}bKq3RZbq6T$I~3-RfIcri~kKN-iEjHv{{jz3$-7>OR=4cnD%4YUyQjrzFsjJ;`C@M=VOD(5L z%SvxnR$jAvy=C=1&)(~W181mv|KIoj_K(GT)?UwEd+)X9ci3C~#_M63KM^yZN!0J_ zWd2N#1&mufey7JmDi#mtL-1Hk4ca3l1RhcJ+*qNf#(u<)mW)OaQWv5o6hFncMpYOs z&TK{BXRZS3;TxF%UuQ&SB88hO;#EQPJFuBIP_(5Y1)idT6qT^As#GbVhElYhQ^V?_ z+ec8ej+ssz&7T`;u=H)26UZ#7*3l$Rq3<&NE?DMtGOH>ew#?b|Sg$-PeMc10w=i=t zFGb3_=NZGuW%O98Q#f)ZnKvc5Pmn2A{Ua9#wvY|**h0_U9;H)Cj|Wsl>LdJ$FY#5+ zSz|C}2KfFP|No)_RbX(JmLZ>1xzJd)E*&7`Rmk23)yr2#=098JI}ET~6$t;?G7r(? zkxE3!F?f8+V6!>ns!=J){DROGoQ~D-Q1BIfAFYo4j=qmq*D69L z*%sajeB{rNo6bzfQoza-Oqq@{TV^nQpHLaB7C1ACqSus21z1SsS}#8oilKtc`T*7M zUsm}rD%XpQ5%YGRaz^HF|#9mhgJ2JJa(sOU{#SVGl{-KtNKcS{uJF@wPZzf zD@C_dT2a-Z%ryF@R`rztf1zk_Rgo=oJbiDkG!ND203lN#Dh4$eTbX+mTv;#VF^FEK zcyMLXDYj+42H*NAN~cn%tM`8ReoK5c+t@;Wgm3L-kc_CVsUdvpXH?e|2j82CzoQbb zvp<;l%<8_w=$q^_6C)rRPw@~HNT+`)J#MRr)fUYvJp-N%J4drKE5y%6vC)Sx`&@#b zjT=QijEl=2{W*Nr;b&~4$Y*ge9npM8cpH8;X&lYD?oRw{+Ax~)-8cBNQ8eeghxxN{ zH0Qma@@H%`=e`&Cvq?0E@}K#$X*B1+!NvI5ESmG+82*e?dRy{mE2XzHf3{Y7llZfZ z(t8VkwpDsF`LmtUJApsjE4}&r*+J=@&!6$p&trPK96y^iQu%)ZKOG&_&l3EMi&dlD zPW)^hJF56zlsjA$$e#8ZJfniL=s{N>WKZMQZO)Km5dDbJ+M3C5`wH9WSp1_)0@>4| zf_nkMS8=|U-$WOUm>_OxH1=K?6aE{h4++$+F_*S#I{5^y=cDvlxXN>Y{` z1AllUBEe<2$u(wqt2yuIfF{{SM<7l*6d2PGF;vpPX-ibZ0H$+HieRQH%pv3`D(M0E zRmshmGC|o8#-8>QQFZPn%DMdT_xEuA#$1n0fRY=W%TIoP5BG_QYQfpzSoqQNwVMHPYSAL&!4P(qa3N;zYCL_aqkS264|LpfUu@sKrofcRx z3$uDU+!aMEy^xZQpzwoCEz71Az~Kk6A)P84zV#mdp2)JgQuaQ%jQOJG5vXB7-9*t5 zu9|GNtOQK3=yYwmwLe7bUqLKyBV^S)rwDQr(DpQbn;111s&EIl{Vfd zHZBw4ItcA)e?_vKA+r#RSBp)}3Z)X8?Guna?GqrE0q0f!Qj=;bn5`A;Z%;Fl@hlLy zYrQk8*D^l^aV^7@L^=uwd%XXgjU164wvVaXWO}S}ncky95`a@>ORLc9a0_A=D@}k^w(hb9vp4U~?TprhBLK20V#EPWBz zr@)N_?mshGspx30bTqvMRR%h|OqPB|aOler*G<4(7h7oxRs&mhLKObPX|s00@P^7T zYXi&^K9W`5mYO7pe}b{66+_FXi0%JgLrJQ|`0?Hi$ewl)`ePsS)ldor*IMCX24gk{ z+$oO+wG=tB8f9Mt` zO!e5nxNZd!mD|Fwy0gFMz=-eR`QajNS7h-O?4Zd`-tWVRAsU*1v8VNihW#y-1~sHT ztnD@HX*Pxu^`2V#MG3K3g_w;H?}t~7)0SFz4TNxd9NGxXldxhV6pWR&Ra$fIbJYBZ zdKWFdR6?;*+S86A)YMj$A($3h`r#^?uK=?stP;cTmu=~`I`|KFAIP58AjM{T25Gip zR+v<4+gfe^e!z@bg$>DSRN`p8aa6+xV?ob4)W?zOwitTh@v<6tW+B|Q@Ue7PvG~1C zeib-A4rtCef)=Q+3oAYxw52AX8>G`|D2J}{$9;5Isl|fR_4*=k=}%x%gkV;@Pr^1V zX*IH6Z#^`dr24Sy?Ya*u6D`?@(Vo_Ih|PBIf1$ zEox6IMY#4TB`f{P)|0F-n}d|CQu=hn{5gzjb~I9rqbW-+R}3+NTdof7(pV?Oh!qb_ zJ^Qb;%ez7R&WD=TSwaYG$1lW0$yI24r>7O+fH zLer#|3Z|*TJOs=x4~t8K6O1m*oxpTigFDn74V=2zIrGzqpx4wZu&EI=8yxGdJ?&eB z`r99eN>7kb_p4A1QCIg??*P)vs%Y*548IMv^7R7JVoNquk2}W0TaG{2XuR_I?{6msXOSefvn}#;jI_U7^SV|FlBIOG+#?Sq<}E=$f<^dkq0) z+3zLTk7ddAa`eOMO^x)zSQSW`^Is9_8y_j)oqz1<#ykHNQC4p0W=kyX{b@|%G6p5BNg|ZD(=C?^3r+xSraF@`EUdL=6UavpW+^ZpdM-S z+CR>g&PVEW^+5KtwTSMoC?d-^yIHx?BiIt)ZU@=Z-T>x+2S&}kQga1^c{MQK028_a z58T^V>are~OhwZ0CMW0W><2hk2dm~Z;Y@E-<8<8FQNQ>vb-ifT&9NVZ^)_PPTMwhW zg;cUi@Vg~!b*EnLOFt~Z&KgY6Oa!|rUL_`nD_}`XmU?<~PQ6M34H-w7m~(b&U_V1E z*80}I3;{i?==Fvg<|Zv^AFCmqMP$Fh5SA6+QC7St7~Mg*Gw>p+hZV)rt+bv6xY*O$ z0kbBwQjaxetFBXT&1FkpFF}^7AfpiEp4iGD*81oaauTtaMy~kC4x>72CYP7|BLutR5yYzQs)i*v{Phy)g`$O%FMC?!OuXph(P)mU zs#7W$bd|u|0L-P%l^J6XhUunYx+%;AU>@?&BdN(d%M3J7uSB!)spo+W)T_{F=4`ug zF(7-|7HDYDrFtw0g5kEr_O$naX_`=psgmbh(|RVVT2-#eRu!-rr52*N=yZjQM}M>9 zIh*Yj538~uQ0E25zRR9A6u8ON3K~7S%4=j1U*ra-vKm>WmrjQzd|eg(F@&$P^^XfY zobR7Ssef-ENDP0a9)^+Wblv#^{>C;ut3k@FdiN2M%mL;nn*J-=1oQq5Dv*t%wmmI+ z1p2M&rcR9&Onrq(1ZEsG$5qpeHLc*F0J^e)+xN#QNG+65>^q{wl@msv)rIsY>y>;}0uEx|$s$1s#<3q>)%d`qTb? zRqgNp3GE4JNOXgh_O;Odjz8_6RMq~;pU_@-t=3+o2BE9a?&w%qGpaO~Ru!)hD9f}m zXc-u4!f&iMt<+X_7?YCJyO6C7Rz8gMFV9miL$*lZygxR7tiCWtX5a!Q?{~zO*K8DyH-8d#WFws7rgD^FK4$@ zwc9PqZW*0=Xa#9b8h?3qB$GDMp;mx_qb}~PLykd6d)kmuHrq^pQ7^9=^>Q8ci+!|$ z>rv*6x*?<9@Moe{FS#OcU-Xgow1bFxyT7O>JF9emlbtfD=&uTJic=LJ%2SnJo|CU0 zqewQ-Ys19MQ13mfBIBf{)=VegI{?3KURTOzIr-cH{Mvba$^T>Z}rSHOA ze&k&%SZ#fe@L$edMZS~C^ku{h)rKxZwSw^5xr-@`(83=vA*OpxvH)XGTDQJKRowI!f!FvbCdYt8oV192oKKX%B)t3=n7b!vQyAs(V;L= zreC2v(dzVTJ?E|JGxcdkcHXfUy+!3a#_6RJl+6s!07he8iJV#;zrOKxQ80ZK=67H= z#8zUe%+F?5o1d|-qthcmuQ3>=_F$x`Q5l>wLcG2tI2zQRHU_x2Vk}h|8qTnWe(y-G~R7ypE6E0;B zxw2~MOJS+N)dktpdXB|?$=FJ@deWRLn7b8bG%!s(Fjn?eWc#hC`Q#&_d=UGf^otUH zvkJcf;lmSE9O{0B+=$KDhvey(^Dvla9abE*fy-dh!-tT=+$0PC;aGj`X+J>QWyFFy zQAHc$55HMblXaTm2k<5@Zs4Pa&~*dZ(>iD4z2Vn<6?&53ZdJH+;7(Mld#J`UKZj=7 ziryAJy(#n;OE`{u_Oyo)u5B5<(2S|Hsw^{f*s1Cj`5Y8GwhQCVU==%tVeTWU?o_Hi zh49<|QdN2qDhyq1kUg#WINT7gJ|Rj!oTDJNScMq?3^yFGTAQ_w=jZj&YxO$*qJ+S3 z2d#4u;tLE{RtRe?t!_nL7tD?6VX{f;{e5g%4~u}klijuKU~fxLn5dJmMJYT8g-`oa z*uJVlY@qL{Q17R2%RVCt!<51r7zAMIS@;l$g9m=*%Fl{Ur{Wt0)LRM5!P=fSd_3+W zdfQ_rpWa8WX2*q_hj-vV++sUJJctlo5TjK$Wjd0hRxCeSU0>GUQHAiq5$h@j%Mt4B z!^`UXql{&uFBAG8%TQy_PY#YH8Jk3QotCAmmmmM>P~Saz^r6|dNjgnyRhmA9kdO&)*CAtXuF|7fUnV>wIz~d3J#Ebd z%q`8T6$JC^DLNhu48ZII=JvPnj48AdXRXWCJ*ej#e0ot)k)Bi23b0w~dG2!#?w*Fn z4x+TRQd$@FbT5=1sn)e4SgumKsjAXVdajaMDq5y0Eu)~N{@ef4q@`OY(0!qlmO^R2 zI#u&J?rDfry0)wP-%O^;-S!~n4mBZ1wW-peBfWskPRYf8xOyOa+QwjIo&t5tA6x6A z#8EQ^@{@uzN6j7tv{f_t)EMCt)1QQqQtq(T|{V??OPh=Ro$faR~p8kMP{g zzQ%W~$zvHGmAF5K*G2uPD?N4^bzmwBvZrl@76W6il?p!Ntw@DDgv*i;tVi~=&k^Dk zl)!&jj_HR*3x^|nS~IkqcU_ex*Yk)7HgmWFkUi~YVBE+}wZ1HmvuK{A0i&`QxM6?L z^}!jc&J~M>CQ8FY&`@W;e%IR4A{DvHTh;087U-6O>}h2P)(RS|AlC5eaf6BP_jA7? zTY5?!1LDI;5Z+kAWl*)C9y5qC0dG{`Rv1)5tJOQ!GnJ#&YKu{@lNc>_4VAuCx3Sf# z7H0e)`cj~eol_V}I%us5$qJVbZ#dnmA4P0@UT5XXYSAh-y`d?d9Y_#eN(T@mu38D8 zPZo?WrSE{@VGNd98FBKs;NamUQc64-A*gTgcQkZ*?hKVKn>Ir{ddF{lBrJlNS*o^X ztuVvVs%BWK&9F}NS!UpyO9Q^%&w@FZee=OZ?iK)n$x9;IW*2!9jE82*Y< z|H!6hiLSO#X;1qOUeCOb`}+V{`M-o5vJm&9)bJfDZ=-?DQA?m})q2U6UMyPlt&w;% zEVFY}4Yur3!EoYcPg?*vwW@LJyo29vg0-gX{E9Q4iR6c!xXCq3XIM9arBJ`dBZ2=? zMUYel^CB>>d0?0c6q8^=RT7Q^)1Z1X(+jKU`5BnwUV2Ka=xKxwy|b5|gu8W`lT=)N zff-w^dtmm}-S1|>Tqq)W5~QCBl8+$#2*D}`Yv#l88ixw0?UU2Xss!1LAUFF9(lnUM zNf>iB{=@11@)HF4vD)y7gypGN8V7S$fG(j*kT8r~;oh<6AhE$5@iAkSAn1xw+BYJ| z_lI$Jv$`o$O9j_Z;U)t&=g5Ct|5DG)L2$U{AiMzvEmu&%HSIu%HXLH zZ1He6f$;nT!FK0 z;Nf&^%Mk1!f^G2;8_$Uedc>iMId#1R!wdy^dmF)89{m%+a_6eZw%!My9_VZkLRoP8SVT^W(9kcpyIfj#Y^*y8dGCQ2l{?vzb`r9%-pj4mFspm@SQ#19HAm&R%9DW}EVm^$) zuU*7d44k&*?APEPM{?+1k?Wgs)xMSghX{VVAN(QlKk6s^R@QE~gL3^quAwL(U(R}& zeWTdc!n_lqe_8J(J}7dl40cz;Tj6Z|hxX}j2e%#c7yRI;Nk>0B_F%StGoQ=@MiJZZ zaFoDw>NmrL$?s@fYlGMn>Vnwi$AX%Int@t^+JexAY-|egAl7e`p6xmi>o6;SB8W>A z#?>3wKA^s!8$kU)H-iR%ZUGGj4FRQsh^HHd-|50<;5q^{3X}z+d^E0OLE}LaK%5A( zU&9o|#x{}*LM5@~fo6a>f-xMs_d-w+Xd!43=spl-oW?u|S_&!#Jq%h2dJMD*M9dSo zt_H0Wem$-mKpR0%gPs9x0c{0s1HAzHD`+R^Wzb&G8zA=h`$6TP1E6<6?}HA3j(|P{ z9R;DoQ1PPm**=or9Ggyqz5tyA{T=ib=sf5f(6^u;Ko>#(0R05|8T1Q?6(b1b1_gs^ zfNFxmK#`zYplA@!`sO*M^+63ljX<%WI8aMaD^Ocddl27)qiyIq;WuwgTn|bV|DL$2 z&n|Gq4&b(A&|nbpx8llAABKR^K*K@2>2W*gt1;td#U8uA;KI(rOVNWG)-3yd*RY0< zuYBXqzW2DBe{}1+r~jQ}4B9#V+IDx>&us9>!N&&PQJm9va))CjLvm{Nsrh;OqkRVC z&d!|uOitl5FGVfAtIU2);*lL6^o;NK_Up|CFW!*Ud)S4WBCgz5qj^&^_2Uu8znJy) z=a;^FD0k`ud(7ph$2@$ZKYx4ZauO3w51Z(OjbV{pRYs}XfNoPMIidlSBmT6lW! zz$rJ+e0SH{Wna8HaqnMl?7m{>R}+8OpVX!K$IWUVyvg;$xwk_f3!ad@u;4H-L;8Pd zPkeBTvE-?5jU(V|T{m*|!8hh#dFAON#WQazC?C7)__s4&eI+P!>l^Q7{{C>&E1&(N z+sJEgTsH8bwij#HyQjsZkyk>4{}wr?!?7jrzViA5AD)JeRjwLa=GA)pra6;lKGJ)W z`J`>xOP4=`zj^mV1!r)5c=PZtZ+PXd$f8@^-J9h%T#@)|ji%XyoyoO#+25TuD)*s~ zmmIe5f17<%@v*HtKOH!K-^#v^gg)NmeCI{wJ$g;4dH49%1>Jg{nVN9A{^;XhY&+5M zdfVaadvyQhwF9#cHo5fJKXV&QFX{4nlk9trH#+$At)Z{2U6#=Qu^y*CP5h|)>0#f! zytKxaF{vpNgFj!DcWU+bN4nNOHZv&lvEWGHru}eB`>k(>#W%})yKfZuUz_B%sJVas zm0>+wMs;6wp~F|pK1iK%?Z#v8_l<7zR&39X*SA|0_ulZ$dzLhQ@7&19r)z(5I?333 z>cauU=Pz6z)a{vwzBjI2_4O}rG>QGT$&k0|1?@~9+-iIy>dhG1vCTV63K9przA6@c z6VMBjep@m6^uJg3e|_=l^dXTW9(k_)mEYP8`uiRD9BEmLMXh@L^v_2>UDtTq{`id( z_Crbw2~Up;YteT0 zu%crVUT{8hFy+bRQNz)rk9(-YXhvhBG;=Y`>V$R6Dtxr#yTHbl- z(kUP2n}3^pBx>Z9&vrKZ{L9`Q2mO8I)O}~1>*_CG`>6B9ZhyP+(5dN5ejYe!REyIu z)mr_R=W|>9WLwm6Ss&-FS2I8Rsr!`s8#Q=)X1nEs2co{i3a5W}l?iZEt+;U`qF&w*2c{=}*b?2CiGy zwAF-~znp&QrP>=}-Ir@GuCac7@0pLh-|D;P4wa62?`hlP-)w%MAotkkJC@D*X3x21 zJ)YWC@a!9j_noWRzwwybcRU}|{?#iDZay@;^BtT1)#s(WX>o52+xp?gvWYE*bx0id zz`ZBWJv8O_`)U-OeEXvs&u@GA>R*2i{{BGEsKnwAQr8v4{@N#fu`#%I%^35=up39_ z&3qu_`lbKe_sGw^cCOxaPu`ake^}$1SwH!%zup<~+2c#E7QH+F^><7A?C20XGi>Nr z1&4mx^WBJ)J338%aMQT2va)YUANW8)t)FAJ9cgs><-(0WAMEqskmJ|iFuvyDgZIac zsN4C_@cZ&Vx&5~2wjcj(lkw^`i)*xqyTf)mtZz=_`FT&=`1LjWmJi>!|D_*Z8XA#y zaZ}TSgZ_0_%lQQ{N83BrCJo+{?x?Zlo#s!yaIhxcm|z zC;^lN;zuW0AbwO*2r34x2bF@#K!-tRKo>#INQ`BmI8YZ*KTs+t811AihtZ1WEyAgYrNNKr2C;Ks!MDKu1AmL03TTdWaj; z3e*kMACv*g0nGv}0j&X*fcAh6f=+=hfUbf<>%(rKcA!MiAkYZVBv1ip31|(d1hfZq z5OfN30dy4<+5q7}?Ldj3L7)+!NuUDI63`k@31|=KAm|k60_Z9z29xwwpl+c4pbStB zXclNOXccHP=w(nj=p^Vo=nBYxXqS^!!J+63AG+6OucIt#iCa>k-wg5p43K>a|eplr}A&|=Uk&}PufpmNYj(0R~R zP;?W71$6=S1EqqpL3yABpjDvFpqD}App&5UperDEQ`i^O4wMKQ1R4RF1S$Y60j&X* zfcAh6f=+=hfUbfkS|9hI|dB_d<>u%FL zH^edU^W<2}@1b+0=;cnh#63GgvX$gJI%tQLH+&jC`8t;34SbU%XSxM~nSyXK0=; z`cpnw(m8yV=J!p}a_%rl`LB|1e*Q>4XP}mI??>jV4eb5uUD}VIs1kEt(#?a`$XjXV zIVR-)k*@LF1fKkDLp9Isjmf_!ay~I7zh#1!7m1y=rfHtL@loDKrUBfAoqWezHP2hN$+3(ul+^yvn0QdN`ASCFY#g1 zw4C1`k*|+(qvL+cXaPgr(ybLJaes=)B<# z&AVW0x<^nJl>gpevFdgv`4lN59`r|kfs{Mn4kh12+RNw-=+D5nMj5azJ_xevK0i$% z_OO%}x0)sYQYQYvaW7=@DZ+E(Q0C_Y)YaR>ru=e}n0%?XV{Xv==TZhdgphJ8eSB-5 zJkvwR!%e7@>76HO<_SD#mbQto*-)gnlh~gpjWF!aruYZ9d9CKxNIT>aWRzQd65o>| z-wbJ>q2i@kTv)mz3ve zX?OpUcE?-ml;??@XGSW#louaPkhko~lZD9NCvAeedXf)AzejgO!ka0YpInXShM&ZD z5;4vLrn@Oi^DZebKF?uV z4oUszgMRXFPsBgCXV+^!M#_(`u2UW@eFV2^Am2&y!kt^mTjhK7e$6lG2~W72P0jBd zr+FST$M(#;vL9l?yc=i)@Sz&WF zX}-VorRQGK{Pn2sblmua_)a$|*7h{)Lq76O&7XK!^H&i!9nZFBSzkpuwn;s?w_Ib+ z-k~6BD}L&*#;dOjwcMSlB5#e4hi7Qsnj_`T z)BL+qANh(O@iC%rjpX5|8|Z8^VC^G&2qd;*?nIE4CrT*`(Y0jW5IKd?*l_m2h;j;Eke zZq5C;VGVh!?06Ix`AJRi5AI{Jt2KAwPTiDSWxoi61Nl=@_S}`5{7$JGJd2FH)#tT$ zX+BQ+czyv)`Dn2L&r(&q*pM$_k^fElz*!|a&zyG*kUocpD-gr+iH@6Plb0;Z`JuPW@-K}GM@3FJLQ}w(s2WS@>YMv z4Xc@^6=*Zo81e1h8pCrS==kuHVg4@t3cn&JZ?#MAfJxq(!}CK^@|&gIeL7e3FGxRE z`l9CV8wn5`Hx4J>vVEOZI!y<9a|EC2jBn*0+(wS05F=B>KTtx+kr`W5a{LEajRdCnpEWTb>h`cq&XoPx9zVCSa zgX6)}?xN zE^@bV#Y^4g36$imIbvPuTjs%rbo{`Wa%+9cog&D$PN5WaS9rDuI_`C$^hv+dS!~a7 zn~o>+Qf{rudDMf#OWlk?gC}p*rCtLx|AVxZ!}nEqXE=*Rvce*iUmF$n_=HoSY+aUBI!J^M8)PT=#K4 z#`T*uui}QjOdr>Yblmu#Jo`|({0+M9a9zoHB>PQkj>oe>iM86z=lD&&4Tz4fLXfv? z9VhMH>Ido^&~j@I#1~kIx9$P(7!mT;T${%ikZ&hxynHGmR)(a0OeLY=B8=nt$wsW>`LCc53+T$=B;}zJTicCwO<`BJX(Qe%k)`e@f-L} z%s*xPcy6)gtu@k)jhfF&2MBJ3^bJ;f;xVBNZ_Q6?iF^jyFda|8pxnC0WJg118j^0V zTx;^QR+!$#@rL(!tT`VK^I%x3?%z`_KRl&?a_gQ5Pue7Jt%3I**8H5N@PzyBdd*w+ zg|=4f7kMZV)5d!m*7(Vfv#HaX&+#}G^5>*|^ZZxxR^M;7)x6dI?nRxZ+?s2@R;>9$ zH^LK+C#Fzt&Chu3Jku}>cC^+WErK=1x=+$T(rxvhvC>B!lQuHCTA6Y~MaIE3AKmgX znz!cSp&K;Mc`F^yqb1%NkHcQlymc>#`(;sX&8tRBpK9G};3-{{TlXdTwJmvTe%J{1 zC2!rg85N>=-rJ<(9$A!gO+>c{40&r#+eP}!1oS0zh1KfZqQ7dqRYrG78Cdt~#!5T0 z=50SDX}onG^FE}5@mcp)CJNq~qov9m%j&bAJ*@FoJ>wZ93~!B(+$N1Y*Lie#t2J-k zN97*tEOU~mjB@L~!X1U0|2Yw!a6A@?a_fH8v6-5;)?=@j znzz>S-^n;*-P_<+kqpmvO4qhb^Q@P2*857t&|wHrjy&I2;yWQ0#tA=CbqoU#$Go%s z=M7z4BX{fK8co}GS#s;t4z?8dWr0w9wnEU3dO8g^Tn7fORQO)P^Js3y|7as6wlzki z*kKwFzx$qlJP`z6fjw{m~iEC|89T1YCUQ29< zD`kwnF(?+)6x19<|CVxXg==e2J5XowqnxfQcnqWJh2cK9GOag&*mPNaXpjV(0m2EPJ!!(*)#d}n<@EcWHVQ0&g;pot`l&$CE%J)6mZ(hDD z`i9!ic1~(}bMS%POS)%YUGn$tjlwQBy{}Fi=l!4ktzGTj`CYE*z5K5$3*J5bWZB+= zYkxUo|KZg~(&qHtHs{zc_22u@dEbz_H6Ffnxc(1^7xi>4zrR7#v5&nwHujN%Wl!zi zzW4UiZ}6G?{bBQ_JpAB;g`4Npc;VF7AuS(TJ8)f5`IOsUJn;N;zqA?@zWVdK!jE0d zj40}u@?cW;ArJPiU2l)``4gcxY-}=?@80Y@)8Yrmqr)QSt|_>+r1(b<9_n*Ca%Jz2f7+TdeYmaD$p?b#eNm_Pj9X5x8BuuRUB1)v{Z5B1BITvkEm|Mh z{occgFE-llOd6bgW6~=%9_#b0`C{I=+v}C+ z_)XJqOwgIt=;}^eZR=jini=D`)^{1ZXO#2=oYOGiW#HebDEi%b>6z z+~Wpy0SyL?2IYb713dxS1}X!62>LsSFFe))wE%So4FX{wds`vsVbC+6GSG*hzk~h_ z3Pl5M4C(~B5tIR%23iPO2YM0o7U(4CThMQy#u%46fo=qGjG6{o2wDZ&3VIcE1auZ; zqT7f8wFUJ84FT~b_06E&p!Y$agD!)D&=J-HbphQB$^=aY6@nfHJp+0LbP)6z=n}|8 z-xdRE3+e?L0?G!>1U&$H5>yI$6LcK(HOL6VnhTTwx&f31ng}WYEdy-??F5yBJ^_6X zvZI5G2DJoT54r`E1)2_81bP;<3-lhyy8n7BY*h=z0>>TL*>!Tq^f=|C4(4G`%A9raumW+QbD4seX zsNRJd^%;g_NyK}S;-d&G0q;bGrmp0!6#=J5A>?ryTa=OiIE@c3F>7T z5P8D2sOQ`tw648k)I-1if-7f)3YFCIz3y!5He3wKMW*DIAd=KJXM;tT4czQ4rSzH5b-I&cao zoBg1{^;u<#dA0^s@?a=Y`PB&R#ZxIH$InVyK1W)_i~F!MAkPw#fZUIr zUOZPwygDNR$hd7Znk&4rU^!fxL5BdMq}mMA06=Z?F_u$JkEjY1pGq?Qd~+Tex&M;n z>?0rveiLF*IYvyv&rrlmow-F+rAa18tuCreEcbG!E}mf|0iSVdul< z8A~E~EE~PJYrU9bgzi`VE%uZFNXi-)^MBd7ayZ^JMCCCp{SK+Sx0 z8UVW3LhW_5vI(zlqLac6R1uJ;DogmCQWpHWQ;c;^?Du=6{kYRVW8wDw5>TCr1}`3x zCIMR`0YrUS*^>Suw&WIdf^wH>)CgokymBR%+;tP`59vxcEUqH5qCy>p8{vsbpAchl zH-AYIhZ@G8Af<($4NJ5aw`GxlwYK{4;X`YBsWXvrg=;T`5?xsW zJX?k+9@7B3(0w4;oU3baRAmj$L7E8Ww@?D+c?R^_SDC!GmS`^?{v|1%jrvX$w-1zj zeX&4$&4(>uF*+VCO%(Uw60e6O#mg&G%&%yP;-o~H5s#Xn7mrMn75*6;wc&8)f~Mk zb(qi%uLimiz{6IGlBHyExRR7KuL#2<(Wr)JaS;L6UChq;pQLh|sZsnSO1xT1b>O*i z68|>{OkFpC1jR!;=*0u*1Z9_!;5m|#J)ZqR)Q^?fYb9M^$GR2ivYr>Lt4!+2;W}Ur z*0iFY$6!(yPv8;tounk5sw|u<(nIkG5eYa7*=Il=B_dut?t@-D>Q21EoZ9O{^ibl( z`8QEKQB$&=DFJzKo}kvEDI<)HUwpyqCZq`$9$O~>o{YXQ3U`qD>V@CL8g*Yi9D$h`C?NXOzY|DGo)_zIsSU1S#>v6ucr zk+=3EFBSPvEw4!b%aZ;G3Quk??S9s4;y8-c%pOKlEzxLsI zx`40n{KA3GUwD4`K!;f>omc$DBKKE6%0!;+Cwu}1P`Xro>7y^07EAdRi+o%)dGvfi zO2YlwH$mhbHQX!xxgz&he#Iikx`56re3{7o^&e+Mez%|So}2Ld((k!hzAw4wM)|(v zXE5ue^JgE=?eGEf%Ae=P_rBzwo8J49dv18|ORgSKK+qHf=N&&*^>mmk(s{`}H?#L8 zUoYXusNmk=BVx6nhaY*0$o<)`@DJprBKOxm&WN1b$iwwf|M9P#)Nd}_=%g8V<==D9 zcfh>lp8LJ~lCPJH`OBZ@_Us5>k-i*BpXZM1zVv(UrtV7~(F(qB3-qNz|4PyCxotWi zUitIf8{L=Ob5C?%a?g#>A+LzPMB?|{;@nqw>otxh5c-lQw9x{8_RSKxR8z0~6^cAg ztMQVTid=?SFZp4SW5r45C6ADa8}63)lqZP1uMX)IzObDRDBYZwe7(s1wQtWYzM;u0 z{6z`>fsUq+zTgRol+R(AIQg@$+ExOA{PoYV9kfP&=}!{5-}#Zqr5bys-*aDX#N;LS z+>_gvTy1;?0e98*B~R$A{IPSIZ+W3C{E7@Eudts}8eBwo9iIC`!+E98a}#G@a?hQX zA+OM%Ao^2AP_5o=0~as-r6R|Yn$AmpQRIF7$UXPo^%dT8&s|?~&y96`$vyYWg}fqv zldSxWf-js*bG*{;x#=xnUUJV(ZGFktXTcXPLtnhYdu~Guh?m@R`&nOd&uwOX$vyXu z^(FV*5Z0GGYYcqhcw{@ASNaa;D1Te5zIe$mirnA&$#bVyU-~^aZuKSi+?>^y+;b~d zUvkfFQGLlhcR%$d_uSdkmpn-p<{csQB`*}Yzxjpd)}y|{$I6YLFO+)k@`=dRf=+(q zo_mJ+((k!ps89J_TJdv!^m}gg=_|bF#-5P((Q0syP}-;GmYu%Bb6+dE0)6qSf5jqi z;zzEw{DN$$AGzn&nt*ue_uNg>m)vvzOJ8!&%`Sb(JvX}aCHLIM(wE$G<4Ip~&&?!# z$%|*g7tY`KTPkwtM!oD4F-wQ{XMfKpDW?zHk_B-bMHrA;YCt}5=Prr9i(_k-ouE-N~G!^leOZ@9a zF4Iu2@MlEs@A*W^y;`xq^;53M{pGJzR>~PVDT3V_xa(vr`5sO9ZWUf{n23!DSk4vR?G4hil;75BAdr z@{x}buw(B2Keo#P;Bo{f&yl>+$GA&?D|<)ldk4I7KH@z}eeeEpyjOwC65OT$`r@$m zIxn~v1K-^wYE_;xV&4T+xaPG!8_$(LV zF94tMzSb+xrEKoDzVWm>zgWpQr13pOzpwf@2)JCq1!@O*z~%e_j_F*9{AUSHrolG% zYkmFZYaj6I1;1O;>3-HXp82|pbR-H=IV!CC!=ulg_oxLCo- z`pzp}mU98pXW3V7_t@NZ`uHqo=4S`=TKN8wOkeSz0xnD9_h&!qbD}fvFSvgO(AN&Q z*dw~W$o(R({7_#iaNPta>ozYO^PPwEB?(TRui4z!CHc*F3H0U)esh3y9tG}--~!dx ztH50p-1UC+F`W&7bAO=oy+UyAXM6iiXDZ&Km?iioe)Q5#1;7;wPUe?hb|P*QaOVZr zEP%d)z+DtvWB}adKdG;QyHekM0rd3)F5^ROpMC*wlYlD}T%dAU3EV8fako_Ee6&Np zw^(>o#~VoBS?Uvhn2kA%=e4u)97Pt(-$$b{z`9~*_E4V=Qrwed7f@>k^te$_S zZ-j@wK>h9l4}J0+(P#QffGe}|8=zhs1+M(~AJ>bk)F-&60rC-t$+M*|kevqscUbhv z{ZgO#$n(&5e}H(`0GDt==Od85eZaL6T%hsj0&uZ{3zXmJ&`N#sT+(Mg5`jw+eS!M9 zY~cC}ZcKpuE&;Asa6JOxb^y0oaDmF>6mX?~0_Vg#N-qnpwV!y~!9NcA$^<9RGi~l) zy8CR;s{TXo`j2$^)$^m5xCOwi65Qckbv~EVw}JXOo9Mf8|Mi2Z38J z`s99r&vtv+Lm$H_=VN?rfOp3%eb#*fU-s??oR!~h0rX7*u2j+&69BgoxXps=8=#-x z1Ki=ybbSa^&S!xu7hIrv8;U{C(&w+-SRdMX==(tO;a=C(Z++kny0gycbOtKFCBPL5 zF3@%bHaIJ51033IOUM0AU0Jucp4ht?&zn2Z%dBNQpK;IJJA|iD9ItRe* z0Irqb?hJrC1zfJ+@KZYv%2lX{Z$ID|umGcpAKj3oe zXbw0ibfa?O> zdBJrGfExjvt%24TaQ+M2718%o0DUFE9Tt7h1;8BzE~BB2*WY@d{n2IEC0B42^Sa04 zbwD5G+zy>kso;AAh(8s$a={e@z!d-&+ek+jaQ+8eE5R)dpzk1X#e%yd0PZqyCk3}L z0ImTFEvvCkU!Z!}54c%^3uKo`z!eKFkX=>+cV2LT(#PH9b7TKFeP@ANEVw}Hrcexq z#exeo|LOvqr7zI9Jp#Bg(HE$E7XVlOCve;m|FGaf1C-lQ;9mX{`na3EmA*jw;&4-8 zv*-&n-V6fnqTrGOq%RLRcN1N1{Q}^)i+{qO!0iJrLva4uJNrSN0Fe79aM2A>zJh~^ zwDZv)Bm!3`IQ;aB%Z6~4;1&nKEdlO~;PM0Db^zC{skUG90Ju}YB?<1P05~Tqdye1& ztxwtkmn*na0raH;*Q%LLUm$%2z$FOotpNHq0e4bxf!fhQ;LZpxP(8iO^u_7)1=81` zG14cvy8@)IA8?BWhg*u;RjV&*{)>2X1(zT&ckk9ZA=U7#uWO*!!Uw8{JUt>u^kQnG zoezB%fXfnG2R}HbGt@(0MLM^)@|(_nv6b<6_oJ8jnFL&+#2;uLvJ$v*!67Ny`N+>6 z;K~FS$UbL*J1MvtqOSV-ZQ0HI@R!HN+U>uD)x>|h9Z--xK7abO_(@a8j-C`hWAwE6 zG5HfGW#2h5Z(RG)6UI%+)BN=K={XapOuIY3eaHChiPOhUotAA~+fU0K8$W&8Sew!_ zamv_9`Pt**Cw9gc!&Q8y-#tBkRNmdWMpfjGdZ2uEXfu-1r-&B6(BtrpNaiH)GtSsk!5(#ivf4I%#aq=!q7t z-?;Ik^C#tXm^C)fl2oZ%W81ckpV9Gu->|9a0=-1` z)Uo-KQ7Yi@ba>npl-9&46Q*l+6he0GVksX*MZ!YS=t*o#c~hqmj3=>5+_9?_&*X7= zqanbfKy)$Fh~ut!)5lGlIC|2=*{X6tjLb~W8$I?;jZ|jFPYgcQaxxb0Cj&ce-019a z(||x)r{{s2jNgbmck0ZJ30j9rMsD7;id0wT9tKLBo`?MPV&{opFgOCCE3Np=B<4+n z1uTF0t^BjI$Bl#SL` zgBfwwYzJ?rtGyCCUAs(|>vl5)xkkSQ}J<(Vdu;CAJi4PC>Lwmkd~ z0>+M%+KhJYC^Ic2_2Hk%!z2 zH|^M=!x*yG3=eU%tc8pwBc0*5<41{E6M^cw)|xdlz#cGbW}0TE8JB5^ly8MkG?7Dg}F$(RlUuQ7v%yNr|!Wn2h4GPvE9 z!T-js8D>3~(Rr6y!ySzT<(W4on=M>h;ps+RT<@a%6V3kP&701eb(77S?hF*i0Wkl848O9ZZB7b zVJ~q_a2cED?ShGnQ?}z~9Bdp`gxKesQ3p^kYmJTbip|C@<1@Th)8GVrk|C<;PB0to z1uD;YV%~Td!T1W|P6*p0*=#o6tX%})e3!9mUOB^l?GYB`Qge^l5#|qeEp!>n<~f?# zp~(2rhGJ_ABh*gD#oZGXEYGa(X2RB)-H_@wun7~s%XQ8j?=tS6x65Vx48;I*cXU{WZU{huciDM(N z8$)1Sqf-XW`Qu#2b#_|xkloSBj{5EH>B=xl=c;TUL0fBy#5G7ZwnH5Z@d11qz=ti; zC^w_o`kcvTtF^}SbJ0B7D)j_)=C2I1J1%B2{{et{j$aNaVO?{;2O3<)he~IL*%Y4m zS+fYOW`!Bb2B_L5TFrns|-* zCYm>nH*Y|fk!%JRx#ll7%@wA7pz3OFb{GGT`kLea!@ed6Ir=%mooFV&+GYfD8Jxj{ zxr~juC}EUAJj!6NE`xnAiIl+}T?TI{d-*DZ-IZlPkarpEt|)`IqzrcJGI(3*tXc*O zbQvU~$@g?Rk>;|wNOSEFqcPev?4Lj144IEcs~SDi?Q(B3L$;wwu)yu^SoEaE?d}p~ z^Jmas*AMw_g&DlsG#woy&6uYUpvdKDR?9Tqm|URW7|&X9oc~y@3{|&wIbkiA@pjm8 zvu%j`7{Vl)y>^+Mlg;EJb3~CjHrbq>Y>r4a=d1n#2@G?&2cfwQ>DmcI$XP)HJFZtccGS>A?~y8Au3zh=$zOM zL1@I5m<>WMnda?GvhhH8i5e|TYBF5z#3Een%%ao13;!KO)b~HUPk5Lb4Grn;{!|)JTbO>zT zyMs9XqUl9y?a|ENm<<)e}*YyA<48gcrw+B-R@5@N{ za1=yji2Hiw6^4+twI0(oNG11eTQT#>3SwnRXFA)oxgRkj=+B-`O?NP)G=hht*lf)U z8=b@We(qWo!Z22#eKo=O*&ddymuxn54Ma^zL>lK~h(YQBce?H}YmNk4q&1E=Tfi6N zgBo~}QKuRqFmi;XzXYqcN6~RW?VO?8;C)f5Ml+1dttJxXKo19c<&0fs(-3sO)UD=d z?&Ij!esmctW~!nxesCwdjO8=WGB6oj9miRj_Riu&1U0ZHQri(Px4MktAcTnzad&VT z`(|SNRAKhGrMS$o;GG%fOkRr3R9wun<}KuQG4w~XVDm}s46YyndH#X)<*TH3t^pPvo>*3+2X4yzP;Fel1R7aSSYP0(g=fp6e)4@Yffb)R6?BNlDWcz8OxyxUlJhU&WWPADqR;1J9gZbp@-w%yYq zZKGNStJ5#$bx21KB>mb%^QJ^IIoa%u(5j|gM1_n4vJ<4bmMy`OL09bk6&3rH>J?kn z=wgo=y)+0JM7`+gGG5M=-m5&^qgwneSE|JU%NJvCCbGw=ZBNyPV=~l&ClYNSG*Pb! zuo%EJt1dvXD8@J>vMxabISDpHG0meP$73e7LTTuV&NRb}Og0nI$y(jS+jqIwnhlZ1 z=9r1WIu~oMHE#+*t?mueg5Nm}_UlfAUat%at}E=-5iwk^Y;>YVvDu2v?i;JwJzCN1 zZbbr6;3Ih{G6(ZA-kgOCn%x{;l9i`fWUgQzfv$&`pknhTUX=P*u@D#$0`m<=jGa3$ zNv}^UHhUuteRUcJDBM44jyG>+x|3XadM5S+Q;s<&RH3&kD$+H#7|Tkl??5^0Qr*i1 zlj=Jjp6+O>yQ}X)t!g_48jy=2yr}xP#R+qu7UZL^PBy-tvI{+>u?mI_b`?9LnZ#eF zmY`bzDj7a%`txl#Qq$XGwy1C`Ia`cJUfLipsDJ&6%wCumCF?LJ!;9IlaxjXai!aul zeYx45Il>Z1UHH#S(Igvc}S> zXlSbEa1pQ29HSkoF+){37(+zP3_TlpAr}pkw-ka^m3x;XD&{D2mHq9;)`|f=k`pBq zZ!Mbmc}I!)q?#kGwY$o-!FGm~(8h_V1jQP4{4Ur4EpHZPTo_g{sK;Xhi&=;svQ@I& zOuHjbB~3L>jKu|FaanZf3P6KjRI4tGVk_zjdX3tRhtB@ZYr^xd!|TE~26 z23EauQ2Ep-qfCpOI?yL`qKQ>(0fz79XbEw!al;O}W^_kC-yMC^jW7cif{hY&F~5mf z1A9|tM^#HW-9|LS&05P<=`N=gSF73R$~jP?``&-eb+pxu`+loV0cRNh!m11v{Q+5( z)j~pC?j}^E<69V6f-drsnSj~1s(WwTRl=UdwEb*O;VgYF(l;U5Txv%*f;VPRJ@ovD zGg4UzSrv4bnTUX#cPAz4od07=u^G*ttBs}pSp&A{$$H#N4`RWn#4&pM%xa0Dz-A=p znXRFzD>OCD(7n$5dk}wJ*b9S%PUs>7J!dbD&9?$KEYTd8Z2skvMqe#Bj^*nv^E!+u z*K%~%K~4s*<&-yHO`RiQ=tN^#K1_&P8ka&G*>*MS!fc>tF}#NR1 zeowL45jJawF8W{h6k+9MJmA2M7M9K}*t?f)m>rbe`0<`{Gn^%5Jml!0W_oxoYZh(UneIMFP2Ff*=)nuSG?v(QW5=Zk$ zbcw2}9>JZa7#OCtnxJmQJet2z`%vL9AwYew;cjC+1mXOlwL3#s%H{LcqI&JZENi^h zQ|>&@R+R5DUY+e|u3OO?X2lc+(+>1huJxE+&30cx3hl;QY6fSg2fJ2>csSs}(aHd? z49AZ(Z)GR<17^8Y^pF0R%q6G zy|TJ&u#EGW7zZBOINHNuh=*Zl4+9=7c_(<)y4W6^@Kn}1V|MUmt#wwuKChmy|B1EM zSX$3k*ZQZdwMJX(9Ia)%X)7|X4RJKBg;548a2M{CEI`IE&tN7UZmzo>#?iYSadr*? zZ=$(z8fO|4-5rLjz9S5in+}5z9CsTT52} z_^Y}DXw44zeg6(OIAXw=`qsmEa}XmhF>mK3*_@~^Ts#?`Kqp60+|{bh%Xma?U=CGWy}Q8E z5XhbCe~_MgslFjtjl?19hMjZ_z|~}55T?LkG)0*4sxn2m@rE)*1m%(Z7sY?I_%9j_ z9~ZmK-;BL?=Ye&wC~!60oHk=(f`0h{+>4Uh|Kc30vwYuKz4m8f@>4w<=nLjZulIot z@Spa2@mM!v=Au%{X%HsI`0r2!&1@LzmSk<0aRO@^RE`W|%N*5oPC9)yooB7|eDvR? zrzWaK9ZXI0am&v;w;L?&pZ!Z8kDWu^7}f0fq2@niV4ru)7V7&tfr*It0;hj|=IHPLu*4#syB^1rxLrFRb$ z18!a_-MiI)k80r>&U+2GeSjG|Zu5DK#6?!lfBWxpj+;nc+zsn?+mmE2&Oc~#^bpExv&ObFGzlWqtt=eE> zscJOj(7YWhdW_BPb!uq7&gGuuGM3E5vM<(U{1YoRb(bIa12EWz;hFN{nS8us`~pds zN*{hixwhv+Xx1FKO?jyqGW^3`C$^cvcvfP3Wyb<}Wxl@Eav?-n7(Ax)Shy?-#uDJ? z8G2p~hC0Bjdxj25;bBl}(3hMOzG^_!%+I*J+!~LP@d!lC4e->73l!XC<-!N!a-^%* zI^^senP|zVXk023b;H& z)-X$yatFgY=&OdR&1-pz5!RSp4HBIqo1wLj%LB{(tIQF}Z7gZXA)y=Cv zo)o=5gM&mkLUF3&Yf@B;n(@Ha*ooT)HF4*89jZ}zg}q-EdzXv7HSYjI?5#b--tg7- ze!0Tlh}HzUocA$b30~_eH}=ms&Kk8V7_V2nElpyVr{&+aEWgXL{I#f1ja_a$$H5@j zkaJh(Fth$hKIS%im8ew&@7xT40ClPbFNtOxFQ~@6tVPvA-tg09%&MqbHBhzoR%G=} z$?9Ios^%R)NLICnWEH+Tt8Z4#>Rx0O{p~)L)jc|^Z!xR8C97|FW_7of)wllNWfj$p znM8GakJasVl<#)%(X@+kL^8cyGOc+B5Rz%_A(@7+&h!yvTHQ+4>~>@tgX0Hy%i~h@ z$%l{HEc1GngXel5Y)v(zugMvGO=Fv?ykW+Ns`7@j{(IG6&P~zNG`VCphS-iiU9DP* z)q`48f(GA0JALB*3 z+)eRjh?L-`VzZ6fMh-)JNdFCAYI4F?_21+Fgh7Ig4br?nQ@a0b^WGrM`!m1IJ350C z%ME7zb*Pn`0t|8)k5^RruOugrOX+Lg0fdyk_K?ztuP*Mds#f{ObzgcO9S9yY;$dFn zO!aJ`FK+hHf@qny@QT+#cu7>xIZ-IeybLqYY;q1=LI$43;KA#P8F)wvAnNT`sIaY# z8hkAcjlaGN#dZq@(~8>rv!s8Kq+jzGP_6W94@p0Kb^3pJ~Fn&sbF69cln~7(XBtnBqLFrzxoW=$`q` z+lBl*L}EM|Qj9SwUr$#amAT9}`KnSlAY~$@y2F>86TTkPm2dLPaW~v}3~6u0G-A5a zk=J5%6TqJ6ns5N6i$tjQX*@1be5Im9{ZqUH2&sqKL&_1px*Q)5!Ha-Ui>Hu{QI5^< zj!RFx%fpB;!|10YRPp0JG`S*}egbORTGq3(h+dVdu|}dlE75D-0fa=aJtTVg>gd-X zda9Kh!e^1^W-jANDOuM)%(`fLkh_MOk)vG38N}BDy+{Zrhpg3ae4suMRj%F=bd)O&Z*+1bGm4bma61fl zTJbV5hPidrV>ZTmjDapG|7a}x*O`sinKwYxH`%;7(QGMo9UX{D=y9}-OsrC|aF8zN z5+1ajFk>$ zqb9AFn)KK1Y7%$v`l;Q!eq3s?&c(;;rPcsWCKB`(9-L@O6epAiw)DQb8d-^Z@n_;B z0s0D__{3uO$;8B2ys;Pm@Uc5_mjzyU!&dbm3ld#->zkN=s6lUn8+?|pm z^!8Zn9`op!4PkI2GX-bC7%h_Ez){_SNf$!e0<0eBw!t1S zuD@PwKX4tpp?VJil86`t*6`JNS++0k?s`LcdU`qs1 z;G{jwNbgC=UQP=J!xg!EYs=j>VX2WwZ2M zLJZ4u(F9R!Z~AuP#1@axC!L5xh36&?8rU!OxWvu^H#k}W&sgQN9-n+EM&@Dc4Pcp$VA5+brY z!Bk^~?4|#uzZ4|`B*K~k&f4|71Lc zpbqfy2+gpFk+Wa?O{M~$hbeHADDZg?6c_{{YHa=oCYC3%UhpXv9={!mMxfc0c;aPJ zVOR%;VIHUQiKQX;e49*7{%z4jMSrkeVaUK#xRKdjbXvo_)jNXq%jfxnn4gq2d9RIk3NYV&c?^i4#=cf*k}5C73P0R{a)t5`TW2 zA3enNi5IFv+q?mX1yu&n52MgvoW*>#nxjMfFT(uMgL>K^F8&o96h{yG%j3rJTtNKq z{p^AUKB2mx)~m7eiIXh-J4vs6l1SP6}{0>?i zhdb)#d1;)bWyI{Y7Mi`*N$8R6H!IUn*z)-=9641}j|x42p~f*39#(++P>e_?qRz8} zIz!f973SWKnq(caKT93M8Fanj+%LXSS1)xBH38Nv>O|OD?|H?AI>OCxj*mZ}YgZGB zm{Wo?VTq}U4>_!^*1EyNyzX{o|Qcb=aDffK>B!SV;nZCaL8&LpSw8~ zX*~|ZBnKmQ`B@VaCrwNogQbf0fzeW|$C#mb5dPGtP&h;rD-?y90r?CTCwQ3_I|}2| zU#-_AsndphY>G`G9>?Cyn7a^7YpZCB`c~_R81bAHpEipBr-Aw&{{)Vi^4SCCCZ++$ zB4(_!kLmxm8hd|tEYGmuY~jDErFyP8PP9Ws;n_mB zZGfluIUV^0k2IfyhmP>f15%B{+v%?=3tm0=3k9h;x%6 zND}YbpN6!n-Si4QA@u7Nckuo_+b!A@w-Tgjore&oVA!XPJ}-p@@(h^pfWs*O)*#0b zx;@5kMyffeCp@3%xE$lDKe6JX#PW%W$w(98=Oh&k*_^NHbUBdmrn>RB;7N&8obJct z4mgOHcm}6Xvl6d^7Ar4GoQKfY^RP4?t6?s2?lnoxIZt7YWUg}>I!ko~aQYr*?#Q_9 zd>(2rssx?~MNke?gBReqbYhdLFz+X9NOZE`E6_qKaWdT>|K8P@OwC0);^Obc#z8%= z)~O@w`mFlRgRz&$AmbrxDqZhRyo_BjW^Xt$JU-D4U2yRDY*tH7kgre7MoRQSXyoj9 z2*SP?k7B9kGJNP?r}4~NV*H@%)q%!`cv4a?0uKE^BNW-F+rXY{<($^KU>AKh+Q4`y zbj(FeJ3c1i0Ri{1Yr(bq2|CmCWmZWpt9`*X6JYu z`ST}^$7DN{ZCNVYR8d4_+l$vgZbUL3B$0S8pEgMPT+!1AC!rUFHoa&yj?E_ z3-nshZk^B-Fx&8`G%`*W@p}?5DnrSO5|^sSC}6sP)3E|B@)jg|u1{R5o*eM*Wktbg z9)B!`iFiNSHO~2NPCSVZd~@B{kT{e**n;?dSEElw6U1%kaY?fqENC-)B_I!%7~ zOE?|emEibEe8g!V1_(bw{RS0^la40UAFr#S+uzlO$creu>){LgZNI_BOH(3t*wl~- zS3K^BShnIk?wQbu>#>vNQHCF5#Kdv({tNo`$7>giRd^%Ac6>VC2|fenfFFX%;Arq4 zjfU|7_zL(N@F{RBco+B)xEj0;94hu-!9e?+;1%Gt;J?6gz#{PdYqj}Cun^|gS88(r zyaeXQuF>Wd;KeZKi1}aNF^u^zKMnrbFeW_;?uGdmAYQUD>^|Y$!U^Exa6eA?qpJ;L z3Ct_OJkSTWgOflPm@4MID-0ta=8r(S|1UTTyiLsC24})NPs}HQzlGTl?pm(Rw}KDB zzDPI{+yL{Z%kW+k@Okj};Jx6(;3}{Z+`km>69Yd2zXZ36c_Vl?%$I=K;B@c?a18hq zI1GFedn6yW#9y`9HgFkAoa`uw}AijX+1vyspkveN8qF2MDSklcVI5K zAAAZg2TKR<1U~~)z-I>WdF{1`90V)|YN-vb{7CxiEaOlJ*v0q6pAz+vDdFacyd zdunvOy9X?Qc_BCt90l$L&jgu2!-PYGFI5}HgK%#L9|G5k`6^+tFh_VINO?m+%1ab} zU8T+MfJ&b5UZG!jx$r#U8%uP&KLFo_+?zl+jcouKPaVj3%7s@7ogn=`fR|Wq04IX< zp9RwYdBTyx?WmkixIYfEynYDI0M~*yfVEp<#rDMJtx+1NSb}?cynr_P+orr%mi{0V%H)8~}N%gjWkoL54e5cq+*7gTRNue^==6`@sPS z|B3L=!ry@mzZQHDyas#-93}R{LCV7;`bv+lyjsp4;cnrpAmuy`{t8?y<|{ykcY;hu zE=WDng=2-oK!*P{It}uE5M9MspP0)*%9#yPjtiumiNXxwX&}RYR%RIJD#pGltOseo z5Tx8fkm)=JWV-u?eHiO2c>>?(@K6a5T6XJOz9feB%lO`}^o` z!FI3}Wd1D#nLm?3>XiXL3LYzr2hp^~Zn#|M|4m>O%+(7fAccK z_%8S$*aBV!eh-`ht^>cm)G%%aw+rWjn_wOQqDaT?L}8%nj;#hMZ#KyI$AGAEV^0LB z$FU&w!1kiz*OzF%2{K%zFb`z-b3ul)febf7c${$e#X8)LAgbipbny3Jg7CME}Q@| ze?OU{AMt8UBTQ9p4?o zT#)hyf=ur}XKDThWI8Vp4ivVdG0^{7kp5Q)CxG<7IZtz~a5%{L_q(*dZ-C67tswP& z45Z#0g%1cDL58z~jPHe+TJEL7F~W~#X!q+t#-A+wqf?t70vWzq%#(!U!NssYFkQQE z1sT2>WWHYldciz!5ts`88hm`3*6TsA3g#bx4}&*>OwWzr0Ho(TLcj0|km)%?I22@f z17!HUQ+4=HL5BZ8_|OS$3W__M$F4V%C7(^e*sAOg&^h6 z6y^#?gOt+`Yy`i!Q1`dHK!*Dh$Z&59JA}UgH^BWekm2(|#ybIIykkLz9}P16sls8x ze^1uo+J(Oa8U9Bg!+#HC`2PVJ{(9kegk>P(odn(njsqV86UF|kNjhIX0crmzNPX9W z47W<$FBNkE=!X4BF`pvtyC-V@?}F6tMUeVE0aCxmK1XBJEkn&##DgSw4yYPOH@~;Qi zfJ;G^%Oa5B%0Py@L|7nnfK1od*?Qc66MPirYeCBUHpu+C0Hhx0fRuL{NO>m;lZ78; z>2TizZ-GBAcoUcfGTc~@;YJD15Wbsf7(a*mZ6M=q1g`=M!HwVqkm(r>J_-&6DQ^Hs zd4}+x8QT0j$aFmlvY(p^QtlLx>9K=M&sm^K4@fyfg#(3q({;EIA9R zYv5k+cOb)W6>b*(FG#(-!b?Dgp8+y_Hn@QovtTArt1g7Wx@)O z=~)2o1q(sSn<>l{o(VENFWR--CqU}+AV__F2r~TbAj97zTqCRosgGTF7Rc~JL57b9 z8UE|>I{aSYUxlxO4F3@LKVU1!^eh(66lQ{|9)gtjEs*-0Buo*0HcqF<0X_zQyT=;F zBj6VBWANwTqu`H(*MkqiJOX4sB!RyMZ$2MyWCa(2CE$GUN^m0R0Y`!C--dwS2KS$5 zaBFAmhv0H>9=HMg`dq_+YGc=fFM|!>wO}4t1D+)A?_g0w{W`$y;IBXw&DbA<&w(Cr zB{&6K3w}9T=fgih=EH8`hr%bo58-be_z}1QoC;Qfmx7mq%*VMP!@Go2gs+~X_1y@5 z41YfWYr#<<%j+1h3jEtBUC!@H)KNFC2-AmjOq@K3^aknyYq8IKR7-Xq0+D9HE{z-n;cxA0zh@Nuvi zyczrsSPU{f1t8;@E}SI%(^)!Seh*#)f7^t=0Ru2U2wo1}1U?Cti2VeRavdP$o-6#8 z@Ut^@xjh5E0)Hz&KUfCd2wn_c4cfpbz<96|yu*fX7lM`GFTp8b6POPE0{rw09q%rX z@xCW~Q+OqKJN(T9?*;EX9pASA>p|*U12SBx@N%IO+yVE0o@N+71xvwyg5$t4UeW#J}}a(@QW-+f|#hwv8RH6Z=X0)GNt2)+S2K!!UXqFp%<7K*~=L{(FQr{~Wv% z?o+_az>~oH!F|IG<5lpl;QQc<;2*#z!3V&N;1ux3Acp9%H-n7lCXn$o3Reirz#VWe z2I;Rr?57JS3C{tU-p@`lj5*+Q;2q#&;EP}b_&PWZq@2kh<4YBuCmaUufcqUM8phAS z#US&2F35bJ0y6wWkm2pZF~Z})x8eTqFx`Ic122U+Ap8!P3G-rb8hA1I5|{$+0SADr zpRb-^82i9F5JU3V1IO#~`vj!FXTcwWi$Qe7WA`7Y_4+$Vy*?Ip3ZE4BO=8|4yia&K zNV#7P)%QEz0Y8FyE4U4OH^ngiANU&hckmbB3*gP*k3kQZ3Qhr^2TuYS{>x;&-~0yn zC+wF!1MY?W;~@3?rSL&v0Q?u+F9R8V9?1IT1h<2u#C)=t@hqirE9^fQVi@;DtcoxWV z+IOtpN9zRJVBQFRA6!4kFx~%ljV zF${E_W4D2yfOmplf>S_rWn=q;?|@$>>3H4;S$|&>^RGb0^Aqp^@D7mi+ypY79Pl6D zK=2Ec&nGAp#`g}0CN=gc5dVffAolA)>fr=efv1Z7F(Cba+21hG<&1p?gw?Ruguew( zhW)R^%pH%{A-ZzKLY7~BS^Wp$*SD{mZ0^16+8{@Pk>C% zW8lZ&E#iIyNI92*)PDrH3;b=oVW5j2yHPj`{0in7Amce*%p=77W9%3nvLj2wz8r(%+53O5q6M+e@_j zuY`@lQsHsJKQGq)ekQCJI)sCT&sS=H>xFZL$-++-Y4;xpox%ePMZWL`;Z)%%s?wYlL%!=LrW0UoF((?i4N) z77E{;uiYOLeouIXFk6@?e0iSs{{vyE@KoVj1={^#VX5$3VSnL=bG5%M!e$}wV=%u` zg?r{`^Gm{?30sAWg;RxJ&({9m5-t@M3GG7Ow_rTm@-^=gE)bqA{P!&F{-*F|VWseF z;lD2uf5L}^vxU3!wEI@!_k~vr(}X-^LcQ*BXd`LTB-|*xAEf^_VYApb3YQD(glN7> z9;&6HOPDLn7TSfwg(<=$A)vyyjnMHog4DA_m@BjihlBBOPXRy2{KF9YPDG&6Cu|em z4$}WRkp3IRzC@TSvKS#cnh<&cmCNzXx zAFA>Zwh0@BCBj^xO=t)^he~*1o3K$>BFq)qgodya6;H)4Y!fyLON6;Xo6rz;ChPD! zK&HC`WV+kMzD?LDED`1kZ9+r1e~6Z|2c(=%Q0XUZ6W$K0`U}!uqu7@SbA>jcA?zG1 z@`P=|Mq!C?0Z91;Am!(Zy-jEcx$ac@3EPB?!V+Pw&?Yp5or5I2a1+RQH-e0}P3#+m zCBj@`Hc0<=kp69AZwNaFYWX`r`s)DcuU+ihgpI-yVXiP6RPsS3U+fKG=P{zcuua$~ zED`1kZ9+rXi4ITYpRi5XC@c}?3T;9|*f~JL3)_T^!V=*Ekm)D@nT}ks&lY>T*xSV3 z5O!kFQ2GhmgpI-yVXn|7G=!ar5?yO=){bCsBL#sBSM zeo@>viupZp-!5j}M__($l>D3SFpT85MuYtsf4r|rbBQt;#&PFq^B!@3KSSJ6e*7&y zmF9M%JwcnV!aRxQ67=uGAnZ+Z~pcwbGy+9z4#lZ^ldjbVtnQAR7o%AJN%8#6M5Cz{N+e7pRdgY$XAvB z=W6pR(YFBe3;vo#-vZ26_!}qswj&?;`?2V2^J()xr2IJVrU3@GbU=YtyY_F6n*RxpR+*X zYtZhW<%s`f+I)(tAINXf|2%QeZPf0M&7uExqZ9LK{{Apao7dHA^PW-K+*qT{&t9O- zxnkZqPQrgjyI+QKpuDq`fe0`n?>IgiSKLG9@~vJ(KkW#%@uvyrM~bc zI)Bfh9Z0T%9`DjNp=Zg7*Oqx-i;y+)^8?V;#-$T8n`#LfI3H46p zhvc{YY%Q-t+HdtF?QR$Ik0)w#2kIGrmm^;pzER9Or9bQtd0E&OpnfH#+W&W5+T2;G z&0owEcai_7Q=2=!rQI*ONSilGdiIF9;0oRTuB_n#$Z^b7obEcK;8%ym*<>Q-rY8_JF8*(2#KM7^iEtx>zbnV`)Zr9XIYyf(KF z)b1`Zr`WW4U7mJt6!Y;?-#W#-19Jz;?~wL%0>&wtJEi|UCYxr|e@V~MEN$)-{hyNZ zv5VP-en_RiQOAF+YJZJJiqr?5J5uReq}}gH*XCT0HotkSHgA;tKOOCc{tG1h^f+y< zTcQ2q^*GAiF6PNn|Lv99{TP7Z+r@pJSTrPOQpyCnU&Xeaz7 zN`2;flfP%BKU#-;;O|9M-`dqpCz>aSd%L*bE$-{2fA^!@s9%ccv+Hba#y&?Tg$5?G1DCS&={~GDP zY+`Pb@@^FK6VO}LC+QC#MLVUrM8?NUReMK$yHd+v+h4nPHfr;;1GG6s+S9pbYI7Uv z9e=mjw7FgC-*@|IbAewu8(YQy9%&!Hmh!MQYWJ)&#Q(Ro`Ilz>acgr@f_Cqe`fxYO zN$D^8{#E)f?%VKpub8?2!(Wc%Pn)R+UpFoE6VGT`u+jZt>jC3yhF4(Me4^eiLX)W`*o6@ zI+6G0Jng?7?U27KCH{>f|M7V3ULfUnx8%YrMY7vgx&D4b|Qnf8Lxz zcY1NrjO@HJrxVwXoY~&$THlI-+S;lqRaLcR9)GQmo*b#ueEy(~)9FmL&!}APEzhs4 z@p^nghrImiRC{_h+%tCOcvVlI;q!W(;>nQ_QQyN{XN4Ntp(ZiISzYH};nb=efgFcprq@5s zQ|BqG42nB^t+J+j>;1l3Q?HPqqu7u9C+Og?qoShw^Z7hxURcT~6?v{YRdk)DUSA&S zw(2$WOYQ7Z53hT5*7>7rgQK^4fK1d9bTWMyLq=YGD1uPMIn;LHa1<``Rn{yis-013 zsvDAa6ssW=VHKELy4YK0Dq^Vvy;d^WdG%p&gc5tmS%=DE8L^{!xuZ9pF>|6cv1Hz% zr_AN44^BB^RANVg$5-#2@2zjB@@M7MJAJ-dUkq<)(r)K_J>_V(*0x%h>OR=0)sp+-Y*f|vX(drh4M;5Az4r>NyOsm2SP!zKG>FG?e zi|~h9DY_8TN1bzBbb61lHl@yK;OK#j_j;;X7gNm!npaa_>2J^_BF?CuPAA6~{&%Jo z)JE&mU2tnncV-tf_@{aoR@Ou(sn@EML)TtwG>-JCo_g=J+L{`4sFk%f>2vG6rV5U< z`E_Nnoh%j1%%8qr%cRd~sH%#}o*w6LdXYCqaK|@SVPY%P^Yj#Wy-OrJEZz7wnIMZs zmKt(|Ic!%wn_8np75>qjdPM7C&Gp`Eq=k!WebV#iU<}Cj)-3cdic!wJ79(1)#1|G< z@0H*YbgG&Ec`9WWd6sw!8tVJ9Ojz)GsOiIk$0WC_I1Y8#=hUdM@@lVW8#$_EPQ!5O z@5&W(hT8g|WB8yG<`$}vJ?|u0Skc|a5q3#OP@&UfE7V(!nbSSYUz|1NF)9wGlxl^n zOMSk#0^5ycOABU|#qevLTb3;?H48TNBJ5w9L;dvBUeDRgP-j24#<{%GA1jWdH|22j zNS~h0v16sBw+cR%>?5n?F(e*pw-7_bQ5>;j#2!q51Dl?l;^$*;y=q!*-HLU4W;cO@wMAdCB;zwjhYcSI-Y z$f|mbW*#GsZ?xNqp-+#yofu(zt=owq`^d^7M(GAyZ4d8MbSI)$8h)=Q+HnLkiePHP zTgkK-N`^Ij(>=1`oA!Ot@J-nVYxt(W2;I`TN9dd%o>1J@a+fV%?p|0`Tk5HDFZKA` zl{J-qb?>zvZwkh}*RY$fy;b#*!5kEdR@8Z&PDg6Fx59&s&KXsnh4qMYX8zo%Q}W&J z`i4?>p4(Sf<}M3vvWzRk0U&q1-&a-*R^t{i>2`bS>%Bg|+vl&L(lyJfi8+yzX`KlL zOJlocT;i+5OuJx~=^inkj&KeY@}V}eENtw0eM{B7<6avXa7$41K77S8oy+SyHRZj1 ztJ2KR$a{~-2M=%2VY4nq9nJZP4m4@2}~5z`dqdZ?)~-Q7fIh1if7kam)Njv&&(pV#PJ}o{C;? zzA@B0!kW(3Qgr%n^b)=Z_aF*pp^-<{ ziXI;#%AQhQK5bD$%@Sv%h(k?ACdLHr0!7LRyHk}`==H0#q=#6sgZq+;~jmnX9Pydn<7$`M#6wh>{&F$Bcs7We&S?$9mi2F6C(j zH;yKkEke<|%c?vz3t_CPatDu`vPy)ly^nB2*NYxKDJrT3c}OFFvBQb!5B^~p(%p?A zwGb-I#xQ_EAk{s;D9!E6^wyVo>by|2xMo>pO}U%Lm8xN`z^s>G>WwZ2OY3hg3uWS}&;FpM z;h2weKB`c`e~M1nScu4-?plC#o$k!Ui6h=8JbVe9As%-07-V$dR0r=Vs(mRJ_HF7H z;f^gP2iP&GL^saV@!&5H!m0Z-c(frS)9I|9KcxtrPHZ1|;32|8UyL%2Ow1~@X66w+ zQKwI0!;>C0<#K!1j3;7$)V$AbI)~OIJ+2jLtQC=kdNjw*S>6?DF;N;(uaBY*nYvJ8 zt8s)wnBIcd5vZZ7CxaIJL?>Slcs*X_JF$l%3m`kjK8O1o%;5B?c(BPCr9gV&lFGVE z7GeLo9*<5ObVV1|o5|8HqS6G%Xcj3J0DQh`alx!2xAGUcvmSiNVSYiO_z2%UkMf}A zvJlwhI z>YG#vdBT>f?wb{$B2^a@W<}Mc-kPH3%=avtQeR)Wum-8l?6YV*g?%dCka%nloRZ0C_}ythh*^S?fh0$V_M;)Rckp%!3+J=5K%DRQJDI=!u>;^U}o z&KBfG8P};97>4^^4?V-69#kXNrmgBQBTLuR_b|8IqmIkTU=a~ba9Hk*(-^U%20U#>w&TAqT{ApY_5W4nm7zNMZ=?pYHd{}8I_DSZou9}W z+0!wWs{$NyD=3T}3VSR9v;HF$k?K5B6=H^uHAm*$a#oDw#`KHXTP(jvHcLp&2;UT& zQd2&ywpuL&dt9m14KI5yPhV2g3d=k-+>$S@(Kpe`^_t_L2Qm26w0Rp2JCV_f*^7Lh zntC4UhGbiZQvv@KQSt-tZ#EK`Xt4E75PnD=;Q%`I4VN5=IG8~yR&*&UFvO1N8 zhq`%}6FHcHS4tiJBk$OBW!}yyoa#=Uw#XUTuk@OhJ(;9yMRH;)(rbGbmaVJE#P(Vo zmSg387DsAcsnc2HEcMod)YQJoh#D_?SJct`Qhm6Io5npZ z0X>2o*83z`0#g6@QX8{M9-XK;ftFNTqMkWzn%ld)%vl= zc2vlWtSBo-v{h!br<`cJ>}V@TY7Dy=R*o2U_84{<8Bv<#q(xb!M_Z*uTcxH(1UXb0zp2&EF!-5f$Taw0UU7`n`n}8Lea!Udb{9Dp z;JvbuzbvP=p*-sHMpm5B$|w?yM(v{iBJ;}1EEPCXUbe{LH*ok{G)sLGMjK-M#i6Hq zHKK`Iq`X}-wZl`)DEx-c(KP=`G^P>h!-I+Sp#(?D+X#L5+aWKy?Zi8cncl8`Zg;u2 zv|%A1Z&Y5~?&+6InLi`wy?M62JbQvBziAWk3scdQ$8&)EMap}qIXv_q{wLfFQ%rfD z(o&yyY1i`pDf!n^d6hL4s-T@8agK<7+MN);V#iA031)N4x01!S;q%O4BAX z|Ar6JHRYyJ+P`b4Hs2-kU>l|%%T2v*{8+rqUL1#m_riYwOur<~*n#(ELl2_>|M}xJ z|2N=&BmUzx>xcX+b_M?ITJ;ITx>^z$+|^>Z0?z%ez?04U4jga=9%%#u>#yP8*5&w{ zA6QdImzGDAhnDs9;A&m7jtD&O3alB9D^@ZN1}udiwG<_FfrD+n%A5dl-cxT9j=Y!)l)EVxmt(4 zg{~QXT`^;5kqk*e0v^>KBXlr*6ePjR9o>0pTApGguVF28NuZ|X!=c9{)F0^K)nRkH z(?f|^{d04a;OlR*9GI!B_plUSs1vZ-sRDM9p>@N<6L3N>0SL_!V}!ac28G*@ohQ)MER|ea zV>U9KBe7}Mw0v}wuhGg^ewZ(NlrOvTH7d*(q_0K?6_nnRn@wM<-=kgYu=}PHPi8|^ zS8HVTHI*!|p){}8KD)?_g3<7@qW z8EbAeJkBM>2|dCgFSuomcA z*P_)gB(L9^{OD)l1)CD|sKEjV36zyi|(*NZII!BnEFO|nP~*|$uB1QhFq zt`-c-InO7r$yH|M-L+~P$L=ei=}{CdPnMWbE9ENIsqw$*6Pqir5<`B&9#^1vm#YQW zEx2we-le>`nzq@ld?xt}^a%uW4KE zmCqf#Q;7Ey_mg&lpi|D?_HP-6ekMOxl8o}_+*W-8N)vFnAMckCs=GMuaVCyJ9S=nHaq{QGN{@4KC;J- zIulV}dKTY+UW+eOzCA1tGp%N`VTC-D`V=fr)#w-+wJ^|NmZ@%jmSXIpP|fz0qRIz# zQ)Mgi6z$O3UJo^WJ zv9SU{y3)rYta;6xP^c~^Qn?mC>u{}eEP5h!2@9)b4ZUL`#Z0>LnTXlqZhoW=$>E$W z!bwZDDCg>WezlpE1AW)wju)FT$vf=uN3r~)%h{|JS7VA0RV^@;KQ%MlKD=HeMYw8d z|L5yP`26@kqI`az7G4f!xvj-g)mm=h<+CWl^}n=yIu6o*x&rIDn;2;IGqc)lz9rY9LeT=JS(s#nVRXN0HbH8bI^yzZu#h#qVAWOPH3cBjJ* z?QnaPs2M>~kfgj|hr(JFL{+u6bwzDlwPxHLAyWHqc_ez{)oDfr@xcKlx|N#|vNMkE zeFJN_gJ$~auHT=_^t34N==WK;!3A_g?wGN}j8ckXYA;~B$^$7oC)Shg3(TdR zwp5F6=9{xKF#A0$|JqG=SIbJhH12+V7nt4YYQc6uOYt68V5lqbqO0lYBxt~$h)&nm zj}xHi4l3GG49xD(h0-#+4o}HqCTS5ELCX-;(84TOB-@uk-<7Wr(?~AP%FSs?c`+!b* zr}i$%4$T3ekjx#)TXd4l&SaO0XHAig0%FjNJ0S+z zuVFMzD?d+6zO_C509H^s31`r2>!b^z6~-)LbGsV920w&rtsuM@!5CaEDEqB(u0Yam z+yzuAS?ih@nKL4G*Lg}Tv3Z*oyEsfNGvc}2iBOTfO=SJ!{%Np2$i^ZoS_2A3wl~=h z%}!BQk(m3HDOgXkh^?zgwYR5Ih=8aJ*8QE7E#G0{*br4CxKR1q7-y|JA^$;dGl#oc zu1j%^LG|vUeL|!zG89Tm^7mM!LiI^s?_%lf=4xrsd>7R(qPP&?+KX>%AuXsqrY7;l3Ro7_ln3_cr-oIM+$5r`8%fC%>hJ_toRhccQ zs&;(*eDf-uJ2N742ki*C6JQ!=L+uX|T=6vHziOF!_q`E;&Hk<+EWJ(Frl9N_wkNN- ziV<+joUM7ye3&++B%xzB+d4L@IqJ8gqd;_}(JHgqJ+yosd zw?q3@1HXuD+E#$Mnb~B5{jsj*Gi_beUwc^osI65!5fK$TT`hJD3#d<=Sa1u!LnTn< ze+y{rCOX=Numaddvo&R5ntUy1GnmySlJ zwPq{>HmjYC*1^xek3S1F~QPhp1 zrj^@JtHCJixkLw2y#2YjvFACr z1)STScecY_dtIG}t4-W!ZkY|YO@ZxqpjGVqXQ23rmf~%JjyrJa+}7fJBDeXu+~h6K zHMQGug(+{~`KIUN(6aK&+NU=A6FYW4bl|`N*f+Hw2;lF^b|d+wb0F4L=4@Y^pNJYp zeV;a!X-*3I-Tewe()l@NHV1A1|1d$$K@(Ruf>f(e#j1vni1{Gqb0|cVHveDf_(FL^ z_o^#}8a!kkrTg~i`Jj#AqvjX8Ec1)527^0CLEYAj`$nQtzD3nr2j2oKrGivS)j=eg zvevqix)_ZMw5ZD{>TNBmHcZqe4ADm5Ib;pGoUM@fii$>6UMxnGq02jBq4CER*}v;s zF(L~C_STOQTseEX82ygXS{6{tfY$QMv#kksw4+*bX|wgi1U*^8@G<69SKKSE00)ve z!}XYGvyNv`ZH5zaCXv$$oy_zDmM-B~#?0rVj$tMM~Xyi-rmCNC-8*}v)Oeu38l9T<$-%^CF;6f|poyIJ#HI6=T>rekky=xA~7 zL_gaiQ<&gNf(PB{SF}`zEHKh0KRWxBz>AF&Pts$rrHQ@Bh|B<6u29ipCe?Cbv-2sd z5Ohbd9h&@T!z)t)NW{vGdh252)Z{Jc{lup_20<@@y|5kH^mRk>nsSKTVvk5pltpkz zP;pbl)~^#>WiLZak_eYEgKFf^L(@meuClk_Aw_wRgGS6IW}97EvNy3L_86$~ob!OO zn{#~CZgy|{`oMvx+=idHwax=(CBa-R#(IX;8a2(*znSYBne!)aY0wL2RD~3Zh@5|? zm=(>er8=eJJKDc3=wIK@*W(=Kn!A#3k(Ge%!ldqn#}{gb$y)}f6m{V~AUNYlPTqn& z#Nhfo6hG&E>h```4@v=HWg{!$P?u|IUy@%c9K&-KMqI1rO3dIc^=Y{-DY`!})5A7} zb&)!-p$?OAk;J)rz`1AlhkDilADC#2*&cX0&|&uPO`q7q^Ar1tYC|d2T>oR1D@o&? zKx$|oP+wLR)8l3KgZg zW+Unj*BI$tC?3>X(jM2Gb^^qP{m{CsVEOgIv##r=yO?wYu%87oqWhMH- z2C0i`+sWL|sS|lx*MM`^s+C`*V7i#x^d_WkV$aYr`>TNS-oSRpYb~?y-S^qn&bWYc zXN&VI#}|RUFn)*#IuU9YHky*JS1WT&2U=$D47`}THa$fvW==QvH-5!=XZ*-Lk_|2V~ z48NiLd86ATAwb&=abdzcx)QFlsH0nX+Rsbfi+HIABDQxgVtcnDcAtRb44YU?s`lNb zv;QuZ4AwwW^#a9TVU>m2F^{#>xlLt$J6hE)3@?GFQTv9%fM#K?yiofb;*1s<=+e(_ zwkQZ}-kQ8+D;8QnVYb8EcOnz@9iSus;u)=cC)4-kdD%Y~rsS#M8!ux%WiK zhJy&%&=Vo|A4JIg-3u{i(ilFr)uDS2?;rJ|)jD77?eW95ISF;+@Xu59zCLm`Eo$hN zZQz5PFU84d?y9I+Vd!uy_E>lVR_z{j=n+wG*|}P|C8dVFO_=v$P}y!75$S~XhyN3t z+k+#b_BgxUG9qH;tp@-0o{fkFp%F2>yrb67*!OB$iB0@gnVh5XTgOCpZmy<12PAqd zT9HfP17p~HVbv$OoUBXU>M?SQVQj74d&9R3*HcF0bN61`8gIBBH*&8|`TJ$?y4h&+ z%^8kKY~Cg#<-RuB0J4$dtkQuE3hlF=196 zPb;sa@43Cjd6%VkxfNj}hwR(C>av?w-W4`v-`;KK4c}oy_N`rsWpT93zO`FnyB~-c zrIEfpOrH$Y>w?J&6yMY`d!0@0aGZe3PZmZESJg6mngE4JT;G>&WrC zxyvNLbL4>C+--s=K61of-KBVyL#w+NsQff`FQW0_B3haFZlx$6-3r?6M0e!c6l@|n z&i%n1|!1$C%Ugba1C2&LPMjF2VLO@w9_8<9eW>OMmDvFL}bnaNV_GAjCKpKQrS`tLpx zmD{WVU5X9*=z$>CneGMAM-K$Co^>yXK6)UCHM4s`^wF)L-T%T0+0uz{nH*TNgLR#~ zyQ`&DU1KqT?jaY_I3DWm0f(K7_cuLB%Yn&F*dRA>$QFifX7aoDV}Q{?%9ES88>)kF zHL+%*l8yz1y6SdKp?q||tOy{cRZ2NE@;3cAIBK_2$-tU7*zs|p-O8(dpM~A)iC6&S zHfL!?!#aj+r7+eF>v@H__SCiMkxK`JR7(ft#hh-(_P6`hNEJJRD)LH?v1`&1msZ9y zmfC}=(7F3*|9W~cRq1B6vz|f^B8pzR7p1oqkuuBjf3q5lcvxhAV9iTNnk%p$b#31l zQv&TcS9v~!vYI&^Fg>lTJ77H;*3(;*>vW7=+&Wk@5_Z~3dxqV58|~K9g?&3hFor4n z_NYpBstQ0yU6i!PuFCr1DiDJ*km>sb<(szQzEhNMDx`;xz?x%~PuiGOB(Oe-cCB<_ zJu_t{D4(=-U?awi-%x%T!s_=cXx_4hwpPFUnPb@eZfRv|0e`7Pa_|LXnyd|TxG>Mxx8 z*xTT|C2y2%V(R5aeM^o`x}OU3&b?{ji?rZ-O~QP5BP@0=g2g88<44G@i14_@6KPQu zX`xRxS=5P)EOci8cWR6ScfP*Li0?qNFpO{W4}ZKk9{*3n=74bx{xez!4Ikn^=QK_l z@JbhB1$Ze9@58`XLsZjnJ@&H^FfMM{&fKqfV3@i-wJ8rShf67rVf5$}&{;OYia`1{C!&r*{Eb(vCZ~*@)N4fCLIej4K%6K*r!_7bZ z@q(#(iiTzQj~ylBbs8>!0_TB$p=#IT4^>kx_lQA-c@TysxTxQOJIBPI!>a;q))%M4 zz>+p<@P7<1_&adtu=v3#xL}Fd@IMZc@C(YAri}Q*3wo@gMIrug;01q52GvL58Kdz( zCmy_mpWxc^BsuU21rI3+s)#%5nqmSgKr#x78W-evjX4lzaX7uzJ1W zuf&V1{GRH%dOG<0hPMWO>+8M#dZP+~z3$3t&qA+UtCzvm^E;$st*@1J9YU`#5EDOo zZ`6Cse3VhGzKFZHwz9^kuk)6vxGT+X$SyU?sw(jnCpSVB7EdjlHa~Bw)9^0!8^v=% z=0fM3>A?iKFPfV-$DKC^iE|p$^5+&hBb??t=M_5(i;M=mK96$oQRa%u<;M7idf#}w zHO*5seyPVdzOArD`48AJMHffS=iGIN?zw~9C zxyVyLzqZ!zHi~NNj=paA;JMd_mluvlk(Vujjx+J;PL$f{F}BH*Y%IUpiqS=5416s} zeQ~xoGOylOHa`4~hKr0dYkigYY%;!_?f2P6jj{#JRK_T1s9#iEQ}3xjZK9sYD!1*t zkb1UrZDq9$HGbPf=u8jzeyiK4spZ#+gP&A4s=Q0RRq`3)ak0{wPY+{^Gs8Ukz14M9 zXeTyAI#KzUJbKL7$(1$g12skgN-a#5R^;4}a@0WkJrucU;QD8Gq^6~3WM*aOOqn`u zx^qT@{7U^b4HZ7q6ry3AWd=QDa^(I`|Jm(!hdtGvW>2?g*fZ@}_H28O!|rf6QXOfI zbVr6G(~;%KcI2emQyr;z#b#=HYDQ{iYF27?YEGIx&5@RxmX?;DmXVg3mX(&BmXmHz zcciDLr=_Q-XQXGQXQgMS=VaJ3@OsXSw2btOjEu~Ttc>i8oJ@PBBQrHKEi*kcBQrBI zD>FMYC(EAY$V$yh%SzA6$jZ#h%F52l$+l-ZvQx9uveUCOvNN;s63^_M9H^Ls=yM=C z2f=b+HHB{rwB_etJlnPuZxF?cJ#9JT?BndV(dvugV{_~DdTkpKL6d?yc}NRQYFnmQVMVVWg`nsKU2a>kX=7I;vz$ z#~XJS8MXCpBU&k=RO#k6s0#;BTs8Q79M}x^WpfWxD7kQ2Mk58Grzb@t35x6!pfBO*7AC3C#q@)`UW{ZFWjJ8lCNo7r?A1~mY=E3_Z`I=vyg~qiiCz*uM2WW$z4aiWAd8v5Y zd343g!`He|_3)htd?9l#zCdi$;x)p|@JUA|F1>J>rw(5*ghXB)nXrs$RcI}!Pl`t- z3*Vevgm0B&=$=vOhe(Twf-Nr&Khzv_q`Exy!E%IXtMLex#>XrCR?$}D5vrZxtgiE~ zfVzrDD9qCKk1#Xw9)7=B&!L>fbYxkXIp53P9t~e#9GSG>2d9@B(=o#MYF8YYJbtHk z78^~lu(4bT9|+t=aHg(@w(uA;wPjwcp4s}||H3r)LAr$e#dfC?Um3x|3k?~clv0c4MX84jeH?8L>R055t7~1PZJ*}0BZuF7h$wJpr4hrnPxVOW zw+4}ZqHiOT56u&O8c|wajUO3_zkM1_dNF1<&cy~{gv}(w2IpRGH5o`&X1a4Zlb4y! z307u0rnhQ3tNu`%zEmKS>4gR>RKlS`L$nS@EjKc!*EZlY6wY!(Ul`@e+@~49&zS4a zbg7SKml{E{F>R3%S`~yVVSa=q8@eG1BW_edgDsk1PQRM_TfY3h#ulqDghh62P+Vn9q zRqp`xW#z$l%Je>yPG{dom>H_AeVUzSW$DvMve9#>kH@lFR&&P2*6w77qO1+o_?K{G z)>rC_tooAQ($!bGA?a&X0QypAl)l#8mAdZB+K{8>qcWceUiWDh>L_Jqp`z^b=|#4R zCQr>V%*&&YMwxA>7}b=cFH6#4H&dqO8X-fUCe+~wrcO;TET*FoZ*VT5;*|+SpXRbo zZ>URKthXMI!XTWQ&M(I53=aQftP@|BbUUy}s=)`K%Csu@>-ALUVIAqjV!Er4Shz=p znHY1!6uW)cuEpxs>%neij9@Ho%gQshI@TqwGrhp;U4ns+2(K(X30&k^!Zj#y7*Q8_ z)e4F@em_jd#(pk)i7lcN5Z5v7=G%FUL(ghf!X+6sD^hYH^3oTWwTn zb8xGpN-S_6qr$+SO8%)*f6y7%`+fdeoC(p;#tLn$Fe<8QJ&Xrls><~aifkWfJ8`Pg zYzVRnw+hka)vLca(!sCcRqzfJPp04+nWpF|t;LBJ+{RyCiGwZt<96~da?e|{6w0lr z$BlkNP+E`s9%YM+tLhobeOa2Pw0^mPKREotKk6^6k^be&nJX$QV9(2HY=YF_ufKL# znX!z!2*|T#W&YagQrOnhx*ld+z+_Z=tIO(E5d5k%lSd;^BgBnLZ3OALx=wl0s4niKgwvTJv~Vhef8EN4I|KM@moO37B3Jdw>+{tr```tO zpw90rudJv*?qe_CjqhhJtid(vbT%M2o7E-{tQ?uNTg2ivD?MvJeUi#KxRVz2=f?f9 zdgTdzv_bg{npEovn$+$f#f8F!Ogf67qY4>vRYB=kVTq8}!T4whMn^*^HZzP87Yr0M zg`x@uLrlm$BtCenK4`;W+6@=XSe--q>LQ$jQsdJ6%Cbf1mFvAYf`dgdszYjeSB?c` z)s>Y6vm80o^+_vhSR)w7XStl}saH(}lbqn~-eA|K?zGQx*h3-Hxp{}_0lI6e^)!6Y zxU5KL)_rA{p1 z#{f`|GFqAf1|Jk8N%<5L|`NKkimK-cx?yinErkn=*T*+ogIo}#;g>N1OUuhE5A)pf)c zdu^zXj_jOOo&=p;nB>(j!j1qM34EqHV!Ci3;T%NeY()FimEY1nW7qeXVI6i=g)D&` z_L%i1G!zszl-8H|DoZh=uCC?`6-s9Wm5y{Z6%TqSuBne9AgdeqC=nOop!IxjT@~-H zII@EwgVqRuysC^n8tHmsNpS4C5i_@RjkSc0-6Ka9__S0t8u#Ur3Q_PtML}VPo3rGY z$MIxR0M~;Y(}2gNGEv}6+HwS}msg(CQ}xv4@XwerP1r9~X+8oeC?HcxtWz$b0z6pG zNrIwI^MxcFzLu)r2rG_5Jx^xlcle|aRVQrHcSKR7^FVtZ_Ah!|RdU?OdVMlTE!Vk{ zD?*7N)|cD5P}v3Q>3NV6l@2(`HXvw4!~TwaH1%8_OV zYKIo|ACnP1?qPd)E>rhOspymBMt-d`MPvji5Fk-7{O`Vg|N#rQnXTG;aE!HCnG&qLxBoqAPVWVtu!K@gKby{kd zYx&BwRDZ1}ytqSxwX3rdcV`>A^{8DDeHqW(hi=YHk#)nU>q-_&_bzsTP?dS3upEy?@V*DCwLA#RN5AW2 zOCFD|sfU`ww%Y5%9tVfX=Pxp!3FotHA%l7xJdaOjby!94z44IUp zdS*HgitrI}^$?c2n(bK*W&LG~3f05n2A>j_OY>QAF$SL)_v67^^+^=(krKBLr-=Q0fs9@VVGeK_oLL-ks0 zLE*vlIrPs*%VFhH`z*EU!FlTq*eX6yte+Ru4+e%FtV5i*S8G0L!+TZg@o@dfo}nHh zHt)mY8A8P1H)_1gg8p%>a?kSEv|(N=2NbkXqh=xopI|od3^N{vF6TX9-Z{ezMc?c7 zR(Y%Oc%nAouGvC7+gMhMTad^mWDBbjpXS7y1JwHf8jNz>22M4~(~RLePv3kPWxkFZY$Lo-I%R|sIF=RP3WNG?4PNGbt z1zung@}Ywn#tGw9+6`lvU0pC+PCVXBFkU%vk~JBIF`N=7j!0KYFpLpF*Fo7x;>qDj zG>lV%F{)G>#;H~xc%?|l-PGvxaVWUs`sWTeb0Y6}>VAeUx(i1z2m9gELbgPs-*BB* z%(^qv!;EJQQc?`#TM^=rVH7tq7#bFaadt4YGL8!701|ahuzDanMkiSEX3S_*23CM` zlMJYpI2@ABi->O!V>>@t74KMUZm~*?Q&lTbSFQ1s;1@a~j2>YH{Z z{ANL)bXM0vgC;{*##9waW{N_VsYm(oGZ7%$l6{HHz8sway82z9#6iXcR{202RGz4k zG>A!>bbOpy{U@8nXO`B5;}AdfH!X5a3s$)sDQU_u=snd87_^=?3f9wyspL2ZspdH& zq;t&>YCY4mFzW(d@nc$*t7feI<(ZZYWE_})HVqm^l6qB2f^ohw8O9Alq7ARm>DP&i zEc}meZH$ZO3vUu;;?L*!-|zGUeh}?n_#bygBHuDIAgTXp#5wqrn{Y|ecfnbB-%7&e zaohSGvjHYbO6VWg&o=NWm@c6k-ucsSU^$}tE($B*)wra71KaQtmIAuH7MI;`;4fi1 zfX^!=ydF2P-=N>Xlu#CTtm`=R3A6d<7`P3lW`=fLD2^ffAx|R^YM_yDjU}LwY=_ld zw7!Az3`rf*o_Wd>zYuA%MyCJG7|e-Bl$Pek>T)FmYzQmXJjAt{c& z`l)JYq%4KiA89?M3ck|6jUYYIO^ig^}_w9B1G&rKshh^bNiT zNzg4Ur3@Y88~C5_Q;P>9<L9kkwH zvDP(3HSeMC!!iF9cz7gE=e(3kA?$ub`xmVNnE>PeGxsKNRaNWz_&)5jk4F?l#R13T zJTW?eBr2vTq9#s=rWX)FF+~C#QzW(0G{q*ZOzGAwD=V5!tthR`tZXv7>5a7^*wkzDVFjAkCN7MY*Wx$GX*gPy;35t_PCtjy z>NYS;+i5!7%_!n@I2zxI+SCogX#GMj4l8P;FkF{o*IoeM2hKGMYROpN2SF&5}V-%Qk_}3>1!4#w^+zQsH|yWgqtP zZTkp({zKoFbp9D;wB^BGi6HAW_f%~>>G}A!a-Jn@92Xg4C57$RqP|W?uBh9 zL>k6%koCAv3#`64@eO3Ht5b#1AsGU67}yO*N{?u?1yG|_$I<;eu4;!f0FlE+ts9!< zW0jm?bf`e?>4t(FDT@afMh>WB2aeMozb#82yoekXbn@GhS4OTQx!~{7b~%w49U@UM zbmKvel-Cjc5UA1RY~4_?Vrwk9zaV*VdEY3GVNf{#2`FrozY}H|9g0QIi)d($l%JsE zTk7diO-~QXR_ak<&@-2rYt)m5b-qv39EDB<&ECT#`g}G>aq0WWg_1KmZ$XvOU5|AO zBxl?~(*}xUYA7XRg`2Fj3=%F`X^9hV>@$=cB3$BgqxHLj|wi-WTgSY2N_v>OUqRajStnwL71 zimvO>4jd`tp(l~Lu8yGGbutNulHt+1u5&XT=~Z09&MG&=svicaR1 z?W;`qHd@EF)_JOg9YZ+6w&{AgR!aUxT`wER8l7XJsRer2qRcHNx`wxk>_%O~+k{=G zHQg%gTCM3eVT*MQ-!AOgB2~jX$RZ*CfdtG~=qpI*ry`36KP19G6uHTk345lf5!pwC z{jw;K?4!b-E>aEcabZstsfPB1uoXqBq3sd&gf`gD@dd>$TyIW`XKf>+GH*+YQyJvuiknzftGc&*n>XhE1E_sB>)D{5qXwm(8!$d3M`; zvCecun?Ji!<+_p0|FlwNyRqUs-zM4SIjG3?{vy?PKcQ_#=K%Hp7Y$>F4&0*yztn+c z5_m)hKBfb|Wgrxl6?MTyqwka~B)Vs^$GX$o=K?o_+()*dmj>`h5AAou(`k?K?hK;` zmq-u6v*8Ly&oVBB8eZzx>v3Edy`JR?px0si`t^Dnzh^2QI+B8nRA?}N|B^euQ4^HSqSmFH=A zcv``;P*LsKjXd0et(>cbOJz z-x|x{Ng)5_N})1}TJ(ByIzo)z0jnJh?33Obzi`y#NSV+NPcA_IlQH@&y%VF2|770X zax84GI7U+I(^PinK6w(on~MH7M7@U5FRhGzsYGAGnZp0lk1%3aMQ_;(qp`#Ns9)`c zZu6N4ItFs@^W$s!!j1tsxSIur zBkW_FDReu+PTS0)AV(XDn@b#xe}-rP<@FjT@LTw^$ju@NV*@h+o5PD`Zm!kdMw3`@ zTpOBKv4|Xv&rz&;Ra4>cfR>6&t zJ#$WwBl0Z-{!ID#4x>#DLd?02#vW$A#YFrR!KXL~xuy;?wkp?yymKAr_ELnSe%nyo z#IoB(MVcF?Ij=Hk@)4vACON7R%K*pbqtxncZ>ObpCzXBgRFoYNf*&9X6C zX5dozE}`$G@GTeLSah-_SoqwHaSzLwxf^kfTjWhh0_^M?(Sg9GAz7?yl1s@haL|;_ zez=vR>w>fqHlBUWxzNE3p+Dy%p^I3uL54XA;(gb`Ll?EfFj?-(M~NIVLU}Wxew-XX z?}Vj|JGyoQ29@C_E?{;Xl*R>QC1Na#3&_q>Fn6bdc`qrr?4*MEUn|Hxrywr~<5XP0 zdvoSOvH7mM1P?J6FtmQPeKEG3@QSr40Z=j4B3lI&If^$jF4yT>&Z^Tc?IMSP;UC*punk0ZX3J;Q?;DB zp5`{J!;ry9!6}?p2c|=OrV{6H68IM_uCCME#*p_Zvxd*M0(f&^gtCJTsi5y#+M#`i zd_s?_n230ML63D*qdnT6fyYnu{A;DMfZk~KMkr^b_AI3a$Z_DEqv5II=wK@lzE0~51 z=8DG%O~vo9i?5*fCT-`%#bgeM(N~ixQ4_qXtM=Ey<0g9U^Qx-t^te_f_Y4#UsGm3% zg8DhAk~)Cj;h`_%cZ7;sDQUF3i}7z)IjWin15~v3_aW>NP?JTf!1-egd4dtPsLJ7w zF=QV-ZmN=K{~SCHGumbuy<$=q~WqrwF&4L%yb1xe`+a$S`Bbzvz3bDwi6Ohy2Q*XH}4j@C%h|y#~fN zlM043=zy6iv8sM6%i0(c$e__agIY3ZywX}#nM2yscS?0%$zwMLjj0}F3<;(0r0TvB zp+AF0Rj*kI8pNP+Ri&s}(vXYkJGr{AL`Y)LCDntBArt9)X;tx1jgHWMI)YY!nr2qz zUPV`>*M1Fx?qcvIRi-o87;-;+gOZg_rB0dF{!#e8OZggQW3>MOzK)IvnNd?yL-+=z z*3=XP-+q*zS0%5re-Y)U*Yq7m-z1-zNJP*?22W6twEdUTV`62hhI1PVWfnY}^>cDy zn~%%p9w(oLFU4hW2Wu6;<#0}g&jwt!=wRIdu>71geQSw|jBf zx})_7pn;#0GvIT$3~BEii_6z|*}=(~@B}YAIyoDD!Ap;mGvZIY?BwLE=%dSdqKVJ4!dWZ6|m(n|ym%WwVX}s*C^k(xiROv0?Wth@?B`?F3-p#y> za1KMSx*eBokS`R@-MDl_sh6O8aM@P-K99?G9_9NAF57!h&)WTpC&-SJui^O)sKcZ< zczet(>lUUBB+I%0Tf7i^GmH+CCG>3WWn`zYOcDB1?&V}tggukHi0ss-E>gGdB@1ur z1a=z#cX~oG)}*+dKb;#N3%?nx--KlCcQkhd{bnn_AnkW3cQpMjQ+_msjK0ZfzsWH-hO(eSn?b_l)kxd{Dc1+Tj+DOeFF=$h5rkWWrMyMh zFbLIv+XYscd6TL#+%T}l%$u0D(S1E)xI1(UVNHzpAgA4pcJ%Aeqw!?00rWH4ZKqE^ zJ4PRB4P#mspppSj^{PP=_%n=|t6{$50O32-O+Ju=V5FZ*mcJTyhgM8ht86 z2dV-oH%G>Qp$-oph^VwYq9gBG#`4^OSi!T=Zdx?+O&Dqnb2Mbs&9l0Hvy5og-^e`Cqnpqocuj`>O?4GOm>4y;ghqw2zAM{-5mQ>t zsAmwk+)>M@LO%C%KFBgL%zr?p%BY4$Gz)X&nQBJ)!=PJ14_=^AY-GW9<1_kruuXw( z4#<&m8j4;3br@b*(8H@0^l-Kzgw5rwJjt%~siV*CiYvWE4B`7V5`^4`FR zW^W%^Q7!K#jOhXTx<+iaY}G|-s~tsDuIubMgZ zj9`RvP90eyHt7t02(LFmr69XyKQ7~zs@>RXV@+)Jv1VksDANrs9R2Jp6x~omnPJ8w zq^hjlMl}21$ck#F%!gMWP`Ibcl=?audv$PSKkgG0$db0pdKm&!Ky{Zjb5f&i*mJ4T zr?{H3qfqofy~;S+)lgPB_QjkLWqOtvj|Ik0epOklHcOmQvqVgM6P=ft07uG|h>=#i z$1mZ_UAdW9p&0ijRjEhzglV7-hpMN3sCw#l zsHA?Vdg_O&r+!$a9)uQHRr0S&>Yf%l^>BnbQsyD$sZ9O->Z!k9J#{=};G{ApubMFxG$tWl`^inmm)bz151&KR>9%nPtXoeD>uej< z$E!Xi)uNw7)EDZFUVV%ic~qirg$0h3_83APy?*0Te`H>3l>zmy4;?8P(9sGy_QKO1 zf9(e zTnQa*P=x-js`6#IVICJb2q3L{0W*Bb#gvO&qLOSbx* zMX+in9|qwTO(Y_eM5}PL52SXUTeO&TiFJvJH5#!}(5>wjrP@hMnaEtH#@hvudBRy; z2Cvf!o52?B;N*td&fiLmbI{5iL#-IL$H8rDxF?Ip^A@^`L5`HCp>JS=Dt&gFPGG42L3>sJh9XMbsD3TyngcEYpBFOS&*ghuS!5#FR@kR5enJKoP~($bk`aMr7C+ z9VwF_Q|46*Zw-QXOc3T_x_KZ+$`Z)Ts9|}Ptue(SJVXiK1>rkucX;(0-z-uu!DGrL z#uOFf7-C#eLp?jADwqN`MX$s>?Cx;uL5`HBk%n2QVk`qVQr>~g2`?GD zU8uxfvh%=xX&s7T#F*qxI{q#dzeN<@9iyM1EvvV{(y!-^gn9byItnv=qT;9xTq;dB zCy>J@4V?*wY?8xAR%#o0O>Jsi7$w%Er!oF$jv2$j3eb9#Gej2UsLTb(uhnX*1@G_YdkZVN3JQKnV?4E7m{nnu+D98w?{V=glT>M zD&DMh2xgd}e$|7Lkw-;r0K6S3DSh$pmXU6)8`78{+=9`40dk})hujvws?IADW8oD@ z!}&H}t)n1W0&tr^j+EVq@sGM%)H)WVS7R)Zs3|JyXNdY*jeg6n&UP$&#L z#~?-wm&J6`L5>ve5#|5)woA`mKB>oU<<+#6SJS4xN-;*3vKZjlL>(#LK^sftFw(U( zocy0;1US_j}Ji0MA<+nbfj#7qGh1EZ(OQBKOK3dnk`#l%j1at zKR%C)NBgGJw)_l5AJ%J2^~aep#S;B7sBologqAyXEu?zYLb7@u*+=d2M$x9LS_pM~ zizdsGR<#hOYvCQy2OAg`uWBK}u7${pX{ucdTaeo2$o>ELG_qKf>6||XMcYAj*FyD& znIp@q+0q^j>o}qZda4?IeGjavKO7txG+gCNnwOgDVb=flATB0dludw6JpX}ZyZx%H z(ktz9kq}JTCaXpboA2?N*~arb)g>G|)2q zIE-$JpysN656Gomo(U2^yAJs*kzXd^M+M)hLw+dQ8r?p@W=%C8C#boq-=U~=y0-*- zqbbl$7SvqT?+4;vz%>lqVZk2+wQtpLGTJp=iD1)Kn&&2aU+(G_+V{~K^4x=8pL4g> zq4sl)n1ni{6DJKzWF6*!-U2liIr=&9Q2`yV&%v=R(Z>yH2%;?WPupluYY^qy0MSnk z-tlwY)(O-d#6>HIUM`x#LAU`j`hxm{qCqhr^l?7_Qr~29J;%Fy>Kq0fA=e{;iE^C; z90y7UO#)2;QGP0LCMXS*4$1({0-P~b&+l~MFOn*n?!jHOqu)5v5*CiKxFlVy6&;0TxmyNmJam%37{l>nR z+5W&+>n_O+SeAXead7gWSEt^wVZ}8^2IOA-ZpG#S-%WaQ;$x#$rk|`>7_tbrEJ*fkN+ zebtIfCkFQ!clOe?CvN-tjfEknqMvEGu2IVS8&_Pr)sxxbw*YJ4J^E{d7&Ele2Dk z*Z-nT{~opZ-v7qDH*b9VDX#Y(@ABctKbwn;8O6(w?)YNUjKD?%qOIKK|9xfBuNS3# z@t0?Yorpbn^~p1TxoCKHz@+RZQ#!rl{MWvi4uJ>1=`?5g<J z-#_5<6we*2p1kvkuCtmqJ-zDI4%41{W$(Eo@7^+DY@?>n4eU9g?W$4B``vWY-?o1L z!UGjwd^+l@@PG$bwk^Eo-q#Ki*XFBImv7nBwrztUuTSeY@7a`qt9mz_c<7z<-dFuAHTUG!AJ-b~cW(`t7T9Ue zsPshl3;+G8{q}!!n&)U4_r{dr%Yttnci-b5%)dSSxtNwa=kK`hf%sRt?sY9oKe@U4 z)jbb3|6yy&W9z?q^~wg{{CH2|4+n4hc}Q8s<|}7@yXN%1R(x@I+Re!Y5B4)} zn3@-vQ0CcwcEXiU-B5Akz8f!^JvM7)@IMwGDOtAd+8291wKi@4FPn1PeX#7GSBJ*_ z{hPk|-;4`;AmXE|?^(QUN4ND~9NxO++Si`==7~w|?o2NDPvemfm!{l)V1^ra=Aadz zjiBwI-Jt!TBcKzYFF|KPK^O$N0fvWM#DgY-W`hbr>pQ zC8#H8AZRRT253HL1!yB^J7_m(Kj;YP1n5i9Sy1Cf7-K=9pg7Q2&^w5tpjZX?E>uq9RZyHeF-`X;>S_#K%t;G z&{zfLv$^#XHNOf!Jw|7{-6<{$)MSwLeN^!ji9?gdq9UkCqQ3<&Vm|aA<_;M3W@`b1#T zpi)p7s2p?@#CvM49bV?d4#(F{Cj7Yfe<4aoNpo;UpDSBO4- zu1J3T0Q|u5+kW!HfpmOrP5#rKid9c~$sdT){0uBM@n^(E;BXm9gI_#Sra*M^gE8{I zicY=`_twcxgw*k6=PJASMpdPQ{L=9iGWm~sDc0b|LdH3bxQhpBKYn3Fng6h^;kbQ+ z{0<-;x5JU2-bu0QD{%4!7z^mQMS=VmKstUYN4|5IV%2y4DwT zXC$9Ij)8nS%7%^`pvco^Iv#+*JY+*|lcd2Xrj)ry%A1Q+@=Z~1bRUULW2OALTan?L zJq*Pobm%6(9(kqXVKwBpO5N}{AM#7ZhIc%gU%-VX96xeo_!yDrJ}dGAfOI^1fqb-- z0bdx9-zfI*3<>f-OP+aR3;EW}I9xg%t zCLkR*0FsZB{Bn0IvS8eY{0$Nrp6)}LOyRkgmolwz>+9DC7jXPmkuramdf)*+N`$zLaV=Lf&!?YiX2M&#}IJOzWiDP_weKgi!5 zjvqLl>qOoz8*bI24KD)6bI}jSeP)#TMCyxs1j)w&>A2ySao7h2NSorWB+C3#`UwxZ zA)g}Y@+}K_yF7X35cw$HWWZ&HXue!*;D!o@uSMO_aX%LM38Ftp+IYE?C7+Zt{9P%> z4{GS=_6UaCb;a%c!GpV<$g{X1uM!?`xp>k4YCR9%nUuroXaoD_S?LQr28%M=#ZGRfB0m@POvj^G$lGHAH;$0sCN^>B8+p5ZO_ugz&sqFl zmf;_x-s!l7lKg6E!+bnS-cQo!4r}sndGG_r(?Q7hKwjzi;U)Q(WehvgNb~lX$Afzq zeyfbr{KS&{(Z2YB~5Ru6yq1C2#jrp3_7AS*a&}{!N=$&p*pp$isFhV~>SA;ElXp*F64=yxm5* zgH44?y_sTzJ$CR@eumrad;-dcyuB9S&TaDFbixlDKZYl7&lMj_z1ro@U7QSWj{2wL zRxtAR9M0{4YU`<;e)-*Pst5hk77y&%fM`M4oMhj_0P4cgxtpensA{ zM{al_Z}%;pMnm3SgYc9a@^)M1TT1e?W!=Lg63E-*0Z&gNZ_gP#Xo~z3((bseio8?o z<9jpm_Snxit>l|RFCEW5AaBoEJR^y`JvQ=GF_zhf$d^6mf9=sS_8NlcyfF^f-gFfp z@=}fJj4AT=8o{Vx^Mo2@&MnWBx7S%bOU_$Ax4x0L$3(u`A#bk>)v0IT?K0qYZ-(3B z3lIJxZ?BPgA|QEty}8I}qA#Tn_}+}cGMyRY(qLh|-F%d_do z+jAzrAtGXmgP%C@^*UsZkfEjj^~?K^7cH!vo2^O$7K87fhX!w z#$KE8t0l^CUbfoK0z7#euA4f$=mA<9>GT5UWao_8+m(;&F?(O+iPSV z<3ZlOf8l2iCBx^te9magI1xswDZ?m~V_smsQ8;N`qrCgqHR>GJ zf8+Rt;p*9II{foM#UP%$!1NwMdDHC{{yyP(cpt;BMcbw0>8IqUDXz+9W?>`L$<1v?ulKgP4|LRVD2w3Uwe;LwMm*I?3UX6hL=hE|myRA=QgYNmy%Q2m_454%eQ zs2_;K3z}rLXVZKxJrpz?Gy*j9^rWUuM((=mnh7C|B8%5Gdit*ed$swf)zBL@Y$#4H zm}b0lW_r*K-yLmRFmKK?4_xuiFSmVod6P%dX7vwBe&V*+*=INMdD$nQPTauft;=Ut z^gh$8Swv9d#gDx|>+0+NeWmsB^o!mN^R)eP^X`(rUG-#Wi=lkRIB(nCSGgxegmiew z8NWVoRqk~=#_aT5I`}_+H&1EWp!L4+Mg3b2&Gg)~V%HUo9-g^zTi;i2hxtegyfW^4fzULBl~QAg&8|M&n(eCqX<$@g(RB$V5Zr$y>cZ zaiH;_S)fIrb)efo4}zWpy$$*d^fL$tUh@QJqaTPTgG>X>2dx5K5BeKu59k%pKR`VF z%85SL3e+1k7?cdk1T6-YfbIl60eTt4Epy+1{Lt81fO>)kfi3}MfC@p^fNljn04fK) z1^N{9A5ddA?sGsqr-W^HCmJT(CER9@_Tm8&;>E)sD3u3Zymo=77vG$A1;X)*VtVl- zWAW(S#eqcX zIg#Q?8{)+SYbeD-7bGH&exMhRgb*)&*GwDWgcu0$Q zweV;!9-ty#JU)t2+<+^(_(eRuc%F+$WlKb!ry^cF4vA7Ts*FfO5WRMyeM(83lnn8B zCQ+}BU4s;lq7^BwACxW_A=&1>A$svR7)g=aAsEVS67b?i35h?{qlG`O66W!2jL+@Z zP9Pi)ouC&Fi4a@(u!dgz#zPY3C;If_0W^{@&jp|t_cn;vSdaGlp~~wQNKk4NNTeEp zr`JS~q{uV5=*5qF_%=v7!H^}OifIXEK4lkO z5+vK;l;c?eaKqFueg-DU6-HdTJ{lOin)Ckt8UeM!(Cd-XHKntXBTYB|cYV zzQQXcysr8S;!+Q8j)q$Li_a6T-fSUmUHUy}a&&d+=Nm7&y5jRK7+szDJ5PM?PdlNe zcK*Rny1MKuIZyae z3E!&KRO(M0r9HeqiGz>Mg$`1`-XFO63RmBKAfT@D_h3$LvCA_Zo>-`xT)YP)C zT;fNmRBDIw^dvgoNx{{M@BP`BukbvHUswLTKLtbl%JMCg^7Z}%%$NQkQ7p|=W^_o3 zv$s+CYrdBK-XDiSq*i#k=)a_n_}-s@`HCNpX_M|^4Yl-pf42pZTH)mqU!G#s3itjv z%U68w53_uQdw+}NE8P3bD_`LrX_)H~=qud&t0{yJQ&RZZDD_+B(LT})Yvu2#gfG)# zwZgqWZGuRxaPNP{g;oe^dA-pnwdnA9}Uj_M!@BIysuW;`VeSC#` zf7RnF-200jU*X@fGg<{}X(Ld;ebqU*XAp z;R`3rv|9D&{hdl2@BKlFukd)8cvBJRE4);~`CkTn zg?oR3;w#+ys}f(~-k**53itjJ#8m74H2}hp%w&?=*ac`LuIirczcR8==eCWFo-l-xd?bN5-e#qsC zoZQd)lsg5vZ6a4+J{qI^N-scPf5;uW0DUtccU0u&zy{@fdVL5kee%V^_AaQ$Q6s+xO(jCihGe=A}8~f&vG6MxzY=;kDsd8`s&N?cF3I(ef7y5 zgxtWU=WnN9LM~q9>eCmDr~d0MKwli>N<^-{a+!UB`Zjv$tIxj2Ab0!%@^J!ko@TmS z>gyj)C!Pn1oZNT&tlv<`6^ooKlYPqZ6QZReS68`koH_!zJdu<8al^eiQ5)=|pYY#Q zl{eSH^|fohg*kp6Ii^1r51-G7oZOEa?y0`hr#wG(N^haluasX{xBPC%A8o1S<$m69 zU*lW8EA(%qeCzY)?=i@oK93yj4doyoqV>uBzTuuzclwPXpC|HZh^m~Adgu?iT_RWC zI5Y!tWg=HsJ7B)odg-gLUG0Wk=>??wwwJyH$%e0a<}BoniavQ>;IlnFuXq5Az?=i@2 zYpaXlViEI|F29f{7rFY{sT0q%4~d-I-uSdH6mmyJPVVo0%JJ(9Ti?8T>{|i3pmsVR zL+X*c3vxY0Zc06JMB{|rPkjd=w@c)@)uWGJtdxlyPhC;2M*Cv<%x;A8 z>8R7?ZVNj1&f(glhCJ;Y0r}%1|Amsqj}JM15mV~XYBtp)cO&H7owQs^J#zaY7cX+X z>yhKvHi;rv-}u_Nag{z4m3B4q!SY!Pxt^l0vV68)tPQRq&+?fK`GF$;nW*(uKK$Cp z=&aS$m!HQV=N7rv_2@g{rLV4Wmi9SuulbYMC(m7c)?X;(f+XGP^`tu)a)}}*&tZJ( zTLHN&mmdi3$DtRRuAuN|E7(l@joecZ9=5q+cTk?Rk+M3H-> z9=REis}Q;I^~kM-oV%MY=NFwK=%f60L$0ismO~Y4=R@vo$ZZq3`torWa^)gd-+G!~ zsU5!nePbbK^w##(r>_ultwrv!dh)Rya%CcyT94d8$ek8Bd2ZyhAAJeA57ARNHz$8~UPgZ5vWWbQyqwwd3Kr&uMTJL&M^@&g(*OTFL6}gOm7kk2 zzj{&rfyMY+vLBI^pT96aB0T*6T{%=HF73>S7?zheKPNMzFlS+IK}2fi!r58j8F_gT z!xy6DatjM0Mr19{n!hkFD?eiL!iDoQ=Vs*CawD>`GZxJ+3}2dAXopm5u$g`OL@bW_ zGg6qJGbMN&PC;Qt=4H4<7f(a;i|%j7OIuXM;*L2h7loaZJEuTLtL!9T8&FGr zR>lHc6rhl}4zDD=35pb<2Y*lnSJ9?^1b<#V7P24clL?mH+J7S=sQ% znl>#BF~FrQ$XJ?&oXyEq2`~i74Xm^uOjNWtCzha0RNk~C>{6VFf>lQk;UvqxtWN8BA1~q4MQ9}xNvoLFdD)_?aX%#htIK9kSZEez2OlRwKq- zD;oash}ksG8t6j!#k@|Umc>@MYp)e$_&FWfRtv&jtCMREv>kWt1$KvYB&0pNA^pAO zFvC+RcVN><$!jVnR?0!xz&dfmwDByRI8~{W1ck%t(MchjTpp$ zLTyr#HI7`I)e@#ez|g*Avn?hL8O0@8YW@aqtpsT zMj~|bv4ld+C0V1%=?d!unQ$#LP|GMT$r@E9Q)i{>%DBktlw)0lY>m)ak7d?}>+8Y1 z9;L3$Po)BGQ^tNG72x)+fF-A_)}>Z^_sdof#EFcvTBn*H6}d~S0GGK_Mf*_l2#yAt zAEE#ny3A5!&e~@+-|sR{7P*_LB82x{N(vVziu^(yRzpTn!up~DHdy-d4z15+ejs-F z+p!y=Mhqy}>oi^FElkJXUHG!I13Wjc+D$GF9}AeB+~HQBzhBqpmgP#aI=S`(z+3svFO%KvrD zKQgr1n&djBGlULaJwt0&9kYV{zq5L?Zd|)6RsR1bZ@<$JGrzK!9)l|7A6*W_OR{l+~N9G#;%ZBFXB`ri517@f6$W(`<3Q{rx(lDlxxhlvq<49%o&` ziachGI_5MfxA2(N8QF`3j<&2yv#`)=;QyWKU9G<3eA>VIeA>|6+zQ5+5`@{aA;!;E z>iU@Z1_n@!1~%Q=HdkK*G;|-XwE7us^#QSZpIH534XgLsRwJOg)lXMh zts`lx_tNT@QA5AQnESOc$HbUjV$6FrjJd})1_9NLxv$C?9Z4H=4~;pYjTuz4HiNC^ zsKEe?_Q6;_G{ng7Fq^7r49geznU}lcFzgn&S>5Ir4h*L^a~=tCnO{1NSplV1Tf`4` z9W%GUe2AQZRi5d%I%ICb+<-Rmy<}*EJu&#X%zvv);o@3O3}^u+z3d5Mxy-I5$dJqr zP@>z(b&^S^t;AC8q%Lg0tYyY{I9a-)V^`!J;z$%yg~1Cjl&QX@#> zYAeX!tx|Ul!H|Io*R@8K!5t1P8~oj4tiX4%3|npWqcW`8G21nCm9ShsbsVw+{N0f* z_bIC#YNRiuf>&d)H3lPEl3tn5aV42AuGrx+_nE0!%VQ~;YQC@nP4sCq$?6Ecdy*9u z$2q)1lGO$?T7YYx)odD82T4{}rntjiT1JzLvo0b)xdPW5%=IhWdQDeuy4eg&a?VsJ znr3xip}Tfk0n=UP{uS;WjAS0P<*)*rW?5@hnLfI*1k)wvd^Va6E(}{ij9a3c)Kv~t z`7kzti!rDo>vvTsxuqi9+Q>j=HB$o-v4zr-PS zTHTO-1PZO8w8q?1EYD7`E6EDLa1YB{LVpOCCay?jXC6ZQ-9ubx-mP2^4S=ZS+JcI2 zh{U<>aGB?d{Q9uNI?O98lj?z_8Y8LBs2mUCpfBi}OrniZhnV@H(1ryMQsoU-I0lROA& zQNnK673szyoiPxTOyVvLmqF+dEPFkeY*EThb5S;Owq%Dj7^ONIp`((l&Z<;fA`Mno zODxX2L0c@E(lB(%@9aCSAl@ykLAz9WZ2=Lvw0r2)s}5N${M`>Q)2^K^b2oSlj_(>t zD$~bQ0p7dn5YP|4>PFGLcNNDy6TGTJD;2dcLz)UoWelvHkKWq?9k2;%E*L&dVL<@O zvITflYAX~k$ASPCX6VB@%NR4btbG`xwTFXC3^EfDXI-4C*QQq&9kTrW-TRbqAXGJV zow7Kl5E}x6IG87y1=;X51H+YnGx{URhOVJjW9DU%6s^jhxgZ-wX9lODrsAx?-Kh1! zsD?NzC>6yy7(FxFYLB{$;{e(aZ4KiB3&J(U@}H^i)KH(Qu28-(DG>GF^pt8Qey%VP zF0ov$OSyPAv*OhK1{M+RFxsKT&BhwKAF|pK0~t-|O%qR9?U_in?sRuJ(BIIaBVFcw zl`Z<1-J)I7T;{z+e)wDz5zTjPZ*V63F~A(hVAT;;g`gD#QHaZ-W4fn4w5qbR{8*`a zeKj3FViH3MU5l|s8csL%HIIQJN7ZWFgS)(0lVocR#@I3CTCir9B zkph{\vk*6h>;fKvX+YRe+)J7{hPoDlo*~Y=Xwn3)%Ik!4kbA z*yV1CLd1-XF)a)Y=Z2MfrDJ~WhcQA`W2&C)IMzGN>sKB^`!T;kD2IY^F4M!ic6T%L z+Z7npTxJR8nRXn}3Q@41sHYxHF$=lS@dvqfSS{kruU2GZNHlN61l0mk9@RmK`!F~c zTH}(eZgG%<$M@Ae0$kU-%+FS+c5mv+K*jv%!)vRV+{>b zb1+6wgEbHh6@#G9`5&W==c@2VY8v_{?Z22cxzHZ`swvKj|4b}*~iy6^8rS#m1C zfQJWk7(K%ESQePd3=|*(Tni1s)PV6N36&j$qPCYFpYbj!)ZedLFy_EG^OKd(X5QwP zge3V~s4wynhnQRR9ThaG?jpHMvRY$2;sX`5r$|-$S4ws4C1-xT65U~^AJ!Vk)`u&1 zI~%#oZw-`ePybIaj>RF1dKnM|J}^s6utN$S;hc_g9`H4HjYE&e14_Hczfp7yJ>DIGF7G#{8Jg{wHCFJNG0Is@xQ<4(4tv4r0ihl38ls1$y|rzs48wR*)81BiC!^oZ zRNC7LT5YeI_IiiaV{ZtosnJipv!lB)9(>`wj4C~hl(>PmM@q{z#AUvP++wzU5V=M5 zns1`)`{4%I;ohN^GySmaXdMo(Ihrjb#}`Zb6638XV-eRVBXDrMQktTi^yWNNu#PL%%`--Auo|&mx}zP4ms=< zqDF78$d7B0BVHmB`B5G6npa4T$TF32?akRu)s>#zv{y}WJsf^lZM?&4Jj}RiR^zk~ z1TEgf;U5;PCXhSPUi#w22C_5|ovbgGRA>=RTys7};TGae%^b`NtG(w1Do2C~2 zdX7>3!z;sfhDsHWv`m|Oa0WmuUF%ni}wC6Q#K~-3z_U2qWRUkAW&2P4ledP>V3S4ClD^&T7QGvH^jW*H^t1`VP!#^laIxn=9f@`=Sw&Hh5I$a&a>_b zIMD~^Dzy-F3VuIA`+p?(25>m!o)UhS;8ww_1s4G+*Bh7wYzxFb>9F_UiG8YJe+6Cw zyakB;*kK!i*}&yM>`M$w0ww|n0r7oB*w6SVfqMQ4Y!AF2I0-mU{4WJ!pKRD;_?ToC za1*cq7zw-v7zkX4r2pMd=jT-*REIqRyd1b0$neX6lfd@|D!YN$pC9%q{I2Mu<@123 zim=anWB(-ZDIoS8hHU_{9OHo0izin6W;E05}FX6Uch)0K`7;un&8v z|JoCF3y}Gk3#9yX;8@@|;A~(Na4j$tXyQ;lk6?)4uie#u{R#UVNV!u$${iPcL+}yc z6$rl)xC)pJycF0F$n@Xtrv4jI*ptBJ;HLwrZwiq5Mhjjn*bYd2|Lm&mJ_#HL{wQ!Z z@G;<8;6p&hzf*9#U=c72;W@yyz}e!TDmX!~FOcatfVBJ5F6u10u&067fd4CS9kOs+ zXN{kBQvYEo>}}v$guf1C`UeE}3w8t!LUp2tb#x+z^JG5q&j>y#m=7F`@NmKZw$=6VCXngx z1da#Z3{>M2FdO`GAlvaoU=pw`@Je7a;8nn1ah46s=L9eo_!Mvz@D5-O@Je7Vus1Lc zn1R7%K5zhV0kA3XV&J!}@!bgU3E*Wwo`_ovoDR$YUIb+McLNRu1_RT9`&#L7>I%Um zAlpd-knv-IU4UW07+@#CPh0Bt^8t|IF98<;_W>!#Q+(mVc)}t1D}mF1IY3lx*i0bH zc>)kaL|7~kMH?0-{w;x&_ZR+^7Mgz+$ar@HQG{W)3cm?RJy!rb0mFf8=gol3PXLhl zaR6!Wzk;=0cLOQ66G;DSfQx`vNI3r^3hfvRWP0&HrXMc;orP~H;r_z^+Fa-VGa&7H z8%Vo00hwMtkajHq(yk03)1LxldAWd;JJ(G6e+Hyo?*kcr5JJc9sH118)G*&P#!e-w7B6{K8-B zeH}>u<-(^4-xL@P|MwbdeXjs#f`1lBeOrKifzyD~fr&uozY&o7UUlnwdfUKv{z)1La0(J)e+(7I37m)4Yb0F*eB#`y}hTz|T)U!jv zuLiPRESKfS+DKv|ZKjk$2U8`d*|y zaB+PStMNHO{ySxu;7S%W1rH9?{!0X>2{sfwj7nj=m4ZVAzeVSw|677<1fvC;37)`U zLAh;$g@Va~fr7^|2vF`?!8pNYf?xO3;fDpc3FZlo73?YK6nq1noO*8-oGln9*h27N zl$N_raGc;dbY{kXR`52#5rV&; zx%UO16x=L0N3e_FFX&8^e^RhOFhUS}J5=~dG&aiJA~;IW6g-GV&hV=QKSm=XpC$NN zPtETV%n|%21_R1HCwRNyWrDGSUv}4WI|U~S1`ED~L4$hw34YpD^J@g71wZei{qGlC zCU}wHSDkhEwSt2M&verMy9DJw1i6|E|F%bmmk3T5Y>h=2?aIZVPaNG`V*{WQ{I|_C zz6xacfhHRHoh12l0UAFNd_nNF#@heuMjEdYoF+I}kl&wE5C7vK(O>W;%va?52{sgb z-mU$Y3&seB0co#O_&pf!7{5$VjzD&m3cpUUSa7Leo?xnAvS6ZMykJj3k6>%TAi=isMSRr^wuv~DDV42`H!4koBg2jSM1@i<`1(O961>*&K3VH-v3kC_g1p%sj;sZ5$ z1UYFUYpx1ukL7};g2jUAg7JbLK|`=Y+HtvHsbH~Sx?sGZN6--D8O5}tT#)NO^2LJb zg7JbLK|`=Y`a`*3sbH~Sx?sGZN6-+gkbYAx$p1QuCh95!UX7(isrVNQrVGXkdISwY zo@q_{j{~XaD3E%}#lKXrSTJ2MUeF_G2>#SS>p26Yo(iBUFTqm5V!?F5ctMY#Az0y( z_<~#ys`3_07mOG52(|_?KS98&x#SZ63as;#J%Xiz#e(UA@q!*fL$Csal8P_52dK&) z$aG4@zgRF`FcnC-WFY0@#ebmqM~c5k{JEY~_KUwE{uQRAFSrM&(g&*a#lKiET`*qI zBWMU#AhODjV5wlSV7g$uphwUUtUzQHU$9iLSTJ2MUeF_G2v$gcFBdEoEEY@`j2H9> za{Pb^E{-3}H-IX6drf}a5~;7=5C}v7+b!Lrc&-$Pi1wNBmhko&)z=DdpDDdWc>4_L z3BucFMh_9*KI6Hy@b;O+vxT?Muzf*z`^?uq!rN!0=C#88hojiA&ypPn`Ydl;bZ=a3+l<*w)=+@fds)X}8-%T9lI21w!t8;M3+h=z_hjE8|x#agTm*(xW zWv|CW4Tjri!4DGNKHKtUJHC|vdWmnJjoSj_F5}z(i=d?{Z`dRGd0O<@|0|%0@b=mD zPlo9D6(XNz^O9Zz;qCtw@ICUW(nC6QpWFKSYCc+ttg{gfN_*{Jv1`4{_k*yYzn%NL++uswLhp7v;G1Eov%?n$ zYkB)D>Rp!R?X!tL7kT?E^+$!b&n^#<^5DxHIzF#pe)+J9&JDY1kA0T!Wzrw)vvK)f zgBTv!N6QaU_LLj;*}X2|OCztb>0(s>E!O{e8~jaDzV=zkZ?@3- z+=v(ZMhS19&3{bnx6jJwf2(4C?6dKQOMA7?TE0t-$7ru%I(Ap2=~938+0`-9{!67j@Oc~cmG#j2bA=C*_TOLla^c^T{$D2LvBe$_y6gB~ ziM)MQeHP}0CQg*s7#+TZ{TFg5| zcu{tCR{kZE()v%CJaXXZ%!GtV{nGkIj?7t_HG6DMZdOMAu=zadrEp>X=&=j>M)n_= zkT7;$WI{qzq|!H}%795c1!MGi z@{!PQ^1{5)$omBsO>7!UM`eG&SRPE0kdTl(IZc@{dw#MuCu%^Aa_c`bKPxLiLdR59 z$ZxfFK*EB&!et3MmEWN!Dr!_#;qZ*SjLe)$b^p6nF(a~Y0>(nyt|~`7w7F{>cJAfI2DH@M&)Rk(0_8){Q0#z<%Psd z&dRz>V)`1C2aKG*s9>(G+LuHO8p9+U4P?tyHH69rbAcmaO-)geNjOML6;FPDuOzBc zxR4A^&bZ9BO{NRgyhrr4a~-8p(4}AH>y>t;XH~+#HETXp{J}$0WeVq+Z-!UqThE=k zFrs`GMy0QJVc4F(qcCh0=QCC0ycZCa1z&Rz!df7+a!lfs>>cY5F6$`WWORQ_NFI|p zFClhr)>56kS`LVWZd54piQaA5heT8@iL{IYob*(fmS31l`P?N7RJ8xS)MF-QLE+-8 z-@DdW{Cf?FPFR|kkvsbjvZK~Y2l>q4Y7vW_1=`eFBB+q$ObPR9+TPwi)~DXV-m#*p zl=+HP6YUNz zboZ@k?H^pcefv+!%+QOADY;n%nHhOmvt>Y^h_#jPl?8I2pzOwJfw;Fz%ba^zT6RXx z{2D{^A8cyv>E_Q(Z(!vuz`Q>=4NJ9n>KT3Ow_!dQo(L90reiw~apC;i4`E#s=SM#lf(RHCbv$2Ai2J+@Z6q2-KK%fJhXhbc!?G*k zPtLbpy7Ok$$o8LCzJGR7v1;hM7$+Pj{K=W>|9_DP=eLxM`HQmt?A++*vuMkIa;Zr= zQ97Nd{+BFTFe@v6@4&m-%t7Bz9fYJZC?OwbMNLhOa&`h=?< z9aOD@(7VTGwr&o$6 z_?k--5@w-gPn;a7#*8REM~u(oA^I8fW#p-2kV&3YZzSJ?&UqsF9$(HA$@h43o=E+C z4hQFn6yccfA#Kjm zrD^!b4tURiL;nkxr7e!E6}PreOr+rt*Ci^V??6wLiyF|kZ@&SteFsE(JOd)55HJu| z9#2$cWOV=j9#3pkq=={cXD-am#j7lImb68=IZMNFj(_+p9j$0+RVc$SqE>8ARL^2NC5$su_gHAo1Bn3xr(>1 z#?Syb>f_~E>;X{QMVv-4{cV?)Hmjh(W`JpFBZf^LR^?&akyqu#J&l#F+P(q!;%>J< z?GF%%n)cat#Yp%S*!$$|ymiw*Ep2v2VMdiiP5ahLKC#6@xyPWdrjDxEN?+EjMRRcD znyS3SKhlkfnzNWqa+b|W1kJ7OBqK5OSFJsoM z{H(>QKC0Pg>$_13{zCQTgPIrxu0Y%kU9 z`v!Y~yj@4^ovPt{>RW(K1vIfPeRexLzdrmInE6?0xfu&+UM+oR#J(9~h3CBXX?+W4 z%~KUz)4s9T>qXa9gRug8!D_e~`Sr37J1J`F%d4S}d(~<yPy!UeFa5JQ}LN|ZKsgpR3y%dl5SIjN8ej8p6?vptpDRcqLnH8(9gAGM*Q)f^AX znrnZ4OF~zHaZtLR;v1$uUI=X|RWT5O>yvtL$$EliqtT$Ce zjde$7Acx-FkY`af?hFH98|>g263VfwkT^EepY&VZl*IL)oMxn%2by$536oE}&Z5tY z>en&zKz4R^c$1E6>8HcjeCbJCzw)QV4WyyCJcG+KN{#Y+i53~_623`XbI?;~d=&|i zPb1FhHLINGnq0*};KhV<#^>E|k+>n@^oFHQQ9JJROT(P}Ut@_I#+`oAK{3brgj3fh zoa^dn@dnOU2}m#D5U^tX>+4@rVPiKWR18}m?^L*E zX*EkeLNtE30CUDwY*^-8|Kj@R%M2CmnRDk1V{d0v+b}J0-MAAkC7fVFV<9|@(g_EZ z=t~L5;cKi{b?oF$QG><9&@JM!wtI`8h^WR&Ua;8fomVojoJU8CIHJ-+%b&31`B|=|m)GV*V)?mwFs;V?)+5d*^UM`*F1+XE;jprth3DlgnD>PoRfZ${audv@zYyKx zOu=AoAh_L&cM~DMJTS1*-{D)?*x0EB0}WT!BY@FO3wE{Fw))z&uJ#~~4)Zm7a7Y{^ zKy9jT^S5?u!Fm;{4Pl(&iC;J=ObB$;hgvi#j<=#5d$rn2%L>BD;1oLbq@b;;58`!# zg>J%gLkvmt2iJEX8(Xkc3oRA%7ez-|Tm;*(5Y3@vAdyVimU2U7RjsBBD-#JWVp32g zQcRFoeo<>6DAFQKq(NF!V#OXdC1QzLlV{AKh8pWTF=bF^&S|ZI_GVAGZc%xOv@L?+ zM!(5gtp=2 z#tyVOEb3}FJW=p8ks)NW8LIGpEwrjTgefZCwQ2eoeNK9oX{5WyPfj1BXX2U7wn#J5 zOS6``&Ue`+v|}c2Wa&n_%S8faA8BE30Z?-`&=oEhf{t-oX_k>L#gcTL-&Q+kfVKq8 zWXic*D-cYX0vhAGaJ9C8nlQ3H|Z$Q|lyP54V%!&xP z4@G;!=3 z_{)Bbw4_`0anB&I8@!~i>Dsto0^#*Z`ns-<`yG%>_@r;>Hf`i0;7i?kpuPt0oaR^r z@Fu+NYV+>^CO z?ccr>aqV7SfyuW09m|O29tEaNVdJ2?0$#5^ME&d8Sf)a5CFEFjh|?nCTqNTh5izhy z9(a27yNt7lA40~)S;KS|7olxKL!HpDgc^WtUQgZ%mSkEp{^;0*!K$eyYn5PG%M%+U zYvUDU6_W)w-Gh|rj>GHKbHSTJ{#2FX_ASJw6Vs-+5vIEdUauY`=d$ylCo<2dsg`EJ zVLJm>*D5gPf*BJfxLlQ>GDu#-H0EIn_0io2uUCIU&eodIv~OiI4Qt;TrM*>Y-?)=H zIz>s{B`CpI-ny98Rjn*RZ1Jopo+||vi2~{xI(#_J#pqaWQW)k_DQC27HCzKkFQ)zN zxf@Dfx@6(j*VE^0%jpfi_hwQ3j2Tmo?LYskr&IHO;7fm`#(mLu#{cz!$ru0H{aF9z z>}PJf{pE|-eRap)hhONeZo2vX8Bh1`xb2RPgX0$6eE&Uv-n_6s?}uOc{yD$7>0i*D ziVRJG$FWr!dzdo#&G4=8JK%4G|2F(V_$T3Cfd6m!cj5m9pNeXo0)H<2GWarhHh!?Q z^8xADuMlrjI6DmDUr`t1IKsrwhNt5VMBIwcu8KJK%b;TqMEp*Lv-2Tt>D!>>@1`)^ zF@^K)rek+Wd5g~ugt&Ng1w5_fE&c2U$+zOO0TaJW<)3{gajSgn?TGWcM>=-1#I5`v zj7g6-1NoLdak~Py>VrLKq&}-{kw(Xd9XjG{TWm-Fi45Bsy|pyPY*UY+nHUDysiBvH zXB*{;16L2&PRU_fOrJ2)u?=%RKw4f;uj|O=g;P9}-@UnG+KzVz@BZ~i`yak_M`r5- z*B*HP$m9mk*LM89$n`&u44?Jh+pkPISkjyGmx0^zPafWp|8cs*B~~UrhAw_HKLdUd z{DttB!neWqz;nF#Av~`k+vw}?@57s@JB||wia}yFAeDfS|2O^yRQN$fFHL=NI44Z*939P~)y zSg0a$AR>uh;>bx72UC?I#}JZsk4PaDcJk^Ai7<@;wii0p zW~d>`@zI89?*KE-A?QY$j zn&jMvT(Z`%J%N_@u59h9ey}u^?!LiRlqP$2DYqJO6O^2#FOgg;43BO>sT)7TM*&#pcm7mlLVs>f7d;AnPxpg@zritQnz0#&Xd%uR$NSKk0uE1IG#&eRo(B)9 z6Pjvxc;K3SNYhw`bG(H@aB;-AyGtDRVXnpD5qss<;5aD?k6k!;kblNgyPC`jhw-e2 zGlXgoG1*ayGd3^9cJ??74X3=}oIGR&$1)(ZlR!%YX5J!BDYhBgvHv=>*c|&DMskfR z@*bJ-i=c3VI!Y)N8O>sHIQKyuv?SB6+h58We^5r4@i`-0 zVMUnvIU`)oqquCwEben2ogH<+OaTtD!hx1uxE4H+uFSfWcbd}o@~ae{r|@$W&Uq*G4*_DH;r$VN59t3M{?N~Q z*-tZ_>lD2K5QC|=01zuHUiLV6Z6x-Qgi7ySxCb$Z@sKk9H>hB{f|n@Bc{2HUyTbm(@l)tWRXUac5}zj1cMK~yq~M@} zJqp$-Sg4>!K>(qDBJ?wz7lEfE0c*Knh&U3m)-E`o`4#h&g&dPuk2XW8FadR|r$?g&p>!d-uB#E1;IF1TT4rd+BRRPg(e!%A8o(HJ@M$yRyR}u9~>iG zeEx(!EW^WqEr_X9O#Vt#{nscRE$Hx>zYgS&MMw7C5$X|N=);SzV2~PP^$jY0v=N{i zQu>~UKGoeN(&ulhZ}!o^C05@drOzqVX~&>1#>ME9_C}-GFAXVu?<$^_lrQv;9(*s;}8f z-$IWHjDVQ(M&vJn{nC;ceHVXDeWTegU8eN?NZnl5ex|-N+b=oQ9#}o9d~;E7s&<|$ z`&9&E%6n$}rCz1)kkWUL(x*`NF)db@Fnqs_V!u?#$sSytDsSB!iO)s;R2z!QAFrFZ zMPuxj@*vMKro)S|2NBuVRZ3N&fK)y`sq!f*Y_Ut?X6C2*kC%L!>>z!lBG;MWC z`tuLtwlC>>sif~28DSvpHNnjPzF<68()TNiaa=OkQNRc%f^kwZI%639X@^MZ-vpbL z{L2Ls=@cJP`OjY^xaCKpljmOikk5}%2CJu%elsAVd7p zzGuMw6s4zG2&`X*P*j*p4Z+Z9NR=$RMW&f7w3oy5XE{!aMj>||D(U+Wb}@%~iyu`6 zP4j=b@^MIO#eGML=N~QZ`z=z0aSc7~ZSsF0B1#jb-s1m)r4G!JGNu`S^!%e`118^=l?*&`>XT1DEt8fv<^9QJedV}@hffIN00HyS_o9`DqkX@B96FpT zV&C59AtDRYw|AK0{brdcaz3B6ER!i@Z(JnWxAz!j_Z%ib6Pd+EHjuxPS?Y%%L4iuM zZ|}1ZI{8mQG~bgIHbkK8v7r3vNVIS75viPDL^)ptBv3v?<=+v?56c3`y!HJ;6svFV z3lP|InE$v*=237U|LG`Q{a+(DoZTm>aUBGof)tXJ*-@E|(KlP_!0Oiz5Hh)uNl*Opw7D9d0<3d?>%6Z4GhTZEle%T`!mb>aF59AUDEf6 zEWZF{yfYsWSE=vCvi<>vR0-9!FXnwsisln!cJ@#%ne z?M#dm{K|LcQqRme!I?WPAun`Q1Uy^1+8bdOLF?sy$p0cVc zY_R2Ps_$wI@mu3oU+0=Y=cWy1RShk^Hs4au9H@wp-k=^jAR&3I^%3{Hn#UbLqoh-) zMDTC%Z&!Tvav+ZX;Ag~tRPn|A5{^Bh|FGgK5SFmge?~FXG)$Av3ah$t5%4_cZ*QjM z3_hps2(-iGWvSv{><_hY+rTREsena|iB-HE57D$nTdFn6dM&SS$21x?T5<=%?$y3l zUkGWG)dxdS>1YkYW=if?80hR?DcDP|MzW>c>95V#=!Z>}#rOMyOY1{Wx}^&yIZMS; zu$3uh6&JFt9+|(I8zF8Ctns({ARlN$D{F1-UW#w!11zc)v8~?UzDl$nO*W#^MwH#( zr1iX0fX_oeI9G;6D_cq8i4R6fB5sC^CA~e<3j5B>&$w ze~F*BzmUcH#AbgLRV%BCN=s!cD^^!YtEj5LCo@$Wu`!BhM-hy**xV2si};E+6~*yJ z+G|9F(yH}k=xN%q`y5s?nj<(>-ECU}>YKUJgO_&rugkHp6(f)pF*?vnuc~!MH7uDs|J^Vfet;M8r9(A+2SgWLS9uo3ZpDBW8s2?^0=I%$wN_WMQfXIxu7Y^ zaF|tLfb5K3v8gN#gbw;D5ga;e+_hXHu$PKd<}AhYzYKInwYeqqZXSYASto+14~r2 zk;c}n2uZRoQ&Aj6nRB;b`X@z$42G|3)d<7V;gJ$pm5$bp1|bQ&fk#4^^^K@2i(*A% z9&zKxN+*&D=Y+ydt$})#un206fi8TAD>ER&!f0F)R;^!;N{ujNhYI#Ol3P(#syZPn z3582`Q1sI>+=U$nwGK3(s{`232cK>=w_)}I3P0k)+(}*HtGaxcYg-pu*hjb22dx=Z zw;(iOqEyw5$$DE%+aZIEz#rsXN;HQMZVK!m1ataE;*_8chHKGIRjRdCQ^H#VKe7db zaJETokqF~)G|aA`wjQ^H2(ZYwk;StDnsbzq^;^4K%Ffyj6X~{zmSMFq7Z%b}u;y%! zw4*j7?5m~xh$(iGT^Ertfp&)D07;ex(J9jY*_8#o{Kgly)zXMr+AV)c7+k}?I?|9C zcGl4{cpVmP+w2aTQ@h^Yg{7S_mNj=~4{SwG>{6EF@9aWGvclHZt^(Hr2#=Lk;n~6} z90KD;tis1fML)SKU1*qa7AA}n@dg$qb(nU_8NalOc89H^`@!Xcl5l*>U^|MS(>BX^ z3s5&`uw^sG;u+2`_#|gHxCCq(wfJ`!+wh-c&=$&R+>ifc<2n4N7&O~*8UMzAsxcYr z(+nE-r5hLHKf~z4e>Tn}hvk!TFaA@EA^i93?&(Q3UYDW4WP{&igEs6m#>>!9vawjv zk~RCEkg*z|wwc1P%#Wa+W`+QgoQ?oez5zkIz0tT6P%|FGe@}{W4B&dZ@d3d&14h+2 z?ZlWzU^7+`?Cu%Tj2eVK9dBGM={HGwk8a#8LxZ|8BtyfR@p~B>(v4G!rfc?VkbW|* zk^Kt$UIbzBt{L6t41gqilHIsYH*ye0t$iO{?qhEr)06rBJLLiVxe7^H$3MIM=OC;{ z&@nFgR}^@O0(^awN(FQk@OpI}NJ%TwV0_GTDU()Yqlmyd9uH$$y0wz{ZRpUeuOi18 zj^T`oA+QV>=srWKjI*E(SlvH}ja699KZ#8trlp^PPP&sq_x0p>(v1Blc8ctHs64~i ze`=?RrkFI7*9qwGPJT3zH2a%~1oYTWK3653CG;EnkL;X9^jyBE2ls`YzjFdz5Cl<6 z9cHRQAB6(3AG(4rL3G&WpM$XbIfR|I zHSRGb6w3T7P_{K&nXYT@BV;=B-C2J?pcVqo#khU!TM_ybC`rqb0|>g_M0hMUXNwQg zVV}-bK4(($0BG)c2+vK)wo=Fi`Zn55O7#pqb3G6iKjo4cV=}L>kW0a71Hzg}xeS~x z3)u|hdP}Sh2;XiB1@%C_Wg$&K_$)dZ8B1vfG6~fp#9Dw%w-7%NUSh%73S_Ruxe~~H z3uy(y(-DMN8;}bvq#ejcAe)d@N~f-8`hf6Sq+Fxx{3 z#*8sp2Z0Fn6Es`aqZVf(kRc#k^i6?{Pu4FjWHK&8@;j(SHy3!F$#K^&xdgc>1uq-r zORm7hOy+GlA=!g}H`kq=uDR|p8UkA8Q~2lQbDfV!&jXnX?^*`r1Ol^(EC=!t0_PA} z0c0{B;U7jjc3l8uHW1$Vu0kL@pmqVpRs!Lh%@at&wF=0kK+Yql2*@@dg+x{ZxeEvn zo^=%i`6&>tFu2wL;n%{fUe|>{jss~X!qR;NgiX~|3M3sh!wPh*n}K$FKV+OPm(}DR z0m`f5N=H4IemvY8hEm`<}rf*VP6nhyZj?Izz=+MV_~MBw4QsTY|% zJH(;eS<3ei)Ke!qcOm>oWWpG)+gUGfGJFlzI+aO1u9Ze_^asL@MlfuOT)Z`D z%X)3$$Ni$^ZgI86RU&ofbW6lt=tcTO;mJIJ+X^TNKWYlK9K~gR}CZ z(1iKdY^6j2wDu8N6dhur1s3u{8&GPeYIpgt_4wvL;q{*d0+WYd&E#Ib1g@2;r zbm}F6pQK&q`sTdq>3=9Vc~$pa2k-FR_?KsI{9VZLlu1+T<#%p8_o3P?i)g0(%Bf4; z%R4?;{F?*I9vXA|?j0`;*PL^F_GCLvxv!jg?yP%)$6vhv+E+eyr*8Y{?4uQz*OkBe zv)kXeD&z3?3g$H&cur$jAd|?Wpy-RYf%VtxLk6<24N&4R&}hPc(KQ@;f!>xTKevx!O$A_3>1c@ZK{S!-t4yqOSPXHG?W zut(RKpu>r7@4Kd%Vp}rSoM@Y!1#9zzkl4nkHIzUKyOHfK6lb?_NfY?S+*g4t11bAK zSYKOWsUu=lLM+D;Tk@c}5qTINGShd%$R2jnj*w9{kFO|0p2k?*+sp!uu^i zOemHg07U%kZa}mw@1=^*L6-a?#h(X=9@6Vnd=ARwe+bC<{8R}YwwK?|K~MGz3V&AN zhXD~k`#wOX|6M@F{}v#A+1KHZ@wWjoen8>P3aK>l9w8@Ir;>DcqxQ zx55F0KFZsnzeK@81q&2peDdci=uwd7aHLZoA?6qY0)*+H@gatjWHbRh@By;@p`4Be z1=%i$zk)wPPP_^06f9KGqac9b->u}Y0;J76%R$GsPHUsx2y8Syfd#8}eK`woC%VUi29BJ3BOK!CT*jlLuiR zfDyA2JFDPS6}+>F*soq40TH%C=eZE0M8yFlT5Q_ZdbBk{%e`4>ETG;TYqd?5f%|8e zhQyb2true - $(SolutionDir)3rdparty\7zip\7zip\C;$(SolutionDir)3rdparty\hidapi\hidapi\hidapi;.\;$(SolutionDir);$(SolutionDir)3rdparty\asmjit\asmjit\src;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include;$(SolutionDir)3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)3rdparty\libpng\libpng;$(SolutionDir)3rdparty\GL;$(SolutionDir)3rdparty\stblib\stb;$(SolutionDir)3rdparty\openal\openal-soft\include\AL;$(SolutionDir)3rdparty\pugixml\src;$(SolutionDir)3rdparty\Optional;$(SolutionDir)3rdparty\discord-rpc\include;$(SolutionDir)3rdparty\zlib\zlib;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(SolutionDir)3rdparty\fusion\fusion\Fusion + $(SolutionDir)3rdparty\7zip\7zip\C;$(SolutionDir)3rdparty\hidapi\hidapi\hidapi;.\;$(SolutionDir);$(SolutionDir)3rdparty\asmjit\asmjit\src;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include;$(SolutionDir)3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)3rdparty\libpng\libpng;$(SolutionDir)3rdparty\GL;$(SolutionDir)3rdparty\stblib\stb;$(SolutionDir)3rdparty\openal\openal-soft\include\AL;$(SolutionDir)3rdparty\pugixml\src;$(SolutionDir)3rdparty\Optional;$(SolutionDir)3rdparty\discord-rpc\discord-rpc\include;$(SolutionDir)3rdparty\zlib\zlib;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(SolutionDir)3rdparty\fusion\fusion\Fusion $(SolutionDir)build\lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) $(SolutionDir)build\lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) - $(SolutionDir)3rdparty\7zip\7zip\C;$(SolutionDir)3rdparty\hidapi\hidapi\hidapi;.\;$(SolutionDir);$(SolutionDir)3rdparty\asmjit\asmjit\src;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include;$(SolutionDir)3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)3rdparty\libpng\libpng;$(SolutionDir)3rdparty\GL;$(SolutionDir)3rdparty\stblib\stb;$(SolutionDir)3rdparty\openal\openal-soft\include\AL;$(SolutionDir)3rdparty\pugixml\src;$(SolutionDir)3rdparty\Optional;$(SolutionDir)3rdparty\discord-rpc\include;$(SolutionDir)3rdparty\zlib\zlib;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(SolutionDir)3rdparty\fusion\fusion\Fusion + $(SolutionDir)3rdparty\7zip\7zip\C;$(SolutionDir)3rdparty\hidapi\hidapi\hidapi;.\;$(SolutionDir);$(SolutionDir)3rdparty\asmjit\asmjit\src;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include;$(SolutionDir)3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)3rdparty\libpng\libpng;$(SolutionDir)3rdparty\GL;$(SolutionDir)3rdparty\stblib\stb;$(SolutionDir)3rdparty\openal\openal-soft\include\AL;$(SolutionDir)3rdparty\pugixml\src;$(SolutionDir)3rdparty\Optional;$(SolutionDir)3rdparty\discord-rpc\discord-rpc\include;$(SolutionDir)3rdparty\zlib\zlib;$(SolutionDir)3rdparty\libsdl-org\SDL\include;$(SolutionDir)3rdparty\fusion\fusion\Fusion @@ -90,7 +90,7 @@ opencv_world4100.lib;DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Core.lib;Qt6Gui.lib;Qt6Widgets.lib;Qt6Concurrent.lib;Qt6Multimedia.lib;Qt6MultimediaWidgets.lib;Qt6Svg.lib;Qt6SvgWidgets.lib;7zip.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;fusion.lib;%(AdditionalDependencies) - $(SolutionDir)3rdparty\opencv\opencv\opencv410\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib_ext\$(CONFIGURATION)-$(PLATFORM);$(SolutionDir)3rdparty\discord-rpc\lib;$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories) + $(SolutionDir)3rdparty\opencv\opencv\opencv410\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib_ext\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true Debug @@ -142,7 +142,7 @@ opencv_world4100.lib;DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslangd.lib;OSDependentd.lib;OGLCompilerd.lib;SPIRVd.lib;MachineIndependentd.lib;GenericCodeGend.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Cored.lib;Qt6Guid.lib;Qt6Widgetsd.lib;Qt6Concurrentd.lib;Qt6Multimediad.lib;Qt6MultimediaWidgetsd.lib;Qt6Svgd.lib;Qt6SvgWidgetsd.lib;7zip.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;fusion.lib;%(AdditionalDependencies) - $(SolutionDir)3rdparty\opencv\opencv\opencv410\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)3rdparty\discord-rpc\lib;$(SolutionDir)build\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories) + $(SolutionDir)3rdparty\opencv\opencv\opencv410\build\x64\lib;$(SolutionDir)build\lib\$(Configuration)-$(Platform)\glslang;$(SolutionDir)build\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /VERBOSE %(AdditionalOptions) true Debug From 1398e7702b139f34493dac9a8c1b0d8038de6015 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 16 Mar 2025 22:11:29 +0100 Subject: [PATCH 131/529] Improve BUILDING.md documentation - Add llvm-devel dependency to Fedora (required to compile). - Recommend using the Ninja generator on Linux to speed up compilation (and mention it in the package installation lists). - Use shorter CMake commands and use the standard `build` folder as a target. - Use `--recursive` in Git clone to automatically fetch submodules. - Fix path of output binary file on Linux. --- BUILDING.md | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index c4830d056d..0095bf9131 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -46,11 +46,11 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst #### Arch Linux - sudo pacman -S glew openal cmake vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl3 sndio jack2 base-devel + sudo pacman -S glew openal cmake ninja vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl3 sndio jack2 base-devel #### Debian & Ubuntu - sudo apt-get install build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl3-3.2 libsdl3-dev libjack-dev libsndio-dev + sudo apt-get install build-essential ninja-build libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl3-3.2 libsdl3-dev libjack-dev libsndio-dev Ubuntu is usually horrendously out of date, and some packages need to be downloaded by hand. This part is for Qt, GCC, Vulkan, and CMake @@ -67,7 +67,7 @@ sudo apt-get update sudo apt-get install gcc-13 g++-13 ``` -You can either use `update-alternatives` to setup `gcc-13`/`g++-13` as your default compilers or prefix any `cmake` command by `CXX=g++-13 CC=gcc-13 ` to use it. +You can either use `update-alternatives` to setup `gcc-13`/`g++-13` as your default compilers or prefix the `cmake` build file generation command by `CXX=g++-13 CC=gcc-13` to use it. ##### Vulkan SDK @@ -94,19 +94,21 @@ sudo apt-get install cmake #### Fedora - sudo dnf install alsa-lib-devel cmake glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt6-qtbase-devel qt6-qtbase-private-devel vulkan-devel pipewire-jack-audio-connection-kit-devel qt6-qtmultimedia-devel qt6-qtsvg-devel + sudo dnf install alsa-lib-devel cmake ninja-build glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt6-qtbase-devel qt6-qtbase-private-devel vulkan-devel pipewire-jack-audio-connection-kit-devel qt6-qtmultimedia-devel qt6-qtsvg-devel llvm-devel #### OpenSUSE - sudo zypper install git cmake libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt6-qtbase-devel libqt6-qtmultimedia-devel libqt6-qtsvg-devel libQt6Gui-private-headers-devel libevdev-devel libsndio7_1 libjack-devel + sudo zypper install git cmake ninja libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt6-qtbase-devel libqt6-qtmultimedia-devel libqt6-qtsvg-devel libQt6Gui-private-headers-devel libevdev-devel libsndio7_1 libjack-devel ## Setup the project Clone and initialize the repository -``` -git clone https://github.com/RPCS3/rpcs3.git +```bash +git clone --recurse-submodules https://github.com/RPCS3/rpcs3.git cd rpcs3 +# This is automatically done by `git clone --recurse-submodules`, +# but in case you forgot it, you can manually fetch submodules this way: git submodule update --init ``` @@ -181,11 +183,11 @@ In case you preferred to install and use the standalone **CMake** tool: While still in the project root: -1) `cd .. && mkdir --parents rpcs3_build && cd rpcs3_build` -2) `cmake ../rpcs3/ && make` or `CXX=g++-13 CC=gcc-13 cmake ../rpcs3/ && make` to force these compilers -3) run RPCS3 with `./bin/rpcs3` +1) `cmake -B build -G Ninja` to generate build files with the default compiler (override the compiler by prepending e.g. `CC=clang CXX=clang++`) +2) `cmake --build build` to compile +3) run RPCS3 with `build/bin/rpcs3` -If compiling for ARM, pass the flag `-DUSE_NATIVE_INSTRUCTIONS=OFF` to the cmake command. This resolves some Neon errors when compiling our SIMD headers. +If compiling for ARM, pass the flag `-DUSE_NATIVE_INSTRUCTIONS=OFF` to the first `cmake` command. This resolves some NEON errors when compiling our SIMD headers. When using GDB, configure it to ignore SIGSEGV signal (`handle SIGSEGV nostop noprint`). If desired, use the various build options in [CMakeLists](https://github.com/RPCS3/rpcs3/blob/master/CMakeLists.txt). From 1a51ce1e6665218cac64816cb308d8b9477d534d Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 17 Mar 2025 19:00:55 +0100 Subject: [PATCH 132/529] SPU: Add Disable SPU GETLLAR Spin Optimization checkbox --- rpcs3/Emu/Cell/SPUThread.cpp | 14 +++---- rpcs3/Emu/system_config.h | 3 +- rpcs3/rpcs3qt/emu_settings_type.h | 2 + rpcs3/rpcs3qt/settings_dialog.cpp | 3 ++ rpcs3/rpcs3qt/settings_dialog.ui | 69 +++++++++++++++++-------------- rpcs3/rpcs3qt/tooltips.h | 1 + 6 files changed, 52 insertions(+), 40 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 4248fb84f1..faf78babb3 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -4615,15 +4615,15 @@ bool spu_thread::process_mfc_cmd() if (getllar_busy_waiting_switch == umax && getllar_spin_count == 4) { - const u32 percent = g_cfg.core.spu_getllar_busy_waiting_percentage; - // Hidden value to force busy waiting (100 to 1 are dynamically adjusted, 0 is not) - if (percent != 101) + if (!g_cfg.core.spu_getllar_spin_optimization_disabled) { + const u32 percent = g_cfg.core.spu_getllar_busy_waiting_percentage; + // Predict whether or not to use operating system sleep based on history auto& stats = getllar_wait_time[(addr % SPU_LS_SIZE) / 128]; - const auto old_stats = stats; + const std::array old_stats = stats; std::array new_stats{}; // Rotate history (prepare newest entry) @@ -4640,7 +4640,7 @@ bool spu_thread::process_mfc_cmd() for (u8 val : old_stats) { total_wait += val; - zero_count += (val == 0 ? 1 : 0); + if (val == 0) ++zero_count; } // Add to chance if previous wait was long enough @@ -4675,10 +4675,8 @@ bool spu_thread::process_mfc_cmd() // Don't be stubborn, force operating sleep if too much time has passed else if (getllar_busy_waiting_switch == 1 && perf0.get() > getllar_evaluate_time && perf0.get() - getllar_evaluate_time >= 400'000) { - const u32 percent = g_cfg.core.spu_getllar_busy_waiting_percentage; - // Hidden value to force busy waiting - if (percent != 101) + if (!g_cfg.core.spu_getllar_spin_optimization_disabled) { spu_log.trace("SPU wait for 0x%x", addr); getllar_wait_time[(addr % SPU_LS_SIZE) / 128].front() = 1; diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index eeebd7d132..4049a8aa14 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -32,7 +32,8 @@ struct cfg_root : cfg::node cfg::_bool set_daz_and_ftz{ this, "Set DAZ and FTZ", false }; cfg::_enum spu_decoder{ this, "SPU Decoder", spu_decoder_type::llvm }; cfg::uint<0, 100> spu_reservation_busy_waiting_percentage{ this, "SPU Reservation Busy Waiting Percentage", 0, true }; - cfg::uint<0, 101> spu_getllar_busy_waiting_percentage{ this, "SPU GETLLAR Busy Waiting Percentage", 100, true }; + cfg::uint<0, 100> spu_getllar_busy_waiting_percentage{ this, "SPU GETLLAR Busy Waiting Percentage", 100, true }; + cfg::_bool spu_getllar_spin_optimization_disabled{ this, "Disable SPU GETLLAR Spin Optimization", false, true }; cfg::_bool spu_debug{ this, "SPU Debug" }; cfg::_bool mfc_debug{ this, "MFC Debug" }; cfg::_int<0, 6> preferred_spu_threads{ this, "Preferred SPU Threads", 0, true }; // Number of hardware threads dedicated to heavy simultaneous spu tasks diff --git a/rpcs3/rpcs3qt/emu_settings_type.h b/rpcs3/rpcs3qt/emu_settings_type.h index 1bc86e307f..845e21a8d8 100644 --- a/rpcs3/rpcs3qt/emu_settings_type.h +++ b/rpcs3/rpcs3qt/emu_settings_type.h @@ -51,6 +51,7 @@ enum class emu_settings_type AccuratePPUFPCC, MaxPreemptCount, SPUProfiler, + DisableSpinOptimization, // Graphics Renderer, @@ -248,6 +249,7 @@ inline static const std::map settings_location { emu_settings_type::AccuratePPUFPCC, { "Core", "PPU Set FPCC Bits"}}, { emu_settings_type::MaxPreemptCount, { "Core", "Max CPU Preempt Count"}}, { emu_settings_type::SPUProfiler, { "Core", "SPU Profiler"}}, + { emu_settings_type::DisableSpinOptimization, { "Core", "Disable SPU GETLLAR Spin Optimization"}}, // Graphics Tab { emu_settings_type::Renderer, { "Video", "Renderer"}}, diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 3297bc2dc9..1d275bb498 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1585,6 +1585,9 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceCheckBox(ui->disableAsyncHostMM, emu_settings_type::DisableAsyncHostMM); SubscribeTooltip(ui->disableAsyncHostMM, tooltips.settings.disable_async_host_mm); + m_emu_settings->EnhanceCheckBox(ui->disableSpinOptimization, emu_settings_type::DisableSpinOptimization); + SubscribeTooltip(ui->disableSpinOptimization, tooltips.settings.disable_spin_optimization); + // Comboboxes m_emu_settings->EnhanceComboBox(ui->maxSPURSThreads, emu_settings_type::MaxSPURSThreads, true); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index bdc51566d9..08a453d1f6 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -265,7 +265,7 @@ - + @@ -2422,6 +2422,13 @@ + + + + Disable SPU GETLLAR Spin Optimization + + + @@ -4242,16 +4249,16 @@ - - Disable Asynchronous Memory Manager - + + Disable Asynchronous Memory Manager + - - Disable On-Disk Shader Cache - + + Disable On-Disk Shader Cache + @@ -4365,16 +4372,16 @@ - - PPU Vector NaN Fixup - + + PPU Vector NaN Fixup + - - SPU Profiler - + + SPU Profiler + @@ -4398,7 +4405,7 @@ - + 0 @@ -4459,23 +4466,23 @@ - - - - 0 - 0 - - - - Vulkan Queue Scheduler - - - - - - - - + + + + 0 + 0 + + + + Vulkan Queue Scheduler + + + + + + + + diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index 4e5de9d619..83eb96ddf6 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -41,6 +41,7 @@ public: const QString force_hw_MSAA = tr("Forces MSAA to use the host GPU's resolve capabilities for all sampling operations.\nThis option incurs a performance penalty as well as the risk of visual artifacts but can yield crisper visuals when MSAA is enabled."); const QString disable_vertex_cache = tr("Disables the vertex cache.\nMight resolve missing or flickering graphics output.\nMay degrade performance."); const QString disable_async_host_mm = tr("Force host memory management calls to be inlined instead of handled asynchronously.\nThis can cause severe performance degradation and stuttering in some games.\nThis option is only needed by developers to debug problems with texture cache memory protection."); + const QString disable_spin_optimization = tr("Disable SPU GETLLAR spin optimization.\nThis can cause severe performance degradation and stuttering in many games.\nThis option is only needed for a select number of games."); const QString zcull_operation_mode = tr("Changes ZCULL report synchronization behaviour. Experiment to find the best option for your game. Approximate mode is recommended for most games.\n· Precise is the most accurate to PS3 behaviour. Required for accurate visuals in some titles such as Demon's Souls and The Darkness.\n· Approximate is a much faster way to generate occlusion data which may not always match what the PS3 would generate. Works well with most PS3 games.\n· Relaxed changes the synchronization method completely and can greatly improve performance in some games or completely break others."); const QString max_spurs_threads = tr("Limits the maximum number of SPURS threads in each thread group.\nMay improve performance in some cases, especially on systems with limited number of hardware threads.\nLimiting the number of threads is likely to cause crashes; it's recommended to keep this at the default value."); const QString sleep_timers_accuracy = tr("Changes the sleep period accuracy.\n'As Host' uses default accuracy of the underlying operating system, while 'All Timers' attempts to improve it.\n'Usleep Only' limits the adjustments to usleep syscall only.\nCan affect performance in unexpected ways."); From 2aba8c639ea1c144246c4af861b9438e26ee1b52 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 00:02:58 +0100 Subject: [PATCH 133/529] Fix typo --- rpcs3/rpcs3qt/debugger_frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index 606b491bf8..f98c7fbdd5 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -1207,7 +1207,7 @@ void debugger_frame::OnSelectSPUDisassembler() } m_spu_disasm_dialog = new QDialog(this); - m_spu_disasm_dialog->setWindowTitle(tr("SPU Disassmebler Properties")); + m_spu_disasm_dialog->setWindowTitle(tr("SPU Disassembler Properties")); // Panels QVBoxLayout* vbox_panel(new QVBoxLayout()); From 971fd4035394df1e1aa2722c95fcd9c81b4927c0 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 00:03:36 +0100 Subject: [PATCH 134/529] Remove some useless translations --- rpcs3/rpcs3qt/cheat_manager.cpp | 4 ++-- rpcs3/rpcs3qt/dimensions_dialog.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/rpcs3qt/cheat_manager.cpp b/rpcs3/rpcs3qt/cheat_manager.cpp index 8f1f1cb049..5724999771 100644 --- a/rpcs3/rpcs3qt/cheat_manager.cpp +++ b/rpcs3/rpcs3qt/cheat_manager.cpp @@ -990,7 +990,7 @@ void cheat_manager_dialog::do_the_search() { for (u32 row = 0; row < size; row++) { - lst_search->insertItem(row, tr("0x%0").arg(offsets_found[row], 1, 16).toUpper()); + lst_search->insertItem(row, QString("0x%0").arg(offsets_found[row], 1, 16).toUpper()); } } @@ -1024,7 +1024,7 @@ void cheat_manager_dialog::update_cheat_list() item_type->setFlags(item_type->flags() & ~Qt::ItemIsEditable); tbl_cheats->setItem(row, cheat_table_columns::type, item_type); - QTableWidgetItem* item_offset = new QTableWidgetItem(tr("0x%1").arg(offset.second.offset, 1, 16).toUpper()); + QTableWidgetItem* item_offset = new QTableWidgetItem(QString("0x%0").arg(offset.second.offset, 1, 16).toUpper()); item_offset->setData(Qt::UserRole, QVariant(offset.second.offset)); item_offset->setFlags(item_offset->flags() & ~Qt::ItemIsEditable); tbl_cheats->setItem(row, cheat_table_columns::offset, item_offset); diff --git a/rpcs3/rpcs3qt/dimensions_dialog.cpp b/rpcs3/rpcs3qt/dimensions_dialog.cpp index 378f887f22..a6eb07018e 100644 --- a/rpcs3/rpcs3qt/dimensions_dialog.cpp +++ b/rpcs3/rpcs3qt/dimensions_dialog.cpp @@ -773,7 +773,7 @@ void dimensions_dialog::load_figure_path(u8 pad, u8 index, const QString& path) } else { - m_edit_figures[index]->setText(tr("Blank Tag")); + m_edit_figures[index]->setText("Blank Tag"); } } } From 24b6b6cad5f917805525163770b20f3cab077b46 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 00:04:54 +0100 Subject: [PATCH 135/529] Qt: fix handler not found in pad settings after changing language --- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 37 ++++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 1522e89858..0eeda510e2 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -27,7 +27,6 @@ LOG_CHANNEL(cfg_log, "CFG"); inline std::string sstr(const QString& _in) { return _in.toStdString(); } -constexpr auto qstr = QString::fromStdString; cfg_input_configurations g_cfg_input_configs; @@ -77,7 +76,7 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr gui_setti if (game) { m_title_id = game->serial; - setWindowTitle(tr("Gamepad Settings: [%0] %1").arg(qstr(game->serial)).arg(qstr(game->name).simplified())); + setWindowTitle(tr("Gamepad Settings: [%0] %1").arg(QString::fromStdString(game->serial)).arg(QString::fromStdString(game->name).simplified())); } else { @@ -89,13 +88,13 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr gui_setti if (m_title_id.empty()) { - const QString input_config_dir = qstr(rpcs3::utils::get_input_config_dir(m_title_id)); + const QString input_config_dir = QString::fromStdString(rpcs3::utils::get_input_config_dir(m_title_id)); QStringList config_files = gui::utils::get_dir_entries(QDir(input_config_dir), QStringList() << "*.yml"); - QString active_config_file = qstr(g_cfg_input_configs.active_configs.get_value(g_cfg_input_configs.global_key)); + QString active_config_file = QString::fromStdString(g_cfg_input_configs.active_configs.get_value(g_cfg_input_configs.global_key)); if (!config_files.contains(active_config_file)) { - const QString default_config_file = qstr(g_cfg_input_configs.default_config); + const QString default_config_file = QString::fromStdString(g_cfg_input_configs.default_config); if (!config_files.contains(default_config_file) && CreateConfigFile(input_config_dir, default_config_file)) { @@ -114,7 +113,7 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr gui_setti } else { - ui->chooseConfig->addItem(qstr(m_title_id)); + ui->chooseConfig->addItem(QString::fromStdString(m_title_id)); ui->gb_config_files->setEnabled(false); } @@ -673,7 +672,7 @@ void pad_settings_dialog::ReloadButtons() auto updateButton = [this](int id, QPushButton* button, cfg::string* cfg_text) { - const QString text = qstr(*cfg_text); + const QString text = QString::fromStdString(*cfg_text); m_cfg_entries.insert(std::make_pair(id, pad_button{cfg_text, *cfg_text, text})); button->setText(text); }; @@ -1228,7 +1227,7 @@ void pad_settings_dialog::UpdateLabels(bool is_reset) if (is_reset) { button.keys = *button.cfg_text; - button.text = qstr(button.keys); + button.text = QString::fromStdString(button.keys); } // The button has to contain at least one character, because it would be square'ish otherwise @@ -1493,7 +1492,7 @@ void pad_settings_dialog::ChangeHandler() case pad_handler::skateboard: case pad_handler::move: { - const QString name_string = qstr(m_handler->name_string()); + const QString name_string = QString::fromStdString(m_handler->name_string()); for (usz i = 1; i <= m_handler->max_devices(); i++) // Controllers 1-n in GUI { const QString device_name = name_string + QString::number(i); @@ -1628,15 +1627,15 @@ void pad_settings_dialog::ChangeConfig(const QString& config_file) } const u32 player_id = GetPlayerIndex(); - const std::string handler = fmt::format("%s", g_cfg_input.player[player_id]->handler.get()); + const QString q_handler = QString::fromStdString(g_cfg_input.player[player_id]->handler.to_string()); - if (const QString q_handler = qstr(handler); ui->chooseHandler->findText(q_handler) >= 0) + if (const int index = ui->chooseHandler->findData(q_handler); index >= 0) { - ui->chooseHandler->setCurrentText(q_handler); + ui->chooseHandler->setCurrentIndex(index); } else { - cfg_log.error("Handler '%s' not found in handler dropdown.", handler); + cfg_log.error("Handler '%s' not found in handler dropdown.", q_handler); } // Force Refresh @@ -1773,7 +1772,7 @@ void pad_settings_dialog::AddConfigFile() QMessageBox::warning(this, tr("Error"), tr("Please choose a non-existing name")); continue; } - if (CreateConfigFile(qstr(rpcs3::utils::get_input_config_dir(m_title_id)), config_name)) + if (CreateConfigFile(QString::fromStdString(rpcs3::utils::get_input_config_dir(m_title_id)), config_name)) { ui->chooseConfig->addItem(config_name); ui->chooseConfig->setCurrentText(config_name); @@ -1799,12 +1798,12 @@ void pad_settings_dialog::RefreshHandlers() const std::vector str_inputs = g_cfg_input.player[0]->handler.to_list(); for (usz i = 0; i < str_inputs.size(); i++) { - const QString item_data = qstr(str_inputs[i]); + const QString item_data = QString::fromStdString(str_inputs[i]); ui->chooseHandler->addItem(GetLocalizedPadHandler(item_data, static_cast(i)), QVariant(item_data)); } - const auto& handler = g_cfg_input.player[player_id]->handler; - ui->chooseHandler->setCurrentText(GetLocalizedPadHandler(qstr(handler.to_string()), handler)); + const QString item_data = QString::fromStdString(g_cfg_input.player[player_id]->handler.to_string()); + ui->chooseHandler->setCurrentIndex(ui->chooseHandler->findData(QVariant(item_data))); } ui->chooseHandler->blockSignals(false); @@ -1932,7 +1931,9 @@ void pad_settings_dialog::SaveExit() m_gui_settings->ShowConfirmationBox( tr("Warning!"), tr("The %0 button %1 of Player %2 was assigned at least twice.
Please consider adjusting the configuration.

Continue anyway?
") - .arg(qstr(g_cfg_input.player[player_id]->handler.to_string())).arg(qstr(key)).arg(player_id + 1), + .arg(QString::fromStdString(g_cfg_input.player[player_id]->handler.to_string())) + .arg(QString::fromStdString(key)) + .arg(player_id + 1), gui::ib_same_buttons, &result, this); if (result == QMessageBox::No) From 806c9230cd53895a4df4c8259d678ce3ca3ad695 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 01:06:16 +0100 Subject: [PATCH 136/529] Fix typo --- rpcs3/rpcs3qt/log_frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp index d01bd1bf4f..50ddb13f1c 100644 --- a/rpcs3/rpcs3qt/log_frame.cpp +++ b/rpcs3/rpcs3qt/log_frame.cpp @@ -360,7 +360,7 @@ void log_frame::CreateAndConnectActions() m_perform_goto_on_debugger->setEnabled(m_log->textCursor().hasSelection() && *goto_signal_accepted); m_perform_goto_thread_on_debugger->setEnabled(m_log->textCursor().hasSelection() && *goto_signal_accepted); m_perform_goto_on_debugger->setToolTip(tr("Jump to the selected hexadecimal address from the log text on the debugger.")); - m_perform_goto_thread_on_debugger->setToolTip(tr("Show the thread that corresponds to the thread ID from lthe log text on the debugger.")); + m_perform_goto_thread_on_debugger->setToolTip(tr("Show the thread that corresponds to the thread ID from the log text on the debugger.")); menu->addSeparator(); menu->addActions(m_log_level_acts->actions()); From 8f3eff293d18ac4ff9650a73accb106bd5eeb95a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 01:48:58 +0100 Subject: [PATCH 137/529] Remove unnecessary localization --- rpcs3/rpcs3qt/main_window.cpp | 2 +- rpcs3/rpcs3qt/memory_viewer_panel.cpp | 2 +- rpcs3/rpcs3qt/patch_manager_dialog.cpp | 4 ++-- rpcs3/rpcs3qt/pkg_install_dialog.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 42301d2f42..57e8c76a87 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -917,7 +917,7 @@ bool main_window::InstallPackages(QStringList file_paths, bool from_boot) if (!info.changelog.isEmpty()) { mb.setInformativeText(tr("To see the changelog, please click \"Show Details\".")); - mb.setDetailedText(tr("%0").arg(info.changelog)); + mb.setDetailedText(info.changelog); // Smartass hack to make the unresizeable message box wide enough for the changelog const int log_width = QLabel(info.changelog).sizeHint().width(); diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp index c1ae7a0a0e..bd8fc91727 100644 --- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp +++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp @@ -119,7 +119,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptrsetInformativeText(tr("To see the error log, please click \"Show Details\".")); - mb->setDetailedText(tr("%0").arg(summary)); + mb->setDetailedText(summary); mb->setAttribute(Qt::WA_DeleteOnClose); // Smartass hack to make the unresizeable message box wide enough for the changelog @@ -1304,7 +1304,7 @@ bool patch_manager_dialog::handle_json(const QByteArray& data) QString message = tr("Errors were found in the downloaded patch file."); QMessageBox* mb = new QMessageBox(QMessageBox::Icon::Critical, tr("Validation failed"), message, QMessageBox::Ok, this); mb->setInformativeText(tr("To see the error log, please click \"Show Details\".")); - mb->setDetailedText(tr("%0").arg(summary)); + mb->setDetailedText(summary); mb->setAttribute(Qt::WA_DeleteOnClose); // Smartass hack to make the unresizeable message box wide enough for the changelog diff --git a/rpcs3/rpcs3qt/pkg_install_dialog.cpp b/rpcs3/rpcs3qt/pkg_install_dialog.cpp index 185bf4d6fc..11431b2ad4 100644 --- a/rpcs3/rpcs3qt/pkg_install_dialog.cpp +++ b/rpcs3/rpcs3qt/pkg_install_dialog.cpp @@ -68,7 +68,7 @@ pkg_install_dialog::pkg_install_dialog(const QStringList& paths, game_compatibil else if (!info.local_cat.isEmpty()) { append_comma(); - accumulated_info += tr("%0", "Package type info").arg(info.local_cat); + accumulated_info += info.local_cat; } if (!info.version.isEmpty()) From ccecd1a627b807b2bb6c3976ac1a1d1e48ca8b63 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 03:01:58 +0100 Subject: [PATCH 138/529] Qt: only show shortcut confirmation once --- rpcs3/rpcs3qt/game_list_frame.cpp | 172 ++++++++++++++++-------------- rpcs3/rpcs3qt/game_list_frame.h | 2 +- rpcs3/rpcs3qt/main_window.cpp | 16 ++- 3 files changed, 108 insertions(+), 82 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index b46ef985dd..b9d7da471c 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -1031,108 +1031,120 @@ void game_list_frame::ItemSelectionChangedSlot() Q_EMIT NotifyGameSelection(game); } -void game_list_frame::CreateShortcuts(const game_info& gameinfo, const std::set& locations) +void game_list_frame::CreateShortcuts(const std::vector& games, const std::set& locations) { - if (locations.empty()) + if (games.empty()) { - game_list_log.error("Failed to create shortcuts for %s. No locations selected.", qstr(gameinfo->info.name).simplified()); + game_list_log.notice("Skip creating shortcuts. No games selected."); return; } - std::string gameid_token_value; - - const std::string dev_flash = g_cfg_vfs.get_dev_flash(); - - if (gameinfo->info.category == "DG" && !fs::is_file(rpcs3::utils::get_hdd0_dir() + "/game/" + gameinfo->info.serial + "/USRDIR/EBOOT.BIN")) + if (locations.empty()) { - const usz ps3_game_dir_pos = fs::get_parent_dir(gameinfo->info.path).size(); - std::string relative_boot_dir = gameinfo->info.path.substr(ps3_game_dir_pos); - - if (usz char_pos = relative_boot_dir.find_first_not_of(fs::delim); char_pos != umax) - { - relative_boot_dir = relative_boot_dir.substr(char_pos); - } - else - { - relative_boot_dir.clear(); - } - - if (!relative_boot_dir.empty()) - { - if (relative_boot_dir != "PS3_GAME") - { - gameid_token_value = gameinfo->info.serial + "/" + relative_boot_dir; - } - else - { - gameid_token_value = gameinfo->info.serial; - } - } - } - else - { - gameid_token_value = gameinfo->info.serial; - } - -#ifdef __linux__ - const std::string target_cli_args = gameinfo->info.path.starts_with(dev_flash) ? fmt::format("--no-gui \"%%%%RPCS3_VFS%%%%:dev_flash/%s\"", gameinfo->info.path.substr(dev_flash.size())) - : fmt::format("--no-gui \"%%%%RPCS3_GAMEID%%%%:%s\"", gameid_token_value); -#else - const std::string target_cli_args = gameinfo->info.path.starts_with(dev_flash) ? fmt::format("--no-gui \"%%RPCS3_VFS%%:dev_flash/%s\"", gameinfo->info.path.substr(dev_flash.size())) - : fmt::format("--no-gui \"%%RPCS3_GAMEID%%:%s\"", gameid_token_value); -#endif - const std::string target_icon_dir = fmt::format("%sIcons/game_icons/%s/", fs::get_config_dir(), gameinfo->info.serial); - - if (!fs::create_path(target_icon_dir)) - { - game_list_log.error("Failed to create shortcut path %s (%s)", qstr(gameinfo->info.name).simplified(), target_icon_dir, fs::g_tls_error); + game_list_log.error("Failed to create shortcuts. No locations selected."); return; } bool success = true; - for (const gui::utils::shortcut_location& location : locations) + for (const game_info& gameinfo : games) { - std::string destination; + std::string gameid_token_value; - switch (location) - { - case gui::utils::shortcut_location::desktop: - destination = "desktop"; - break; - case gui::utils::shortcut_location::applications: - destination = "application menu"; - break; -#ifdef _WIN32 - case gui::utils::shortcut_location::rpcs3_shortcuts: - destination = "/games/shortcuts/"; - break; -#endif - } + const std::string dev_flash = g_cfg_vfs.get_dev_flash(); - if (!gameid_token_value.empty() && gui::utils::create_shortcut(gameinfo->info.name, gameinfo->info.serial, target_cli_args, gameinfo->info.name, gameinfo->info.icon_path, target_icon_dir, location)) + if (gameinfo->info.category == "DG" && !fs::is_file(rpcs3::utils::get_hdd0_dir() + "/game/" + gameinfo->info.serial + "/USRDIR/EBOOT.BIN")) { - game_list_log.success("Created %s shortcut for %s", destination, qstr(gameinfo->info.name).simplified()); + const usz ps3_game_dir_pos = fs::get_parent_dir(gameinfo->info.path).size(); + std::string relative_boot_dir = gameinfo->info.path.substr(ps3_game_dir_pos); + + if (usz char_pos = relative_boot_dir.find_first_not_of(fs::delim); char_pos != umax) + { + relative_boot_dir = relative_boot_dir.substr(char_pos); + } + else + { + relative_boot_dir.clear(); + } + + if (!relative_boot_dir.empty()) + { + if (relative_boot_dir != "PS3_GAME") + { + gameid_token_value = gameinfo->info.serial + "/" + relative_boot_dir; + } + else + { + gameid_token_value = gameinfo->info.serial; + } + } } else { - game_list_log.error("Failed to create %s shortcut for %s", destination, qstr(gameinfo->info.name).simplified()); + gameid_token_value = gameinfo->info.serial; + } + +#ifdef __linux__ + const std::string target_cli_args = gameinfo->info.path.starts_with(dev_flash) ? fmt::format("--no-gui \"%%%%RPCS3_VFS%%%%:dev_flash/%s\"", gameinfo->info.path.substr(dev_flash.size())) + : fmt::format("--no-gui \"%%%%RPCS3_GAMEID%%%%:%s\"", gameid_token_value); +#else + const std::string target_cli_args = gameinfo->info.path.starts_with(dev_flash) ? fmt::format("--no-gui \"%%RPCS3_VFS%%:dev_flash/%s\"", gameinfo->info.path.substr(dev_flash.size())) + : fmt::format("--no-gui \"%%RPCS3_GAMEID%%:%s\"", gameid_token_value); +#endif + const std::string target_icon_dir = fmt::format("%sIcons/game_icons/%s/", fs::get_config_dir(), gameinfo->info.serial); + + if (!fs::create_path(target_icon_dir)) + { + game_list_log.error("Failed to create shortcut path %s (%s)", qstr(gameinfo->info.name).simplified(), target_icon_dir, fs::g_tls_error); success = false; + continue; + } + + for (const gui::utils::shortcut_location& location : locations) + { + std::string destination; + + switch (location) + { + case gui::utils::shortcut_location::desktop: + destination = "desktop"; + break; + case gui::utils::shortcut_location::applications: + destination = "application menu"; + break; +#ifdef _WIN32 + case gui::utils::shortcut_location::rpcs3_shortcuts: + destination = "/games/shortcuts/"; + break; +#endif + } + + if (!gameid_token_value.empty() && gui::utils::create_shortcut(gameinfo->info.name, gameinfo->info.serial, target_cli_args, gameinfo->info.name, gameinfo->info.icon_path, target_icon_dir, location)) + { + game_list_log.success("Created %s shortcut for %s", destination, qstr(gameinfo->info.name).simplified()); + } + else + { + game_list_log.error("Failed to create %s shortcut for %s", destination, qstr(gameinfo->info.name).simplified()); + success = false; + } } } #ifdef _WIN32 - if (locations.size() > 1 || !locations.contains(gui::utils::shortcut_location::rpcs3_shortcuts)) -#endif + if (locations.size() == 1 && locations.contains(gui::utils::shortcut_location::rpcs3_shortcuts)) { - if (success) - { - QMessageBox::information(this, tr("Success!"), tr("Successfully created shortcut(s).")); - } - else - { - QMessageBox::warning(this, tr("Warning!"), tr("Failed to create shortcut(s)!")); - } + return; + } +#endif + + if (success) + { + QMessageBox::information(this, tr("Success!"), tr("Successfully created shortcut(s).")); + } + else + { + QMessageBox::warning(this, tr("Warning!"), tr("Failed to create one or more shortcuts!")); } } @@ -1378,7 +1390,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) QAction* create_desktop_shortcut = manage_game_menu->addAction(tr("&Create Desktop Shortcut")); connect(create_desktop_shortcut, &QAction::triggered, this, [this, gameinfo]() { - CreateShortcuts(gameinfo, {gui::utils::shortcut_location::desktop}); + CreateShortcuts({gameinfo}, {gui::utils::shortcut_location::desktop}); }); #ifdef _WIN32 QAction* create_start_menu_shortcut = manage_game_menu->addAction(tr("&Create Start Menu Shortcut")); @@ -1389,7 +1401,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) #endif connect(create_start_menu_shortcut, &QAction::triggered, this, [this, gameinfo]() { - CreateShortcuts(gameinfo, {gui::utils::shortcut_location::applications}); + CreateShortcuts({gameinfo}, {gui::utils::shortcut_location::applications}); }); manage_game_menu->addSeparator(); diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h index bbef37e377..7282f1b745 100644 --- a/rpcs3/rpcs3qt/game_list_frame.h +++ b/rpcs3/rpcs3qt/game_list_frame.h @@ -59,7 +59,7 @@ public: const std::vector& GetGameInfo() const; - void CreateShortcuts(const game_info& gameinfo, const std::set& locations); + void CreateShortcuts(const std::vector& games, const std::set& locations); bool IsEntryVisible(const game_info& game, bool search_fallback = false) const; diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 57e8c76a87..47c6a5be68 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -2497,7 +2497,13 @@ void main_window::ShowOptionalGamePreparations(const QString& title, const QStri locations.insert(gui::utils::shortcut_location::applications); } + if (locations.empty() && !create_caches) + { + return; + } + std::vector game_data; + std::vector game_data_shortcuts; for (const auto& [boot_path, title_id] : paths) { @@ -2507,7 +2513,10 @@ void main_window::ShowOptionalGamePreparations(const QString& title, const QStri { if (Emu.IsPathInsideDir(boot_path, gameinfo->info.path)) { - m_game_list_frame->CreateShortcuts(gameinfo, locations); + if (!locations.empty()) + { + game_data_shortcuts.push_back(gameinfo); + } if (create_caches) { @@ -2519,6 +2528,11 @@ void main_window::ShowOptionalGamePreparations(const QString& title, const QStri } } } + + if (!game_data_shortcuts.empty() && !locations.empty()) + { + m_game_list_frame->CreateShortcuts(game_data_shortcuts, locations); + } if (!game_data.empty()) { From 76495f07b8ab840d2ebf9a4588824ee55714d169 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 03:42:15 +0100 Subject: [PATCH 139/529] Qt: Remove supporters from translations --- rpcs3/rpcs3qt/about_dialog.cpp | 2 +- rpcs3/rpcs3qt/about_dialog.ui | 164 ++++++++++++++++++++++----------- 2 files changed, 111 insertions(+), 55 deletions(-) diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3qt/about_dialog.cpp index 8b5eecef13..095c65dc8d 100644 --- a/rpcs3/rpcs3qt/about_dialog.cpp +++ b/rpcs3/rpcs3qt/about_dialog.cpp @@ -18,7 +18,7 @@ about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_ ui->version->setText(tr("RPCS3 Version: %1").arg(QString::fromStdString(rpcs3::get_verbose_version()))); ui->description->setText(gui::utils::make_paragraph(tr( "RPCS3 is an open-source Sony PlayStation 3 emulator and debugger.\n" - "It is written in C++ for Windows, Linux, FreeBSD and MacOS funded with %0.\n" + "It is written in C++ for Windows, Linux, FreeBSD and MacOS, funded with %0.\n" "Our developers and contributors are always working hard to ensure this project is the best that it can be.\n" "There are still plenty of implementations to make and optimizations to do.") .arg(gui::utils::make_link(tr("Patreon"), "https://rpcs3.net/patreon")))); diff --git a/rpcs3/rpcs3qt/about_dialog.ui b/rpcs3/rpcs3qt/about_dialog.ui index 4c7d841d8a..67bb5762f4 100644 --- a/rpcs3/rpcs3qt/about_dialog.ui +++ b/rpcs3/rpcs3qt/about_dialog.ui @@ -76,10 +76,10 @@ - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -100,7 +100,6 @@ Arial 14 - 50 false @@ -108,10 +107,10 @@ RPCS3 PlayStation 3 Emulator - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop - Qt::TextSelectableByMouse + Qt::TextInteractionFlag::TextSelectableByMouse @@ -124,10 +123,10 @@ - Qt::RichText + Qt::TextFormat::RichText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop false @@ -136,7 +135,7 @@ true - Qt::TextBrowserInteraction + Qt::TextInteractionFlag::TextBrowserInteraction @@ -152,16 +151,16 @@ - Qt::RichText + Qt::TextFormat::RichText - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop true - Qt::TextBrowserInteraction + Qt::TextInteractionFlag::TextBrowserInteraction @@ -185,13 +184,13 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame - Qt::ScrollBarAlwaysOn + Qt::ScrollBarPolicy::ScrollBarAlwaysOn - QAbstractScrollArea::AdjustToContents + QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents true @@ -201,50 +200,105 @@ 0 0 - 788 - 2076 + 793 + 2638 - QLayout::SetMinimumSize + QLayout::SizeConstraint::SetMinimumSize 24 - - - <p><b>Developers:</b><br><br>¬DH<br>¬AlexAltea<br>¬Hykem<br>¬Oil<br>Nekotekina<br>¬Bigpet<br>¬gopalsr83<br>¬tambry<br>¬vlj<br>kd-11<br>¬jarveson<br>¬raven02<br>AniLeo<br>¬cornytrace<br>¬ssshadow<br>¬Numan<br>hcorion<br>Megamouse<br>¬flash-fire<br>DAGINATSUKO<br>GalCiv<br>eladash</p> + + + 10 - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - Qt::TextSelectableByMouse - - + + + + + true + + + + Developers: + + + + + + + <p>¬DH<br>¬AlexAltea<br>¬Hykem<br>¬Oil<br>Nekotekina<br>¬Bigpet<br>¬gopalsr83<br>¬tambry<br>¬vlj<br>kd-11<br>¬jarveson<br>¬raven02<br>AniLeo<br>¬cornytrace<br>¬ssshadow<br>¬Numan<br>hcorion<br>Megamouse<br>¬flash-fire<br>DAGINATSUKO<br>GalCiv<br>eladash</p> + + + false + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + Qt::TextInteractionFlag::TextSelectableByMouse + + + + - - - <p><b>Contributors:</b><br><br>BlackDaemon<br>elisha464<br>Aishou<br>krofna<br>xsacha<br>danilaml<br>unknownbrackets<br>Zangetsu38<br>lioncash<br>achurch<br>darkf<br>Syphurith<br>Blaypeg<br>Survanium90<br>georgemoralis<br>ikki84<br>scribam<br>TGE<br>velocity<br>Farseer<br>Dangles<br>ruipin<br>jbeich<br>CookiePLMonster<br>Whatcookie<br>rajkosto<br>Admiral Thrawn<br>FlexBy<br>Dunastique<br>Jonathan44062<br>yurinator557<br>Satan<br>HoldTheMourning<br>illusion0001</p> + + + 10 - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - Qt::TextSelectableByMouse - - + + + + + true + + + + Contributors: + + + + + + + <p>BlackDaemon<br>elisha464<br>Aishou<br>krofna<br>xsacha<br>danilaml<br>unknownbrackets<br>Zangetsu38<br>lioncash<br>achurch<br>darkf<br>Syphurith<br>Blaypeg<br>Survanium90<br>georgemoralis<br>ikki84<br>scribam<br>TGE<br>velocity<br>Farseer<br>Dangles<br>ruipin<br>jbeich<br>CookiePLMonster<br>Whatcookie<br>rajkosto<br>Admiral Thrawn<br>FlexBy<br>Dunastique<br>Jonathan44062<br>yurinator557<br>Satan<br>HoldTheMourning<br>illusion0001</p> + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + Qt::TextInteractionFlag::TextSelectableByMouse + + + + - - - <p><b>Supporters:</b><br><br>Howard Garrison<br>EXPotemkin<br>Marko V.<br>danhp<br>Jake (5315825)<br>Ian Reid<br>Tad Sherlock<br>Tyler Friesen<br>Folzar<br>Payton Williams<br>RedPill Australia<br>yanghong<br>Mohammed El-Serougi<br>Дима ~Ximer13~ Кулин<br>James Reed<br>BaroqueSonata<br>Bonzay0<br>Henrijs Kons<br>eoiz<br>Lena Stöffler<br>Michael Holder<br>Max Bosse<br>Tyler Whisinnand<br>Gato Harvey<br>cain4355<br>Thomas Peltier<br>Loli Co.<br>MapleLoonie<br>Travis McEwen<br>Scott Singratsomboune<br>T.E<br>Lukas Rieger<br>Dane Madsen<br>JMS<br>Jonatan R<br>Luke Johnson<br>Thomas Zaorski<br>MyOwnFan<br>Alexandros Mandravillis<br>Socker Bopper<br>Faris Leonhart<br>Fabien Net<br>Raves<br>Barrowsx<br>kilsuton<br>Max Mason<br>Ethan Condon<br>jfidone<br>iaDRM<br>Kazer2.0<br>Bryce Quintin<br>Yuri Kunde Schlesner<br>Abdulla Altayer<br>Nicolas Jallamion<br>Vorvek<br>Ian Faddis<br>Leon<br>Mohammad Taleb<br>Jokez<br>crashX<br>Raveskirza<br>Grant Deacon<br>michael<br>David Zech<br>Ben Manoochehri<br>Adnan Kovacevic<br>Mighty J<br>Sam Shan Jiang<br>TheAnig<br>Rodney Coleman<br>FiniteAce<br>Kian Soon Alex Chiam<br>yukkuri<br>Justin Chadwick<br>toxic Itzi<br>Templerror<br>Myles Wesley Carlson<br>Max Bosse<br>Ethan Clark<br>LupineDream<br>CheatCodesOfLife<br>Jan Zykmund<br>Francesco Cinquemani<br>Andylg<br>Julia H de Camargos<br>Suvodip Mitra<br>Goh<br>Dmitry<br>Steel Brain<br>VarieZ<br>William Swango<br>Matthew Messersmith<br>Duane Locsin<br>Shuddertrix<br>Loweys Litsman<br>Shuddertrix<br>Mason Ferrie<br>Richard Kaplan<br>Hugues Valois<br>richard(lath..ch@)<br>Johnathan (Virtuous John)<br>eoiz<br>Dany Huguenin<br>doobieashtray<br>dean(mag..94@)<br>Pommier Jean-Philippe<br>Douglas Alan Albino<br>Ryan Mull<br>Thor-Erling Engen<br>Nick Carpenter<br>curryking3<br>Jared Tracton<br>alex(koo..oh@)<br>Jason O'Brien<br>Skeletal Charizard<br>Ace00<br>Brandon Corujo<br>HyperBitHero<br>佳文 李<br>sorryboi + + + 10 + + + + + + true + + + + Supporters: + + + + + + + <p>Howard Garrison<br>EXPotemkin<br>Marko V.<br>danhp<br>Jake (5315825)<br>Ian Reid<br>Tad Sherlock<br>Tyler Friesen<br>Folzar<br>Payton Williams<br>RedPill Australia<br>yanghong<br>Mohammed El-Serougi<br>Дима ~Ximer13~ Кулин<br>James Reed<br>BaroqueSonata<br>Bonzay0<br>Henrijs Kons<br>eoiz<br>Lena Stöffler<br>Michael Holder<br>Max Bosse<br>Tyler Whisinnand<br>Gato Harvey<br>cain4355<br>Thomas Peltier<br>Loli Co.<br>MapleLoonie<br>Travis McEwen<br>Scott Singratsomboune<br>T.E<br>Lukas Rieger<br>Dane Madsen<br>JMS<br>Jonatan R<br>Luke Johnson<br>Thomas Zaorski<br>MyOwnFan<br>Alexandros Mandravillis<br>Socker Bopper<br>Faris Leonhart<br>Fabien Net<br>Raves<br>Barrowsx<br>kilsuton<br>Max Mason<br>Ethan Condon<br>jfidone<br>iaDRM<br>Kazer2.0<br>Bryce Quintin<br>Yuri Kunde Schlesner<br>Abdulla Altayer<br>Nicolas Jallamion<br>Vorvek<br>Ian Faddis<br>Leon<br>Mohammad Taleb<br>Jokez<br>crashX<br>Raveskirza<br>Grant Deacon<br>michael<br>David Zech<br>Ben Manoochehri<br>Adnan Kovacevic<br>Mighty J<br>Sam Shan Jiang<br>TheAnig<br>Rodney Coleman<br>FiniteAce<br>Kian Soon Alex Chiam<br>yukkuri<br>Justin Chadwick<br>toxic Itzi<br>Templerror<br>Myles Wesley Carlson<br>Max Bosse<br>Ethan Clark<br>LupineDream<br>CheatCodesOfLife<br>Jan Zykmund<br>Francesco Cinquemani<br>Andylg<br>Julia H de Camargos<br>Suvodip Mitra<br>Goh<br>Dmitry<br>Steel Brain<br>VarieZ<br>William Swango<br>Matthew Messersmith<br>Duane Locsin<br>Shuddertrix<br>Loweys Litsman<br>Shuddertrix<br>Mason Ferrie<br>Richard Kaplan<br>Hugues Valois<br>richard(lath..ch@)<br>Johnathan (Virtuous John)<br>eoiz<br>Dany Huguenin<br>doobieashtray<br>dean(mag..94@)<br>Pommier Jean-Philippe<br>Douglas Alan Albino<br>Ryan Mull<br>Thor-Erling Engen<br>Nick Carpenter<br>curryking3<br>Jared Tracton<br>alex(koo..oh@)<br>Jason O'Brien<br>Skeletal Charizard<br>Ace00<br>Brandon Corujo<br>HyperBitHero<br>佳文 李<br>sorryboi <br>Johnson Bui <br>itachi1986 <br>Mortano @@ -288,22 +342,24 @@ <br>Vekkar <br>Jackson Abney </p> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - Qt::TextSelectableByMouse - - + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + Qt::TextInteractionFlag::TextSelectableByMouse + + + + - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -376,7 +432,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal From 518bfeca3f43236dacba159a5e05edb5241d97b0 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 22:40:41 +0100 Subject: [PATCH 140/529] Update libusb to 1.0.28 --- 3rdparty/libusb/libusb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libusb/libusb b/3rdparty/libusb/libusb index d52e355daa..a61afe5f75 160000 --- a/3rdparty/libusb/libusb +++ b/3rdparty/libusb/libusb @@ -1 +1 @@ -Subproject commit d52e355daa09f17ce64819122cb067b8a2ee0d4b +Subproject commit a61afe5f75d969c4561a1d0ad753aa23cee6329a From cd25e91321829cdb48939b04a7efcf4fe95fadb7 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 19 Mar 2025 20:43:19 +0100 Subject: [PATCH 141/529] VS/MSVC: Enable LTCG and GL on release builds --- buildfiles/msvc/rpcs3_release.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildfiles/msvc/rpcs3_release.props b/buildfiles/msvc/rpcs3_release.props index 378ba797d6..82c8024284 100644 --- a/buildfiles/msvc/rpcs3_release.props +++ b/buildfiles/msvc/rpcs3_release.props @@ -11,10 +11,12 @@ Speed MultiThreaded LLVM_AVAILABLE;%(PreprocessorDefinitions) + true true true + UseLinkTimeCodeGeneration %(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib %(AdditionalDependencies); From 12eacfa67b843036d1f6af10c95aaa45d954b43b Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 18 Mar 2025 23:13:06 +0100 Subject: [PATCH 142/529] overlays: use std::string instead of raw path argument It will be converted to string anyway --- .../FriendsList/overlay_friends_list_dialog.cpp | 2 +- .../Overlays/Trophies/overlay_trophy_list_dialog.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_controls.cpp | 12 ++++++------ rpcs3/Emu/RSX/Overlays/overlay_controls.h | 2 +- rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp index ff6770136b..e0a2d396bb 100644 --- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp @@ -62,7 +62,7 @@ namespace rsx if (fs::exists(avatar_path)) { - icon_data = std::make_unique(avatar_path.c_str()); + icon_data = std::make_unique(avatar_path); static_cast(image.get())->set_raw_image(icon_data.get()); } else diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp index c30a6fe878..bd8acd8446 100644 --- a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp @@ -31,7 +31,7 @@ namespace rsx if (fs::exists(icon_path)) { - icon_data = std::make_unique(icon_path.c_str(), details.hidden || locked); + icon_data = std::make_unique(icon_path, details.hidden || locked); static_cast(image.get())->set_raw_image(icon_data.get()); } else diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp index 3177a76a98..55f1f5dc84 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp @@ -12,7 +12,7 @@ namespace rsx animated_icon::animated_icon(const char* icon_name) { const std::string image_path = fmt::format("%s/Icons/ui/%s", fs::get_config_dir(), icon_name); - m_icon = std::make_unique(image_path.c_str()); + m_icon = std::make_unique(image_path); set_raw_image(m_icon.get()); } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp index db1fc704a8..ca6410e19a 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp @@ -54,7 +54,7 @@ namespace rsx return result; } - image_info::image_info(const char* filename, bool grayscaled) + image_info::image_info(const std::string& filename, bool grayscaled) { fs::file f(filename, fs::read + fs::isfile); @@ -132,7 +132,7 @@ namespace rsx { // First check the global config dir const std::string image_path = fs::get_config_dir() + "Icons/ui/" + res; - auto info = std::make_unique(image_path.c_str()); + auto info = std::make_unique(image_path); #if !defined(_WIN32) && !defined(__APPLE__) && defined(DATADIR) // Check the DATADIR if defined @@ -140,7 +140,7 @@ namespace rsx { const std::string data_dir (DATADIR); const std::string image_data = data_dir + "/Icons/ui/" + res; - info = std::make_unique(image_data.c_str()); + info = std::make_unique(image_data); } #endif @@ -148,7 +148,7 @@ namespace rsx { // Resource was not found in the DATADIR or config dir, try and grab from relative path (linux) std::string src = "Icons/ui/" + res; - info = std::make_unique(src.c_str()); + info = std::make_unique(src); #ifndef _WIN32 // Check for Icons in ../share/rpcs3 for AppImages, // in rpcs3.app/Contents/Resources for App Bundles, and /usr/bin. @@ -188,12 +188,12 @@ namespace rsx #else src = executablePath + "/../share/rpcs3/Icons/ui/" + res; #endif - info = std::make_unique(src.c_str()); + info = std::make_unique(src); // Check if the icons are in the same directory as the executable (local builds) if (info->get_data() == nullptr) { src = executablePath + "/Icons/ui/" + res; - info = std::make_unique(src.c_str()); + info = std::make_unique(src); } } } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index 6fe1b216d7..0229767af8 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -41,7 +41,7 @@ namespace rsx int bpp = 0; image_info(image_info&) = delete; - image_info(const char* filename, bool grayscaled = false); + image_info(const std::string& filename, bool grayscaled = false); image_info(const std::vector& bytes, bool grayscaled = false); ~image_info(); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp index 39d1ee4dba..2cf113243a 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp @@ -58,7 +58,7 @@ namespace rsx } } - icon_data = std::make_unique(entry.info.path.c_str()); + icon_data = std::make_unique(entry.info.path); static_cast(image.get())->set_raw_image(icon_data.get()); } else diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp index a796d62de3..186ac0ee83 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp @@ -17,7 +17,7 @@ namespace rsx if (fs::exists(avatar_path)) { - icon_data = std::make_unique(avatar_path.c_str()); + icon_data = std::make_unique(avatar_path); static_cast(image.get())->set_raw_image(icon_data.get()); } else From b2ff24453c32377d3778e0552253f5a2366c23f4 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 18 Mar 2025 23:16:17 +0100 Subject: [PATCH 143/529] overlays: fix background image logic Also make the path getter more generic --- .../RSX/Overlays/overlay_message_dialog.cpp | 11 +- rpcs3/Emu/System.cpp | 93 ---------- rpcs3/Emu/System.h | 2 - rpcs3/Emu/system_utils.cpp | 167 ++++++++++++++++++ rpcs3/Emu/system_utils.hpp | 11 ++ 5 files changed, 186 insertions(+), 98 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp index 3d8fc99e40..ed30102f2a 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp @@ -3,6 +3,7 @@ #include "overlay_message_dialog.h" #include "Emu/System.h" #include "Emu/system_config.h" +#include "Emu/system_utils.hpp" #include "Emu/Cell/ErrorCodes.h" #include "Emu/IdManager.h" #include "Utilities/Thread.h" @@ -356,10 +357,14 @@ namespace rsx if (!background_image) { - if (const auto picture_path = Emu.GetBackgroundPicturePath(); fs::exists(picture_path)) + for (game_content_type type : { game_content_type::background_picture, game_content_type::content_icon, game_content_type::overlay_picture }) { - background_image = std::make_unique(picture_path.c_str()); - dirty |= !!background_image->get_data(); + if (const std::string picture_path = rpcs3::utils::get_game_content_path(type); fs::is_file(picture_path)) + { + background_image = std::make_unique(picture_path); + dirty |= !!background_image->get_data(); + break; + } } } diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 45d6e33e1d..41ce47c04e 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -753,99 +753,6 @@ void Emulator::SetUsr(const std::string& user) m_usr = user; } -std::string Emulator::GetBackgroundPicturePath() const -{ - // Try to find a custom icon first - std::string path = fs::get_config_dir() + "/Icons/game_icons/" + GetTitleID() + "/PIC1.PNG"; - - if (fs::is_file(path)) - { - return path; - } - - std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME"); - - if (m_sfo_dir == disc_dir) - { - disc_dir.clear(); - } - - constexpr auto search_barrier = "barrier"; - const std::string locale_suffix = fmt::format("_%02d", static_cast(g_cfg.sys.language.get())); - - std::initializer_list testees = - { - m_sfo_dir + fmt::format("/PIC0%s.PNG", locale_suffix), - m_sfo_dir + fmt::format("/PIC1%s.PNG", locale_suffix), - m_sfo_dir + fmt::format("/PIC2%s.PNG", locale_suffix), - m_sfo_dir + fmt::format("/PIC3%s.PNG", locale_suffix), - search_barrier, - m_sfo_dir + "/PIC0.PNG", - m_sfo_dir + "/PIC1.PNG", - m_sfo_dir + "/PIC2.PNG", - m_sfo_dir + "/PIC3.PNG", - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/PIC0%s.PNG", locale_suffix)) : disc_dir, - !disc_dir.empty() ? (disc_dir + fmt::format("/PIC1%s.PNG", locale_suffix)) : disc_dir, - !disc_dir.empty() ? (disc_dir + fmt::format("/PIC2%s.PNG", locale_suffix)) : disc_dir, - !disc_dir.empty() ? (disc_dir + fmt::format("/PIC3%s.PNG", locale_suffix)) : disc_dir, - search_barrier, - !disc_dir.empty() ? (disc_dir + "/PIC0.PNG") : disc_dir, - !disc_dir.empty() ? (disc_dir + "/PIC1.PNG") : disc_dir, - !disc_dir.empty() ? (disc_dir + "/PIC2.PNG") : disc_dir, - !disc_dir.empty() ? (disc_dir + "/PIC3.PNG") : disc_dir, - search_barrier, - m_sfo_dir + fmt::format("/ICON0%s.PNG", locale_suffix), - search_barrier, - m_sfo_dir + "/ICON0.PNG", - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/ICON0%s.PNG", locale_suffix)) : disc_dir, - search_barrier, - !disc_dir.empty() ? (disc_dir + "/ICON0.PNG") : disc_dir, - }; - - // Try to return the picture with the highest resolution - // Be naive and assume that its the one that spans over the most bytes - usz max_file_size = 0; - usz index_of_largest_file = umax; - - for (usz index = 0; index < testees.size(); index++) - { - const std::string& path = testees.begin()[index]; - - fs::stat_t file_stat{}; - - if (path == search_barrier) - { - if (index_of_largest_file != umax) - { - // Found a file in the preferred image group - break; - } - - continue; - } - - if (path.empty() || !fs::get_stat(path, file_stat) || file_stat.is_directory) - { - continue; - } - - if (max_file_size < file_stat.size) - { - max_file_size = file_stat.size; - index_of_largest_file = index; - } - } - - if (index_of_largest_file == umax) - { - return {}; - } - - return testees.begin()[index_of_largest_file]; -} - bool Emulator::BootRsxCapture(const std::string& path) { if (m_state != system_state::stopped || m_restrict_emu_state_change) diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index c3a7815201..738f127922 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -338,8 +338,6 @@ public: void SetUsr(const std::string& user); - std::string GetBackgroundPicturePath() const; - u64 GetPauseTime() const { return m_pause_amend_time; diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp index 2ccb15bd3f..a5b9e42241 100644 --- a/rpcs3/Emu/system_utils.cpp +++ b/rpcs3/Emu/system_utils.cpp @@ -4,6 +4,7 @@ #include "vfs_config.h" #include "Emu/Io/pad_config.h" #include "Emu/System.h" +#include "Emu/VFS.h" #include "util/sysinfo.hpp" #include "Utilities/File.h" #include "Utilities/Thread.h" @@ -338,4 +339,170 @@ namespace rpcs3::utils if (title_id.empty()) return ""; return get_input_config_dir(title_id) + g_cfg_input_configs.default_config + ".yml"; } + + std::string get_game_content_path(game_content_type type) + { + static constexpr auto search_barrier = "barrier"; + + const auto find_content = [](const std::vector& testees) -> std::string + { + // Try to return the content with the highest resolution + // Be naive and assume that its the one that spans over the most bytes + usz max_file_size = 0; + usz index_of_largest_file = umax; + + for (usz index = 0; index < testees.size(); index++) + { + const std::string& path = testees[index]; + if (path.empty()) continue; + + if (path == search_barrier) + { + if (index_of_largest_file != umax) + { + // Found a file in the preferred image group + break; + } + + continue; + } + + fs::stat_t file_stat{}; + + if (!fs::get_stat(path, file_stat) || file_stat.is_directory) + { + continue; + } + + if (max_file_size < file_stat.size) + { + max_file_size = file_stat.size; + index_of_largest_file = index; + } + } + + if (index_of_largest_file < testees.size()) + { + return testees[index_of_largest_file]; + } + + return {}; + }; + + const std::string sfo_dir = Emu.GetSfoDir(false); + std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME"); + + if (sfo_dir == disc_dir) + { + disc_dir.clear(); + } + + const std::string locale_suffix = fmt::format("_%02d", static_cast(g_cfg.sys.language.get())); + + switch (type) + { + case game_content_type::content_icon: // ICON0.PNG + { + const std::vector paths = + { + sfo_dir + fmt::format("/ICON0%s.PNG", locale_suffix), + search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/ICON0%s.PNG", locale_suffix)) : disc_dir, + search_barrier, + sfo_dir + "/ICON0.PNG", + search_barrier, + !disc_dir.empty() ? (disc_dir + "/ICON0.PNG") : disc_dir, + }; + return find_content(paths); + } + case game_content_type::content_icon_video: // ICON1.PAM + { + const std::vector paths = + { + sfo_dir + fmt::format("/ICON1%s.PAM", locale_suffix), + search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/ICON1%s.PAM", locale_suffix)) : disc_dir, + search_barrier, + sfo_dir + "/ICON1.PAM", + search_barrier, + !disc_dir.empty() ? (disc_dir + "/ICON1.PAM") : disc_dir, + }; + return find_content(paths); + } + case game_content_type::content_icon_sound: // SND0.AT3 + { + const std::vector paths = + { + sfo_dir + fmt::format("/SND0%s.AT3", locale_suffix), + search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/SND0%s.AT3", locale_suffix)) : disc_dir, + search_barrier, + sfo_dir + "/SND0.AT3", + search_barrier, + !disc_dir.empty() ? (disc_dir + "/SND0.AT3") : disc_dir, + }; + return find_content(paths); + } + case game_content_type::overlay_picture: // PIC0.PNG (16:9) or PIC2.PNG (4:3) + { + if (g_cfg.video.aspect_ratio == video_aspect::_16_9) + { + const std::vector paths = + { + sfo_dir + fmt::format("/PIC0%s.PNG", locale_suffix), + search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/PIC0%s.PNG", locale_suffix)) : disc_dir, + search_barrier, + sfo_dir + "/PIC0.PNG", + search_barrier, + !disc_dir.empty() ? (disc_dir + "/PIC0.PNG") : disc_dir, + }; + return find_content(paths); + } + + const std::vector paths = + { + sfo_dir + fmt::format("/PIC2%s.PNG", locale_suffix), + search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/PIC2%s.PNG", locale_suffix)) : disc_dir, + search_barrier, + sfo_dir + "/PIC2.PNG", + search_barrier, + !disc_dir.empty() ? (disc_dir + "/PIC2.PNG") : disc_dir, + }; + return find_content(paths); + } + case game_content_type::background_picture: // PIC1.PNG + { + const std::vector paths = + { + // Try to find a custom icon first + fs::get_config_dir() + "/Icons/game_icons/" + Emu.GetTitleID() + "/PIC1.PNG", + search_barrier, + + // Use PIC1.PNG + sfo_dir + fmt::format("/PIC1%s.PNG", locale_suffix), + search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/PIC1%s.PNG", locale_suffix)) : disc_dir, + search_barrier, + sfo_dir + "/PIC1.PNG", + search_barrier, + !disc_dir.empty() ? (disc_dir + "/PIC1.PNG") : disc_dir, + search_barrier, + + // Fallback to PIC3.PNG (should only exist for packages...) + sfo_dir + fmt::format("/PIC3%s.PNG", locale_suffix), + search_barrier, + !disc_dir.empty() ? (disc_dir + fmt::format("/PIC3%s.PNG", locale_suffix)) : disc_dir, + search_barrier, + sfo_dir + "/PIC3.PNG", + search_barrier, + !disc_dir.empty() ? (disc_dir + "/PIC3.PNG") : disc_dir, + }; + return find_content(paths); + } + } + + return {}; + } } diff --git a/rpcs3/Emu/system_utils.hpp b/rpcs3/Emu/system_utils.hpp index fa4af9e008..a706d32f1d 100644 --- a/rpcs3/Emu/system_utils.hpp +++ b/rpcs3/Emu/system_utils.hpp @@ -3,6 +3,15 @@ #include "util/types.hpp" #include +enum class game_content_type +{ + content_icon, + content_icon_video, + content_icon_sound, + overlay_picture, + background_picture, +}; + namespace rpcs3::utils { u32 get_max_threads(); @@ -30,4 +39,6 @@ namespace rpcs3::utils std::string get_input_config_root(); std::string get_input_config_dir(const std::string& title_id = ""); std::string get_custom_input_config_path(const std::string& title_id); + + std::string get_game_content_path(game_content_type type); } From 7cd5d812d224b222de968f92cfd006fd7cfe6343 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 18 Mar 2025 23:16:53 +0100 Subject: [PATCH 144/529] overlays: add background overlay image --- .../RSX/Overlays/overlay_message_dialog.cpp | 35 +++++++++++++++++++ .../Emu/RSX/Overlays/overlay_message_dialog.h | 5 ++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp index ed30102f2a..85dddd2c21 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp @@ -96,6 +96,11 @@ namespace rsx if (background_image && background_image->get_data()) { result.add(background_poster.get_compiled()); + + if (background_overlay_image && background_overlay_image->get_data()) + { + result.add(background_overlay_poster.get_compiled()); + } } result.add(background.get_compiled()); @@ -357,15 +362,27 @@ namespace rsx if (!background_image) { + game_content_type background_content_type = game_content_type::background_picture; + for (game_content_type type : { game_content_type::background_picture, game_content_type::content_icon, game_content_type::overlay_picture }) { if (const std::string picture_path = rpcs3::utils::get_game_content_path(type); fs::is_file(picture_path)) { + background_content_type = type; background_image = std::make_unique(picture_path); dirty |= !!background_image->get_data(); break; } } + + if (background_image && !background_overlay_image && background_content_type == game_content_type::background_picture) + { + if (const std::string picture_path = rpcs3::utils::get_game_content_path(game_content_type::overlay_picture); fs::is_file(picture_path)) + { + background_overlay_image = std::make_unique(picture_path); + dirty |= !!background_overlay_image->get_data(); + } + } } if (dirty && background_image && background_image->get_data()) @@ -393,6 +410,17 @@ namespace rsx const int padding = (background_poster.w - static_cast(background_image->w * (background_poster.h / static_cast(background_image->h)))) / 2; background_poster.set_padding(padding, padding, 0, 0); } + + if (background_overlay_image && background_overlay_image->get_data()) + { + const f32 color = (100 - background_darkening_strength) / 100.f; + background_overlay_poster.fore_color = color4f(color, color, color, 1.); + + background_overlay_poster.set_pos(std::min(virtual_width - background_overlay_image->w, virtual_width * 2 / 3), (virtual_height - background_overlay_image->h) / 2); + background_overlay_poster.set_size(background_overlay_image->w, background_overlay_image->h); + background_overlay_poster.set_raw_image(background_overlay_image.get()); + background_overlay_poster.set_blur_strength(static_cast(background_blur_strength)); + } } } else @@ -402,6 +430,13 @@ namespace rsx background_poster.clear_image(); background_image.reset(); } + + if (background_overlay_image) + { + background_overlay_poster.clear_image(); + background_overlay_image.reset(); + } + background.back_color.a = 0.85f; } } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h index 933510e5c6..171dd80fac 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h @@ -16,8 +16,10 @@ namespace rsx image_button btn_ok; image_button btn_cancel; - overlay_element bottom_bar, background; + overlay_element bottom_bar; + overlay_element background; image_view background_poster; + image_view background_overlay_poster; std::array progress_bars{}; u8 num_progress_bars = 0; s32 taskbar_index = 0; @@ -31,6 +33,7 @@ namespace rsx u32 background_blur_strength = 0; u32 background_darkening_strength = 0; std::unique_ptr background_image; + std::unique_ptr background_overlay_image; animation_color_interpolate fade_animation; From 95aad6ceb5a47d3b6917d52c942d2467f72b0e27 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 19 Mar 2025 20:38:51 +0100 Subject: [PATCH 145/529] overlays: adjust size and position of overlay image --- rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp index 85dddd2c21..c79e84352b 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp @@ -413,11 +413,17 @@ namespace rsx if (background_overlay_image && background_overlay_image->get_data()) { + constexpr f32 reference_factor = 2.0f / 3.0f; + const f32 image_aspect = background_overlay_image->w / static_cast(background_overlay_image->h); + const f32 overlay_width = background_overlay_image->w * reference_factor; + const f32 overlay_height = overlay_width / image_aspect; + const u16 overlay_x = static_cast(std::min(virtual_width - overlay_width, (virtual_width * reference_factor) - (overlay_width / 2.0f))); + const u16 overlay_y = static_cast(std::min(virtual_height - overlay_height, (virtual_height * reference_factor) - (overlay_height / 2.0f))); const f32 color = (100 - background_darkening_strength) / 100.f; - background_overlay_poster.fore_color = color4f(color, color, color, 1.); - background_overlay_poster.set_pos(std::min(virtual_width - background_overlay_image->w, virtual_width * 2 / 3), (virtual_height - background_overlay_image->h) / 2); - background_overlay_poster.set_size(background_overlay_image->w, background_overlay_image->h); + background_overlay_poster.fore_color = color4f(color, color, color, 1.); + background_overlay_poster.set_size(static_cast(overlay_width), static_cast(overlay_height)); + background_overlay_poster.set_pos(overlay_x, overlay_y); background_overlay_poster.set_raw_image(background_overlay_image.get()); background_overlay_poster.set_blur_strength(static_cast(background_blur_strength)); } From 650176fac73bda0e468f1caa876bcae07f99651c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 18:53:20 +0100 Subject: [PATCH 146/529] overlays: Simplify game content search --- rpcs3/Emu/system_utils.cpp | 179 +++++++++---------------------------- rpcs3/Emu/system_utils.hpp | 10 +-- rpcs3/rpcs3qt/tooltips.h | 2 +- 3 files changed, 47 insertions(+), 144 deletions(-) diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp index a5b9e42241..9f5296824d 100644 --- a/rpcs3/Emu/system_utils.cpp +++ b/rpcs3/Emu/system_utils.cpp @@ -342,53 +342,7 @@ namespace rpcs3::utils std::string get_game_content_path(game_content_type type) { - static constexpr auto search_barrier = "barrier"; - - const auto find_content = [](const std::vector& testees) -> std::string - { - // Try to return the content with the highest resolution - // Be naive and assume that its the one that spans over the most bytes - usz max_file_size = 0; - usz index_of_largest_file = umax; - - for (usz index = 0; index < testees.size(); index++) - { - const std::string& path = testees[index]; - if (path.empty()) continue; - - if (path == search_barrier) - { - if (index_of_largest_file != umax) - { - // Found a file in the preferred image group - break; - } - - continue; - } - - fs::stat_t file_stat{}; - - if (!fs::get_stat(path, file_stat) || file_stat.is_directory) - { - continue; - } - - if (max_file_size < file_stat.size) - { - max_file_size = file_stat.size; - index_of_largest_file = index; - } - } - - if (index_of_largest_file < testees.size()) - { - return testees[index_of_largest_file]; - } - - return {}; - }; - + const std::string locale_suffix = fmt::format("_%02d", static_cast(g_cfg.sys.language.get())); const std::string sfo_dir = Emu.GetSfoDir(false); std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME"); @@ -397,109 +351,58 @@ namespace rpcs3::utils disc_dir.clear(); } - const std::string locale_suffix = fmt::format("_%02d", static_cast(g_cfg.sys.language.get())); + const auto find_content = [&sfo_dir, &disc_dir, &locale_suffix](const std::string& name, const std::string& extension) -> std::string + { + // Check localized content first + for (bool localized : { true, false }) + { + const std::string filename = fmt::format("/%s%s.%s", name, localized ? locale_suffix : std::string(), extension); + + // Check content on hdd0 first + if (std::string path = sfo_dir + filename; fs::is_file(path)) + return path; + + // Check content on disc + if (!disc_dir.empty()) + { + if (std::string path = disc_dir + filename; fs::is_file(path)) + return path; + } + } + return {}; + }; switch (type) { - case game_content_type::content_icon: // ICON0.PNG + case game_content_type::content_icon: { - const std::vector paths = - { - sfo_dir + fmt::format("/ICON0%s.PNG", locale_suffix), - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/ICON0%s.PNG", locale_suffix)) : disc_dir, - search_barrier, - sfo_dir + "/ICON0.PNG", - search_barrier, - !disc_dir.empty() ? (disc_dir + "/ICON0.PNG") : disc_dir, - }; - return find_content(paths); + return find_content("ICON0", "PNG"); } - case game_content_type::content_icon_video: // ICON1.PAM + case game_content_type::content_video: { - const std::vector paths = - { - sfo_dir + fmt::format("/ICON1%s.PAM", locale_suffix), - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/ICON1%s.PAM", locale_suffix)) : disc_dir, - search_barrier, - sfo_dir + "/ICON1.PAM", - search_barrier, - !disc_dir.empty() ? (disc_dir + "/ICON1.PAM") : disc_dir, - }; - return find_content(paths); + return find_content("ICON1", "PAM"); } - case game_content_type::content_icon_sound: // SND0.AT3 + case game_content_type::content_sound: { - const std::vector paths = - { - sfo_dir + fmt::format("/SND0%s.AT3", locale_suffix), - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/SND0%s.AT3", locale_suffix)) : disc_dir, - search_barrier, - sfo_dir + "/SND0.AT3", - search_barrier, - !disc_dir.empty() ? (disc_dir + "/SND0.AT3") : disc_dir, - }; - return find_content(paths); + return find_content("SND0", "AT3"); } - case game_content_type::overlay_picture: // PIC0.PNG (16:9) or PIC2.PNG (4:3) + case game_content_type::overlay_picture: { - if (g_cfg.video.aspect_ratio == video_aspect::_16_9) - { - const std::vector paths = - { - sfo_dir + fmt::format("/PIC0%s.PNG", locale_suffix), - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/PIC0%s.PNG", locale_suffix)) : disc_dir, - search_barrier, - sfo_dir + "/PIC0.PNG", - search_barrier, - !disc_dir.empty() ? (disc_dir + "/PIC0.PNG") : disc_dir, - }; - return find_content(paths); - } + const bool high_res = g_cfg.video.aspect_ratio == video_aspect::_16_9; + return find_content(high_res ? "PIC0" : "PIC2", "PNG"); + } + case game_content_type::background_picture: + { + // Try to find a custom background first + if (std::string path = fs::get_config_dir() + "/Icons/game_icons/" + Emu.GetTitleID() + "/PIC1.PNG"; fs::is_file(path)) + return path; - const std::vector paths = - { - sfo_dir + fmt::format("/PIC2%s.PNG", locale_suffix), - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/PIC2%s.PNG", locale_suffix)) : disc_dir, - search_barrier, - sfo_dir + "/PIC2.PNG", - search_barrier, - !disc_dir.empty() ? (disc_dir + "/PIC2.PNG") : disc_dir, - }; - return find_content(paths); - } - case game_content_type::background_picture: // PIC1.PNG - { - const std::vector paths = - { - // Try to find a custom icon first - fs::get_config_dir() + "/Icons/game_icons/" + Emu.GetTitleID() + "/PIC1.PNG", - search_barrier, + // Look for proper background + if (std::string path = find_content("PIC1", "PNG"); !path.empty()) + return path; - // Use PIC1.PNG - sfo_dir + fmt::format("/PIC1%s.PNG", locale_suffix), - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/PIC1%s.PNG", locale_suffix)) : disc_dir, - search_barrier, - sfo_dir + "/PIC1.PNG", - search_barrier, - !disc_dir.empty() ? (disc_dir + "/PIC1.PNG") : disc_dir, - search_barrier, - - // Fallback to PIC3.PNG (should only exist for packages...) - sfo_dir + fmt::format("/PIC3%s.PNG", locale_suffix), - search_barrier, - !disc_dir.empty() ? (disc_dir + fmt::format("/PIC3%s.PNG", locale_suffix)) : disc_dir, - search_barrier, - sfo_dir + "/PIC3.PNG", - search_barrier, - !disc_dir.empty() ? (disc_dir + "/PIC3.PNG") : disc_dir, - }; - return find_content(paths); + // Fallback to PIC3.PNG (should only exist for content discs though...) + return find_content("PIC3", "PNG"); } } diff --git a/rpcs3/Emu/system_utils.hpp b/rpcs3/Emu/system_utils.hpp index a706d32f1d..74c08bff43 100644 --- a/rpcs3/Emu/system_utils.hpp +++ b/rpcs3/Emu/system_utils.hpp @@ -5,11 +5,11 @@ enum class game_content_type { - content_icon, - content_icon_video, - content_icon_sound, - overlay_picture, - background_picture, + content_icon, // ICON0.PNG + content_video, // ICON1.PAM + content_sound, // SND0.AT3 + overlay_picture, // PIC0.PNG (16:9) or PIC2.PNG (4:3) + background_picture, // PIC1.PNG }; namespace rpcs3::utils diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index 83eb96ddf6..6aa44a5599 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -166,7 +166,7 @@ public: const QString perf_overlay_center_x = tr("Centers the performance overlay horizontally and overrides the horizontal margin."); const QString perf_overlay_center_y = tr("Centers the performance overlay vertically and overrides the vertical margin."); - const QString shader_load_bg_enabled = tr("Shows a background image during the native shader loading dialog/loading screen.\nBy default the used image will be /PS3_GAME/PIC1.PNG or /PS3_GAME/PIC0.PNG."); + const QString shader_load_bg_enabled = tr("Shows a background image during the native shader loading dialog/loading screen.\nBy default the used image will be /PS3_GAME/PIC1.PNG."); const QString shader_load_bg_darkening = tr("Changes the background image darkening effect strength of the native shader loading dialog.\nThis may be used to improve readability and/or aesthetics."); const QString shader_load_bg_blur = tr("Changes the background image blur effect strength of the native shader loading dialog.\nThis may be used to improve readability and/or aesthetics."); From 6fb0e991eaa027d8c77c1a67d184582bc7b3926e Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 19:47:55 +0100 Subject: [PATCH 147/529] overlays: Don't use ICON0.PNG from hdd0 if the game is a disc game ICON0.PNG is not supposed to be updateable, so we can ignore the hdd0 dir for disc games in that case --- rpcs3/Emu/system_utils.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp index 9f5296824d..f354732ead 100644 --- a/rpcs3/Emu/system_utils.cpp +++ b/rpcs3/Emu/system_utils.cpp @@ -343,27 +343,35 @@ namespace rpcs3::utils std::string get_game_content_path(game_content_type type) { const std::string locale_suffix = fmt::format("_%02d", static_cast(g_cfg.sys.language.get())); - const std::string sfo_dir = Emu.GetSfoDir(false); - std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME"); + const std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME"); + std::string hdd0_dir = Emu.GetSfoDir(false); - if (sfo_dir == disc_dir) + if (hdd0_dir == disc_dir) { - disc_dir.clear(); + hdd0_dir.clear(); // No hdd0 dir } - const auto find_content = [&sfo_dir, &disc_dir, &locale_suffix](const std::string& name, const std::string& extension) -> std::string + const bool is_disc_game = !disc_dir.empty(); + + const auto find_content = [is_disc_game, &hdd0_dir, &disc_dir, &locale_suffix](const std::string& name, const std::string& extension) -> std::string { + // ICON0.PNG is not supposed to be updateable, so we can ignore the hdd0 dir for disc games in that case + const bool check_hdd0 = !hdd0_dir.empty() && !(is_disc_game && name == "ICON0"); + // Check localized content first for (bool localized : { true, false }) { const std::string filename = fmt::format("/%s%s.%s", name, localized ? locale_suffix : std::string(), extension); // Check content on hdd0 first - if (std::string path = sfo_dir + filename; fs::is_file(path)) - return path; + if (check_hdd0) + { + if (std::string path = hdd0_dir + filename; fs::is_file(path)) + return path; + } // Check content on disc - if (!disc_dir.empty()) + if (is_disc_game) { if (std::string path = disc_dir + filename; fs::is_file(path)) return path; From 1ae1288a88f5e4052b1d1c191854893818f74edc Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 20:47:27 +0100 Subject: [PATCH 148/529] overlays: Look for the overlay in the same dir as the background --- .../RSX/Overlays/overlay_message_dialog.cpp | 13 +++++---- rpcs3/Emu/system_utils.cpp | 28 +++++++++++++------ rpcs3/Emu/system_utils.hpp | 20 +++++++++---- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp index c79e84352b..217d5d2c73 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp @@ -362,22 +362,25 @@ namespace rsx if (!background_image) { - game_content_type background_content_type = game_content_type::background_picture; + // Search for any useable background picture in the given order + game_content_type content_type = game_content_type::background_picture; + game_content_dir_type dir_type = game_content_dir_type::any; for (game_content_type type : { game_content_type::background_picture, game_content_type::content_icon, game_content_type::overlay_picture }) { - if (const std::string picture_path = rpcs3::utils::get_game_content_path(type); fs::is_file(picture_path)) + if (const std::string picture_path = rpcs3::utils::get_game_content_path(type, dir_type); !picture_path.empty()) { - background_content_type = type; + content_type = type; background_image = std::make_unique(picture_path); dirty |= !!background_image->get_data(); break; } } - if (background_image && !background_overlay_image && background_content_type == game_content_type::background_picture) + // Search for an overlay picture in the same dir in case we found a real background picture + if (background_image && !background_overlay_image && content_type == game_content_type::background_picture && dir_type != game_content_dir_type::any) { - if (const std::string picture_path = rpcs3::utils::get_game_content_path(game_content_type::overlay_picture); fs::is_file(picture_path)) + if (const std::string picture_path = rpcs3::utils::get_game_content_path(game_content_type::overlay_picture, dir_type); !picture_path.empty()) { background_overlay_image = std::make_unique(picture_path); dirty |= !!background_overlay_image->get_data(); diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp index f354732ead..ec8bad5545 100644 --- a/rpcs3/Emu/system_utils.cpp +++ b/rpcs3/Emu/system_utils.cpp @@ -340,7 +340,7 @@ namespace rpcs3::utils return get_input_config_dir(title_id) + g_cfg_input_configs.default_config + ".yml"; } - std::string get_game_content_path(game_content_type type) + std::string get_game_content_path(game_content_type type, game_content_dir_type& dir_type) { const std::string locale_suffix = fmt::format("_%02d", static_cast(g_cfg.sys.language.get())); const std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME"); @@ -352,11 +352,12 @@ namespace rpcs3::utils } const bool is_disc_game = !disc_dir.empty(); + const bool check_disc = is_disc_game && dir_type != game_content_dir_type::dev_hdd0; - const auto find_content = [is_disc_game, &hdd0_dir, &disc_dir, &locale_suffix](const std::string& name, const std::string& extension) -> std::string + const auto find_content = [&](const std::string& name, const std::string& extension) -> std::string { // ICON0.PNG is not supposed to be updateable, so we can ignore the hdd0 dir for disc games in that case - const bool check_hdd0 = !hdd0_dir.empty() && !(is_disc_game && name == "ICON0"); + const bool check_hdd0 = !hdd0_dir.empty() && dir_type != game_content_dir_type::dev_bdvd && !(is_disc_game && name == "ICON0"); // Check localized content first for (bool localized : { true, false }) @@ -367,16 +368,24 @@ namespace rpcs3::utils if (check_hdd0) { if (std::string path = hdd0_dir + filename; fs::is_file(path)) + { + dir_type = game_content_dir_type::dev_hdd0; return path; + } } // Check content on disc - if (is_disc_game) + if (check_disc) { if (std::string path = disc_dir + filename; fs::is_file(path)) + { + dir_type = game_content_dir_type::dev_bdvd; return path; + } } } + + dir_type = game_content_dir_type::any; return {}; }; @@ -400,20 +409,21 @@ namespace rpcs3::utils return find_content(high_res ? "PIC0" : "PIC2", "PNG"); } case game_content_type::background_picture: + case game_content_type::background_picture_2: { // Try to find a custom background first if (std::string path = fs::get_config_dir() + "/Icons/game_icons/" + Emu.GetTitleID() + "/PIC1.PNG"; fs::is_file(path)) + { + dir_type = game_content_dir_type::any; return path; + } // Look for proper background - if (std::string path = find_content("PIC1", "PNG"); !path.empty()) - return path; - - // Fallback to PIC3.PNG (should only exist for content discs though...) - return find_content("PIC3", "PNG"); + return find_content(type == game_content_type::background_picture ? "PIC1" : "PIC3", "PNG"); } } + dir_type = game_content_dir_type::any; return {}; } } diff --git a/rpcs3/Emu/system_utils.hpp b/rpcs3/Emu/system_utils.hpp index 74c08bff43..1f8808484f 100644 --- a/rpcs3/Emu/system_utils.hpp +++ b/rpcs3/Emu/system_utils.hpp @@ -3,13 +3,21 @@ #include "util/types.hpp" #include +enum class game_content_dir_type +{ + any, // Can also be used as none when returned + dev_hdd0, // HDD0 dir + dev_bdvd, // Disc dir +}; + enum class game_content_type { - content_icon, // ICON0.PNG - content_video, // ICON1.PAM - content_sound, // SND0.AT3 - overlay_picture, // PIC0.PNG (16:9) or PIC2.PNG (4:3) - background_picture, // PIC1.PNG + content_icon, // ICON0.PNG + content_video, // ICON1.PAM + content_sound, // SND0.AT3 + overlay_picture, // PIC0.PNG (16:9) or PIC2.PNG (4:3) + background_picture, // PIC1.PNG + background_picture_2, // PIC3.PNG (should only exist for install or extra content discs...) }; namespace rpcs3::utils @@ -40,5 +48,5 @@ namespace rpcs3::utils std::string get_input_config_dir(const std::string& title_id = ""); std::string get_custom_input_config_path(const std::string& title_id); - std::string get_game_content_path(game_content_type type); + std::string get_game_content_path(game_content_type type, game_content_dir_type& dir_type); } From 4905fda371fb2b97c45c60c64415e1a990cd98bd Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 20:56:42 +0100 Subject: [PATCH 149/529] Qt: Don't fetch ICON0.PNG from game data for disc games ICON0.PNG is not supposed to be updateable, so we can ignore the hdd0 dir for disc games in that case --- rpcs3/rpcs3qt/game_list_frame.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index b9d7da471c..1f3179a593 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -897,7 +897,9 @@ void game_list_frame::OnRefreshFinished() } } - if (!entry->has_custom_icon) + // ICON0.PNG is not supposed to be updateable, so we can ignore the hdd0 dir for disc games in that case + // Let's fetch it anyway if the path was empty for some reason + if (entry->info.icon_path.empty()) { if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path)) { From fda51920b7bab6a0e2b988fa285cb194caabd83a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 20 Mar 2025 22:34:45 +0100 Subject: [PATCH 150/529] overlays: prefer overlay_picture over content_icon --- rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp index 217d5d2c73..0c24a71347 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp @@ -366,7 +366,7 @@ namespace rsx game_content_type content_type = game_content_type::background_picture; game_content_dir_type dir_type = game_content_dir_type::any; - for (game_content_type type : { game_content_type::background_picture, game_content_type::content_icon, game_content_type::overlay_picture }) + for (game_content_type type : { game_content_type::background_picture, game_content_type::overlay_picture, game_content_type::content_icon }) { if (const std::string picture_path = rpcs3::utils::get_game_content_path(type, dir_type); !picture_path.empty()) { From 4c742f77423b44c39c918f7527bab2e273b7bcdb Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 21 Mar 2025 18:18:39 +0100 Subject: [PATCH 151/529] Fix typo --- rpcs3/rpcs3qt/tooltips.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index 6aa44a5599..9ac64c495a 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -56,7 +56,7 @@ public: const QString anti_cheat_savestates = tr("When this mode is on, emulation exits when saving and the savestate file is concealed after its load, preventing reuse by RPCS3.\nThis mode is like hibernation of emulation: if you don't want to be able to cheat using savestates when playing the game, consider using this mode.\nDo note that the savestate file is not gone completely, just ignored by RPCS3. You can manually relaunch it if needed."); const QString compatible_savestates = tr("When this mode is on, SPU emulation prioritizes savestate compatibility, however, it may reduce performance slightly.\nWhen this mode is off, some games may not allow making a savestate and show an SPU pause error in the log."); const QString paused_savestates = tr("When this mode is on, savestates are loaded and paused on the first frame.\nThis allows players to prepare for gameplay without being thrown into the action immediately."); - const QString spu_profiler = tr("When enabled, SPU performance is measured at runtime.\nEnable only at a developr's request because when enabled it reduces performance a bit by itself."); + const QString spu_profiler = tr("When enabled, SPU performance is measured at runtime.\nEnable only at a developer's request because when enabled it reduces performance a bit by itself."); // audio From b4f453f687c3a66e8e175ba95824efac434649d6 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 21 Mar 2025 18:59:41 +0100 Subject: [PATCH 152/529] overlays: don't check for hdd dirs if we play a disc game --- .../Emu/RSX/Overlays/overlay_message_dialog.cpp | 7 +++---- rpcs3/Emu/system_utils.cpp | 14 +++----------- rpcs3/Emu/system_utils.hpp | 9 +-------- rpcs3/rpcs3qt/game_list_frame.cpp | 17 +---------------- 4 files changed, 8 insertions(+), 39 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp index 0c24a71347..578967de1a 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp @@ -364,11 +364,10 @@ namespace rsx { // Search for any useable background picture in the given order game_content_type content_type = game_content_type::background_picture; - game_content_dir_type dir_type = game_content_dir_type::any; for (game_content_type type : { game_content_type::background_picture, game_content_type::overlay_picture, game_content_type::content_icon }) { - if (const std::string picture_path = rpcs3::utils::get_game_content_path(type, dir_type); !picture_path.empty()) + if (const std::string picture_path = rpcs3::utils::get_game_content_path(type); !picture_path.empty()) { content_type = type; background_image = std::make_unique(picture_path); @@ -378,9 +377,9 @@ namespace rsx } // Search for an overlay picture in the same dir in case we found a real background picture - if (background_image && !background_overlay_image && content_type == game_content_type::background_picture && dir_type != game_content_dir_type::any) + if (background_image && !background_overlay_image && content_type == game_content_type::background_picture) { - if (const std::string picture_path = rpcs3::utils::get_game_content_path(game_content_type::overlay_picture, dir_type); !picture_path.empty()) + if (const std::string picture_path = rpcs3::utils::get_game_content_path(game_content_type::overlay_picture); !picture_path.empty()) { background_overlay_image = std::make_unique(picture_path); dirty |= !!background_overlay_image->get_data(); diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp index ec8bad5545..8455a85fd2 100644 --- a/rpcs3/Emu/system_utils.cpp +++ b/rpcs3/Emu/system_utils.cpp @@ -340,7 +340,7 @@ namespace rpcs3::utils return get_input_config_dir(title_id) + g_cfg_input_configs.default_config + ".yml"; } - std::string get_game_content_path(game_content_type type, game_content_dir_type& dir_type) + std::string get_game_content_path(game_content_type type) { const std::string locale_suffix = fmt::format("_%02d", static_cast(g_cfg.sys.language.get())); const std::string disc_dir = vfs::get("/dev_bdvd/PS3_GAME"); @@ -351,14 +351,11 @@ namespace rpcs3::utils hdd0_dir.clear(); // No hdd0 dir } - const bool is_disc_game = !disc_dir.empty(); - const bool check_disc = is_disc_game && dir_type != game_content_dir_type::dev_hdd0; + const bool check_disc = !disc_dir.empty(); + const bool check_hdd0 = !hdd0_dir.empty() && !check_disc; const auto find_content = [&](const std::string& name, const std::string& extension) -> std::string { - // ICON0.PNG is not supposed to be updateable, so we can ignore the hdd0 dir for disc games in that case - const bool check_hdd0 = !hdd0_dir.empty() && dir_type != game_content_dir_type::dev_bdvd && !(is_disc_game && name == "ICON0"); - // Check localized content first for (bool localized : { true, false }) { @@ -369,7 +366,6 @@ namespace rpcs3::utils { if (std::string path = hdd0_dir + filename; fs::is_file(path)) { - dir_type = game_content_dir_type::dev_hdd0; return path; } } @@ -379,13 +375,11 @@ namespace rpcs3::utils { if (std::string path = disc_dir + filename; fs::is_file(path)) { - dir_type = game_content_dir_type::dev_bdvd; return path; } } } - dir_type = game_content_dir_type::any; return {}; }; @@ -414,7 +408,6 @@ namespace rpcs3::utils // Try to find a custom background first if (std::string path = fs::get_config_dir() + "/Icons/game_icons/" + Emu.GetTitleID() + "/PIC1.PNG"; fs::is_file(path)) { - dir_type = game_content_dir_type::any; return path; } @@ -423,7 +416,6 @@ namespace rpcs3::utils } } - dir_type = game_content_dir_type::any; return {}; } } diff --git a/rpcs3/Emu/system_utils.hpp b/rpcs3/Emu/system_utils.hpp index 1f8808484f..d7af2aa5eb 100644 --- a/rpcs3/Emu/system_utils.hpp +++ b/rpcs3/Emu/system_utils.hpp @@ -3,13 +3,6 @@ #include "util/types.hpp" #include -enum class game_content_dir_type -{ - any, // Can also be used as none when returned - dev_hdd0, // HDD0 dir - dev_bdvd, // Disc dir -}; - enum class game_content_type { content_icon, // ICON0.PNG @@ -48,5 +41,5 @@ namespace rpcs3::utils std::string get_input_config_dir(const std::string& title_id = ""); std::string get_custom_input_config_path(const std::string& title_id); - std::string get_game_content_path(game_content_type type, game_content_dir_type& dir_type); + std::string get_game_content_path(game_content_type type); } diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 1f3179a593..9cf739ac37 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -897,8 +897,7 @@ void game_list_frame::OnRefreshFinished() } } - // ICON0.PNG is not supposed to be updateable, so we can ignore the hdd0 dir for disc games in that case - // Let's fetch it anyway if the path was empty for some reason + // Let's fetch the game data icon if the path was empty for some reason if (entry->info.icon_path.empty()) { if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path)) @@ -910,20 +909,6 @@ void game_list_frame::OnRefreshFinished() entry->info.icon_path = std::move(icon_path); } } - - if (!entry->has_hover_gif) - { - if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path)) - { - entry->info.movie_path = std::move(movie_path); - entry->has_hover_pam = true; - } - else if (std::string movie_path = other->info.path + "/ICON1.PAM"; fs::is_file(movie_path)) - { - entry->info.movie_path = std::move(movie_path); - entry->has_hover_pam = true; - } - } } } From d9071abd8b72b7c62dc17793380afeb4c7e0b12b Mon Sep 17 00:00:00 2001 From: Whatcookie Date: Sat, 22 Mar 2025 07:28:45 -0400 Subject: [PATCH 153/529] Utils: Remove AVX10-256 detection (#16904) - Intel recently removed 256b AVX10 from the AVX10 spec. --- rpcs3/util/sysinfo.cpp | 42 ------------------------------------------ rpcs3/util/sysinfo.hpp | 6 ------ 2 files changed, 48 deletions(-) diff --git a/rpcs3/util/sysinfo.cpp b/rpcs3/util/sysinfo.cpp index dc5ade1dc2..c6516404b8 100755 --- a/rpcs3/util/sysinfo.cpp +++ b/rpcs3/util/sysinfo.cpp @@ -278,17 +278,6 @@ bool utils::has_avx10() #endif } -bool utils::has_avx10_512() -{ -#if defined(ARCH_X64) - // AVX10 with 512 wide vectors - static const bool g_value = has_avx10() && get_cpuid(24, 0)[2] & 0x40000; - return g_value; -#else - return false; -#endif -} - u32 utils::avx10_isa_version() { #if defined(ARCH_X64) @@ -310,28 +299,6 @@ u32 utils::avx10_isa_version() #endif } -bool utils::has_avx512_256() -{ -#if defined(ARCH_X64) - // Either AVX10 or AVX512 implies support for 256-bit length AVX-512 SKL-X tier instructions - static const bool g_value = (has_avx512() || has_avx10()); - return g_value; -#else - return false; -#endif -} - -bool utils::has_avx512_icl_256() -{ -#if defined(ARCH_X64) - // Check for AVX512_ICL or check for AVX10, together with GFNI, VAES, and VPCLMULQDQ, implies support for the same instructions that AVX-512_icl does at 256 bit length - static const bool g_value = (has_avx512_icl() || (has_avx10() && get_cpuid(7, 0)[2] & 0x00000700)); - return g_value; -#else - return false; -#endif -} - bool utils::has_xop() { #if defined(ARCH_X64) @@ -536,15 +503,6 @@ std::string utils::get_system_info() { const u32 avx10_version = avx10_isa_version(); fmt::append(result, "10.%d", avx10_version); - - if (has_avx10_512()) - { - result += "-512"; - } - else - { - result += "-256"; - } } else if (has_avx512()) { diff --git a/rpcs3/util/sysinfo.hpp b/rpcs3/util/sysinfo.hpp index ff78288b15..fd7e810f67 100755 --- a/rpcs3/util/sysinfo.hpp +++ b/rpcs3/util/sysinfo.hpp @@ -29,14 +29,8 @@ namespace utils bool has_avx10(); - bool has_avx10_512(); - u32 avx10_isa_version(); - bool has_avx512_256(); - - bool has_avx512_icl_256(); - bool has_xop(); bool has_clwb(); From 40ff182c31084364450df6b54f5a901a31ae7021 Mon Sep 17 00:00:00 2001 From: RipleyTom Date: Sat, 22 Mar 2025 22:52:34 +0100 Subject: [PATCH 154/529] Fix p2p binding to vport 0 --- rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp index 7acb1273d6..608088aac6 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp @@ -141,7 +141,8 @@ s32 lv2_socket_p2p::bind(const sys_net_sockaddr& addr) p2p_vport++; } } - else if (pport.bound_p2p_vports.contains(p2p_vport)) + + if (pport.bound_p2p_vports.contains(p2p_vport)) { // Check that all other sockets are SO_REUSEADDR or SO_REUSEPORT auto& bound_sockets = ::at32(pport.bound_p2p_vports, p2p_vport); From ba7b7b65a1d09364ecd912d970c50ca22ac30342 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 16 Mar 2025 21:59:49 +0300 Subject: [PATCH 155/529] rsx: Bypass sampling cache logic when dealing with host generated textures --- rpcs3/Emu/RSX/GL/GLGSRender.h | 2 -- rpcs3/Emu/RSX/NV47/HW/common.cpp | 5 ++++- rpcs3/Emu/RSX/RSXThread.h | 3 +++ rpcs3/Emu/RSX/VK/VKGSRender.h | 2 -- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h index 8b2caaf194..59a7e075b9 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.h +++ b/rpcs3/Emu/RSX/GL/GLGSRender.h @@ -145,8 +145,6 @@ class GLGSRender : public GSRender, public ::rsx::reports::ZCULL_control shared_mutex m_sampler_mutex; atomic_t m_samplers_dirty = {true}; - std::array, rsx::limits::fragment_textures_count> fs_sampler_state = {}; - std::array, rsx::limits::vertex_textures_count> vs_sampler_state = {}; std::unordered_map> m_null_textures; rsx::simple_array m_scratch_buffer; diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/Emu/RSX/NV47/HW/common.cpp index b1cb8917c4..a12053b5c6 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/common.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "common.h" +#include "Emu/RSX/Common/TextureUtils.h" #include "Emu/RSX/RSXThread.h" #define RSX(ctx) ctx->rsxthr @@ -100,7 +101,9 @@ namespace rsx ensure(!command_span.empty() && command_span.size() <= count); u32* const dst_regs = ®S(ctx)->registers[reg]; - bool set_dirty = (dst_regs[0] != REGS(ctx)->latch); + bool set_dirty = (dst_regs[0] != REGS(ctx)->latch) || + (RSX(ctx)->fs_sampler_state[texture_index] && + RSX(ctx)->fs_sampler_state[texture_index]->upload_context != rsx::texture_upload_context::shader_read); for (usz i = 1; i < command_span.size(); i++) { diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 6c45e3e48a..71b720bf37 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -248,6 +248,9 @@ namespace rsx program_hash_util::fragment_program_utils::fragment_program_metadata current_fp_metadata = {}; program_hash_util::vertex_program_utils::vertex_program_metadata current_vp_metadata = {}; + std::array, rsx::limits::fragment_textures_count> fs_sampler_state = {}; + std::array, rsx::limits::vertex_textures_count> vs_sampler_state = {}; + std::array get_color_surface_addresses() const; u32 get_zeta_surface_address() const; diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index eaf9cc4a44..88e1e2b00c 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -81,8 +81,6 @@ private: shared_mutex m_sampler_mutex; atomic_t m_samplers_dirty = { true }; std::unique_ptr m_stencil_mirror_sampler; - std::array, rsx::limits::fragment_textures_count> fs_sampler_state = {}; - std::array, rsx::limits::vertex_textures_count> vs_sampler_state = {}; std::array fs_sampler_handles{}; std::array vs_sampler_handles{}; From 1616942943bb4a3aae160ee64b7d4c25d55a74c1 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 16 Mar 2025 22:00:47 +0300 Subject: [PATCH 156/529] rsx: Always execute pre-draw pipeline analysis regardless of flags --- rpcs3/Emu/RSX/GL/GLDraw.cpp | 5 +---- rpcs3/Emu/RSX/VK/VKDraw.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLDraw.cpp b/rpcs3/Emu/RSX/GL/GLDraw.cpp index 9d2bf887c4..c02f12c8c4 100644 --- a/rpcs3/Emu/RSX/GL/GLDraw.cpp +++ b/rpcs3/Emu/RSX/GL/GLDraw.cpp @@ -740,10 +740,7 @@ void GLGSRender::end() return; } - if (m_graphics_state & (rsx::pipeline_state::fragment_program_ucode_dirty | rsx::pipeline_state::vertex_program_ucode_dirty)) - { - analyse_current_rsx_pipeline(); - } + analyse_current_rsx_pipeline(); m_frame_stats.setup_time += m_profiler.duration(); diff --git a/rpcs3/Emu/RSX/VK/VKDraw.cpp b/rpcs3/Emu/RSX/VK/VKDraw.cpp index 7c40cc12ad..acff7b7954 100644 --- a/rpcs3/Emu/RSX/VK/VKDraw.cpp +++ b/rpcs3/Emu/RSX/VK/VKDraw.cpp @@ -1031,10 +1031,7 @@ void VKGSRender::end() m_current_frame->flags &= ~frame_context_state::dirty; } - if (m_graphics_state & (rsx::pipeline_state::fragment_program_ucode_dirty | rsx::pipeline_state::vertex_program_ucode_dirty)) - { - analyse_current_rsx_pipeline(); - } + analyse_current_rsx_pipeline(); m_frame_stats.setup_time += m_profiler.duration(); From a51602018eb8a81a3914e7ffcad973d6c7509859 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 22 Mar 2025 16:11:53 +0300 Subject: [PATCH 157/529] rsx: Code cleanup and fix fragment texture dirty trigger --- rpcs3/Emu/RSX/NV47/HW/common.cpp | 61 ++++++-------------------------- rpcs3/Emu/RSX/NV47/HW/common.h | 2 -- rpcs3/Emu/RSX/NV47/HW/nv4097.h | 10 ------ 3 files changed, 11 insertions(+), 62 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/Emu/RSX/NV47/HW/common.cpp index a12053b5c6..45e7b001a1 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/common.cpp @@ -11,6 +11,16 @@ namespace rsx { namespace util { + bool is_volatile_TIU(rsx::context* ctx, u32 index) + { + if (!RSX(ctx)->fs_sampler_state[index]) + { + return false; + } + + return RSX(ctx)->fs_sampler_state[index]->upload_context != rsx::texture_upload_context::shader_read; + } + void push_vertex_data(rsx::context* ctx, u32 attrib_index, u32 channel_select, int count, rsx::vertex_base_type vtype, u32 value) { if (RSX(ctx)->in_begin_end) @@ -65,7 +75,7 @@ namespace rsx void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index) { - if (REGS(ctx)->latch == arg) + if (REGS(ctx)->latch == arg && !is_volatile_TIU(ctx, index)) { return; } @@ -78,55 +88,6 @@ namespace rsx } } - void set_texture_configuration_command(rsx::context* ctx, u32 reg) - { - const u32 reg_index = reg - NV4097_SET_TEXTURE_OFFSET; - ensure(reg_index % 8 == 0 && reg_index < 8 * 16); // Only NV4097_SET_TEXTURE_OFFSET is expected - - const u32 texture_index = reg_index / 8; - - // FIFO args count including this one - const u32 fifo_args_cnt = RSX(ctx)->fifo_ctrl->get_remaining_args_count() + 1; - - // The range of methods this function resposible to - constexpr u32 method_range = 8; - - // Get limit imposed by FIFO PUT (if put is behind get it will result in a number ignored by min) - const u32 fifo_read_limit = static_cast(((RSX(ctx)->ctrl->put & ~3ull) - (RSX(ctx)->fifo_ctrl->get_pos())) / 4); - - const u32 count = std::min({ fifo_args_cnt, fifo_read_limit, method_range }); - - // Clamp by the count of methods this function is responsible to - std::span command_span = RSX(ctx)->fifo_ctrl->get_current_arg_ptr(count); - ensure(!command_span.empty() && command_span.size() <= count); - - u32* const dst_regs = ®S(ctx)->registers[reg]; - bool set_dirty = (dst_regs[0] != REGS(ctx)->latch) || - (RSX(ctx)->fs_sampler_state[texture_index] && - RSX(ctx)->fs_sampler_state[texture_index]->upload_context != rsx::texture_upload_context::shader_read); - - for (usz i = 1; i < command_span.size(); i++) - { - const u32 command_data = std::bit_cast>(command_span[i]); - - set_dirty = set_dirty || (command_data != dst_regs[i]); - dst_regs[i] = command_data; - } - - // Skip handled methods - RSX(ctx)->fifo_ctrl->skip_methods(static_cast(command_span.size()) - 1); - - if (set_dirty) - { - RSX(ctx)->m_textures_dirty[texture_index] = true; - - if (RSX(ctx)->current_fp_metadata.referenced_textures_mask & (1 << texture_index)) - { - RSX(ctx)->m_graphics_state |= rsx::pipeline_state::fragment_program_state_dirty; - } - } - } - void set_vertex_texture_dirty_bit(rsx::context* ctx, u32 index) { RSX(ctx)->m_vertex_textures_dirty[index] = true; diff --git a/rpcs3/Emu/RSX/NV47/HW/common.h b/rpcs3/Emu/RSX/NV47/HW/common.h index e72565e488..881985c086 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.h +++ b/rpcs3/Emu/RSX/NV47/HW/common.h @@ -19,8 +19,6 @@ namespace rsx void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index); - void set_texture_configuration_command(rsx::context* ctx, u32 reg); - void set_vertex_texture_dirty_bit(rsx::context* ctx, u32 index); } } diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.h b/rpcs3/Emu/RSX/NV47/HW/nv4097.h index 7d338a075c..db736396b9 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv4097.h +++ b/rpcs3/Emu/RSX/NV47/HW/nv4097.h @@ -221,16 +221,6 @@ namespace rsx } }; - template - struct set_texture_offset - { - static void impl(context* ctx, u32 reg, u32 /*arg*/) - { - fmt::throw_exception("Unreacable!"); - util::set_texture_configuration_command(ctx, reg); - } - }; - template struct set_fragment_texture_dirty_bit { From ff135384efa4bc22ed796fd72dc23bf23a040148 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Mon, 24 Mar 2025 10:11:52 +0300 Subject: [PATCH 158/529] Fix for GCC builds --- rpcs3/Emu/RSX/RSXThread.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 71b720bf37..6b078a522b 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -10,6 +10,7 @@ #include "Common/bitfield.hpp" #include "Common/profiling_timer.hpp" #include "Common/texture_cache_types.h" +#include "Common/TextureUtils.h" #include "Program/RSXVertexProgram.h" #include "Program/RSXFragmentProgram.h" @@ -91,8 +92,6 @@ namespace rsx bool supports_normalized_barycentrics; // Basically all GPUs except NVIDIA have properly normalized barycentrics }; - class sampled_image_descriptor_base; - struct desync_fifo_cmd_info { u32 cmd; From faef63e8a788330f087f18515fba6cbe86b44b28 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 24 Mar 2025 16:50:58 +0100 Subject: [PATCH 159/529] patches: fix c_utf8 validation --- Utilities/bin_patch.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Utilities/bin_patch.cpp b/Utilities/bin_patch.cpp index e726d9dbc8..8d3fa1dee2 100644 --- a/Utilities/bin_patch.cpp +++ b/Utilities/bin_patch.cpp @@ -737,7 +737,7 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie return false; } - struct patch_data p_data{}; + patch_data p_data{}; p_data.type = type; p_data.offset = addr_node.as(0) + modifier; p_data.original_offset = addr_node.Scalar(); @@ -789,8 +789,14 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie switch (p_data.type) { + case patch_type::invalid: + case patch_type::load: + { + fmt::throw_exception("Unreachable patch type: %s", p_data.type); + } case patch_type::bp_exec: case patch_type::utf8: + case patch_type::c_utf8: case patch_type::jump_func: case patch_type::move_file: case patch_type::hide_file: @@ -827,7 +833,13 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie get_node_value(u32{}, s32{}); break; } - default: + case patch_type::alloc: + case patch_type::code_alloc: + case patch_type::jump: + case patch_type::jump_link: + case patch_type::le64: + case patch_type::be64: + case patch_type::bd64: { get_node_value(u64{}, s64{}); break; From c52920755acc51fad58fcd7e663c354c69653876 Mon Sep 17 00:00:00 2001 From: Malcolm Jestadt Date: Mon, 24 Mar 2025 07:56:17 -0400 Subject: [PATCH 160/529] SPU LLVM: Don't use vperm2b256to128 outside of CPUTranslator.h - The vperm2b function uses vperm2b256to128 when it's ideal --- rpcs3/Emu/Cell/SPULLVMRecompiler.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp index db9cf47ab6..c158318a8d 100644 --- a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp @@ -5870,13 +5870,13 @@ public: { if (perm_only) { - set_vr(op.rt4, vperm2b256to128(as, b, c)); + set_vr(op.rt4, vperm2b(as, b, c)); return; } const auto m = gf2p8affineqb(c, build(0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20), 0x7f); const auto mm = select(noncast(m) >= 0, splat(0), m); - const auto ab = vperm2b256to128(as, b, c); + const auto ab = vperm2b(as, b, c); set_vr(op.rt4, select(noncast(c) >= 0, ab, mm)); return; } @@ -5920,13 +5920,13 @@ public: { if (perm_only) { - set_vr(op.rt4, vperm2b256to128(a, b, eval(c ^ 0xf))); + set_vr(op.rt4, vperm2b(a, b, eval(c ^ 0xf))); return; } const auto m = gf2p8affineqb(c, build(0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20), 0x7f); const auto mm = select(noncast(m) >= 0, splat(0), m); - const auto ab = vperm2b256to128(a, b, eval(c ^ 0xf)); + const auto ab = vperm2b(a, b, eval(c ^ 0xf)); set_vr(op.rt4, select(noncast(c) >= 0, ab, mm)); return; } @@ -5938,13 +5938,13 @@ public: { if (perm_only) { - set_vr(op.rt4, vperm2b256to128(b, a, eval(c ^ 0x1f))); + set_vr(op.rt4, vperm2b(b, a, eval(c ^ 0x1f))); return; } const auto m = gf2p8affineqb(c, build(0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20), 0x7f); const auto mm = select(noncast(m) >= 0, splat(0), m); - const auto ab = vperm2b256to128(b, a, eval(c ^ 0x1f)); + const auto ab = vperm2b(b, a, eval(c ^ 0x1f)); set_vr(op.rt4, select(noncast(c) >= 0, ab, mm)); return; } From 1b5d9a34df017597d8b34844ebf6ca1672b7c51f Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 25 Mar 2025 17:31:57 +0100 Subject: [PATCH 161/529] overlays/rpcn: Create list even if rpcn connection failed --- .../overlay_friends_list_dialog.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp index e0a2d396bb..de99552fb1 100644 --- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp @@ -453,6 +453,7 @@ namespace rsx std::vector> entries; std::string selected_user; s32 selected_index = 0; + bool rpcn_connected = true; // Get selected user name if (m_list && m_current_page == m_last_page) @@ -516,20 +517,25 @@ namespace rsx { rsx_log.error("Failed to connect to RPCN: %s", rpcn::rpcn_state_to_string(res)); status_flags |= status_bits::invalidate_image_cache; - m_list.reset(); - return; + rpcn_connected = false; } if (auto res = m_rpcn->wait_for_authentified(); res != rpcn::rpcn_state::failure_no_failure) { rsx_log.error("Failed to authentify to RPCN: %s", rpcn::rpcn_state_to_string(res)); status_flags |= status_bits::invalidate_image_cache; - m_list.reset(); - return; + rpcn_connected = false; } - // Get friends, setup callback and setup comboboxes - m_rpcn->get_friends(m_friend_data); + // Get friends + if (rpcn_connected) + { + m_rpcn->get_friends(m_friend_data); + } + else + { + m_friend_data = {}; + } switch (m_current_page) { From 324af044266af0f6214dba71b61475527fecf6ce Mon Sep 17 00:00:00 2001 From: RipleyTom Date: Tue, 25 Mar 2025 15:28:04 +0100 Subject: [PATCH 162/529] Set PSN to disconnected when net status is disconnected --- rpcs3/Emu/NP/np_handler.cpp | 2 +- rpcs3/Emu/System.cpp | 6 ++++++ rpcs3/rpcs3qt/settings_dialog.cpp | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/Emu/NP/np_handler.cpp index 85e9d96c89..4597d27b19 100644 --- a/rpcs3/Emu/NP/np_handler.cpp +++ b/rpcs3/Emu/NP/np_handler.cpp @@ -858,7 +858,7 @@ namespace np presence_self.pr_data = {}; presence_self.advertised = false; - if (g_cfg.net.psn_status == np_psn_status::psn_rpcn) + if (is_connected && is_psn_active && rpcn) { rpcn_log.notice("Setting RPCN state to disconnected!"); rpcn->reset_state(); diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 41ce47c04e..bce15c443e 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -303,6 +303,12 @@ static void fixup_settings(const psf::registry* _psf) g_cfg.video.resolution.set(new_resolution); } } + + if (g_cfg.net.net_active == np_internet_status::disabled && g_cfg.net.psn_status != np_psn_status::disabled) + { + sys_log.warning("Net status was set to disconnected so psn status was disabled"); + g_cfg.net.psn_status.set(np_psn_status::disabled); + } } extern void dump_executable(std::span data, const ppu_module* _module, std::string_view title_id) diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 1d275bb498..77790ac0a0 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1481,6 +1481,16 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std const auto [text, value] = get_data(ui->netStatusBox, index); ui->gb_edit_dns->setEnabled(static_cast(value) != np_internet_status::disabled); ui->enable_upnp->setEnabled(static_cast(value) != np_internet_status::disabled); + + if (static_cast(value) == np_internet_status::disabled) + { + ui->psnStatusBox->setCurrentIndex(find_item(ui->psnStatusBox, static_cast(g_cfg.net.psn_status.def))); + ui->psnStatusBox->setEnabled(false); + } + else + { + ui->psnStatusBox->setEnabled(true); + } }); m_emu_settings->EnhanceComboBox(ui->netStatusBox, emu_settings_type::InternetStatus); SubscribeTooltip(ui->gb_netStatusBox, tooltips.settings.net_status); From 467c4ba2cf45a9107205e2481b8edd983f65e5b8 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 Mar 2025 09:11:50 +0100 Subject: [PATCH 163/529] Qt: add option to prefer game data icons in the game list --- rpcs3/rpcs3qt/game_list_frame.cpp | 28 ++++++++++++++++++++++++++-- rpcs3/rpcs3qt/game_list_frame.h | 2 ++ rpcs3/rpcs3qt/gui_settings.h | 1 + rpcs3/rpcs3qt/main_window.cpp | 2 ++ rpcs3/rpcs3qt/main_window.ui | 11 ++++++++++- 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 9cf739ac37..5c339128df 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -223,6 +223,7 @@ void game_list_frame::LoadSettings() m_category_filters = m_gui_settings->GetGameListCategoryFilters(true); m_grid_category_filters = m_gui_settings->GetGameListCategoryFilters(false); m_draw_compat_status_to_grid = m_gui_settings->GetValue(gui::gl_draw_compat).toBool(); + m_prefer_game_data_icons = m_gui_settings->GetValue(gui::gl_pref_gd_icon).toBool(); m_show_custom_icons = m_gui_settings->GetValue(gui::gl_custom_icon).toBool(); m_play_hover_movies = m_gui_settings->GetValue(gui::gl_hover_gifs).toBool(); @@ -897,8 +898,8 @@ void game_list_frame::OnRefreshFinished() } } - // Let's fetch the game data icon if the path was empty for some reason - if (entry->info.icon_path.empty()) + // Let's fetch the game data icon if preferred or if the path was empty for some reason + if (m_prefer_game_data_icons || entry->info.icon_path.empty()) { if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path)) { @@ -909,6 +910,19 @@ void game_list_frame::OnRefreshFinished() entry->info.icon_path = std::move(icon_path); } } + + // Let's fetch the game data movie if preferred or if the path was empty + if (m_prefer_game_data_icons || entry->info.movie_path.empty()) + { + if (std::string movie_path = other->info.path + "/" + localized_movie; fs::is_file(movie_path)) + { + entry->info.movie_path = std::move(movie_path); + } + else if (std::string movie_path = other->info.path + "/ICON1.PAM"; fs::is_file(movie_path)) + { + entry->info.movie_path = std::move(movie_path); + } + } } } @@ -3001,6 +3015,16 @@ void game_list_frame::SetShowCompatibilityInGrid(bool show) m_gui_settings->SetValue(gui::gl_draw_compat, show); } +void game_list_frame::SetPreferGameDataIcons(bool enabled) +{ + if (m_prefer_game_data_icons != enabled) + { + m_prefer_game_data_icons = enabled; + m_gui_settings->SetValue(gui::gl_pref_gd_icon, enabled); + Refresh(true); + } +} + void game_list_frame::SetShowCustomIcons(bool show) { if (m_show_custom_icons != show) diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h index 7282f1b745..5e4156f09d 100644 --- a/rpcs3/rpcs3qt/game_list_frame.h +++ b/rpcs3/rpcs3qt/game_list_frame.h @@ -73,6 +73,7 @@ public Q_SLOTS: void SetListMode(const bool& is_list); void SetSearchText(const QString& text); void SetShowCompatibilityInGrid(bool show); + void SetPreferGameDataIcons(bool enabled); void SetShowCustomIcons(bool show); void SetPlayHoverGifs(bool play); void FocusAndSelectFirstEntryIfNoneIs(); @@ -212,6 +213,7 @@ private: qreal m_margin_factor; qreal m_text_factor; bool m_draw_compat_status_to_grid = false; + bool m_prefer_game_data_icons = false; bool m_show_custom_icons = true; bool m_play_hover_movies = true; std::optional> m_refresh_funcs_manage_type{std::in_place}; diff --git a/rpcs3/rpcs3qt/gui_settings.h b/rpcs3/rpcs3qt/gui_settings.h index b3fab563cf..fbf66dceed 100644 --- a/rpcs3/rpcs3qt/gui_settings.h +++ b/rpcs3/rpcs3qt/gui_settings.h @@ -214,6 +214,7 @@ namespace gui const gui_save gl_show_hidden = gui_save(game_list, "show_hidden", false); const gui_save gl_hidden_list = gui_save(game_list, "hidden_list", QStringList()); const gui_save gl_draw_compat = gui_save(game_list, "draw_compat", false); + const gui_save gl_pref_gd_icon = gui_save(game_list, "pref_gd_icon", false); const gui_save gl_custom_icon = gui_save(game_list, "custom_icon", true); const gui_save gl_hover_gifs = gui_save(game_list, "hover_gifs", true); diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 47c6a5be68..eecb3be62e 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -3380,6 +3380,7 @@ void main_window::CreateConnects() ResizeIcons(index); }); + connect(ui->actionPreferGameDataIcons, &QAction::triggered, m_game_list_frame, &game_list_frame::SetPreferGameDataIcons); connect(ui->showCustomIconsAct, &QAction::triggered, m_game_list_frame, &game_list_frame::SetShowCustomIcons); connect(ui->playHoverGifsAct, &QAction::triggered, m_game_list_frame, &game_list_frame::SetPlayHoverGifs); @@ -3679,6 +3680,7 @@ void main_window::ConfigureGuiFromSettings() m_game_list_frame->SetShowHidden(ui->showHiddenEntriesAct->isChecked()); // prevent GetValue in m_game_list_frame->LoadSettings ui->showCompatibilityInGridAct->setChecked(m_gui_settings->GetValue(gui::gl_draw_compat).toBool()); + ui->actionPreferGameDataIcons->setChecked(m_gui_settings->GetValue(gui::gl_pref_gd_icon).toBool()); ui->showCustomIconsAct->setChecked(m_gui_settings->GetValue(gui::gl_custom_icon).toBool()); ui->playHoverGifsAct->setChecked(m_gui_settings->GetValue(gui::gl_hover_gifs).toBool()); diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index 5bc38ff754..9cf59d35a0 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -35,7 +35,7 @@ true - QMainWindow::AllowNestedDocks|QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks|QMainWindow::GroupedDragging + QMainWindow::DockOption::AllowNestedDocks|QMainWindow::DockOption::AllowTabbedDocks|QMainWindow::DockOption::AnimatedDocks|QMainWindow::DockOption::GroupedDragging @@ -344,6 +344,7 @@ + @@ -1415,6 +1416,14 @@ Savestates + + + true + + + Prefer Game Data Icons + + From 2a7e957c61e9a09d386d0a98ba37637a1ea1a744 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 Mar 2025 18:15:30 +0100 Subject: [PATCH 164/529] Qt: fix custom icons when "Prefer game data icons" is set --- rpcs3/rpcs3qt/game_list_frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 5c339128df..3bf33f2a8c 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -899,7 +899,7 @@ void game_list_frame::OnRefreshFinished() } // Let's fetch the game data icon if preferred or if the path was empty for some reason - if (m_prefer_game_data_icons || entry->info.icon_path.empty()) + if ((m_prefer_game_data_icons && !entry->has_custom_icon) || entry->info.icon_path.empty()) { if (std::string icon_path = other->info.path + "/" + localized_icon; fs::is_file(icon_path)) { From b8236e183cd75b18d93b69780b49df9fe7f2b85a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 Mar 2025 20:21:10 +0100 Subject: [PATCH 165/529] cellMic: log ALCenum error string --- rpcs3/Emu/Cell/Modules/cellMic.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index 267dc889f5..cb8724f965 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -74,6 +74,22 @@ void fmt_class_string::format(std::string& out, u64 arg) }); } +namespace fmt +{ + struct alc_error + { + ALCdevice* device{}; + ALCenum error{}; + }; +} + +template <> +void fmt_class_string::format(std::string& out, u64 arg) +{ + const fmt::alc_error& obj = get_object(arg); + fmt::append(out, "0x%x='%s'", obj.error, alcGetString(obj.device, obj.error)); +} + void mic_context::operator()() { // Timestep in microseconds @@ -448,7 +464,7 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device) { - cellMic.error("Error opening capture device %s (error=0x%x, device=*0x%x)", devices[0].name, err, device); + cellMic.error("Error opening capture device %s (error=%s, device=*0x%x)", devices[0].name, fmt::alc_error{device, err}, device); #ifdef _WIN32 cellMic.error("Make sure microphone use is authorized under \"Microphone privacy settings\" in windows configuration"); #endif @@ -466,7 +482,7 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device) { // Ignore it and move on - cellMic.error("Error opening 2nd SingStar capture device %s (error=0x%x, device=*0x%x)", devices[1].name, err, device); + cellMic.error("Error opening 2nd SingStar capture device %s (error=%s, device=*0x%x)", devices[1].name, fmt::alc_error{device, err}, device); } else { @@ -523,7 +539,7 @@ error_code microphone_device::start_microphone() alcCaptureStart(micdevice.device); if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR) { - cellMic.error("Error starting capture of device %s (error=0x%x)", micdevice.name, err); + cellMic.error("Error starting capture of device %s (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); stop_microphone(); return CELL_MICIN_ERROR_FATAL; } @@ -542,7 +558,7 @@ error_code microphone_device::stop_microphone() alcCaptureStop(micdevice.device); if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR) { - cellMic.error("Error stopping capture of device %s (error=0x%x)", micdevice.name, err); + cellMic.error("Error stopping capture of device %s (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); } } #endif @@ -621,7 +637,7 @@ u32 microphone_device::capture_audio() if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR) { - cellMic.error("Error getting number of captured samples of device %s (error=0x%x)", micdevice.name, err); + cellMic.error("Error getting number of captured samples of device %s (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); return CELL_MICIN_ERROR_FATAL; } @@ -639,7 +655,7 @@ u32 microphone_device::capture_audio() if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR) { - cellMic.error("Error capturing samples of device %s (error=0x%x)", micdevice.name, err); + cellMic.error("Error capturing samples of device %s (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); } } From b571978f24d750d5f931fffb4f1597bb20477383 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 27 Mar 2025 00:34:18 +0100 Subject: [PATCH 166/529] Windows/Qt: do not deploy dx and ffmpeg libs --- rpcs3/CMakeLists.txt | 2 +- rpcs3/rpcs3.vcxproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 3556502f7a..b6d4baecca 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -172,7 +172,7 @@ if (NOT ANDROID) COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt - --no-translations --no-system-d3d-compiler --no-quick-import + --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-ffmpeg --no-quick-import --plugindir "$,$/plugins,$/share/qt6/plugins>" --verbose 0 "$") endif() diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 3aecdb001a..7c39b0a88c 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -113,7 +113,7 @@ - $(QTDIR)\bin\windeployqt --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --no-system-d3d-compiler --no-quick-import --plugindir "$(TargetDir)qt6\plugins" --release "$(TargetPath)" + $(QTDIR)\bin\windeployqt --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --no-system-d3d-compiler --no-system-dxc-compiler --no-ffmpeg --no-quick-import --plugindir "$(TargetDir)qt6\plugins" --release "$(TargetPath)" xcopy /y /d "..\3rdparty\opencv\opencv\opencv410\build\x64\bin\opencv_world4100.dll" "$(OutDir)" @@ -164,7 +164,7 @@ - $(QTDIR)\bin\windeployqt --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --no-system-d3d-compiler --no-quick-import --plugindir "$(TargetDir)qt6\plugins" --debug "$(TargetPath)" + $(QTDIR)\bin\windeployqt --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --no-system-d3d-compiler --no-system-dxc-compiler --no-ffmpeg --no-quick-import --plugindir "$(TargetDir)qt6\plugins" --debug "$(TargetPath)" xcopy /y /d "..\3rdparty\opencv\opencv\opencv410\build\x64\bin\opencv_world4100.dll" "$(OutDir)" @@ -1099,11 +1099,11 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) From 76c069e8bf7df5960d1ed499cab7debbc0a36e92 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 Mar 2025 20:27:02 +0100 Subject: [PATCH 167/529] VS/MSVC: Move LTCG and GL to CI only This was taking too long on my local builds after simple code changes. --- .github/workflows/rpcs3.yml | 2 +- azure-pipelines.yml | 2 +- buildfiles/msvc/{ci_no_debug_info.targets => ci_only.targets} | 4 ++++ buildfiles/msvc/rpcs3_release.props | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) rename buildfiles/msvc/{ci_no_debug_info.targets => ci_only.targets} (62%) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 81cb881675..e74954e09f 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -165,7 +165,7 @@ jobs: - name: Compile RPCS3 shell: pwsh - run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_no_debug_info.targets" + run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets" - name: Pack up build artifacts run: | diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a1401a7e90..ab91b1e8a3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -121,7 +121,7 @@ jobs: # maximumCpuCount: true # platform: x64 # configuration: 'Release' -# msbuildArgs: /p:CLToolPath=$(CCACHE_BIN_DIR) /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="$(Build.SourcesDirectory)\buildfiles\msvc\ci_no_debug_info.targets" +# msbuildArgs: /p:CLToolPath=$(CCACHE_BIN_DIR) /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="$(Build.SourcesDirectory)\buildfiles\msvc\ci_only.targets" # displayName: Compile RPCS3 # - bash: .ci/deploy-windows.sh diff --git a/buildfiles/msvc/ci_no_debug_info.targets b/buildfiles/msvc/ci_only.targets similarity index 62% rename from buildfiles/msvc/ci_no_debug_info.targets rename to buildfiles/msvc/ci_only.targets index 147806ac97..0275047c3a 100644 --- a/buildfiles/msvc/ci_no_debug_info.targets +++ b/buildfiles/msvc/ci_only.targets @@ -3,6 +3,10 @@ None + true + + UseLinkTimeCodeGeneration + \ No newline at end of file diff --git a/buildfiles/msvc/rpcs3_release.props b/buildfiles/msvc/rpcs3_release.props index 82c8024284..378ba797d6 100644 --- a/buildfiles/msvc/rpcs3_release.props +++ b/buildfiles/msvc/rpcs3_release.props @@ -11,12 +11,10 @@ Speed MultiThreaded LLVM_AVAILABLE;%(PreprocessorDefinitions) - true true true - UseLinkTimeCodeGeneration %(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib %(AdditionalDependencies); From 6921684cd9e3b227d0b3ded01634b7c9d624f584 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 27 Mar 2025 00:57:07 +0100 Subject: [PATCH 168/529] Update Qt to 6.8.3 --- .ci/build-mac-arm64.sh | 4 ++-- .ci/build-mac.sh | 4 ++-- .cirrus.yml | 4 ++-- .github/workflows/rpcs3.yml | 4 ++-- BUILDING.md | 10 +++++----- azure-pipelines.yml | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index 1c5a03ef22..74a2d39bb1 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -72,13 +72,13 @@ if [ ! -d "/tmp/Qt/$QT_VER" ]; then git clone https://github.com/engnr/qt-downloader.git cd qt-downloader git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597 - # nested Qt 6.8.2 URL workaround + # nested Qt 6.8.3 URL workaround # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader cd "/tmp/Qt" "$BREW_X64_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64" - # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.2 workaround + # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.3 workaround "$BREW_X64_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64" fi diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 2ae92fb9fd..b02417cbcb 100644 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -39,13 +39,13 @@ if [ ! -d "/tmp/Qt/$QT_VER" ]; then git clone https://github.com/engnr/qt-downloader.git cd qt-downloader git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597 - # nested Qt 6.8.2 URL workaround + # nested Qt 6.8.3 URL workaround # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader cd "/tmp/Qt" "$BREW_X64_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64" - # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.2 workaround + # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.3 workaround "$BREW_X64_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64" fi diff --git a/.cirrus.yml b/.cirrus.yml index 1ad1dc4190..3b71413102 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ env: BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1] QT_VER_MAIN: '6' - QT_VER: '6.8.2' + QT_VER: '6.8.3' LLVM_COMPILER_VER: '19' LLVM_VER: '19.1.7' @@ -23,7 +23,7 @@ env: # COMPILER: msvc # BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\ # QT_VER_MSVC: 'msvc2022' -# QT_DATE: '202501260838' +# QT_DATE: '202503201308' # QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64 # VULKAN_VER: '1.3.268.0' # VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index e74954e09f..37ed5f55d9 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -105,9 +105,9 @@ jobs: env: COMPILER: msvc QT_VER_MAIN: '6' - QT_VER: '6.8.2' + QT_VER: '6.8.3' QT_VER_MSVC: 'msvc2022' - QT_DATE: '202501260838' + QT_DATE: '202503201308' LLVM_VER: '19.1.7' VULKAN_VER: '1.3.268.0' VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' diff --git a/BUILDING.md b/BUILDING.md index 0095bf9131..83693b0f44 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -19,26 +19,26 @@ The following tools are required to build RPCS3 on Windows 10 or later: with standalone **CMake** tool. - [Python 3.6+](https://www.python.org/downloads/) (add to PATH) -- [Qt 6.8.2](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt) +- [Qt 6.8.3](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt) - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (see "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. The `sln` solution available only on **Visual Studio** is the preferred building solution. It easily allows to build the **RPCS3** application in `Release` and `Debug` mode. In order to build **RPCS3** with the `sln` solution (with **Visual Studio**), **Qt** libs need to be detected. To detect the libs: -- add and set the `QTDIR` environment variable, e.g. `\6.8.2\msvc2022_64\` +- add and set the `QTDIR` environment variable, e.g. `\6.8.3\msvc2022_64\` - or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2022) **NOTE:** If you have issues with the **Visual Studio Qt Plugin**, you may want to uninstall it and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2022) instead. In order to build **RPCS3** with the `CMake` solution (with both **Visual Studio** and standalone **CMake** tool): -- add and set the `Qt6_ROOT` environment variable to the **Qt** libs path, e.g. `\6.8.2\msvc2022_64\` +- add and set the `Qt6_ROOT` environment variable to the **Qt** libs path, e.g. `\6.8.3\msvc2022_64\` ### Linux These are the essentials tools to build RPCS3 on Linux. Some of them can be installed through your favorite package manager: - Clang 17+ or GCC 13+ - [CMake 3.28.0+](https://www.cmake.org/download/) -- [Qt 6.8.2](https://www.qt.io/download-qt-installer) +- [Qt 6.8.3](https://www.qt.io/download-qt-installer) - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. - [SDL3](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) @@ -121,7 +121,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r ##### Configuring the Qt Plugin (if used) 1) go to `Extensions->Qt VS Tools->Qt Versions` -2) add the path to your Qt installation with compiler e.g. `\6.8.2\msvc2022_64`, version will fill in automatically +2) add the path to your Qt installation with compiler e.g. `\6.8.3\msvc2022_64`, version will fill in automatically 3) go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. (Only available in the **Legacy Qt Plugin**) 4) set `Build: Run pre-build setup` to `true`. (Only available in the **Legacy Qt Plugin**) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ab91b1e8a3..fb19dcb7f1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -71,9 +71,9 @@ jobs: # variables: # COMPILER: msvc # QT_VER_MAIN: '6' -# QT_VER: '6.8.2' +# QT_VER: '6.8.3' # QT_VER_MSVC: 'msvc2022' -# QT_DATE: '202501260838' +# QT_DATE: '202503201308' # QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 # LLVM_VER: '19.1.7' # VULKAN_VER: '1.3.268.0' From a469bfd4da4c16c61bacf0388c7a49a664dabda9 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 Mar 2025 23:51:41 +0100 Subject: [PATCH 169/529] overlays: hide friends list in home menu if rpcn is not configured --- .../overlay_friends_list_dialog.cpp | 7 ++++ .../FriendsList/overlay_friends_list_dialog.h | 2 + .../HomeMenu/overlay_home_menu_main_menu.cpp | 39 +++++++++++-------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp index de99552fb1..1d13791059 100644 --- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp @@ -684,5 +684,12 @@ namespace rsx return CELL_OK; } + + bool friends_list_dialog::rpcn_configured() + { + cfg_rpcn cfg; + cfg.load(); + return !cfg.get_npid().empty() && !cfg.get_password().empty(); + } } // namespace overlays } // namespace RSX diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h index 68c95a86fb..3d5ec9dbe2 100644 --- a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h +++ b/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h @@ -59,6 +59,8 @@ namespace rsx error_code show(bool enable_overlay, std::function on_close); void callback_handler(rpcn::NotificationType ntype, const std::string& username, bool status); + + static bool rpcn_configured(); }; } } diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp index fc7f8457fd..f9119a85e1 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp @@ -38,26 +38,33 @@ namespace rsx add_page(std::make_shared(x, y, width, height, use_separators, this)); - std::unique_ptr friends = std::make_unique(get_localized_string(localized_string_id::HOME_MENU_FRIENDS)); - add_item(friends, [](pad_button btn) -> page_navigation + if (rsx::overlays::friends_list_dialog::rpcn_configured()) { - if (btn != pad_button::cross) return page_navigation::stay; - - rsx_log.notice("User selected friends in home menu"); - Emu.CallFromMainThread([]() + std::unique_ptr friends = std::make_unique(get_localized_string(localized_string_id::HOME_MENU_FRIENDS)); + add_item(friends, [](pad_button btn) -> page_navigation { - if (auto manager = g_fxo->try_get()) - { - const error_code result = manager->create()->show(true, [](s32 status) - { - rsx_log.notice("Closing friends list with status %d", status); - }); + if (btn != pad_button::cross) return page_navigation::stay; - (result ? rsx_log.error : rsx_log.notice)("Opened friends list with result %d", s32{result}); - } + rsx_log.notice("User selected friends in home menu"); + Emu.CallFromMainThread([]() + { + if (auto manager = g_fxo->try_get()) + { + const error_code result = manager->create()->show(true, [](s32 status) + { + rsx_log.notice("Closing friends list with status %d", status); + }); + + (result ? rsx_log.error : rsx_log.notice)("Opened friends list with result %d", s32{result}); + } + }); + return page_navigation::stay; }); - return page_navigation::stay; - }); + } + else + { + rsx_log.notice("Friends list hidden in home menu. RPCN is not configured."); + } // get current trophy name for trophy list overlay std::string trop_name; From 32a8bcf525b55cc7ca17cccdd5a4c843e455586b Mon Sep 17 00:00:00 2001 From: Ani Date: Thu, 27 Mar 2025 18:30:04 +0100 Subject: [PATCH 170/529] config: Increase max vblank rate to 6000 --- rpcs3/Emu/system_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 4049a8aa14..c5aa64068e 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -173,7 +173,7 @@ struct cfg_root : cfg::node cfg::_int<0, 16> shader_compiler_threads_count{ this, "Shader Compiler Threads", 0 }; cfg::_int<0, 30000000> driver_recovery_timeout{ this, "Driver Recovery Timeout", 1000000, true }; cfg::uint<0, 16667> driver_wakeup_delay{ this, "Driver Wake-Up Delay", 1, true }; - cfg::_int<1, 3000> vblank_rate{ this, "Vblank Rate", 60, true }; // Changing this from 60 may affect game speed in unexpected ways + cfg::_int<1, 6000> vblank_rate{ this, "Vblank Rate", 60, true }; // Changing this from 60 may affect game speed in unexpected ways cfg::_bool vblank_ntsc{ this, "Vblank NTSC Fixup", false, true }; cfg::_bool decr_memory_layout{ this, "DECR memory layout", false}; // Force enable increased allowed main memory range as DECR console cfg::_bool host_label_synchronization{ this, "Allow Host GPU Labels", false }; From 095c8843312cdc88a17d25dfa17eb50fabb15aab Mon Sep 17 00:00:00 2001 From: Ian Carpenter Date: Thu, 27 Mar 2025 15:39:43 -0400 Subject: [PATCH 171/529] unpkg: Restore support for PSP/Vita packages --- rpcs3/Crypto/unpkg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp index 45fd0b9ee1..bc7481fcd6 100644 --- a/rpcs3/Crypto/unpkg.cpp +++ b/rpcs3/Crypto/unpkg.cpp @@ -528,7 +528,7 @@ bool package_reader::read_entries(std::vector& entries) entries.clear(); entries.resize(m_header.file_count + BUF_PADDING / sizeof(PKGEntry) + 1); - const usz read_size = decrypt(0, m_header.file_count * sizeof(PKGEntry), m_dec_key.data(), entries.data()); + const usz read_size = decrypt(0, m_header.file_count * sizeof(PKGEntry), m_header.pkg_platform == PKG_PLATFORM_TYPE_PSP_PSVITA ? PKG_AES_KEY2 : m_dec_key.data(), entries.data()); if (read_size < m_header.file_count * sizeof(PKGEntry)) { From 949a80dc0a0298d1a468a37af906fd33f09b6a97 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 28 Mar 2025 15:29:29 +0100 Subject: [PATCH 172/529] Loader: deny boot if the firmware is too old --- rpcs3/Emu/System.cpp | 17 ++++++++++++++++- rpcs3/Emu/System.h | 1 + rpcs3/Emu/system_utils.cpp | 15 +++++++++++++++ rpcs3/Emu/system_utils.hpp | 2 ++ rpcs3/rpcs3qt/game_list_frame.cpp | 19 ++----------------- rpcs3/rpcs3qt/main_window.cpp | 3 +++ 6 files changed, 39 insertions(+), 18 deletions(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index bce15c443e..77f98c4798 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -137,6 +137,7 @@ void fmt_class_string::format(std::string& out, u64 arg) case game_boot_result::decryption_error: return "Failed to decrypt content"; case game_boot_result::file_creation_error: return "Could not create important files"; case game_boot_result::firmware_missing: return "Firmware is missing"; + case game_boot_result::firmware_version: return "Firmware is too old"; case game_boot_result::unsupported_disc_type: return "This disc type is not supported yet"; case game_boot_result::savestate_corrupted: return "Savestate data is corrupted or it's not an RPCS3 savestate"; case game_boot_result::savestate_version_unsupported: return "Savestate versioning data differs from your RPCS3 build.\nTry to use an older or newer RPCS3 build.\nEspecially if you know the build that created the savestate."; @@ -1965,7 +1966,6 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch, // Initialize performance monitor g_fxo->init>(); - // Set title to actual disc title if necessary const std::string disc_sfo_dir = vfs::get("/dev_bdvd/PS3_GAME/PARAM.SFO"); const auto disc_psf_obj = psf::load_object(disc_sfo_dir); @@ -2100,6 +2100,21 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch, } } + // Check firmware version + if (const std::string_view game_fw_version = psf::get_string(_psf, "PS3_SYSTEM_VER", ""); !game_fw_version.empty()) + { + if (const std::string fw_version = utils::get_firmware_version(); fw_version.empty()) + { + sys_log.warning("Firmware not installed. Skipping required firmware check. (title_id='%s', game_fw='%s')", m_title_id, game_fw_version); + } + else if (rpcs3::utils::version_is_bigger(game_fw_version, fw_version, m_title_id, true)) + { + sys_log.error("The game's required firmware version is higher than the installed firmware's version. (title_id='%s', game_fw='%s', fw='%s')", m_title_id, game_fw_version, fw_version); + return game_boot_result::firmware_version; + } + } + + // Set title to actual disc title if necessary if (!disc_psf_obj.empty()) { const auto bdvd_title = psf::get_string(disc_psf_obj, "TITLE"); diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 738f127922..2d9b2d954b 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -51,6 +51,7 @@ enum class game_boot_result : u32 decryption_error, file_creation_error, firmware_missing, + firmware_version, unsupported_disc_type, savestate_corrupted, savestate_version_unsupported, diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp index 8455a85fd2..ba98a44795 100644 --- a/rpcs3/Emu/system_utils.cpp +++ b/rpcs3/Emu/system_utils.cpp @@ -418,4 +418,19 @@ namespace rpcs3::utils return {}; } + + bool version_is_bigger(std::string_view v0, std::string_view v1, std::string_view serial, bool is_fw) + { + std::add_pointer_t ev0, ev1; + const double ver0 = std::strtod(v0.data(), &ev0); + const double ver1 = std::strtod(v1.data(), &ev1); + + if (v0.data() + v0.size() == ev0 && v1.data() + v1.size() == ev1) + { + return ver0 > ver1; + } + + sys_log.error("Failed to compare the %s numbers for title ID %s: '%s'-'%s'", is_fw ? "firmware version" : "version", serial, v0, v1); + return false; + } } diff --git a/rpcs3/Emu/system_utils.hpp b/rpcs3/Emu/system_utils.hpp index d7af2aa5eb..30ccb0add0 100644 --- a/rpcs3/Emu/system_utils.hpp +++ b/rpcs3/Emu/system_utils.hpp @@ -42,4 +42,6 @@ namespace rpcs3::utils std::string get_custom_input_config_path(const std::string& title_id); std::string get_game_content_path(game_content_type type); + + bool version_is_bigger(std::string_view v0, std::string_view v1, std::string_view serial, bool is_fw); } diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 3bf33f2a8c..5f9267abce 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -864,30 +864,15 @@ void game_list_frame::OnRefreshFinished() if (entry->info.serial != other->info.serial) continue; // The patch is game data and must have the same serial and an app version - static constexpr auto version_is_bigger = [](const std::string& v0, const std::string& v1, const std::string& serial, bool is_fw) - { - std::add_pointer_t ev0, ev1; - const double ver0 = std::strtod(v0.c_str(), &ev0); - const double ver1 = std::strtod(v1.c_str(), &ev1); - - if (v0.c_str() + v0.size() == ev0 && v1.c_str() + v1.size() == ev1) - { - return ver0 > ver1; - } - - game_list_log.error("Failed to update the displayed %s numbers for title ID %s\n'%s'-'%s'", is_fw ? "firmware version" : "version", serial, v0, v1); - return false; - }; - if (other->info.app_ver != cat_unknown_localized) { // Update the app version if it's higher than the disc's version (old games may not have an app version) - if (entry->info.app_ver == cat_unknown_localized || version_is_bigger(other->info.app_ver, entry->info.app_ver, entry->info.serial, true)) + if (entry->info.app_ver == cat_unknown_localized || rpcs3::utils::version_is_bigger(other->info.app_ver, entry->info.app_ver, entry->info.serial, false)) { entry->info.app_ver = other->info.app_ver; } // Update the firmware version if possible and if it's higher than the disc's version - if (other->info.fw != cat_unknown_localized && version_is_bigger(other->info.fw, entry->info.fw, entry->info.serial, false)) + if (other->info.fw != cat_unknown_localized && rpcs3::utils::version_is_bigger(other->info.fw, entry->info.fw, entry->info.serial, true)) { entry->info.fw = other->info.fw; } diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index eecb3be62e..5e3d973ce8 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -538,6 +538,9 @@ void main_window::show_boot_error(game_boot_result status) case game_boot_result::still_running: message = tr("A game or PS3 application is still running or has yet to be fully stopped."); break; + case game_boot_result::firmware_version: + message = tr("The game or PS3 application needs a more recent firmware version."); + break; case game_boot_result::firmware_missing: // Handled elsewhere case game_boot_result::already_added: // Handled elsewhere case game_boot_result::currently_restricted: From a7df3cfb40d1a502090ca34e23b656527a0381b6 Mon Sep 17 00:00:00 2001 From: Ani Date: Fri, 28 Mar 2025 12:32:29 +0100 Subject: [PATCH 173/529] config: Set default Driver Wake-Up Delay to 0 --- rpcs3/Emu/system_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index c5aa64068e..7035fff5d0 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -172,7 +172,7 @@ struct cfg_root : cfg::node cfg::_int<1, 1024> min_scalable_dimension{ this, "Minimum Scalable Dimension", 16 }; cfg::_int<0, 16> shader_compiler_threads_count{ this, "Shader Compiler Threads", 0 }; cfg::_int<0, 30000000> driver_recovery_timeout{ this, "Driver Recovery Timeout", 1000000, true }; - cfg::uint<0, 16667> driver_wakeup_delay{ this, "Driver Wake-Up Delay", 1, true }; + cfg::uint<0, 16667> driver_wakeup_delay{ this, "Driver Wake-Up Delay", 0, true }; cfg::_int<1, 6000> vblank_rate{ this, "Vblank Rate", 60, true }; // Changing this from 60 may affect game speed in unexpected ways cfg::_bool vblank_ntsc{ this, "Vblank NTSC Fixup", false, true }; cfg::_bool decr_memory_layout{ this, "DECR memory layout", false}; // Force enable increased allowed main memory range as DECR console From 91b1ec6d5c057512842a8b5860c961c2fbadc936 Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Thu, 13 Mar 2025 12:59:06 +0200 Subject: [PATCH 174/529] SPU LLVM: Dump some funcs --- rpcs3/Emu/Cell/SPULLVMRecompiler.cpp | 56 ++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp index c158318a8d..0df3e3a854 100644 --- a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp @@ -1531,8 +1531,6 @@ public: return add_loc->compiled; } - std::string log; - bool add_to_file = false; if (auto& cache = g_fxo->get(); cache && g_cfg.core.spu_cache && !add_loc->cached.exchange(1)) @@ -1566,10 +1564,35 @@ public: m_pp_id = 0; + std::string function_log; + + this->dump(func, function_log); + bool to_log_func = false; + if (g_cfg.core.spu_debug && !add_loc->logged.exchange(1)) { - this->dump(func, log); - fs::write_file(m_spurt->get_cache_path() + "spu.log", fs::write + fs::append, log); + if (!fs::write_file(m_spurt->get_cache_path() + "spu.log", fs::write + fs::append, function_log)) + { + // Fallback: write to main log + to_log_func = true; + } + } + + for (u32 data : func.data) + { + const spu_opcode_t op{std::bit_cast>(data)}; + + const auto itype = g_spu_itype.decode(op.opcode); + + if (itype == spu_itype::RDCH && op.ra == SPU_RdDec) + { + to_log_func = true; + } + } + + if (to_log_func) + { + spu_log.notice("Function %s dump:\n%s", m_hash, function_log); } using namespace llvm; @@ -2715,11 +2738,13 @@ public: m_function_queue.clear(); m_function_table = nullptr; - raw_string_ostream out(log); + // Append for now + std::string& llvm_log = function_log; + raw_string_ostream out(llvm_log); if (g_cfg.core.spu_debug) { - fmt::append(log, "LLVM IR at 0x%x:\n", func.entry_point); + fmt::append(llvm_log, "LLVM IR at 0x%x:\n", func.entry_point); out << *_module; // print IR out << "\n\n"; } @@ -2727,11 +2752,11 @@ public: if (verifyModule(*_module, &out)) { out.flush(); - spu_log.error("LLVM: Verification failed at 0x%x:\n%s", func.entry_point, log); + spu_log.error("LLVM: Verification failed at 0x%x:\n%s", func.entry_point, llvm_log); if (g_cfg.core.spu_debug) { - fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append, log); + fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::write + fs::append, llvm_log); } if (auto& cache = g_fxo->get()) @@ -2786,7 +2811,7 @@ public: if (g_cfg.core.spu_debug) { out.flush(); - fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, log); + fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, llvm_log); } #if defined(__APPLE__) @@ -3182,13 +3207,12 @@ public: run_transforms(f); } - std::string log; - - raw_string_ostream out(log); + std::string llvm_log; + raw_string_ostream out(llvm_log); if (g_cfg.core.spu_debug) { - fmt::append(log, "LLVM IR (interpreter):\n"); + fmt::append(llvm_log, "LLVM IR (interpreter):\n"); out << *_module; // print IR out << "\n\n"; } @@ -3196,11 +3220,11 @@ public: if (verifyModule(*_module, &out)) { out.flush(); - spu_log.error("LLVM: Verification failed:\n%s", log); + spu_log.error("LLVM: Verification failed:\n%s", llvm_log); if (g_cfg.core.spu_debug) { - fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, log); + fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, llvm_log); } fmt::throw_exception("Compilation failed"); @@ -3235,7 +3259,7 @@ public: if (g_cfg.core.spu_debug) { out.flush(); - fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, log); + fs::write_file(m_spurt->get_cache_path() + "spu-ir.log", fs::create + fs::write + fs::append, llvm_log); } return spu_runtime::g_interpreter; From 047f71b434c5f039a3c070eaa931d47de80a1ddd Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Sun, 23 Mar 2025 06:58:35 +0200 Subject: [PATCH 175/529] PPU/cellSpurs: MGS4: Fix cellSpursAddUrgentCommand race condition cellSpursAddUrgentCommand searches in 4 slots for an empty slot to put the command at. At first, it seems to do so unordered. Meanwhile, on SPU side, it expects an order between all the commands because it pops them it in FIFO manner. Not keeping track of how many commands are queued in total. After second observation of cellSpursAddUrgentCommand, something odd comes takes places here. Usually, reservation loops are individual and are expected to be closed without any changes of the previous loop affected by the proceeding one. But in this case, after a single failure, the entire operayion is reset, a loop of 4 reservation operations suddenly is reset completely. This makes one wonder if it the HW expects sometjing else here, perhaps it caches the reservation internally here? After some adjustments to LDARX and STDCX to cache the reservation between succeeding loops, Metal Gear Solid 4 no longer freezes! --- rpcs3/Emu/Cell/PPUInterpreter.cpp | 2 ++ rpcs3/Emu/Cell/PPUThread.cpp | 24 ++++++++++++++++++++++-- rpcs3/Emu/Cell/PPUThread.h | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp index 690581acaa..4f75cd634a 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.cpp +++ b/rpcs3/Emu/Cell/PPUInterpreter.cpp @@ -484,6 +484,7 @@ auto ppu_feed_data(ppu_thread& ppu, u64 addr) { // Reservation was lost ppu.raddr = 0; + ppu.res_cached = 0; } } else @@ -503,6 +504,7 @@ auto ppu_feed_data(ppu_thread& ppu, u64 addr) if (std::memcmp(buffer + offs, src, size)) { ppu.raddr = 0; + ppu.res_cached = 0; } } diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 90241016e6..bdd6eeae84 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -3103,7 +3103,18 @@ static T ppu_load_acquire_reservation(ppu_thread& ppu, u32 addr) ppu.last_faddr = 0; } - ppu.rtime = vm::reservation_acquire(addr) & -128; + const u32 res_cached = ppu.res_cached; + + if ((addr & -128) == (res_cached & -128)) + { + // Reload "cached" reservation of previous succeeded conditional store + // This seems like a hardware feature according to cellSpursAddUrgentCommand function + ppu.rtime -= 128; + } + else + { + ppu.rtime = vm::reservation_acquire(addr) & -128; + } be_t rdata; @@ -3376,7 +3387,7 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value) } // Test if store address is on the same aligned 8-bytes memory as load - if (const u32 raddr = std::exchange(ppu.raddr, 0); raddr / 8 != addr / 8) + if (const u32 raddr = ppu.raddr; raddr / 8 != addr / 8) { // If not and it is on the same aligned 128-byte memory, proceed only if 128-byte reservations are enabled // In realhw the store address can be at any address of the 128-byte cache line @@ -3389,12 +3400,16 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value) data += 0; } + ppu.raddr = 0; + ppu.res_cached = 0; return false; } } if (old_data != data || rtime != (res & -128)) { + ppu.raddr = 0; + ppu.res_cached = 0; return false; } @@ -3650,6 +3665,9 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value) } ppu.last_faddr = 0; + ppu.res_cached = ppu.raddr; + ppu.rtime += 128; + ppu.raddr = 0; return true; } @@ -3669,6 +3687,8 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value) ppu.res_notify = 0; } + ppu.raddr = 0; + ppu.res_cached = 0; return false; } diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h index 0e4ec1bb1a..322cc13ebe 100644 --- a/rpcs3/Emu/Cell/PPUThread.h +++ b/rpcs3/Emu/Cell/PPUThread.h @@ -264,6 +264,7 @@ public: u64 rtime{0}; alignas(64) std::byte rdata[128]{}; // Reservation data bool use_full_rdata{}; + u32 res_cached{0}; // Reservation "cached" addresss u32 res_notify{0}; u64 res_notify_time{0}; From 9c99e75939af118cddcf4c0fc5c45c295cbf38ee Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Fri, 28 Mar 2025 15:11:22 +0300 Subject: [PATCH 176/529] SPU Debug: WrDec and LSA view Report the last written value to WrDec. --- rpcs3/Emu/Cell/SPUThread.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index faf78babb3..6a8c3aeceb 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -1204,18 +1204,30 @@ void spu_thread::dump_regs(std::string& ret, std::any& /*custom_data*/) const std::vector gpr_saved(128); be_t rdata_saved[32]{}; + be_t lsa_saved[32]{}; + spu_mfc_cmd mfc_regs_saved{}; u32 saved_pc = umax; + const u8* lsa_state_ptr = nullptr; + + const u8* lsa_ptr = _ptr(ch_mfc_cmd.lsa); // Load PC, GPRs and reservation data atomically // We may not load the entire context atomically, but there is importance their state being intact for debugging do { saved_pc = pc; + + // Account for list transfer: record EAL instead + mfc_regs_saved = ch_mfc_cmd; + lsa_state_ptr = _ptr(mfc_regs_saved.eal < SPU_LS_SIZE && mfc_regs_saved.eal % 8 == 0 ? mfc_regs_saved.eal : mfc_regs_saved.lsa); + std::memcpy(gpr_saved.data(), gpr.data(), sizeof(v128) * gpr.size()); std::memcpy(rdata_saved, rdata, sizeof(rdata)); + std::memcpy(lsa_saved, lsa_state_ptr, std::min(128, SPU_LS_SIZE - (lsa_state_ptr - _ptr(0)))); atomic_fence_acquire(); } - while (saved_pc != pc || std::memcmp(rdata_saved, rdata, sizeof(rdata)) != 0 || std::memcmp(gpr_saved.data(), gpr.data(), sizeof(v128) * gpr.size()) != 0); + while (saved_pc != pc || std::memcmp(rdata_saved, rdata, sizeof(rdata)) != 0 || std::memcmp(gpr_saved.data(), gpr.data(), sizeof(v128) * gpr.size()) != 0 + || std::memcmp(&mfc_regs_saved, &ch_mfc_cmd, sizeof(mfc_regs_saved)) != 0 || std::memcmp(lsa_saved, lsa_state_ptr, std::min(128, SPU_LS_SIZE - (lsa_state_ptr - _ptr(0)))) != 0); for (u32 i = 0; i < 128; i++, ret += '\n') { @@ -1350,6 +1362,7 @@ void spu_thread::dump_regs(std::string& ret, std::any& /*custom_data*/) const fmt::append(ret, "SNR config: 0x%llx\n", snr_config); fmt::append(ret, "SNR1: %s\n", ch_snr1); fmt::append(ret, "SNR2: %s\n", ch_snr2); + fmt::append(ret, "Last WrDec: %-9d (0x%08x) (%s)\n", ch_dec_value, ch_dec_value, is_dec_frozen ? "suspend" : "running"); if (get_type() != spu_type::threaded) { @@ -1388,6 +1401,14 @@ void spu_thread::dump_regs(std::string& ret, std::any& /*custom_data*/) const fmt::append(ret, "[0x%02x] %08x %08x %08x %08x\n", i * sizeof(rdata_saved[0]) , rdata_saved[i + 0], rdata_saved[i + 1], rdata_saved[i + 2], rdata_saved[i + 3]); } + + fmt::append(ret, "\nLSA Data:\n"); + + for (usz i = 0; i < std::size(lsa_saved); i += 4) + { + fmt::append(ret, "[0x%02x] %08x %08x %08x %08x\n", i * sizeof(lsa_saved[0]) + , lsa_saved[i + 0], lsa_saved[i + 1], lsa_saved[i + 2], lsa_saved[i + 3]); + } } std::string spu_thread::dump_callstack() const From 596e6cc2c39ca452a5a3d42af5b9224de46a9bc3 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 Mar 2025 18:42:38 +0100 Subject: [PATCH 177/529] Add VulkanMemoryAllocator v2.3.0 submodule --- .gitmodules | 4 + 3rdparty/GPUOpen/VulkanMemoryAllocator | 1 + 3rdparty/GPUOpen/include/vk_mem_alloc.h | 18120 --------------------- rpcs3/Emu/RSX/VK/VKMemAlloc.cpp | 2 +- rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h | 14 - rpcs3/Emu/RSX/VK/vkutils/memory.h | 2 +- rpcs3/Emu/RSX/VK/vkutils/sampler.cpp | 2 +- 7 files changed, 8 insertions(+), 18137 deletions(-) create mode 160000 3rdparty/GPUOpen/VulkanMemoryAllocator delete mode 100644 3rdparty/GPUOpen/include/vk_mem_alloc.h delete mode 100644 rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h diff --git a/.gitmodules b/.gitmodules index ecfa049147..305705b06a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -104,3 +104,7 @@ path = 3rdparty/discord-rpc/discord-rpc url = ../../Vestrel/discord-rpc ignore = dirty +[submodule "3rdparty/GPUOpen/VulkanMemoryAllocator"] + path = 3rdparty/GPUOpen/VulkanMemoryAllocator + url = ../../Megamouse/VulkanMemoryAllocator.git + ignore = dirty diff --git a/3rdparty/GPUOpen/VulkanMemoryAllocator b/3rdparty/GPUOpen/VulkanMemoryAllocator new file mode 160000 index 0000000000..3951bb11de --- /dev/null +++ b/3rdparty/GPUOpen/VulkanMemoryAllocator @@ -0,0 +1 @@ +Subproject commit 3951bb11de459d8019ce8b28e276170860c079c0 diff --git a/3rdparty/GPUOpen/include/vk_mem_alloc.h b/3rdparty/GPUOpen/include/vk_mem_alloc.h deleted file mode 100644 index bb72d53f57..0000000000 --- a/3rdparty/GPUOpen/include/vk_mem_alloc.h +++ /dev/null @@ -1,18120 +0,0 @@ -// -// Copyright (c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -// - -#ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H -#define AMD_VULKAN_MEMORY_ALLOCATOR_H - -#ifdef __cplusplus -extern "C" { -#endif - -/** \mainpage Vulkan Memory Allocator - -Version 2.3.0 (2019-12-04) - -Copyright (c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved. \n -License: MIT - -Documentation of all members: vk_mem_alloc.h - -\section main_table_of_contents Table of contents - -- User guide - - \subpage quick_start - - [Project setup](@ref quick_start_project_setup) - - [Initialization](@ref quick_start_initialization) - - [Resource allocation](@ref quick_start_resource_allocation) - - \subpage choosing_memory_type - - [Usage](@ref choosing_memory_type_usage) - - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags) - - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types) - - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools) - - [Dedicated allocations](@ref choosing_memory_type_dedicated_allocations) - - \subpage memory_mapping - - [Mapping functions](@ref memory_mapping_mapping_functions) - - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory) - - [Cache flush and invalidate](@ref memory_mapping_cache_control) - - [Finding out if memory is mappable](@ref memory_mapping_finding_if_memory_mappable) - - \subpage staying_within_budget - - [Querying for budget](@ref staying_within_budget_querying_for_budget) - - [Controlling memory usage](@ref staying_within_budget_controlling_memory_usage) - - \subpage custom_memory_pools - - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex) - - [Linear allocation algorithm](@ref linear_algorithm) - - [Free-at-once](@ref linear_algorithm_free_at_once) - - [Stack](@ref linear_algorithm_stack) - - [Double stack](@ref linear_algorithm_double_stack) - - [Ring buffer](@ref linear_algorithm_ring_buffer) - - [Buddy allocation algorithm](@ref buddy_algorithm) - - \subpage defragmentation - - [Defragmenting CPU memory](@ref defragmentation_cpu) - - [Defragmenting GPU memory](@ref defragmentation_gpu) - - [Additional notes](@ref defragmentation_additional_notes) - - [Writing custom allocation algorithm](@ref defragmentation_custom_algorithm) - - \subpage lost_allocations - - \subpage statistics - - [Numeric statistics](@ref statistics_numeric_statistics) - - [JSON dump](@ref statistics_json_dump) - - \subpage allocation_annotation - - [Allocation user data](@ref allocation_user_data) - - [Allocation names](@ref allocation_names) - - \subpage debugging_memory_usage - - [Memory initialization](@ref debugging_memory_usage_initialization) - - [Margins](@ref debugging_memory_usage_margins) - - [Corruption detection](@ref debugging_memory_usage_corruption_detection) - - \subpage record_and_replay -- \subpage usage_patterns - - [Common mistakes](@ref usage_patterns_common_mistakes) - - [Simple patterns](@ref usage_patterns_simple) - - [Advanced patterns](@ref usage_patterns_advanced) -- \subpage configuration - - [Pointers to Vulkan functions](@ref config_Vulkan_functions) - - [Custom host memory allocator](@ref custom_memory_allocator) - - [Device memory allocation callbacks](@ref allocation_callbacks) - - [Device heap memory limit](@ref heap_memory_limit) - - \subpage vk_khr_dedicated_allocation -- \subpage general_considerations - - [Thread safety](@ref general_considerations_thread_safety) - - [Validation layer warnings](@ref general_considerations_validation_layer_warnings) - - [Allocation algorithm](@ref general_considerations_allocation_algorithm) - - [Features not supported](@ref general_considerations_features_not_supported) - -\section main_see_also See also - -- [Product page on GPUOpen](https://gpuopen.com/gaming-product/vulkan-memory-allocator/) -- [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator) - - - - -\page quick_start Quick start - -\section quick_start_project_setup Project setup - -Vulkan Memory Allocator comes in form of a "stb-style" single header file. -You don't need to build it as a separate library project. -You can add this file directly to your project and submit it to code repository next to your other source files. - -"Single header" doesn't mean that everything is contained in C/C++ declarations, -like it tends to be in case of inline functions or C++ templates. -It means that implementation is bundled with interface in a single file and needs to be extracted using preprocessor macro. -If you don't do it properly, you will get linker errors. - -To do it properly: - --# Include "vk_mem_alloc.h" file in each CPP file where you want to use the library. - This includes declarations of all members of the library. --# In exacly one CPP file define following macro before this include. - It enables also internal definitions. - -\code -#define VMA_IMPLEMENTATION -#include "vk_mem_alloc.h" -\endcode - -It may be a good idea to create dedicated CPP file just for this purpose. - -Note on language: This library is written in C++, but has C-compatible interface. -Thus you can include and use vk_mem_alloc.h in C or C++ code, but full -implementation with `VMA_IMPLEMENTATION` macro must be compiled as C++, NOT as C. - -Please note that this library includes header ``, which in turn -includes `` on Windows. If you need some specific macros defined -before including these headers (like `WIN32_LEAN_AND_MEAN` or -`WINVER` for Windows, `VK_USE_PLATFORM_WIN32_KHR` for Vulkan), you must define -them before every `#include` of this library. - - -\section quick_start_initialization Initialization - -At program startup: - --# Initialize Vulkan to have `VkPhysicalDevice` and `VkDevice` object. --# Fill VmaAllocatorCreateInfo structure and create #VmaAllocator object by - calling vmaCreateAllocator(). - -\code -VmaAllocatorCreateInfo allocatorInfo = {}; -allocatorInfo.physicalDevice = physicalDevice; -allocatorInfo.device = device; - -VmaAllocator allocator; -vmaCreateAllocator(&allocatorInfo, &allocator); -\endcode - -\section quick_start_resource_allocation Resource allocation - -When you want to create a buffer or image: - --# Fill `VkBufferCreateInfo` / `VkImageCreateInfo` structure. --# Fill VmaAllocationCreateInfo structure. --# Call vmaCreateBuffer() / vmaCreateImage() to get `VkBuffer`/`VkImage` with memory - already allocated and bound to it. - -\code -VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; -bufferInfo.size = 65536; -bufferInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; - -VmaAllocationCreateInfo allocInfo = {}; -allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; - -VkBuffer buffer; -VmaAllocation allocation; -vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr); -\endcode - -Don't forget to destroy your objects when no longer needed: - -\code -vmaDestroyBuffer(allocator, buffer, allocation); -vmaDestroyAllocator(allocator); -\endcode - - -\page choosing_memory_type Choosing memory type - -Physical devices in Vulkan support various combinations of memory heaps and -types. Help with choosing correct and optimal memory type for your specific -resource is one of the key features of this library. You can use it by filling -appropriate members of VmaAllocationCreateInfo structure, as described below. -You can also combine multiple methods. - --# If you just want to find memory type index that meets your requirements, you - can use function: vmaFindMemoryTypeIndex(), vmaFindMemoryTypeIndexForBufferInfo(), - vmaFindMemoryTypeIndexForImageInfo(). --# If you want to allocate a region of device memory without association with any - specific image or buffer, you can use function vmaAllocateMemory(). Usage of - this function is not recommended and usually not needed. - vmaAllocateMemoryPages() function is also provided for creating multiple allocations at once, - which may be useful for sparse binding. --# If you already have a buffer or an image created, you want to allocate memory - for it and then you will bind it yourself, you can use function - vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(). - For binding you should use functions: vmaBindBufferMemory(), vmaBindImageMemory() - or their extended versions: vmaBindBufferMemory2(), vmaBindImageMemory2(). --# If you want to create a buffer or an image, allocate memory for it and bind - them together, all in one call, you can use function vmaCreateBuffer(), - vmaCreateImage(). This is the easiest and recommended way to use this library. - -When using 3. or 4., the library internally queries Vulkan for memory types -supported for that buffer or image (function `vkGetBufferMemoryRequirements()`) -and uses only one of these types. - -If no memory type can be found that meets all the requirements, these functions -return `VK_ERROR_FEATURE_NOT_PRESENT`. - -You can leave VmaAllocationCreateInfo structure completely filled with zeros. -It means no requirements are specified for memory type. -It is valid, although not very useful. - -\section choosing_memory_type_usage Usage - -The easiest way to specify memory requirements is to fill member -VmaAllocationCreateInfo::usage using one of the values of enum #VmaMemoryUsage. -It defines high level, common usage types. -For more details, see description of this enum. - -For example, if you want to create a uniform buffer that will be filled using -transfer only once or infrequently and used for rendering every frame, you can -do it using following code: - -\code -VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; -bufferInfo.size = 65536; -bufferInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; - -VmaAllocationCreateInfo allocInfo = {}; -allocInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; - -VkBuffer buffer; -VmaAllocation allocation; -vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr); -\endcode - -\section choosing_memory_type_required_preferred_flags Required and preferred flags - -You can specify more detailed requirements by filling members -VmaAllocationCreateInfo::requiredFlags and VmaAllocationCreateInfo::preferredFlags -with a combination of bits from enum `VkMemoryPropertyFlags`. For example, -if you want to create a buffer that will be persistently mapped on host (so it -must be `HOST_VISIBLE`) and preferably will also be `HOST_COHERENT` and `HOST_CACHED`, -use following code: - -\code -VmaAllocationCreateInfo allocInfo = {}; -allocInfo.requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; -allocInfo.preferredFlags = VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; -allocInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT; - -VkBuffer buffer; -VmaAllocation allocation; -vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr); -\endcode - -A memory type is chosen that has all the required flags and as many preferred -flags set as possible. - -If you use VmaAllocationCreateInfo::usage, it is just internally converted to -a set of required and preferred flags. - -\section choosing_memory_type_explicit_memory_types Explicit memory types - -If you inspected memory types available on the physical device and you have -a preference for memory types that you want to use, you can fill member -VmaAllocationCreateInfo::memoryTypeBits. It is a bit mask, where each bit set -means that a memory type with that index is allowed to be used for the -allocation. Special value 0, just like `UINT32_MAX`, means there are no -restrictions to memory type index. - -Please note that this member is NOT just a memory type index. -Still you can use it to choose just one, specific memory type. -For example, if you already determined that your buffer should be created in -memory type 2, use following code: - -\code -uint32_t memoryTypeIndex = 2; - -VmaAllocationCreateInfo allocInfo = {}; -allocInfo.memoryTypeBits = 1u << memoryTypeIndex; - -VkBuffer buffer; -VmaAllocation allocation; -vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr); -\endcode - -\section choosing_memory_type_custom_memory_pools Custom memory pools - -If you allocate from custom memory pool, all the ways of specifying memory -requirements described above are not applicable and the aforementioned members -of VmaAllocationCreateInfo structure are ignored. Memory type is selected -explicitly when creating the pool and then used to make all the allocations from -that pool. For further details, see \ref custom_memory_pools. - -\section choosing_memory_type_dedicated_allocations Dedicated allocations - -Memory for allocations is reserved out of larger block of `VkDeviceMemory` -allocated from Vulkan internally. That's the main feature of this whole library. -You can still request a separate memory block to be created for an allocation, -just like you would do in a trivial solution without using any allocator. -In that case, a buffer or image is always bound to that memory at offset 0. -This is called a "dedicated allocation". -You can explicitly request it by using flag #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. -The library can also internally decide to use dedicated allocation in some cases, e.g.: - -- When the size of the allocation is large. -- When [VK_KHR_dedicated_allocation](@ref vk_khr_dedicated_allocation) extension is enabled - and it reports that dedicated allocation is required or recommended for the resource. -- When allocation of next big memory block fails due to not enough device memory, - but allocation with the exact requested size succeeds. - - -\page memory_mapping Memory mapping - -To "map memory" in Vulkan means to obtain a CPU pointer to `VkDeviceMemory`, -to be able to read from it or write to it in CPU code. -Mapping is possible only of memory allocated from a memory type that has -`VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag. -Functions `vkMapMemory()`, `vkUnmapMemory()` are designed for this purpose. -You can use them directly with memory allocated by this library, -but it is not recommended because of following issue: -Mapping the same `VkDeviceMemory` block multiple times is illegal - only one mapping at a time is allowed. -This includes mapping disjoint regions. Mapping is not reference-counted internally by Vulkan. -Because of this, Vulkan Memory Allocator provides following facilities: - -\section memory_mapping_mapping_functions Mapping functions - -The library provides following functions for mapping of a specific #VmaAllocation: vmaMapMemory(), vmaUnmapMemory(). -They are safer and more convenient to use than standard Vulkan functions. -You can map an allocation multiple times simultaneously - mapping is reference-counted internally. -You can also map different allocations simultaneously regardless of whether they use the same `VkDeviceMemory` block. -The way it's implemented is that the library always maps entire memory block, not just region of the allocation. -For further details, see description of vmaMapMemory() function. -Example: - -\code -// Having these objects initialized: - -struct ConstantBuffer -{ - ... -}; -ConstantBuffer constantBufferData; - -VmaAllocator allocator; -VkBuffer constantBuffer; -VmaAllocation constantBufferAllocation; - -// You can map and fill your buffer using following code: - -void* mappedData; -vmaMapMemory(allocator, constantBufferAllocation, &mappedData); -memcpy(mappedData, &constantBufferData, sizeof(constantBufferData)); -vmaUnmapMemory(allocator, constantBufferAllocation); -\endcode - -When mapping, you may see a warning from Vulkan validation layer similar to this one: - -Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used. - -It happens because the library maps entire `VkDeviceMemory` block, where different -types of images and buffers may end up together, especially on GPUs with unified memory like Intel. -You can safely ignore it if you are sure you access only memory of the intended -object that you wanted to map. - - -\section memory_mapping_persistently_mapped_memory Persistently mapped memory - -Kepping your memory persistently mapped is generally OK in Vulkan. -You don't need to unmap it before using its data on the GPU. -The library provides a special feature designed for that: -Allocations made with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag set in -VmaAllocationCreateInfo::flags stay mapped all the time, -so you can just access CPU pointer to it any time -without a need to call any "map" or "unmap" function. -Example: - -\code -VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; -bufCreateInfo.size = sizeof(ConstantBuffer); -bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT; - -VmaAllocationCreateInfo allocCreateInfo = {}; -allocCreateInfo.usage = VMA_MEMORY_USAGE_CPU_ONLY; -allocCreateInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT; - -VkBuffer buf; -VmaAllocation alloc; -VmaAllocationInfo allocInfo; -vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo); - -// Buffer is already mapped. You can access its memory. -memcpy(allocInfo.pMappedData, &constantBufferData, sizeof(constantBufferData)); -\endcode - -There are some exceptions though, when you should consider mapping memory only for a short period of time: - -- When operating system is Windows 7 or 8.x (Windows 10 is not affected because it uses WDDM2), - device is discrete AMD GPU, - and memory type is the special 256 MiB pool of `DEVICE_LOCAL + HOST_VISIBLE` memory - (selected when you use #VMA_MEMORY_USAGE_CPU_TO_GPU), - then whenever a memory block allocated from this memory type stays mapped - for the time of any call to `vkQueueSubmit()` or `vkQueuePresentKHR()`, this - block is migrated by WDDM to system RAM, which degrades performance. It doesn't - matter if that particular memory block is actually used by the command buffer - being submitted. -- On Mac/MoltenVK there is a known bug - [Issue #175](https://github.com/KhronosGroup/MoltenVK/issues/175) - which requires unmapping before GPU can see updated texture. -- Keeping many large memory blocks mapped may impact performance or stability of some debugging tools. - -\section memory_mapping_cache_control Cache flush and invalidate - -Memory in Vulkan doesn't need to be unmapped before using it on GPU, -but unless a memory types has `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT` flag set, -you need to manually **invalidate** cache before reading of mapped pointer -and **flush** cache after writing to mapped pointer. -Map/unmap operations don't do that automatically. -Vulkan provides following functions for this purpose `vkFlushMappedMemoryRanges()`, -`vkInvalidateMappedMemoryRanges()`, but this library provides more convenient -functions that refer to given allocation object: vmaFlushAllocation(), -vmaInvalidateAllocation(). - -Regions of memory specified for flush/invalidate must be aligned to -`VkPhysicalDeviceLimits::nonCoherentAtomSize`. This is automatically ensured by the library. -In any memory type that is `HOST_VISIBLE` but not `HOST_COHERENT`, all allocations -within blocks are aligned to this value, so their offsets are always multiply of -`nonCoherentAtomSize` and two different allocations never share same "line" of this size. - -Please note that memory allocated with #VMA_MEMORY_USAGE_CPU_ONLY is guaranteed to be `HOST_COHERENT`. - -Also, Windows drivers from all 3 **PC** GPU vendors (AMD, Intel, NVIDIA) -currently provide `HOST_COHERENT` flag on all memory types that are -`HOST_VISIBLE`, so on this platform you may not need to bother. - -\section memory_mapping_finding_if_memory_mappable Finding out if memory is mappable - -It may happen that your allocation ends up in memory that is `HOST_VISIBLE` (available for mapping) -despite it wasn't explicitly requested. -For example, application may work on integrated graphics with unified memory (like Intel) or -allocation from video memory might have failed, so the library chose system memory as fallback. - -You can detect this case and map such allocation to access its memory on CPU directly, -instead of launching a transfer operation. -In order to do that: inspect `allocInfo.memoryType`, call vmaGetMemoryTypeProperties(), -and look for `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag in properties of that memory type. - -\code -VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; -bufCreateInfo.size = sizeof(ConstantBuffer); -bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; - -VmaAllocationCreateInfo allocCreateInfo = {}; -allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; -allocCreateInfo.preferredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - -VkBuffer buf; -VmaAllocation alloc; -VmaAllocationInfo allocInfo; -vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo); - -VkMemoryPropertyFlags memFlags; -vmaGetMemoryTypeProperties(allocator, allocInfo.memoryType, &memFlags); -if((memFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) -{ - // Allocation ended up in mappable memory. You can map it and access it directly. - void* mappedData; - vmaMapMemory(allocator, alloc, &mappedData); - memcpy(mappedData, &constantBufferData, sizeof(constantBufferData)); - vmaUnmapMemory(allocator, alloc); -} -else -{ - // Allocation ended up in non-mappable memory. - // You need to create CPU-side buffer in VMA_MEMORY_USAGE_CPU_ONLY and make a transfer. -} -\endcode - -You can even use #VMA_ALLOCATION_CREATE_MAPPED_BIT flag while creating allocations -that are not necessarily `HOST_VISIBLE` (e.g. using #VMA_MEMORY_USAGE_GPU_ONLY). -If the allocation ends up in memory type that is `HOST_VISIBLE`, it will be persistently mapped and you can use it directly. -If not, the flag is just ignored. -Example: - -\code -VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; -bufCreateInfo.size = sizeof(ConstantBuffer); -bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; - -VmaAllocationCreateInfo allocCreateInfo = {}; -allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; -allocCreateInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT; - -VkBuffer buf; -VmaAllocation alloc; -VmaAllocationInfo allocInfo; -vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo); - -if(allocInfo.pUserData != nullptr) -{ - // Allocation ended up in mappable memory. - // It's persistently mapped. You can access it directly. - memcpy(allocInfo.pMappedData, &constantBufferData, sizeof(constantBufferData)); -} -else -{ - // Allocation ended up in non-mappable memory. - // You need to create CPU-side buffer in VMA_MEMORY_USAGE_CPU_ONLY and make a transfer. -} -\endcode - - -\page staying_within_budget Staying within budget - -When developing a graphics-intensive game or program, it is important to avoid allocating -more GPU memory than it's physically available. When the memory is over-committed, -various bad things can happen, depending on the specific GPU, graphics driver, and -operating system: - -- It may just work without any problems. -- The application may slow down because some memory blocks are moved to system RAM - and the GPU has to access them through PCI Express bus. -- A new allocation may take very long time to complete, even few seconds, and possibly - freeze entire system. -- The new allocation may fail with `VK_ERROR_OUT_OF_DEVICE_MEMORY`. -- It may even result in GPU crash (TDR), observed as `VK_ERROR_DEVICE_LOST` - returned somewhere later. - -\section staying_within_budget_querying_for_budget Querying for budget - -To query for current memory usage and available budget, use function vmaGetBudget(). -Returned structure #VmaBudget contains quantities expressed in bytes, per Vulkan memory heap. - -Please note that this function returns different information and works faster than -vmaCalculateStats(). vmaGetBudget() can be called every frame or even before every -allocation, while vmaCalculateStats() is intended to be used rarely, -only to obtain statistical information, e.g. for debugging purposes. - -It is recommended to use VK_EXT_memory_budget device extension to obtain information -about the budget from Vulkan device. VMA is able to use this extension automatically. -When not enabled, the allocator behaves same way, but then it estimates current usage -and available budget based on its internal information and Vulkan memory heap sizes, -which may be less precise. In order to use this extension: - -1. Make sure extensions VK_EXT_memory_budget and VK_KHR_get_physical_device_properties2 - required by it are available and enable them. Please note that the first is a device - extension and the second is instance extension! -2. Use flag #VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT when creating #VmaAllocator object. -3. Make sure to call vmaSetCurrentFrameIndex() every frame. Budget is queried from - Vulkan inside of it to avoid overhead of querying it with every allocation. - -\section staying_within_budget_controlling_memory_usage Controlling memory usage - -There are many ways in which you can try to stay within the budget. - -First, when making new allocation requires allocating a new memory block, the library -tries not to exceed the budget automatically. If a block with default recommended size -(e.g. 256 MB) would go over budget, a smaller block is allocated, possibly even -dedicated memory for just this resource. - -If the size of the requested resource plus current memory usage is more than the -budget, by default the library still tries to create it, leaving it to the Vulkan -implementation whether the allocation succeeds or fails. You can change this behavior -by using #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag. With it, the allocation is -not made if it would exceed the budget or if the budget is already exceeded. -Some other allocations become lost instead to make room for it, if the mechanism of -[lost allocations](@ref lost_allocations) is used. -If that is not possible, the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`. -Example usage pattern may be to pass the #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag -when creating resources that are not essential for the application (e.g. the texture -of a specific object) and not to pass it when creating critically important resources -(e.g. render targets). - -Finally, you can also use #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT flag to make sure -a new allocation is created only when it fits inside one of the existing memory blocks. -If it would require to allocate a new block, if fails instead with `VK_ERROR_OUT_OF_DEVICE_MEMORY`. -This also ensures that the function call is very fast because it never goes to Vulkan -to obtain a new block. - -Please note that creating \ref custom_memory_pools with VmaPoolCreateInfo::minBlockCount -set to more than 0 will try to allocate memory blocks without checking whether they -fit within budget. - - -\page custom_memory_pools Custom memory pools - -A memory pool contains a number of `VkDeviceMemory` blocks. -The library automatically creates and manages default pool for each memory type available on the device. -Default memory pool automatically grows in size. -Size of allocated blocks is also variable and managed automatically. - -You can create custom pool and allocate memory out of it. -It can be useful if you want to: - -- Keep certain kind of allocations separate from others. -- Enforce particular, fixed size of Vulkan memory blocks. -- Limit maximum amount of Vulkan memory allocated for that pool. -- Reserve minimum or fixed amount of Vulkan memory always preallocated for that pool. - -To use custom memory pools: - --# Fill VmaPoolCreateInfo structure. --# Call vmaCreatePool() to obtain #VmaPool handle. --# When making an allocation, set VmaAllocationCreateInfo::pool to this handle. - You don't need to specify any other parameters of this structure, like `usage`. - -Example: - -\code -// Create a pool that can have at most 2 blocks, 128 MiB each. -VmaPoolCreateInfo poolCreateInfo = {}; -poolCreateInfo.memoryTypeIndex = ... -poolCreateInfo.blockSize = 128ull * 1024 * 1024; -poolCreateInfo.maxBlockCount = 2; - -VmaPool pool; -vmaCreatePool(allocator, &poolCreateInfo, &pool); - -// Allocate a buffer out of it. -VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; -bufCreateInfo.size = 1024; -bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; - -VmaAllocationCreateInfo allocCreateInfo = {}; -allocCreateInfo.pool = pool; - -VkBuffer buf; -VmaAllocation alloc; -VmaAllocationInfo allocInfo; -vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo); -\endcode - -You have to free all allocations made from this pool before destroying it. - -\code -vmaDestroyBuffer(allocator, buf, alloc); -vmaDestroyPool(allocator, pool); -\endcode - -\section custom_memory_pools_MemTypeIndex Choosing memory type index - -When creating a pool, you must explicitly specify memory type index. -To find the one suitable for your buffers or images, you can use helper functions -vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo(). -You need to provide structures with example parameters of buffers or images -that you are going to create in that pool. - -\code -VkBufferCreateInfo exampleBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; -exampleBufCreateInfo.size = 1024; // Whatever. -exampleBufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; // Change if needed. - -VmaAllocationCreateInfo allocCreateInfo = {}; -allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; // Change if needed. - -uint32_t memTypeIndex; -vmaFindMemoryTypeIndexForBufferInfo(allocator, &exampleBufCreateInfo, &allocCreateInfo, &memTypeIndex); - -VmaPoolCreateInfo poolCreateInfo = {}; -poolCreateInfo.memoryTypeIndex = memTypeIndex; -// ... -\endcode - -When creating buffers/images allocated in that pool, provide following parameters: - -- `VkBufferCreateInfo`: Prefer to pass same parameters as above. - Otherwise you risk creating resources in a memory type that is not suitable for them, which may result in undefined behavior. - Using different `VK_BUFFER_USAGE_` flags may work, but you shouldn't create images in a pool intended for buffers - or the other way around. -- VmaAllocationCreateInfo: You don't need to pass same parameters. Fill only `pool` member. - Other members are ignored anyway. - -\section linear_algorithm Linear allocation algorithm - -Each Vulkan memory block managed by this library has accompanying metadata that -keeps track of used and unused regions. By default, the metadata structure and -algorithm tries to find best place for new allocations among free regions to -optimize memory usage. This way you can allocate and free objects in any order. - -![Default allocation algorithm](../gfx/Linear_allocator_1_algo_default.png) - -Sometimes there is a need to use simpler, linear allocation algorithm. You can -create custom pool that uses such algorithm by adding flag -#VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT to VmaPoolCreateInfo::flags while creating -#VmaPool object. Then an alternative metadata management is used. It always -creates new allocations after last one and doesn't reuse free regions after -allocations freed in the middle. It results in better allocation performance and -less memory consumed by metadata. - -![Linear allocation algorithm](../gfx/Linear_allocator_2_algo_linear.png) - -With this one flag, you can create a custom pool that can be used in many ways: -free-at-once, stack, double stack, and ring buffer. See below for details. - -\subsection linear_algorithm_free_at_once Free-at-once - -In a pool that uses linear algorithm, you still need to free all the allocations -individually, e.g. by using vmaFreeMemory() or vmaDestroyBuffer(). You can free -them in any order. New allocations are always made after last one - free space -in the middle is not reused. However, when you release all the allocation and -the pool becomes empty, allocation starts from the beginning again. This way you -can use linear algorithm to speed up creation of allocations that you are going -to release all at once. - -![Free-at-once](../gfx/Linear_allocator_3_free_at_once.png) - -This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount -value that allows multiple memory blocks. - -\subsection linear_algorithm_stack Stack - -When you free an allocation that was created last, its space can be reused. -Thanks to this, if you always release allocations in the order opposite to their -creation (LIFO - Last In First Out), you can achieve behavior of a stack. - -![Stack](../gfx/Linear_allocator_4_stack.png) - -This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount -value that allows multiple memory blocks. - -\subsection linear_algorithm_double_stack Double stack - -The space reserved by a custom pool with linear algorithm may be used by two -stacks: - -- First, default one, growing up from offset 0. -- Second, "upper" one, growing down from the end towards lower offsets. - -To make allocation from upper stack, add flag #VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT -to VmaAllocationCreateInfo::flags. - -![Double stack](../gfx/Linear_allocator_7_double_stack.png) - -Double stack is available only in pools with one memory block - -VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined. - -When the two stacks' ends meet so there is not enough space between them for a -new allocation, such allocation fails with usual -`VK_ERROR_OUT_OF_DEVICE_MEMORY` error. - -\subsection linear_algorithm_ring_buffer Ring buffer - -When you free some allocations from the beginning and there is not enough free space -for a new one at the end of a pool, allocator's "cursor" wraps around to the -beginning and starts allocation there. Thanks to this, if you always release -allocations in the same order as you created them (FIFO - First In First Out), -you can achieve behavior of a ring buffer / queue. - -![Ring buffer](../gfx/Linear_allocator_5_ring_buffer.png) - -Pools with linear algorithm support [lost allocations](@ref lost_allocations) when used as ring buffer. -If there is not enough free space for a new allocation, but existing allocations -from the front of the queue can become lost, they become lost and the allocation -succeeds. - -![Ring buffer with lost allocations](../gfx/Linear_allocator_6_ring_buffer_lost.png) - -Ring buffer is available only in pools with one memory block - -VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined. - -\section buddy_algorithm Buddy allocation algorithm - -There is another allocation algorithm that can be used with custom pools, called -"buddy". Its internal data structure is based on a tree of blocks, each having -size that is a power of two and a half of its parent's size. When you want to -allocate memory of certain size, a free node in the tree is located. If it's too -large, it is recursively split into two halves (called "buddies"). However, if -requested allocation size is not a power of two, the size of a tree node is -aligned up to the nearest power of two and the remaining space is wasted. When -two buddy nodes become free, they are merged back into one larger node. - -![Buddy allocator](../gfx/Buddy_allocator.png) - -The advantage of buddy allocation algorithm over default algorithm is faster -allocation and deallocation, as well as smaller external fragmentation. The -disadvantage is more wasted space (internal fragmentation). - -For more information, please read ["Buddy memory allocation" on Wikipedia](https://en.wikipedia.org/wiki/Buddy_memory_allocation) -or other sources that describe this concept in general. - -To use buddy allocation algorithm with a custom pool, add flag -#VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT to VmaPoolCreateInfo::flags while creating -#VmaPool object. - -Several limitations apply to pools that use buddy algorithm: - -- It is recommended to use VmaPoolCreateInfo::blockSize that is a power of two. - Otherwise, only largest power of two smaller than the size is used for - allocations. The remaining space always stays unused. -- [Margins](@ref debugging_memory_usage_margins) and - [corruption detection](@ref debugging_memory_usage_corruption_detection) - don't work in such pools. -- [Lost allocations](@ref lost_allocations) don't work in such pools. You can - use them, but they never become lost. Support may be added in the future. -- [Defragmentation](@ref defragmentation) doesn't work with allocations made from - such pool. - -\page defragmentation Defragmentation - -Interleaved allocations and deallocations of many objects of varying size can -cause fragmentation over time, which can lead to a situation where the library is unable -to find a continuous range of free memory for a new allocation despite there is -enough free space, just scattered across many small free ranges between existing -allocations. - -To mitigate this problem, you can use defragmentation feature: -structure #VmaDefragmentationInfo2, function vmaDefragmentationBegin(), vmaDefragmentationEnd(). -Given set of allocations, -this function can move them to compact used memory, ensure more continuous free -space and possibly also free some `VkDeviceMemory` blocks. - -What the defragmentation does is: - -- Updates #VmaAllocation objects to point to new `VkDeviceMemory` and offset. - After allocation has been moved, its VmaAllocationInfo::deviceMemory and/or - VmaAllocationInfo::offset changes. You must query them again using - vmaGetAllocationInfo() if you need them. -- Moves actual data in memory. - -What it doesn't do, so you need to do it yourself: - -- Recreate buffers and images that were bound to allocations that were defragmented and - bind them with their new places in memory. - You must use `vkDestroyBuffer()`, `vkDestroyImage()`, - `vkCreateBuffer()`, `vkCreateImage()`, vmaBindBufferMemory(), vmaBindImageMemory() - for that purpose and NOT vmaDestroyBuffer(), - vmaDestroyImage(), vmaCreateBuffer(), vmaCreateImage(), because you don't need to - destroy or create allocation objects! -- Recreate views and update descriptors that point to these buffers and images. - -\section defragmentation_cpu Defragmenting CPU memory - -Following example demonstrates how you can run defragmentation on CPU. -Only allocations created in memory types that are `HOST_VISIBLE` can be defragmented. -Others are ignored. - -The way it works is: - -- It temporarily maps entire memory blocks when necessary. -- It moves data using `memmove()` function. - -\code -// Given following variables already initialized: -VkDevice device; -VmaAllocator allocator; -std::vector buffers; -std::vector allocations; - - -const uint32_t allocCount = (uint32_t)allocations.size(); -std::vector allocationsChanged(allocCount); - -VmaDefragmentationInfo2 defragInfo = {}; -defragInfo.allocationCount = allocCount; -defragInfo.pAllocations = allocations.data(); -defragInfo.pAllocationsChanged = allocationsChanged.data(); -defragInfo.maxCpuBytesToMove = VK_WHOLE_SIZE; // No limit. -defragInfo.maxCpuAllocationsToMove = UINT32_MAX; // No limit. - -VmaDefragmentationContext defragCtx; -vmaDefragmentationBegin(allocator, &defragInfo, nullptr, &defragCtx); -vmaDefragmentationEnd(allocator, defragCtx); - -for(uint32_t i = 0; i < allocCount; ++i) -{ - if(allocationsChanged[i]) - { - // Destroy buffer that is immutably bound to memory region which is no longer valid. - vkDestroyBuffer(device, buffers[i], nullptr); - - // Create new buffer with same parameters. - VkBufferCreateInfo bufferInfo = ...; - vkCreateBuffer(device, &bufferInfo, nullptr, &buffers[i]); - - // You can make dummy call to vkGetBufferMemoryRequirements here to silence validation layer warning. - - // Bind new buffer to new memory region. Data contained in it is already moved. - VmaAllocationInfo allocInfo; - vmaGetAllocationInfo(allocator, allocations[i], &allocInfo); - vmaBindBufferMemory(allocator, allocations[i], buffers[i]); - } -} -\endcode - -Setting VmaDefragmentationInfo2::pAllocationsChanged is optional. -This output array tells whether particular allocation in VmaDefragmentationInfo2::pAllocations at the same index -has been modified during defragmentation. -You can pass null, but you then need to query every allocation passed to defragmentation -for new parameters using vmaGetAllocationInfo() if you might need to recreate and rebind a buffer or image associated with it. - -If you use [Custom memory pools](@ref choosing_memory_type_custom_memory_pools), -you can fill VmaDefragmentationInfo2::poolCount and VmaDefragmentationInfo2::pPools -instead of VmaDefragmentationInfo2::allocationCount and VmaDefragmentationInfo2::pAllocations -to defragment all allocations in given pools. -You cannot use VmaDefragmentationInfo2::pAllocationsChanged in that case. -You can also combine both methods. - -\section defragmentation_gpu Defragmenting GPU memory - -It is also possible to defragment allocations created in memory types that are not `HOST_VISIBLE`. -To do that, you need to pass a command buffer that meets requirements as described in -VmaDefragmentationInfo2::commandBuffer. The way it works is: - -- It creates temporary buffers and binds them to entire memory blocks when necessary. -- It issues `vkCmdCopyBuffer()` to passed command buffer. - -Example: - -\code -// Given following variables already initialized: -VkDevice device; -VmaAllocator allocator; -VkCommandBuffer commandBuffer; -std::vector buffers; -std::vector allocations; - - -const uint32_t allocCount = (uint32_t)allocations.size(); -std::vector allocationsChanged(allocCount); - -VkCommandBufferBeginInfo cmdBufBeginInfo = ...; -vkBeginCommandBuffer(commandBuffer, &cmdBufBeginInfo); - -VmaDefragmentationInfo2 defragInfo = {}; -defragInfo.allocationCount = allocCount; -defragInfo.pAllocations = allocations.data(); -defragInfo.pAllocationsChanged = allocationsChanged.data(); -defragInfo.maxGpuBytesToMove = VK_WHOLE_SIZE; // Notice it's "GPU" this time. -defragInfo.maxGpuAllocationsToMove = UINT32_MAX; // Notice it's "GPU" this time. -defragInfo.commandBuffer = commandBuffer; - -VmaDefragmentationContext defragCtx; -vmaDefragmentationBegin(allocator, &defragInfo, nullptr, &defragCtx); - -vkEndCommandBuffer(commandBuffer); - -// Submit commandBuffer. -// Wait for a fence that ensures commandBuffer execution finished. - -vmaDefragmentationEnd(allocator, defragCtx); - -for(uint32_t i = 0; i < allocCount; ++i) -{ - if(allocationsChanged[i]) - { - // Destroy buffer that is immutably bound to memory region which is no longer valid. - vkDestroyBuffer(device, buffers[i], nullptr); - - // Create new buffer with same parameters. - VkBufferCreateInfo bufferInfo = ...; - vkCreateBuffer(device, &bufferInfo, nullptr, &buffers[i]); - - // You can make dummy call to vkGetBufferMemoryRequirements here to silence validation layer warning. - - // Bind new buffer to new memory region. Data contained in it is already moved. - VmaAllocationInfo allocInfo; - vmaGetAllocationInfo(allocator, allocations[i], &allocInfo); - vmaBindBufferMemory(allocator, allocations[i], buffers[i]); - } -} -\endcode - -You can combine these two methods by specifying non-zero `maxGpu*` as well as `maxCpu*` parameters. -The library automatically chooses best method to defragment each memory pool. - -You may try not to block your entire program to wait until defragmentation finishes, -but do it in the background, as long as you carefully fullfill requirements described -in function vmaDefragmentationBegin(). - -\section defragmentation_additional_notes Additional notes - -It is only legal to defragment allocations bound to: - -- buffers -- images created with `VK_IMAGE_CREATE_ALIAS_BIT`, `VK_IMAGE_TILING_LINEAR`, and - being currently in `VK_IMAGE_LAYOUT_GENERAL` or `VK_IMAGE_LAYOUT_PREINITIALIZED`. - -Defragmentation of images created with `VK_IMAGE_TILING_OPTIMAL` or in any other -layout may give undefined results. - -If you defragment allocations bound to images, new images to be bound to new -memory region after defragmentation should be created with `VK_IMAGE_LAYOUT_PREINITIALIZED` -and then transitioned to their original layout from before defragmentation if -needed using an image memory barrier. - -While using defragmentation, you may experience validation layer warnings, which you just need to ignore. -See [Validation layer warnings](@ref general_considerations_validation_layer_warnings). - -Please don't expect memory to be fully compacted after defragmentation. -Algorithms inside are based on some heuristics that try to maximize number of Vulkan -memory blocks to make totally empty to release them, as well as to maximimze continuous -empty space inside remaining blocks, while minimizing the number and size of allocations that -need to be moved. Some fragmentation may still remain - this is normal. - -\section defragmentation_custom_algorithm Writing custom defragmentation algorithm - -If you want to implement your own, custom defragmentation algorithm, -there is infrastructure prepared for that, -but it is not exposed through the library API - you need to hack its source code. -Here are steps needed to do this: - --# Main thing you need to do is to define your own class derived from base abstract - class `VmaDefragmentationAlgorithm` and implement your version of its pure virtual methods. - See definition and comments of this class for details. --# Your code needs to interact with device memory block metadata. - If you need more access to its data than it's provided by its public interface, - declare your new class as a friend class e.g. in class `VmaBlockMetadata_Generic`. --# If you want to create a flag that would enable your algorithm or pass some additional - flags to configure it, add them to `VmaDefragmentationFlagBits` and use them in - VmaDefragmentationInfo2::flags. --# Modify function `VmaBlockVectorDefragmentationContext::Begin` to create object - of your new class whenever needed. - - -\page lost_allocations Lost allocations - -If your game oversubscribes video memory, if may work OK in previous-generation -graphics APIs (DirectX 9, 10, 11, OpenGL) because resources are automatically -paged to system RAM. In Vulkan you can't do it because when you run out of -memory, an allocation just fails. If you have more data (e.g. textures) that can -fit into VRAM and you don't need it all at once, you may want to upload them to -GPU on demand and "push out" ones that are not used for a long time to make room -for the new ones, effectively using VRAM (or a cartain memory pool) as a form of -cache. Vulkan Memory Allocator can help you with that by supporting a concept of -"lost allocations". - -To create an allocation that can become lost, include #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT -flag in VmaAllocationCreateInfo::flags. Before using a buffer or image bound to -such allocation in every new frame, you need to query it if it's not lost. -To check it, call vmaTouchAllocation(). -If the allocation is lost, you should not use it or buffer/image bound to it. -You mustn't forget to destroy this allocation and this buffer/image. -vmaGetAllocationInfo() can also be used for checking status of the allocation. -Allocation is lost when returned VmaAllocationInfo::deviceMemory == `VK_NULL_HANDLE`. - -To create an allocation that can make some other allocations lost to make room -for it, use #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag. You will -usually use both flags #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT and -#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT at the same time. - -Warning! Current implementation uses quite naive, brute force algorithm, -which can make allocation calls that use #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT -flag quite slow. A new, more optimal algorithm and data structure to speed this -up is planned for the future. - -Q: When interleaving creation of new allocations with usage of existing ones, -how do you make sure that an allocation won't become lost while it's used in the -current frame? - -It is ensured because vmaTouchAllocation() / vmaGetAllocationInfo() not only returns allocation -status/parameters and checks whether it's not lost, but when it's not, it also -atomically marks it as used in the current frame, which makes it impossible to -become lost in that frame. It uses lockless algorithm, so it works fast and -doesn't involve locking any internal mutex. - -Q: What if my allocation may still be in use by the GPU when it's rendering a -previous frame while I already submit new frame on the CPU? - -You can make sure that allocations "touched" by vmaTouchAllocation() / vmaGetAllocationInfo() will not -become lost for a number of additional frames back from the current one by -specifying this number as VmaAllocatorCreateInfo::frameInUseCount (for default -memory pool) and VmaPoolCreateInfo::frameInUseCount (for custom pool). - -Q: How do you inform the library when new frame starts? - -You need to call function vmaSetCurrentFrameIndex(). - -Example code: - -\code -struct MyBuffer -{ - VkBuffer m_Buf = nullptr; - VmaAllocation m_Alloc = nullptr; - - // Called when the buffer is really needed in the current frame. - void EnsureBuffer(); -}; - -void MyBuffer::EnsureBuffer() -{ - // Buffer has been created. - if(m_Buf != VK_NULL_HANDLE) - { - // Check if its allocation is not lost + mark it as used in current frame. - if(vmaTouchAllocation(allocator, m_Alloc)) - { - // It's all OK - safe to use m_Buf. - return; - } - } - - // Buffer not yet exists or lost - destroy and recreate it. - - vmaDestroyBuffer(allocator, m_Buf, m_Alloc); - - VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; - bufCreateInfo.size = 1024; - bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; - - VmaAllocationCreateInfo allocCreateInfo = {}; - allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; - allocCreateInfo.flags = VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT | - VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT; - - vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &m_Buf, &m_Alloc, nullptr); -} -\endcode - -When using lost allocations, you may see some Vulkan validation layer warnings -about overlapping regions of memory bound to different kinds of buffers and -images. This is still valid as long as you implement proper handling of lost -allocations (like in the example above) and don't use them. - -You can create an allocation that is already in lost state from the beginning using function -vmaCreateLostAllocation(). It may be useful if you need a "dummy" allocation that is not null. - -You can call function vmaMakePoolAllocationsLost() to set all eligible allocations -in a specified custom pool to lost state. -Allocations that have been "touched" in current frame or VmaPoolCreateInfo::frameInUseCount frames back -cannot become lost. - -Q: Can I touch allocation that cannot become lost? - -Yes, although it has no visible effect. -Calls to vmaGetAllocationInfo() and vmaTouchAllocation() update last use frame index -also for allocations that cannot become lost, but the only way to observe it is to dump -internal allocator state using vmaBuildStatsString(). -You can use this feature for debugging purposes to explicitly mark allocations that you use -in current frame and then analyze JSON dump to see for how long each allocation stays unused. - - -\page statistics Statistics - -This library contains functions that return information about its internal state, -especially the amount of memory allocated from Vulkan. -Please keep in mind that these functions need to traverse all internal data structures -to gather these information, so they may be quite time-consuming. -Don't call them too often. - -\section statistics_numeric_statistics Numeric statistics - -You can query for overall statistics of the allocator using function vmaCalculateStats(). -Information are returned using structure #VmaStats. -It contains #VmaStatInfo - number of allocated blocks, number of allocations -(occupied ranges in these blocks), number of unused (free) ranges in these blocks, -number of bytes used and unused (but still allocated from Vulkan) and other information. -They are summed across memory heaps, memory types and total for whole allocator. - -You can query for statistics of a custom pool using function vmaGetPoolStats(). -Information are returned using structure #VmaPoolStats. - -You can query for information about specific allocation using function vmaGetAllocationInfo(). -It fill structure #VmaAllocationInfo. - -\section statistics_json_dump JSON dump - -You can dump internal state of the allocator to a string in JSON format using function vmaBuildStatsString(). -The result is guaranteed to be correct JSON. -It uses ANSI encoding. -Any strings provided by user (see [Allocation names](@ref allocation_names)) -are copied as-is and properly escaped for JSON, so if they use UTF-8, ISO-8859-2 or any other encoding, -this JSON string can be treated as using this encoding. -It must be freed using function vmaFreeStatsString(). - -The format of this JSON string is not part of official documentation of the library, -but it will not change in backward-incompatible way without increasing library major version number -and appropriate mention in changelog. - -The JSON string contains all the data that can be obtained using vmaCalculateStats(). -It can also contain detailed map of allocated memory blocks and their regions - -free and occupied by allocations. -This allows e.g. to visualize the memory or assess fragmentation. - - -\page allocation_annotation Allocation names and user data - -\section allocation_user_data Allocation user data - -You can annotate allocations with your own information, e.g. for debugging purposes. -To do that, fill VmaAllocationCreateInfo::pUserData field when creating -an allocation. It's an opaque `void*` pointer. You can use it e.g. as a pointer, -some handle, index, key, ordinal number or any other value that would associate -the allocation with your custom metadata. - -\code -VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO }; -// Fill bufferInfo... - -MyBufferMetadata* pMetadata = CreateBufferMetadata(); - -VmaAllocationCreateInfo allocCreateInfo = {}; -allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; -allocCreateInfo.pUserData = pMetadata; - -VkBuffer buffer; -VmaAllocation allocation; -vmaCreateBuffer(allocator, &bufferInfo, &allocCreateInfo, &buffer, &allocation, nullptr); -\endcode - -The pointer may be later retrieved as VmaAllocationInfo::pUserData: - -\code -VmaAllocationInfo allocInfo; -vmaGetAllocationInfo(allocator, allocation, &allocInfo); -MyBufferMetadata* pMetadata = (MyBufferMetadata*)allocInfo.pUserData; -\endcode - -It can also be changed using function vmaSetAllocationUserData(). - -Values of (non-zero) allocations' `pUserData` are printed in JSON report created by -vmaBuildStatsString(), in hexadecimal form. - -\section allocation_names Allocation names - -There is alternative mode available where `pUserData` pointer is used to point to -a null-terminated string, giving a name to the allocation. To use this mode, -set #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT flag in VmaAllocationCreateInfo::flags. -Then `pUserData` passed as VmaAllocationCreateInfo::pUserData or argument to -vmaSetAllocationUserData() must be either null or pointer to a null-terminated string. -The library creates internal copy of the string, so the pointer you pass doesn't need -to be valid for whole lifetime of the allocation. You can free it after the call. - -\code -VkImageCreateInfo imageInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO }; -// Fill imageInfo... - -std::string imageName = "Texture: "; -imageName += fileName; - -VmaAllocationCreateInfo allocCreateInfo = {}; -allocCreateInfo.usage = VMA_MEMORY_USAGE_GPU_ONLY; -allocCreateInfo.flags = VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT; -allocCreateInfo.pUserData = imageName.c_str(); - -VkImage image; -VmaAllocation allocation; -vmaCreateImage(allocator, &imageInfo, &allocCreateInfo, &image, &allocation, nullptr); -\endcode - -The value of `pUserData` pointer of the allocation will be different than the one -you passed when setting allocation's name - pointing to a buffer managed -internally that holds copy of the string. - -\code -VmaAllocationInfo allocInfo; -vmaGetAllocationInfo(allocator, allocation, &allocInfo); -const char* imageName = (const char*)allocInfo.pUserData; -printf("Image name: %s\n", imageName); -\endcode - -That string is also printed in JSON report created by vmaBuildStatsString(). - -\note Passing string name to VMA allocation doesn't automatically set it to the Vulkan buffer or image created with it. -You must do it manually using an extension like VK_EXT_debug_utils, which is independent of this library. - - -\page debugging_memory_usage Debugging incorrect memory usage - -If you suspect a bug with memory usage, like usage of uninitialized memory or -memory being overwritten out of bounds of an allocation, -you can use debug features of this library to verify this. - -\section debugging_memory_usage_initialization Memory initialization - -If you experience a bug with incorrect and nondeterministic data in your program and you suspect uninitialized memory to be used, -you can enable automatic memory initialization to verify this. -To do it, define macro `VMA_DEBUG_INITIALIZE_ALLOCATIONS` to 1. - -\code -#define VMA_DEBUG_INITIALIZE_ALLOCATIONS 1 -#include "vk_mem_alloc.h" -\endcode - -It makes memory of all new allocations initialized to bit pattern `0xDCDCDCDC`. -Before an allocation is destroyed, its memory is filled with bit pattern `0xEFEFEFEF`. -Memory is automatically mapped and unmapped if necessary. - -If you find these values while debugging your program, good chances are that you incorrectly -read Vulkan memory that is allocated but not initialized, or already freed, respectively. - -Memory initialization works only with memory types that are `HOST_VISIBLE`. -It works also with dedicated allocations. -It doesn't work with allocations created with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag, -as they cannot be mapped. - -\section debugging_memory_usage_margins Margins - -By default, allocations are laid out in memory blocks next to each other if possible -(considering required alignment, `bufferImageGranularity`, and `nonCoherentAtomSize`). - -![Allocations without margin](../gfx/Margins_1.png) - -Define macro `VMA_DEBUG_MARGIN` to some non-zero value (e.g. 16) to enforce specified -number of bytes as a margin before and after every allocation. - -\code -#define VMA_DEBUG_MARGIN 16 -#include "vk_mem_alloc.h" -\endcode - -![Allocations with margin](../gfx/Margins_2.png) - -If your bug goes away after enabling margins, it means it may be caused by memory -being overwritten outside of allocation boundaries. It is not 100% certain though. -Change in application behavior may also be caused by different order and distribution -of allocations across memory blocks after margins are applied. - -The margin is applied also before first and after last allocation in a block. -It may occur only once between two adjacent allocations. - -Margins work with all types of memory. - -Margin is applied only to allocations made out of memory blocks and not to dedicated -allocations, which have their own memory block of specific size. -It is thus not applied to allocations made using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT flag -or those automatically decided to put into dedicated allocations, e.g. due to its -large size or recommended by VK_KHR_dedicated_allocation extension. -Margins are also not active in custom pools created with #VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT flag. - -Margins appear in [JSON dump](@ref statistics_json_dump) as part of free space. - -Note that enabling margins increases memory usage and fragmentation. - -\section debugging_memory_usage_corruption_detection Corruption detection - -You can additionally define macro `VMA_DEBUG_DETECT_CORRUPTION` to 1 to enable validation -of contents of the margins. - -\code -#define VMA_DEBUG_MARGIN 16 -#define VMA_DEBUG_DETECT_CORRUPTION 1 -#include "vk_mem_alloc.h" -\endcode - -When this feature is enabled, number of bytes specified as `VMA_DEBUG_MARGIN` -(it must be multiply of 4) before and after every allocation is filled with a magic number. -This idea is also know as "canary". -Memory is automatically mapped and unmapped if necessary. - -This number is validated automatically when the allocation is destroyed. -If it's not equal to the expected value, `VMA_ASSERT()` is executed. -It clearly means that either CPU or GPU overwritten the memory outside of boundaries of the allocation, -which indicates a serious bug. - -You can also explicitly request checking margins of all allocations in all memory blocks -that belong to specified memory types by using function vmaCheckCorruption(), -or in memory blocks that belong to specified custom pool, by using function -vmaCheckPoolCorruption(). - -Margin validation (corruption detection) works only for memory types that are -`HOST_VISIBLE` and `HOST_COHERENT`. - - -\page record_and_replay Record and replay - -\section record_and_replay_introduction Introduction - -While using the library, sequence of calls to its functions together with their -parameters can be recorded to a file and later replayed using standalone player -application. It can be useful to: - -- Test correctness - check if same sequence of calls will not cause crash or - failures on a target platform. -- Gather statistics - see number of allocations, peak memory usage, number of - calls etc. -- Benchmark performance - see how much time it takes to replay the whole - sequence. - -\section record_and_replay_usage Usage - -Recording functionality is disabled by default. -To enable it, define following macro before every include of this library: - -\code -#define VMA_RECORDING_ENABLED 1 -\endcode - -To record sequence of calls to a file: Fill in -VmaAllocatorCreateInfo::pRecordSettings member while creating #VmaAllocator -object. File is opened and written during whole lifetime of the allocator. - -To replay file: Use VmaReplay - standalone command-line program. -Precompiled binary can be found in "bin" directory. -Its source can be found in "src/VmaReplay" directory. -Its project is generated by Premake. -Command line syntax is printed when the program is launched without parameters. -Basic usage: - - VmaReplay.exe MyRecording.csv - -Documentation of file format can be found in file: "docs/Recording file format.md". -It's a human-readable, text file in CSV format (Comma Separated Values). - -\section record_and_replay_additional_considerations Additional considerations - -- Replaying file that was recorded on a different GPU (with different parameters - like `bufferImageGranularity`, `nonCoherentAtomSize`, and especially different - set of memory heaps and types) may give different performance and memory usage - results, as well as issue some warnings and errors. -- Current implementation of recording in VMA, as well as VmaReplay application, is - coded and tested only on Windows. Inclusion of recording code is driven by - `VMA_RECORDING_ENABLED` macro. Support for other platforms should be easy to - add. Contributions are welcomed. - - -\page usage_patterns Recommended usage patterns - -See also slides from talk: -[Sawicki, Adam. Advanced Graphics Techniques Tutorial: Memory management in Vulkan and DX12. Game Developers Conference, 2018](https://www.gdcvault.com/play/1025458/Advanced-Graphics-Techniques-Tutorial-New) - - -\section usage_patterns_common_mistakes Common mistakes - -Use of CPU_TO_GPU instead of CPU_ONLY memory - -#VMA_MEMORY_USAGE_CPU_TO_GPU is recommended only for resources that will be -mapped and written by the CPU, as well as read directly by the GPU - like some -buffers or textures updated every frame (dynamic). If you create a staging copy -of a resource to be written by CPU and then used as a source of transfer to -another resource placed in the GPU memory, that staging resource should be -created with #VMA_MEMORY_USAGE_CPU_ONLY. Please read the descriptions of these -enums carefully for details. - -Unnecessary use of custom pools - -\ref custom_memory_pools may be useful for special purposes - when you want to -keep certain type of resources separate e.g. to reserve minimum amount of memory -for them, limit maximum amount of memory they can occupy, or make some of them -push out the other through the mechanism of \ref lost_allocations. For most -resources this is not needed and so it is not recommended to create #VmaPool -objects and allocations out of them. Allocating from the default pool is sufficient. - -\section usage_patterns_simple Simple patterns - -\subsection usage_patterns_simple_render_targets Render targets - -When: -Any resources that you frequently write and read on GPU, -e.g. images used as color attachments (aka "render targets"), depth-stencil attachments, -images/buffers used as storage image/buffer (aka "Unordered Access View (UAV)"). - -What to do: -Create them in video memory that is fastest to access from GPU using -#VMA_MEMORY_USAGE_GPU_ONLY. - -Consider using [VK_KHR_dedicated_allocation](@ref vk_khr_dedicated_allocation) extension -and/or manually creating them as dedicated allocations using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT, -especially if they are large or if you plan to destroy and recreate them e.g. when -display resolution changes. -Prefer to create such resources first and all other GPU resources (like textures and vertex buffers) later. - -\subsection usage_patterns_simple_immutable_resources Immutable resources - -When: -Any resources that you fill on CPU only once (aka "immutable") or infrequently -and then read frequently on GPU, -e.g. textures, vertex and index buffers, constant buffers that don't change often. - -What to do: -Create them in video memory that is fastest to access from GPU using -#VMA_MEMORY_USAGE_GPU_ONLY. - -To initialize content of such resource, create a CPU-side (aka "staging") copy of it -in system memory - #VMA_MEMORY_USAGE_CPU_ONLY, map it, fill it, -and submit a transfer from it to the GPU resource. -You can keep the staging copy if you need it for another upload transfer in the future. -If you don't, you can destroy it or reuse this buffer for uploading different resource -after the transfer finishes. - -Prefer to create just buffers in system memory rather than images, even for uploading textures. -Use `vkCmdCopyBufferToImage()`. -Dont use images with `VK_IMAGE_TILING_LINEAR`. - -\subsection usage_patterns_dynamic_resources Dynamic resources - -When: -Any resources that change frequently (aka "dynamic"), e.g. every frame or every draw call, -written on CPU, read on GPU. - -What to do: -Create them using #VMA_MEMORY_USAGE_CPU_TO_GPU. -You can map it and write to it directly on CPU, as well as read from it on GPU. - -This is a more complex situation. Different solutions are possible, -and the best one depends on specific GPU type, but you can use this simple approach for the start. -Prefer to write to such resource sequentially (e.g. using `memcpy`). -Don't perform random access or any reads from it on CPU, as it may be very slow. - -\subsection usage_patterns_readback Readback - -When: -Resources that contain data written by GPU that you want to read back on CPU, -e.g. results of some computations. - -What to do: -Create them using #VMA_MEMORY_USAGE_GPU_TO_CPU. -You can write to them directly on GPU, as well as map and read them on CPU. - -\section usage_patterns_advanced Advanced patterns - -\subsection usage_patterns_integrated_graphics Detecting integrated graphics - -You can support integrated graphics (like Intel HD Graphics, AMD APU) better -by detecting it in Vulkan. -To do it, call `vkGetPhysicalDeviceProperties()`, inspect -`VkPhysicalDeviceProperties::deviceType` and look for `VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU`. -When you find it, you can assume that memory is unified and all memory types are comparably fast -to access from GPU, regardless of `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`. - -You can then sum up sizes of all available memory heaps and treat them as useful for -your GPU resources, instead of only `DEVICE_LOCAL` ones. -You can also prefer to create your resources in memory types that are `HOST_VISIBLE` to map them -directly instead of submitting explicit transfer (see below). - -\subsection usage_patterns_direct_vs_transfer Direct access versus transfer - -For resources that you frequently write on CPU and read on GPU, many solutions are possible: - --# Create one copy in video memory using #VMA_MEMORY_USAGE_GPU_ONLY, - second copy in system memory using #VMA_MEMORY_USAGE_CPU_ONLY and submit explicit tranfer each time. --# Create just single copy using #VMA_MEMORY_USAGE_CPU_TO_GPU, map it and fill it on CPU, - read it directly on GPU. --# Create just single copy using #VMA_MEMORY_USAGE_CPU_ONLY, map it and fill it on CPU, - read it directly on GPU. - -Which solution is the most efficient depends on your resource and especially on the GPU. -It is best to measure it and then make the decision. -Some general recommendations: - -- On integrated graphics use (2) or (3) to avoid unnecesary time and memory overhead - related to using a second copy and making transfer. -- For small resources (e.g. constant buffers) use (2). - Discrete AMD cards have special 256 MiB pool of video memory that is directly mappable. - Even if the resource ends up in system memory, its data may be cached on GPU after first - fetch over PCIe bus. -- For larger resources (e.g. textures), decide between (1) and (2). - You may want to differentiate NVIDIA and AMD, e.g. by looking for memory type that is - both `DEVICE_LOCAL` and `HOST_VISIBLE`. When you find it, use (2), otherwise use (1). - -Similarly, for resources that you frequently write on GPU and read on CPU, multiple -solutions are possible: - --# Create one copy in video memory using #VMA_MEMORY_USAGE_GPU_ONLY, - second copy in system memory using #VMA_MEMORY_USAGE_GPU_TO_CPU and submit explicit tranfer each time. --# Create just single copy using #VMA_MEMORY_USAGE_GPU_TO_CPU, write to it directly on GPU, - map it and read it on CPU. - -You should take some measurements to decide which option is faster in case of your specific -resource. - -If you don't want to specialize your code for specific types of GPUs, you can still make -an simple optimization for cases when your resource ends up in mappable memory to use it -directly in this case instead of creating CPU-side staging copy. -For details see [Finding out if memory is mappable](@ref memory_mapping_finding_if_memory_mappable). - - -\page configuration Configuration - -Please check "CONFIGURATION SECTION" in the code to find macros that you can define -before each include of this file or change directly in this file to provide -your own implementation of basic facilities like assert, `min()` and `max()` functions, -mutex, atomic etc. -The library uses its own implementation of containers by default, but you can switch to using -STL containers instead. - -For example, define `VMA_ASSERT(expr)` before including the library to provide -custom implementation of the assertion, compatible with your project. -By default it is defined to standard C `assert(expr)` in `_DEBUG` configuration -and empty otherwise. - -\section config_Vulkan_functions Pointers to Vulkan functions - -The library uses Vulkan functions straight from the `vulkan.h` header by default. -If you want to provide your own pointers to these functions, e.g. fetched using -`vkGetInstanceProcAddr()` and `vkGetDeviceProcAddr()`: - --# Define `VMA_STATIC_VULKAN_FUNCTIONS 0`. --# Provide valid pointers through VmaAllocatorCreateInfo::pVulkanFunctions. - -\section custom_memory_allocator Custom host memory allocator - -If you use custom allocator for CPU memory rather than default operator `new` -and `delete` from C++, you can make this library using your allocator as well -by filling optional member VmaAllocatorCreateInfo::pAllocationCallbacks. These -functions will be passed to Vulkan, as well as used by the library itself to -make any CPU-side allocations. - -\section allocation_callbacks Device memory allocation callbacks - -The library makes calls to `vkAllocateMemory()` and `vkFreeMemory()` internally. -You can setup callbacks to be informed about these calls, e.g. for the purpose -of gathering some statistics. To do it, fill optional member -VmaAllocatorCreateInfo::pDeviceMemoryCallbacks. - -\section heap_memory_limit Device heap memory limit - -When device memory of certain heap runs out of free space, new allocations may -fail (returning error code) or they may succeed, silently pushing some existing -memory blocks from GPU VRAM to system RAM (which degrades performance). This -behavior is implementation-dependant - it depends on GPU vendor and graphics -driver. - -On AMD cards it can be controlled while creating Vulkan device object by using -VK_AMD_memory_overallocation_behavior extension, if available. - -Alternatively, if you want to test how your program behaves with limited amount of Vulkan device -memory available without switching your graphics card to one that really has -smaller VRAM, you can use a feature of this library intended for this purpose. -To do it, fill optional member VmaAllocatorCreateInfo::pHeapSizeLimit. - - - -\page vk_khr_dedicated_allocation VK_KHR_dedicated_allocation - -VK_KHR_dedicated_allocation is a Vulkan extension which can be used to improve -performance on some GPUs. It augments Vulkan API with possibility to query -driver whether it prefers particular buffer or image to have its own, dedicated -allocation (separate `VkDeviceMemory` block) for better efficiency - to be able -to do some internal optimizations. - -The extension is supported by this library. It will be used automatically when -enabled. To enable it: - -1 . When creating Vulkan device, check if following 2 device extensions are -supported (call `vkEnumerateDeviceExtensionProperties()`). -If yes, enable them (fill `VkDeviceCreateInfo::ppEnabledExtensionNames`). - -- VK_KHR_get_memory_requirements2 -- VK_KHR_dedicated_allocation - -If you enabled these extensions: - -2 . Use #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag when creating -your #VmaAllocator`to inform the library that you enabled required extensions -and you want the library to use them. - -\code -allocatorInfo.flags |= VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT; - -vmaCreateAllocator(&allocatorInfo, &allocator); -\endcode - -That's all. The extension will be automatically used whenever you create a -buffer using vmaCreateBuffer() or image using vmaCreateImage(). - -When using the extension together with Vulkan Validation Layer, you will receive -warnings like this: - - vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequirements() has not been called on that buffer. - -It is OK, you should just ignore it. It happens because you use function -`vkGetBufferMemoryRequirements2KHR()` instead of standard -`vkGetBufferMemoryRequirements()`, while the validation layer seems to be -unaware of it. - -To learn more about this extension, see: - -- [VK_KHR_dedicated_allocation in Vulkan specification](https://www.khronos.org/registry/vulkan/specs/1.0-extensions/html/vkspec.html#VK_KHR_dedicated_allocation) -- [VK_KHR_dedicated_allocation unofficial manual](http://asawicki.info/articles/VK_KHR_dedicated_allocation.php5) - - - -\page general_considerations General considerations - -\section general_considerations_thread_safety Thread safety - -- The library has no global state, so separate #VmaAllocator objects can be used - independently. - There should be no need to create multiple such objects though - one per `VkDevice` is enough. -- By default, all calls to functions that take #VmaAllocator as first parameter - are safe to call from multiple threads simultaneously because they are - synchronized internally when needed. -- When the allocator is created with #VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT - flag, calls to functions that take such #VmaAllocator object must be - synchronized externally. -- Access to a #VmaAllocation object must be externally synchronized. For example, - you must not call vmaGetAllocationInfo() and vmaMapMemory() from different - threads at the same time if you pass the same #VmaAllocation object to these - functions. - -\section general_considerations_validation_layer_warnings Validation layer warnings - -When using this library, you can meet following types of warnings issued by -Vulkan validation layer. They don't necessarily indicate a bug, so you may need -to just ignore them. - -- *vkBindBufferMemory(): Binding memory to buffer 0xeb8e4 but vkGetBufferMemoryRequirements() has not been called on that buffer.* - - It happens when VK_KHR_dedicated_allocation extension is enabled. - `vkGetBufferMemoryRequirements2KHR` function is used instead, while validation layer seems to be unaware of it. -- *Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.* - - It happens when you map a buffer or image, because the library maps entire - `VkDeviceMemory` block, where different types of images and buffers may end - up together, especially on GPUs with unified memory like Intel. -- *Non-linear image 0xebc91 is aliased with linear buffer 0xeb8e4 which may indicate a bug.* - - It happens when you use lost allocations, and a new image or buffer is - created in place of an existing object that bacame lost. - - It may happen also when you use [defragmentation](@ref defragmentation). - -\section general_considerations_allocation_algorithm Allocation algorithm - -The library uses following algorithm for allocation, in order: - --# Try to find free range of memory in existing blocks. --# If failed, try to create a new block of `VkDeviceMemory`, with preferred block size. --# If failed, try to create such block with size/2, size/4, size/8. --# If failed and #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag was - specified, try to find space in existing blocks, possilby making some other - allocations lost. --# If failed, try to allocate separate `VkDeviceMemory` for this allocation, - just like when you use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. --# If failed, choose other memory type that meets the requirements specified in - VmaAllocationCreateInfo and go to point 1. --# If failed, return `VK_ERROR_OUT_OF_DEVICE_MEMORY`. - -\section general_considerations_features_not_supported Features not supported - -Features deliberately excluded from the scope of this library: - -- Data transfer. Uploading (straming) and downloading data of buffers and images - between CPU and GPU memory and related synchronization is responsibility of the user. - Defining some "texture" object that would automatically stream its data from a - staging copy in CPU memory to GPU memory would rather be a feature of another, - higher-level library implemented on top of VMA. -- Allocations for imported/exported external memory. They tend to require - explicit memory type index and dedicated allocation anyway, so they don't - interact with main features of this library. Such special purpose allocations - should be made manually, using `vkCreateBuffer()` and `vkAllocateMemory()`. -- Recreation of buffers and images. Although the library has functions for - buffer and image creation (vmaCreateBuffer(), vmaCreateImage()), you need to - recreate these objects yourself after defragmentation. That's because the big - structures `VkBufferCreateInfo`, `VkImageCreateInfo` are not stored in - #VmaAllocation object. -- Handling CPU memory allocation failures. When dynamically creating small C++ - objects in CPU memory (not Vulkan memory), allocation failures are not checked - and handled gracefully, because that would complicate code significantly and - is usually not needed in desktop PC applications anyway. -- Code free of any compiler warnings. Maintaining the library to compile and - work correctly on so many different platforms is hard enough. Being free of - any warnings, on any version of any compiler, is simply not feasible. -- This is a C++ library with C interface. - Bindings or ports to any other programming languages are welcomed as external projects and - are not going to be included into this repository. - -*/ - -/* -Define this macro to 0/1 to disable/enable support for recording functionality, -available through VmaAllocatorCreateInfo::pRecordSettings. -*/ -#ifndef VMA_RECORDING_ENABLED - #define VMA_RECORDING_ENABLED 0 -#endif - -#ifndef NOMINMAX - #define NOMINMAX // For windows.h -#endif - -#ifndef VULKAN_H_ - #include -#endif - -#if VMA_RECORDING_ENABLED - #include -#endif - -// Define this macro to declare maximum supported Vulkan version in format AAABBBCCC, -// where AAA = major, BBB = minor, CCC = patch. -// If you want to use version > 1.0, it still needs to be enabled via VmaAllocatorCreateInfo::vulkanApiVersion. -#if !defined(VMA_VULKAN_VERSION) - #if defined(VK_VERSION_1_1) - #define VMA_VULKAN_VERSION 1001000 - #else - #define VMA_VULKAN_VERSION 1000000 - #endif -#endif - -#if !defined(VMA_DEDICATED_ALLOCATION) - #if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation - #define VMA_DEDICATED_ALLOCATION 1 - #else - #define VMA_DEDICATED_ALLOCATION 0 - #endif -#endif - -#if !defined(VMA_BIND_MEMORY2) - #if VK_KHR_bind_memory2 - #define VMA_BIND_MEMORY2 1 - #else - #define VMA_BIND_MEMORY2 0 - #endif -#endif - -#if !defined(VMA_MEMORY_BUDGET) - #if VK_EXT_memory_budget && (VK_KHR_get_physical_device_properties2 || VMA_VULKAN_VERSION >= 1001000) - #define VMA_MEMORY_BUDGET 1 - #else - #define VMA_MEMORY_BUDGET 0 - #endif -#endif - -// Define these macros to decorate all public functions with additional code, -// before and after returned type, appropriately. This may be useful for -// exporing the functions when compiling VMA as a separate library. Example: -// #define VMA_CALL_PRE __declspec(dllexport) -// #define VMA_CALL_POST __cdecl -#ifndef VMA_CALL_PRE - #define VMA_CALL_PRE -#endif -#ifndef VMA_CALL_POST - #define VMA_CALL_POST -#endif - -/** \struct VmaAllocator -\brief Represents main object of this library initialized. - -Fill structure #VmaAllocatorCreateInfo and call function vmaCreateAllocator() to create it. -Call function vmaDestroyAllocator() to destroy it. - -It is recommended to create just one object of this type per `VkDevice` object, -right after Vulkan is initialized and keep it alive until before Vulkan device is destroyed. -*/ -VK_DEFINE_HANDLE(VmaAllocator) - -/// Callback function called after successful vkAllocateMemory. -typedef void (VKAPI_PTR *PFN_vmaAllocateDeviceMemoryFunction)( - VmaAllocator allocator, - uint32_t memoryType, - VkDeviceMemory memory, - VkDeviceSize size); -/// Callback function called before vkFreeMemory. -typedef void (VKAPI_PTR *PFN_vmaFreeDeviceMemoryFunction)( - VmaAllocator allocator, - uint32_t memoryType, - VkDeviceMemory memory, - VkDeviceSize size); - -/** \brief Set of callbacks that the library will call for `vkAllocateMemory` and `vkFreeMemory`. - -Provided for informative purpose, e.g. to gather statistics about number of -allocations or total amount of memory allocated in Vulkan. - -Used in VmaAllocatorCreateInfo::pDeviceMemoryCallbacks. -*/ -typedef struct VmaDeviceMemoryCallbacks { - /// Optional, can be null. - PFN_vmaAllocateDeviceMemoryFunction pfnAllocate; - /// Optional, can be null. - PFN_vmaFreeDeviceMemoryFunction pfnFree; -} VmaDeviceMemoryCallbacks; - -/// Flags for created #VmaAllocator. -typedef enum VmaAllocatorCreateFlagBits { - /** \brief Allocator and all objects created from it will not be synchronized internally, so you must guarantee they are used from only one thread at a time or synchronized externally by you. - - Using this flag may increase performance because internal mutexes are not used. - */ - VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001, - /** \brief Enables usage of VK_KHR_dedicated_allocation extension. - - The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`. - When it's `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1. - - Using this extenion will automatically allocate dedicated blocks of memory for - some buffers and images instead of suballocating place for them out of bigger - memory blocks (as if you explicitly used #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT - flag) when it is recommended by the driver. It may improve performance on some - GPUs. - - You may set this flag only if you found out that following device extensions are - supported, you enabled them while creating Vulkan device passed as - VmaAllocatorCreateInfo::device, and you want them to be used internally by this - library: - - - VK_KHR_get_memory_requirements2 (device extension) - - VK_KHR_dedicated_allocation (device extension) - - When this flag is set, you can experience following warnings reported by Vulkan - validation layer. You can ignore them. - - > vkBindBufferMemory(): Binding memory to buffer 0x2d but vkGetBufferMemoryRequirements() has not been called on that buffer. - */ - VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT = 0x00000002, - /** - Enables usage of VK_KHR_bind_memory2 extension. - - The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`. - When it's `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1. - - You may set this flag only if you found out that this device extension is supported, - you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device, - and you want it to be used internally by this library. - - The extension provides functions `vkBindBufferMemory2KHR` and `vkBindImageMemory2KHR`, - which allow to pass a chain of `pNext` structures while binding. - This flag is required if you use `pNext` parameter in vmaBindBufferMemory2() or vmaBindImageMemory2(). - */ - VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT = 0x00000004, - /** - Enables usage of VK_EXT_memory_budget extension. - - You may set this flag only if you found out that this device extension is supported, - you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device, - and you want it to be used internally by this library, along with another instance extension - VK_KHR_get_physical_device_properties2, which is required by it (or Vulkan 1.1, where this extension is promoted). - - The extension provides query for current memory usage and budget, which will probably - be more accurate than an estimation used by the library otherwise. - */ - VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT = 0x00000008, - - VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaAllocatorCreateFlagBits; -typedef VkFlags VmaAllocatorCreateFlags; - -/** \brief Pointers to some Vulkan functions - a subset used by the library. - -Used in VmaAllocatorCreateInfo::pVulkanFunctions. -*/ -typedef struct VmaVulkanFunctions { - PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties; - PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties; - PFN_vkAllocateMemory vkAllocateMemory; - PFN_vkFreeMemory vkFreeMemory; - PFN_vkMapMemory vkMapMemory; - PFN_vkUnmapMemory vkUnmapMemory; - PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges; - PFN_vkInvalidateMappedMemoryRanges vkInvalidateMappedMemoryRanges; - PFN_vkBindBufferMemory vkBindBufferMemory; - PFN_vkBindImageMemory vkBindImageMemory; - PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements; - PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; - PFN_vkCreateBuffer vkCreateBuffer; - PFN_vkDestroyBuffer vkDestroyBuffer; - PFN_vkCreateImage vkCreateImage; - PFN_vkDestroyImage vkDestroyImage; - PFN_vkCmdCopyBuffer vkCmdCopyBuffer; -#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR; - PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR; -#endif -#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000 - PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR; - PFN_vkBindImageMemory2KHR vkBindImageMemory2KHR; -#endif -#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000 - PFN_vkGetPhysicalDeviceMemoryProperties2KHR vkGetPhysicalDeviceMemoryProperties2KHR; -#endif -} VmaVulkanFunctions; - -/// Flags to be used in VmaRecordSettings::flags. -typedef enum VmaRecordFlagBits { - /** \brief Enables flush after recording every function call. - - Enable it if you expect your application to crash, which may leave recording file truncated. - It may degrade performance though. - */ - VMA_RECORD_FLUSH_AFTER_CALL_BIT = 0x00000001, - - VMA_RECORD_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaRecordFlagBits; -typedef VkFlags VmaRecordFlags; - -/// Parameters for recording calls to VMA functions. To be used in VmaAllocatorCreateInfo::pRecordSettings. -typedef struct VmaRecordSettings -{ - /// Flags for recording. Use #VmaRecordFlagBits enum. - VmaRecordFlags flags; - /** \brief Path to the file that should be written by the recording. - - Suggested extension: "csv". - If the file already exists, it will be overwritten. - It will be opened for the whole time #VmaAllocator object is alive. - If opening this file fails, creation of the whole allocator object fails. - */ - const char* pFilePath; -} VmaRecordSettings; - -/// Description of a Allocator to be created. -typedef struct VmaAllocatorCreateInfo -{ - /// Flags for created allocator. Use #VmaAllocatorCreateFlagBits enum. - VmaAllocatorCreateFlags flags; - /// Vulkan physical device. - /** It must be valid throughout whole lifetime of created allocator. */ - VkPhysicalDevice physicalDevice; - /// Vulkan device. - /** It must be valid throughout whole lifetime of created allocator. */ - VkDevice device; - /// Preferred size of a single `VkDeviceMemory` block to be allocated from large heaps > 1 GiB. Optional. - /** Set to 0 to use default, which is currently 256 MiB. */ - VkDeviceSize preferredLargeHeapBlockSize; - /// Custom CPU memory allocation callbacks. Optional. - /** Optional, can be null. When specified, will also be used for all CPU-side memory allocations. */ - const VkAllocationCallbacks* pAllocationCallbacks; - /// Informative callbacks for `vkAllocateMemory`, `vkFreeMemory`. Optional. - /** Optional, can be null. */ - const VmaDeviceMemoryCallbacks* pDeviceMemoryCallbacks; - /** \brief Maximum number of additional frames that are in use at the same time as current frame. - - This value is used only when you make allocations with - VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocation cannot become - lost if allocation.lastUseFrameIndex >= allocator.currentFrameIndex - frameInUseCount. - - For example, if you double-buffer your command buffers, so resources used for - rendering in previous frame may still be in use by the GPU at the moment you - allocate resources needed for the current frame, set this value to 1. - - If you want to allow any allocations other than used in the current frame to - become lost, set this value to 0. - */ - uint32_t frameInUseCount; - /** \brief Either null or a pointer to an array of limits on maximum number of bytes that can be allocated out of particular Vulkan memory heap. - - If not NULL, it must be a pointer to an array of - `VkPhysicalDeviceMemoryProperties::memoryHeapCount` elements, defining limit on - maximum number of bytes that can be allocated out of particular Vulkan memory - heap. - - Any of the elements may be equal to `VK_WHOLE_SIZE`, which means no limit on that - heap. This is also the default in case of `pHeapSizeLimit` = NULL. - - If there is a limit defined for a heap: - - - If user tries to allocate more memory from that heap using this allocator, - the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`. - - If the limit is smaller than heap size reported in `VkMemoryHeap::size`, the - value of this limit will be reported instead when using vmaGetMemoryProperties(). - - Warning! Using this feature may not be equivalent to installing a GPU with - smaller amount of memory, because graphics driver doesn't necessary fail new - allocations with `VK_ERROR_OUT_OF_DEVICE_MEMORY` result when memory capacity is - exceeded. It may return success and just silently migrate some device memory - blocks to system RAM. This driver behavior can also be controlled using - VK_AMD_memory_overallocation_behavior extension. - */ - const VkDeviceSize* pHeapSizeLimit; - /** \brief Pointers to Vulkan functions. Can be null if you leave define `VMA_STATIC_VULKAN_FUNCTIONS 1`. - - If you leave define `VMA_STATIC_VULKAN_FUNCTIONS 1` in configuration section, - you can pass null as this member, because the library will fetch pointers to - Vulkan functions internally in a static way, like: - - vulkanFunctions.vkAllocateMemory = &vkAllocateMemory; - - Fill this member if you want to provide your own pointers to Vulkan functions, - e.g. fetched using `vkGetInstanceProcAddr()` and `vkGetDeviceProcAddr()`. - */ - const VmaVulkanFunctions* pVulkanFunctions; - /** \brief Parameters for recording of VMA calls. Can be null. - - If not null, it enables recording of calls to VMA functions to a file. - If support for recording is not enabled using `VMA_RECORDING_ENABLED` macro, - creation of the allocator object fails with `VK_ERROR_FEATURE_NOT_PRESENT`. - */ - const VmaRecordSettings* pRecordSettings; - /** \brief Optional handle to Vulkan instance object. - - Optional, can be null. Must be set if #VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT flas is used - or if `vulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)`. - */ - VkInstance instance; - /** \brief Optional. The highest version of Vulkan that the application is designed to use. - - It must be a value in the format as created by macro `VK_MAKE_VERSION` or a constant like: `VK_API_VERSION_1_1`, `VK_API_VERSION_1_0`. - The patch version number specified is ignored. Only the major and minor versions are considered. - It must be less or euqal (preferably equal) to value as passed to `vkCreateInstance` as `VkApplicationInfo::apiVersion`. - Only versions 1.0 and 1.1 are supported by the current implementation. - Leaving it initialized to zero is equivalent to `VK_API_VERSION_1_0`. - */ - uint32_t vulkanApiVersion; -} VmaAllocatorCreateInfo; - -/// Creates Allocator object. -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator( - const VmaAllocatorCreateInfo* pCreateInfo, - VmaAllocator* pAllocator); - -/// Destroys allocator object. -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator( - VmaAllocator allocator); - -/** -PhysicalDeviceProperties are fetched from physicalDevice by the allocator. -You can access it here, without fetching it again on your own. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties( - VmaAllocator allocator, - const VkPhysicalDeviceProperties** ppPhysicalDeviceProperties); - -/** -PhysicalDeviceMemoryProperties are fetched from physicalDevice by the allocator. -You can access it here, without fetching it again on your own. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties( - VmaAllocator allocator, - const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties); - -/** -\brief Given Memory Type Index, returns Property Flags of this memory type. - -This is just a convenience function. Same information can be obtained using -vmaGetMemoryProperties(). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties( - VmaAllocator allocator, - uint32_t memoryTypeIndex, - VkMemoryPropertyFlags* pFlags); - -/** \brief Sets index of the current frame. - -This function must be used if you make allocations with -#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT and -#VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flags to inform the allocator -when a new frame begins. Allocations queried using vmaGetAllocationInfo() cannot -become lost in the current frame. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex( - VmaAllocator allocator, - uint32_t frameIndex); - -/** \brief Calculated statistics of memory usage in entire allocator. -*/ -typedef struct VmaStatInfo -{ - /// Number of `VkDeviceMemory` Vulkan memory blocks allocated. - uint32_t blockCount; - /// Number of #VmaAllocation allocation objects allocated. - uint32_t allocationCount; - /// Number of free ranges of memory between allocations. - uint32_t unusedRangeCount; - /// Total number of bytes occupied by all allocations. - VkDeviceSize usedBytes; - /// Total number of bytes occupied by unused ranges. - VkDeviceSize unusedBytes; - VkDeviceSize allocationSizeMin, allocationSizeAvg, allocationSizeMax; - VkDeviceSize unusedRangeSizeMin, unusedRangeSizeAvg, unusedRangeSizeMax; -} VmaStatInfo; - -/// General statistics from current state of Allocator. -typedef struct VmaStats -{ - VmaStatInfo memoryType[VK_MAX_MEMORY_TYPES]; - VmaStatInfo memoryHeap[VK_MAX_MEMORY_HEAPS]; - VmaStatInfo total; -} VmaStats; - -/** \brief Retrieves statistics from current state of the Allocator. - -This function is called "calculate" not "get" because it has to traverse all -internal data structures, so it may be quite slow. For faster but more brief statistics -suitable to be called every frame or every allocation, use vmaGetBudget(). - -Note that when using allocator from multiple threads, returned information may immediately -become outdated. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStats( - VmaAllocator allocator, - VmaStats* pStats); - -/** \brief Statistics of current memory usage and available budget, in bytes, for specific memory heap. -*/ -typedef struct VmaBudget -{ - /** \brief Sum size of all `VkDeviceMemory` blocks allocated from particular heap, in bytes. - */ - VkDeviceSize blockBytes; - - /** \brief Sum size of all allocations created in particular heap, in bytes. - - Usually less or equal than `blockBytes`. - Difference `blockBytes - allocationBytes` is the amount of memory allocated but unused - - available for new allocations or wasted due to fragmentation. - - It might be greater than `blockBytes` if there are some allocations in lost state, as they account - to this value as well. - */ - VkDeviceSize allocationBytes; - - /** \brief Estimated current memory usage of the program, in bytes. - - Fetched from system using `VK_EXT_memory_budget` extension if enabled. - - It might be different than `blockBytes` (usually higher) due to additional implicit objects - also occupying the memory, like swapchain, pipelines, descriptor heaps, command buffers, or - `VkDeviceMemory` blocks allocated outside of this library, if any. - */ - VkDeviceSize usage; - - /** \brief Estimated amount of memory available to the program, in bytes. - - Fetched from system using `VK_EXT_memory_budget` extension if enabled. - - It might be different (most probably smaller) than `VkMemoryHeap::size[heapIndex]` due to factors - external to the program, like other programs also consuming system resources. - Difference `budget - usage` is the amount of additional memory that can probably - be allocated without problems. Exceeding the budget may result in various problems. - */ - VkDeviceSize budget; -} VmaBudget; - -/** \brief Retrieves information about current memory budget for all memory heaps. - -\param[out] pBudget Must point to array with number of elements at least equal to number of memory heaps in physical device used. - -This function is called "get" not "calculate" because it is very fast, suitable to be called -every frame or every allocation. For more detailed statistics use vmaCalculateStats(). - -Note that when using allocator from multiple threads, returned information may immediately -become outdated. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetBudget( - VmaAllocator allocator, - VmaBudget* pBudget); - -#ifndef VMA_STATS_STRING_ENABLED -#define VMA_STATS_STRING_ENABLED 1 -#endif - -#if VMA_STATS_STRING_ENABLED - -/// Builds and returns statistics as string in JSON format. -/** @param[out] ppStatsString Must be freed using vmaFreeStatsString() function. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString( - VmaAllocator allocator, - char** ppStatsString, - VkBool32 detailedMap); - -VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( - VmaAllocator allocator, - char* pStatsString); - -#endif // #if VMA_STATS_STRING_ENABLED - -/** \struct VmaPool -\brief Represents custom memory pool - -Fill structure VmaPoolCreateInfo and call function vmaCreatePool() to create it. -Call function vmaDestroyPool() to destroy it. - -For more information see [Custom memory pools](@ref choosing_memory_type_custom_memory_pools). -*/ -VK_DEFINE_HANDLE(VmaPool) - -typedef enum VmaMemoryUsage -{ - /** No intended memory usage specified. - Use other members of VmaAllocationCreateInfo to specify your requirements. - */ - VMA_MEMORY_USAGE_UNKNOWN = 0, - /** Memory will be used on device only, so fast access from the device is preferred. - It usually means device-local GPU (video) memory. - No need to be mappable on host. - It is roughly equivalent of `D3D12_HEAP_TYPE_DEFAULT`. - - Usage: - - - Resources written and read by device, e.g. images used as attachments. - - Resources transferred from host once (immutable) or infrequently and read by - device multiple times, e.g. textures to be sampled, vertex buffers, uniform - (constant) buffers, and majority of other types of resources used on GPU. - - Allocation may still end up in `HOST_VISIBLE` memory on some implementations. - In such case, you are free to map it. - You can use #VMA_ALLOCATION_CREATE_MAPPED_BIT with this usage type. - */ - VMA_MEMORY_USAGE_GPU_ONLY = 1, - /** Memory will be mappable on host. - It usually means CPU (system) memory. - Guarantees to be `HOST_VISIBLE` and `HOST_COHERENT`. - CPU access is typically uncached. Writes may be write-combined. - Resources created in this pool may still be accessible to the device, but access to them can be slow. - It is roughly equivalent of `D3D12_HEAP_TYPE_UPLOAD`. - - Usage: Staging copy of resources used as transfer source. - */ - VMA_MEMORY_USAGE_CPU_ONLY = 2, - /** - Memory that is both mappable on host (guarantees to be `HOST_VISIBLE`) and preferably fast to access by GPU. - CPU access is typically uncached. Writes may be write-combined. - - Usage: Resources written frequently by host (dynamic), read by device. E.g. textures, vertex buffers, uniform buffers updated every frame or every draw call. - */ - VMA_MEMORY_USAGE_CPU_TO_GPU = 3, - /** Memory mappable on host (guarantees to be `HOST_VISIBLE`) and cached. - It is roughly equivalent of `D3D12_HEAP_TYPE_READBACK`. - - Usage: - - - Resources written by device, read by host - results of some computations, e.g. screen capture, average scene luminance for HDR tone mapping. - - Any resources read or accessed randomly on host, e.g. CPU-side copy of vertex buffer used as source of transfer, but also used for collision detection. - */ - VMA_MEMORY_USAGE_GPU_TO_CPU = 4, - /** CPU memory - memory that is preferably not `DEVICE_LOCAL`, but also not guaranteed to be `HOST_VISIBLE`. - - Usage: Staging copy of resources moved from GPU memory to CPU memory as part - of custom paging/residency mechanism, to be moved back to GPU memory when needed. - */ - VMA_MEMORY_USAGE_CPU_COPY = 5, - /** Lazily allocated GPU memory having `VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT`. - Exists mostly on mobile platforms. Using it on desktop PC or other GPUs with no such memory type present will fail the allocation. - - Usage: Memory for transient attachment images (color attachments, depth attachments etc.), created with `VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT`. - - Allocations with this usage are always created as dedicated - it implies #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. - */ - VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED = 6, - - VMA_MEMORY_USAGE_MAX_ENUM = 0x7FFFFFFF -} VmaMemoryUsage; - -/// Flags to be passed as VmaAllocationCreateInfo::flags. -typedef enum VmaAllocationCreateFlagBits { - /** \brief Set this flag if the allocation should have its own memory block. - - Use it for special, big resources, like fullscreen images used as attachments. - - You should not use this flag if VmaAllocationCreateInfo::pool is not null. - */ - VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT = 0x00000001, - - /** \brief Set this flag to only try to allocate from existing `VkDeviceMemory` blocks and never create new such block. - - If new allocation cannot be placed in any of the existing blocks, allocation - fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY` error. - - You should not use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT and - #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT at the same time. It makes no sense. - - If VmaAllocationCreateInfo::pool is not null, this flag is implied and ignored. */ - VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT = 0x00000002, - /** \brief Set this flag to use a memory that will be persistently mapped and retrieve pointer to it. - - Pointer to mapped memory will be returned through VmaAllocationInfo::pMappedData. - - Is it valid to use this flag for allocation made from memory type that is not - `HOST_VISIBLE`. This flag is then ignored and memory is not mapped. This is - useful if you need an allocation that is efficient to use on GPU - (`DEVICE_LOCAL`) and still want to map it directly if possible on platforms that - support it (e.g. Intel GPU). - - You should not use this flag together with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT. - */ - VMA_ALLOCATION_CREATE_MAPPED_BIT = 0x00000004, - /** Allocation created with this flag can become lost as a result of another - allocation with #VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT flag, so you - must check it before use. - - To check if allocation is not lost, call vmaGetAllocationInfo() and check if - VmaAllocationInfo::deviceMemory is not `VK_NULL_HANDLE`. - - For details about supporting lost allocations, see Lost Allocations - chapter of User Guide on Main Page. - - You should not use this flag together with #VMA_ALLOCATION_CREATE_MAPPED_BIT. - */ - VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT = 0x00000008, - /** While creating allocation using this flag, other allocations that were - created with flag #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT can become lost. - - For details about supporting lost allocations, see Lost Allocations - chapter of User Guide on Main Page. - */ - VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT = 0x00000010, - /** Set this flag to treat VmaAllocationCreateInfo::pUserData as pointer to a - null-terminated string. Instead of copying pointer value, a local copy of the - string is made and stored in allocation's `pUserData`. The string is automatically - freed together with the allocation. It is also used in vmaBuildStatsString(). - */ - VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT = 0x00000020, - /** Allocation will be created from upper stack in a double stack pool. - - This flag is only allowed for custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT flag. - */ - VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = 0x00000040, - /** Create both buffer/image and allocation, but don't bind them together. - It is useful when you want to bind yourself to do some more advanced binding, e.g. using some extensions. - The flag is meaningful only with functions that bind by default: vmaCreateBuffer(), vmaCreateImage(). - Otherwise it is ignored. - */ - VMA_ALLOCATION_CREATE_DONT_BIND_BIT = 0x00000080, - /** Create allocation only if additional device memory required for it, if any, won't exceed - memory budget. Otherwise return `VK_ERROR_OUT_OF_DEVICE_MEMORY`. - */ - VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT = 0x00000100, - - /** Allocation strategy that chooses smallest possible free range for the - allocation. - */ - VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT = 0x00010000, - /** Allocation strategy that chooses biggest possible free range for the - allocation. - */ - VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT = 0x00020000, - /** Allocation strategy that chooses first suitable free range for the - allocation. - - "First" doesn't necessarily means the one with smallest offset in memory, - but rather the one that is easiest and fastest to find. - */ - VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT = 0x00040000, - - /** Allocation strategy that tries to minimize memory usage. - */ - VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT, - /** Allocation strategy that tries to minimize allocation time. - */ - VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT, - /** Allocation strategy that tries to minimize memory fragmentation. - */ - VMA_ALLOCATION_CREATE_STRATEGY_MIN_FRAGMENTATION_BIT = VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT, - - /** A bit mask to extract only `STRATEGY` bits from entire set of flags. - */ - VMA_ALLOCATION_CREATE_STRATEGY_MASK = - VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT | - VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT | - VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT, - - VMA_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaAllocationCreateFlagBits; -typedef VkFlags VmaAllocationCreateFlags; - -typedef struct VmaAllocationCreateInfo -{ - /// Use #VmaAllocationCreateFlagBits enum. - VmaAllocationCreateFlags flags; - /** \brief Intended usage of memory. - - You can leave #VMA_MEMORY_USAGE_UNKNOWN if you specify memory requirements in other way. \n - If `pool` is not null, this member is ignored. - */ - VmaMemoryUsage usage; - /** \brief Flags that must be set in a Memory Type chosen for an allocation. - - Leave 0 if you specify memory requirements in other way. \n - If `pool` is not null, this member is ignored.*/ - VkMemoryPropertyFlags requiredFlags; - /** \brief Flags that preferably should be set in a memory type chosen for an allocation. - - Set to 0 if no additional flags are prefered. \n - If `pool` is not null, this member is ignored. */ - VkMemoryPropertyFlags preferredFlags; - /** \brief Bitmask containing one bit set for every memory type acceptable for this allocation. - - Value 0 is equivalent to `UINT32_MAX` - it means any memory type is accepted if - it meets other requirements specified by this structure, with no further - restrictions on memory type index. \n - If `pool` is not null, this member is ignored. - */ - uint32_t memoryTypeBits; - /** \brief Pool that this allocation should be created in. - - Leave `VK_NULL_HANDLE` to allocate from default pool. If not null, members: - `usage`, `requiredFlags`, `preferredFlags`, `memoryTypeBits` are ignored. - */ - VmaPool pool; - /** \brief Custom general-purpose pointer that will be stored in #VmaAllocation, can be read as VmaAllocationInfo::pUserData and changed using vmaSetAllocationUserData(). - - If #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT is used, it must be either - null or pointer to a null-terminated string. The string will be then copied to - internal buffer, so it doesn't need to be valid after allocation call. - */ - void* pUserData; -} VmaAllocationCreateInfo; - -/** -\brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo. - -This algorithm tries to find a memory type that: - -- Is allowed by memoryTypeBits. -- Contains all the flags from pAllocationCreateInfo->requiredFlags. -- Matches intended usage. -- Has as many flags from pAllocationCreateInfo->preferredFlags as possible. - -\return Returns VK_ERROR_FEATURE_NOT_PRESENT if not found. Receiving such result -from this function or any other allocating function probably means that your -device doesn't support any memory type with requested features for the specific -type of resource you want to use it for. Please check parameters of your -resource, like image layout (OPTIMAL versus LINEAR) or mip level count. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex( - VmaAllocator allocator, - uint32_t memoryTypeBits, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex); - -/** -\brief Helps to find memoryTypeIndex, given VkBufferCreateInfo and VmaAllocationCreateInfo. - -It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex. -It internally creates a temporary, dummy buffer that never has memory bound. -It is just a convenience function, equivalent to calling: - -- `vkCreateBuffer` -- `vkGetBufferMemoryRequirements` -- `vmaFindMemoryTypeIndex` -- `vkDestroyBuffer` -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo( - VmaAllocator allocator, - const VkBufferCreateInfo* pBufferCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex); - -/** -\brief Helps to find memoryTypeIndex, given VkImageCreateInfo and VmaAllocationCreateInfo. - -It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex. -It internally creates a temporary, dummy image that never has memory bound. -It is just a convenience function, equivalent to calling: - -- `vkCreateImage` -- `vkGetImageMemoryRequirements` -- `vmaFindMemoryTypeIndex` -- `vkDestroyImage` -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo( - VmaAllocator allocator, - const VkImageCreateInfo* pImageCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex); - -/// Flags to be passed as VmaPoolCreateInfo::flags. -typedef enum VmaPoolCreateFlagBits { - /** \brief Use this flag if you always allocate only buffers and linear images or only optimal images out of this pool and so Buffer-Image Granularity can be ignored. - - This is an optional optimization flag. - - If you always allocate using vmaCreateBuffer(), vmaCreateImage(), - vmaAllocateMemoryForBuffer(), then you don't need to use it because allocator - knows exact type of your allocations so it can handle Buffer-Image Granularity - in the optimal way. - - If you also allocate using vmaAllocateMemoryForImage() or vmaAllocateMemory(), - exact type of such allocations is not known, so allocator must be conservative - in handling Buffer-Image Granularity, which can lead to suboptimal allocation - (wasted memory). In that case, if you can make sure you always allocate only - buffers and linear images or only optimal images out of this pool, use this flag - to make allocator disregard Buffer-Image Granularity and so make allocations - faster and more optimal. - */ - VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT = 0x00000002, - - /** \brief Enables alternative, linear allocation algorithm in this pool. - - Specify this flag to enable linear allocation algorithm, which always creates - new allocations after last one and doesn't reuse space from allocations freed in - between. It trades memory consumption for simplified algorithm and data - structure, which has better performance and uses less memory for metadata. - - By using this flag, you can achieve behavior of free-at-once, stack, - ring buffer, and double stack. For details, see documentation chapter - \ref linear_algorithm. - - When using this flag, you must specify VmaPoolCreateInfo::maxBlockCount == 1 (or 0 for default). - - For more details, see [Linear allocation algorithm](@ref linear_algorithm). - */ - VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT = 0x00000004, - - /** \brief Enables alternative, buddy allocation algorithm in this pool. - - It operates on a tree of blocks, each having size that is a power of two and - a half of its parent's size. Comparing to default algorithm, this one provides - faster allocation and deallocation and decreased external fragmentation, - at the expense of more memory wasted (internal fragmentation). - - For more details, see [Buddy allocation algorithm](@ref buddy_algorithm). - */ - VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT = 0x00000008, - - /** Bit mask to extract only `ALGORITHM` bits from entire set of flags. - */ - VMA_POOL_CREATE_ALGORITHM_MASK = - VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT | - VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT, - - VMA_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaPoolCreateFlagBits; -typedef VkFlags VmaPoolCreateFlags; - -/** \brief Describes parameter of created #VmaPool. -*/ -typedef struct VmaPoolCreateInfo { - /** \brief Vulkan memory type index to allocate this pool from. - */ - uint32_t memoryTypeIndex; - /** \brief Use combination of #VmaPoolCreateFlagBits. - */ - VmaPoolCreateFlags flags; - /** \brief Size of a single `VkDeviceMemory` block to be allocated as part of this pool, in bytes. Optional. - - Specify nonzero to set explicit, constant size of memory blocks used by this - pool. - - Leave 0 to use default and let the library manage block sizes automatically. - Sizes of particular blocks may vary. - */ - VkDeviceSize blockSize; - /** \brief Minimum number of blocks to be always allocated in this pool, even if they stay empty. - - Set to 0 to have no preallocated blocks and allow the pool be completely empty. - */ - size_t minBlockCount; - /** \brief Maximum number of blocks that can be allocated in this pool. Optional. - - Set to 0 to use default, which is `SIZE_MAX`, which means no limit. - - Set to same value as VmaPoolCreateInfo::minBlockCount to have fixed amount of memory allocated - throughout whole lifetime of this pool. - */ - size_t maxBlockCount; - /** \brief Maximum number of additional frames that are in use at the same time as current frame. - - This value is used only when you make allocations with - #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocation cannot become - lost if allocation.lastUseFrameIndex >= allocator.currentFrameIndex - frameInUseCount. - - For example, if you double-buffer your command buffers, so resources used for - rendering in previous frame may still be in use by the GPU at the moment you - allocate resources needed for the current frame, set this value to 1. - - If you want to allow any allocations other than used in the current frame to - become lost, set this value to 0. - */ - uint32_t frameInUseCount; -} VmaPoolCreateInfo; - -/** \brief Describes parameter of existing #VmaPool. -*/ -typedef struct VmaPoolStats { - /** \brief Total amount of `VkDeviceMemory` allocated from Vulkan for this pool, in bytes. - */ - VkDeviceSize size; - /** \brief Total number of bytes in the pool not used by any #VmaAllocation. - */ - VkDeviceSize unusedSize; - /** \brief Number of #VmaAllocation objects created from this pool that were not destroyed or lost. - */ - size_t allocationCount; - /** \brief Number of continuous memory ranges in the pool not used by any #VmaAllocation. - */ - size_t unusedRangeCount; - /** \brief Size of the largest continuous free memory region available for new allocation. - - Making a new allocation of that size is not guaranteed to succeed because of - possible additional margin required to respect alignment and buffer/image - granularity. - */ - VkDeviceSize unusedRangeSizeMax; - /** \brief Number of `VkDeviceMemory` blocks allocated for this pool. - */ - size_t blockCount; -} VmaPoolStats; - -/** \brief Allocates Vulkan device memory and creates #VmaPool object. - -@param allocator Allocator object. -@param pCreateInfo Parameters of pool to create. -@param[out] pPool Handle to created pool. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool( - VmaAllocator allocator, - const VmaPoolCreateInfo* pCreateInfo, - VmaPool* pPool); - -/** \brief Destroys #VmaPool object and frees Vulkan device memory. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool( - VmaAllocator allocator, - VmaPool pool); - -/** \brief Retrieves statistics of existing #VmaPool object. - -@param allocator Allocator object. -@param pool Pool object. -@param[out] pPoolStats Statistics of specified pool. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStats( - VmaAllocator allocator, - VmaPool pool, - VmaPoolStats* pPoolStats); - -/** \brief Marks all allocations in given pool as lost if they are not used in current frame or VmaPoolCreateInfo::frameInUseCount back from now. - -@param allocator Allocator object. -@param pool Pool. -@param[out] pLostAllocationCount Number of allocations marked as lost. Optional - pass null if you don't need this information. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaMakePoolAllocationsLost( - VmaAllocator allocator, - VmaPool pool, - size_t* pLostAllocationCount); - -/** \brief Checks magic number in margins around all allocations in given memory pool in search for corruptions. - -Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero, -`VMA_DEBUG_MARGIN` is defined to nonzero and the pool is created in memory type that is -`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection). - -Possible return values: - -- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for specified pool. -- `VK_SUCCESS` - corruption detection has been performed and succeeded. -- `VK_ERROR_VALIDATION_FAILED_EXT` - corruption detection has been performed and found memory corruptions around one of the allocations. - `VMA_ASSERT` is also fired in that case. -- Other value: Error returned by Vulkan, e.g. memory mapping failure. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool); - -/** \brief Retrieves name of a custom pool. - -After the call `ppName` is either null or points to an internally-owned null-terminated string -containing name of the pool that was previously set. The pointer becomes invalid when the pool is -destroyed or its name is changed using vmaSetPoolName(). -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName( - VmaAllocator allocator, - VmaPool pool, - const char** ppName); - -/** \brief Sets name of a custom pool. - -`pName` can be either null or pointer to a null-terminated string with new name for the pool. -Function makes internal copy of the string, so it can be changed or freed immediately after this call. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName( - VmaAllocator allocator, - VmaPool pool, - const char* pName); - -/** \struct VmaAllocation -\brief Represents single memory allocation. - -It may be either dedicated block of `VkDeviceMemory` or a specific region of a bigger block of this type -plus unique offset. - -There are multiple ways to create such object. -You need to fill structure VmaAllocationCreateInfo. -For more information see [Choosing memory type](@ref choosing_memory_type). - -Although the library provides convenience functions that create Vulkan buffer or image, -allocate memory for it and bind them together, -binding of the allocation to a buffer or an image is out of scope of the allocation itself. -Allocation object can exist without buffer/image bound, -binding can be done manually by the user, and destruction of it can be done -independently of destruction of the allocation. - -The object also remembers its size and some other information. -To retrieve this information, use function vmaGetAllocationInfo() and inspect -returned structure VmaAllocationInfo. - -Some kinds allocations can be in lost state. -For more information, see [Lost allocations](@ref lost_allocations). -*/ -VK_DEFINE_HANDLE(VmaAllocation) - -/** \brief Parameters of #VmaAllocation objects, that can be retrieved using function vmaGetAllocationInfo(). -*/ -typedef struct VmaAllocationInfo { - /** \brief Memory type index that this allocation was allocated from. - - It never changes. - */ - uint32_t memoryType; - /** \brief Handle to Vulkan memory object. - - Same memory object can be shared by multiple allocations. - - It can change after call to vmaDefragment() if this allocation is passed to the function, or if allocation is lost. - - If the allocation is lost, it is equal to `VK_NULL_HANDLE`. - */ - VkDeviceMemory deviceMemory; - /** \brief Offset into deviceMemory object to the beginning of this allocation, in bytes. (deviceMemory, offset) pair is unique to this allocation. - - It can change after call to vmaDefragment() if this allocation is passed to the function, or if allocation is lost. - */ - VkDeviceSize offset; - /** \brief Size of this allocation, in bytes. - - It never changes, unless allocation is lost. - */ - VkDeviceSize size; - /** \brief Pointer to the beginning of this allocation as mapped data. - - If the allocation hasn't been mapped using vmaMapMemory() and hasn't been - created with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag, this value null. - - It can change after call to vmaMapMemory(), vmaUnmapMemory(). - It can also change after call to vmaDefragment() if this allocation is passed to the function. - */ - void* pMappedData; - /** \brief Custom general-purpose pointer that was passed as VmaAllocationCreateInfo::pUserData or set using vmaSetAllocationUserData(). - - It can change after call to vmaSetAllocationUserData() for this allocation. - */ - void* pUserData; -} VmaAllocationInfo; - -/** \brief General purpose memory allocation. - -@param[out] pAllocation Handle to allocated memory. -@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). - -You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages(). - -It is recommended to use vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(), -vmaCreateBuffer(), vmaCreateImage() instead whenever possible. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory( - VmaAllocator allocator, - const VkMemoryRequirements* pVkMemoryRequirements, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo); - -/** \brief General purpose memory allocation for multiple allocation objects at once. - -@param allocator Allocator object. -@param pVkMemoryRequirements Memory requirements for each allocation. -@param pCreateInfo Creation parameters for each alloction. -@param allocationCount Number of allocations to make. -@param[out] pAllocations Pointer to array that will be filled with handles to created allocations. -@param[out] pAllocationInfo Optional. Pointer to array that will be filled with parameters of created allocations. - -You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages(). - -Word "pages" is just a suggestion to use this function to allocate pieces of memory needed for sparse binding. -It is just a general purpose allocation function able to make multiple allocations at once. -It may be internally optimized to be more efficient than calling vmaAllocateMemory() `allocationCount` times. - -All allocations are made using same parameters. All of them are created out of the same memory pool and type. -If any allocation fails, all allocations already made within this function call are also freed, so that when -returned result is not `VK_SUCCESS`, `pAllocation` array is always entirely filled with `VK_NULL_HANDLE`. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages( - VmaAllocator allocator, - const VkMemoryRequirements* pVkMemoryRequirements, - const VmaAllocationCreateInfo* pCreateInfo, - size_t allocationCount, - VmaAllocation* pAllocations, - VmaAllocationInfo* pAllocationInfo); - -/** -@param[out] pAllocation Handle to allocated memory. -@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). - -You should free the memory using vmaFreeMemory(). -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer( - VmaAllocator allocator, - VkBuffer buffer, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo); - -/// Function similar to vmaAllocateMemoryForBuffer(). -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage( - VmaAllocator allocator, - VkImage image, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo); - -/** \brief Frees memory previously allocated using vmaAllocateMemory(), vmaAllocateMemoryForBuffer(), or vmaAllocateMemoryForImage(). - -Passing `VK_NULL_HANDLE` as `allocation` is valid. Such function call is just skipped. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory( - VmaAllocator allocator, - VmaAllocation allocation); - -/** \brief Frees memory and destroys multiple allocations. - -Word "pages" is just a suggestion to use this function to free pieces of memory used for sparse binding. -It is just a general purpose function to free memory and destroy allocations made using e.g. vmaAllocateMemory(), -vmaAllocateMemoryPages() and other functions. -It may be internally optimized to be more efficient than calling vmaFreeMemory() `allocationCount` times. - -Allocations in `pAllocations` array can come from any memory pools and types. -Passing `VK_NULL_HANDLE` as elements of `pAllocations` array is valid. Such entries are just skipped. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages( - VmaAllocator allocator, - size_t allocationCount, - VmaAllocation* pAllocations); - -/** \brief Deprecated. - -In version 2.2.0 it used to try to change allocation's size without moving or reallocating it. -In current version it returns `VK_SUCCESS` only if `newSize` equals current allocation's size. -Otherwise returns `VK_ERROR_OUT_OF_POOL_MEMORY`, indicating that allocation's size could not be changed. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaResizeAllocation( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize newSize); - -/** \brief Returns current information about specified allocation and atomically marks it as used in current frame. - -Current paramters of given allocation are returned in `pAllocationInfo`. - -This function also atomically "touches" allocation - marks it as used in current frame, -just like vmaTouchAllocation(). -If the allocation is in lost state, `pAllocationInfo->deviceMemory == VK_NULL_HANDLE`. - -Although this function uses atomics and doesn't lock any mutex, so it should be quite efficient, -you can avoid calling it too often. - -- You can retrieve same VmaAllocationInfo structure while creating your resource, from function - vmaCreateBuffer(), vmaCreateImage(). You can remember it if you are sure parameters don't change - (e.g. due to defragmentation or allocation becoming lost). -- If you just want to check if allocation is not lost, vmaTouchAllocation() will work faster. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo( - VmaAllocator allocator, - VmaAllocation allocation, - VmaAllocationInfo* pAllocationInfo); - -/** \brief Returns `VK_TRUE` if allocation is not lost and atomically marks it as used in current frame. - -If the allocation has been created with #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag, -this function returns `VK_TRUE` if it's not in lost state, so it can still be used. -It then also atomically "touches" the allocation - marks it as used in current frame, -so that you can be sure it won't become lost in current frame or next `frameInUseCount` frames. - -If the allocation is in lost state, the function returns `VK_FALSE`. -Memory of such allocation, as well as buffer or image bound to it, should not be used. -Lost allocation and the buffer/image still need to be destroyed. - -If the allocation has been created without #VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag, -this function always returns `VK_TRUE`. -*/ -VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaTouchAllocation( - VmaAllocator allocator, - VmaAllocation allocation); - -/** \brief Sets pUserData in given allocation to new value. - -If the allocation was created with VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT, -pUserData must be either null, or pointer to a null-terminated string. The function -makes local copy of the string and sets it as allocation's `pUserData`. String -passed as pUserData doesn't need to be valid for whole lifetime of the allocation - -you can free it after this call. String previously pointed by allocation's -pUserData is freed from memory. - -If the flag was not used, the value of pointer `pUserData` is just copied to -allocation's `pUserData`. It is opaque, so you can use it however you want - e.g. -as a pointer, ordinal number or some handle to you own data. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData( - VmaAllocator allocator, - VmaAllocation allocation, - void* pUserData); - -/** \brief Creates new allocation that is in lost state from the beginning. - -It can be useful if you need a dummy, non-null allocation. - -You still need to destroy created object using vmaFreeMemory(). - -Returned allocation is not tied to any specific memory pool or memory type and -not bound to any image or buffer. It has size = 0. It cannot be turned into -a real, non-empty allocation. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaCreateLostAllocation( - VmaAllocator allocator, - VmaAllocation* pAllocation); - -/** \brief Maps memory represented by given allocation and returns pointer to it. - -Maps memory represented by given allocation to make it accessible to CPU code. -When succeeded, `*ppData` contains pointer to first byte of this memory. -If the allocation is part of bigger `VkDeviceMemory` block, the pointer is -correctly offseted to the beginning of region assigned to this particular -allocation. - -Mapping is internally reference-counted and synchronized, so despite raw Vulkan -function `vkMapMemory()` cannot be used to map same block of `VkDeviceMemory` -multiple times simultaneously, it is safe to call this function on allocations -assigned to the same memory block. Actual Vulkan memory will be mapped on first -mapping and unmapped on last unmapping. - -If the function succeeded, you must call vmaUnmapMemory() to unmap the -allocation when mapping is no longer needed or before freeing the allocation, at -the latest. - -It also safe to call this function multiple times on the same allocation. You -must call vmaUnmapMemory() same number of times as you called vmaMapMemory(). - -It is also safe to call this function on allocation created with -#VMA_ALLOCATION_CREATE_MAPPED_BIT flag. Its memory stays mapped all the time. -You must still call vmaUnmapMemory() same number of times as you called -vmaMapMemory(). You must not call vmaUnmapMemory() additional time to free the -"0-th" mapping made automatically due to #VMA_ALLOCATION_CREATE_MAPPED_BIT flag. - -This function fails when used on allocation made in memory type that is not -`HOST_VISIBLE`. - -This function always fails when called for allocation that was created with -#VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT flag. Such allocations cannot be -mapped. - -This function doesn't automatically flush or invalidate caches. -If the allocation is made from a memory types that is not `HOST_COHERENT`, -you also need to use vmaInvalidateAllocation() / vmaFlushAllocation(), as required by Vulkan specification. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory( - VmaAllocator allocator, - VmaAllocation allocation, - void** ppData); - -/** \brief Unmaps memory represented by given allocation, mapped previously using vmaMapMemory(). - -For details, see description of vmaMapMemory(). - -This function doesn't automatically flush or invalidate caches. -If the allocation is made from a memory types that is not `HOST_COHERENT`, -you also need to use vmaInvalidateAllocation() / vmaFlushAllocation(), as required by Vulkan specification. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory( - VmaAllocator allocator, - VmaAllocation allocation); - -/** \brief Flushes memory of given allocation. - -Calls `vkFlushMappedMemoryRanges()` for memory associated with given range of given allocation. -It needs to be called after writing to a mapped memory for memory types that are not `HOST_COHERENT`. -Unmap operation doesn't do that automatically. - -- `offset` must be relative to the beginning of allocation. -- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation. -- `offset` and `size` don't have to be aligned. - They are internally rounded down/up to multiply of `nonCoherentAtomSize`. -- If `size` is 0, this call is ignored. -- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`, - this call is ignored. - -Warning! `offset` and `size` are relative to the contents of given `allocation`. -If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively. -Do not pass allocation's offset as `offset`!!! -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaFlushAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size); - -/** \brief Invalidates memory of given allocation. - -Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given range of given allocation. -It needs to be called before reading from a mapped memory for memory types that are not `HOST_COHERENT`. -Map operation doesn't do that automatically. - -- `offset` must be relative to the beginning of allocation. -- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation. -- `offset` and `size` don't have to be aligned. - They are internally rounded down/up to multiply of `nonCoherentAtomSize`. -- If `size` is 0, this call is ignored. -- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`, - this call is ignored. - -Warning! `offset` and `size` are relative to the contents of given `allocation`. -If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively. -Do not pass allocation's offset as `offset`!!! -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaInvalidateAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size); - -/** \brief Checks magic number in margins around all allocations in given memory types (in both default and custom pools) in search for corruptions. - -@param memoryTypeBits Bit mask, where each bit set means that a memory type with that index should be checked. - -Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero, -`VMA_DEBUG_MARGIN` is defined to nonzero and only for memory types that are -`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection). - -Possible return values: - -- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for any of specified memory types. -- `VK_SUCCESS` - corruption detection has been performed and succeeded. -- `VK_ERROR_VALIDATION_FAILED_EXT` - corruption detection has been performed and found memory corruptions around one of the allocations. - `VMA_ASSERT` is also fired in that case. -- Other value: Error returned by Vulkan, e.g. memory mapping failure. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption(VmaAllocator allocator, uint32_t memoryTypeBits); - -/** \struct VmaDefragmentationContext -\brief Represents Opaque object that represents started defragmentation process. - -Fill structure #VmaDefragmentationInfo2 and call function vmaDefragmentationBegin() to create it. -Call function vmaDefragmentationEnd() to destroy it. -*/ -VK_DEFINE_HANDLE(VmaDefragmentationContext) - -/// Flags to be used in vmaDefragmentationBegin(). None at the moment. Reserved for future use. -typedef enum VmaDefragmentationFlagBits { - VMA_DEFRAGMENTATION_FLAG_INCREMENTAL = 0x1, - VMA_DEFRAGMENTATION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF -} VmaDefragmentationFlagBits; -typedef VkFlags VmaDefragmentationFlags; - -/** \brief Parameters for defragmentation. - -To be used with function vmaDefragmentationBegin(). -*/ -typedef struct VmaDefragmentationInfo2 { - /** \brief Reserved for future use. Should be 0. - */ - VmaDefragmentationFlags flags; - /** \brief Number of allocations in `pAllocations` array. - */ - uint32_t allocationCount; - /** \brief Pointer to array of allocations that can be defragmented. - - The array should have `allocationCount` elements. - The array should not contain nulls. - Elements in the array should be unique - same allocation cannot occur twice. - It is safe to pass allocations that are in the lost state - they are ignored. - All allocations not present in this array are considered non-moveable during this defragmentation. - */ - VmaAllocation* pAllocations; - /** \brief Optional, output. Pointer to array that will be filled with information whether the allocation at certain index has been changed during defragmentation. - - The array should have `allocationCount` elements. - You can pass null if you are not interested in this information. - */ - VkBool32* pAllocationsChanged; - /** \brief Numer of pools in `pPools` array. - */ - uint32_t poolCount; - /** \brief Either null or pointer to array of pools to be defragmented. - - All the allocations in the specified pools can be moved during defragmentation - and there is no way to check if they were really moved as in `pAllocationsChanged`, - so you must query all the allocations in all these pools for new `VkDeviceMemory` - and offset using vmaGetAllocationInfo() if you might need to recreate buffers - and images bound to them. - - The array should have `poolCount` elements. - The array should not contain nulls. - Elements in the array should be unique - same pool cannot occur twice. - - Using this array is equivalent to specifying all allocations from the pools in `pAllocations`. - It might be more efficient. - */ - VmaPool* pPools; - /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places using transfers on CPU side, like `memcpy()`, `memmove()`. - - `VK_WHOLE_SIZE` means no limit. - */ - VkDeviceSize maxCpuBytesToMove; - /** \brief Maximum number of allocations that can be moved to a different place using transfers on CPU side, like `memcpy()`, `memmove()`. - - `UINT32_MAX` means no limit. - */ - uint32_t maxCpuAllocationsToMove; - /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places using transfers on GPU side, posted to `commandBuffer`. - - `VK_WHOLE_SIZE` means no limit. - */ - VkDeviceSize maxGpuBytesToMove; - /** \brief Maximum number of allocations that can be moved to a different place using transfers on GPU side, posted to `commandBuffer`. - - `UINT32_MAX` means no limit. - */ - uint32_t maxGpuAllocationsToMove; - /** \brief Optional. Command buffer where GPU copy commands will be posted. - - If not null, it must be a valid command buffer handle that supports Transfer queue type. - It must be in the recording state and outside of a render pass instance. - You need to submit it and make sure it finished execution before calling vmaDefragmentationEnd(). - - Passing null means that only CPU defragmentation will be performed. - */ - VkCommandBuffer commandBuffer; -} VmaDefragmentationInfo2; - -typedef struct VmaDefragmentationPassMoveInfo { - VmaAllocation allocation; - VkDeviceMemory memory; - VkDeviceSize offset; -} VmaDefragmentationPassMoveInfo; - -/** \brief Parameters for incremental defragmentation steps. - -To be used with function vmaBeginDefragmentationPass(). -*/ -typedef struct VmaDefragmentationPassInfo { - uint32_t moveCount; - VmaDefragmentationPassMoveInfo* pMoves; -} VmaDefragmentationPassInfo; - -/** \brief Deprecated. Optional configuration parameters to be passed to function vmaDefragment(). - -\deprecated This is a part of the old interface. It is recommended to use structure #VmaDefragmentationInfo2 and function vmaDefragmentationBegin() instead. -*/ -typedef struct VmaDefragmentationInfo { - /** \brief Maximum total numbers of bytes that can be copied while moving allocations to different places. - - Default is `VK_WHOLE_SIZE`, which means no limit. - */ - VkDeviceSize maxBytesToMove; - /** \brief Maximum number of allocations that can be moved to different place. - - Default is `UINT32_MAX`, which means no limit. - */ - uint32_t maxAllocationsToMove; -} VmaDefragmentationInfo; - -/** \brief Statistics returned by function vmaDefragment(). */ -typedef struct VmaDefragmentationStats { - /// Total number of bytes that have been copied while moving allocations to different places. - VkDeviceSize bytesMoved; - /// Total number of bytes that have been released to the system by freeing empty `VkDeviceMemory` objects. - VkDeviceSize bytesFreed; - /// Number of allocations that have been moved to different places. - uint32_t allocationsMoved; - /// Number of empty `VkDeviceMemory` objects that have been released to the system. - uint32_t deviceMemoryBlocksFreed; -} VmaDefragmentationStats; - -/** \brief Begins defragmentation process. - -@param allocator Allocator object. -@param pInfo Structure filled with parameters of defragmentation. -@param[out] pStats Optional. Statistics of defragmentation. You can pass null if you are not interested in this information. -@param[out] pContext Context object that must be passed to vmaDefragmentationEnd() to finish defragmentation. -@return `VK_SUCCESS` and `*pContext == null` if defragmentation finished within this function call. `VK_NOT_READY` and `*pContext != null` if defragmentation has been started and you need to call vmaDefragmentationEnd() to finish it. Negative value in case of error. - -Use this function instead of old, deprecated vmaDefragment(). - -Warning! Between the call to vmaDefragmentationBegin() and vmaDefragmentationEnd(): - -- You should not use any of allocations passed as `pInfo->pAllocations` or - any allocations that belong to pools passed as `pInfo->pPools`, - including calling vmaGetAllocationInfo(), vmaTouchAllocation(), or access - their data. -- Some mutexes protecting internal data structures may be locked, so trying to - make or free any allocations, bind buffers or images, map memory, or launch - another simultaneous defragmentation in between may cause stall (when done on - another thread) or deadlock (when done on the same thread), unless you are - 100% sure that defragmented allocations are in different pools. -- Information returned via `pStats` and `pInfo->pAllocationsChanged` are undefined. - They become valid after call to vmaDefragmentationEnd(). -- If `pInfo->commandBuffer` is not null, you must submit that command buffer - and make sure it finished execution before calling vmaDefragmentationEnd(). - -For more information and important limitations regarding defragmentation, see documentation chapter: -[Defragmentation](@ref defragmentation). -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragmentationBegin( - VmaAllocator allocator, - const VmaDefragmentationInfo2* pInfo, - VmaDefragmentationStats* pStats, - VmaDefragmentationContext *pContext); - -/** \brief Ends defragmentation process. - -Use this function to finish defragmentation started by vmaDefragmentationBegin(). -It is safe to pass `context == null`. The function then does nothing. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragmentationEnd( - VmaAllocator allocator, - VmaDefragmentationContext context); - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass( - VmaAllocator allocator, - VmaDefragmentationContext context, - VmaDefragmentationPassInfo* pInfo -); -VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass( - VmaAllocator allocator, - VmaDefragmentationContext context -); - -/** \brief Deprecated. Compacts memory by moving allocations. - -@param pAllocations Array of allocations that can be moved during this compation. -@param allocationCount Number of elements in pAllocations and pAllocationsChanged arrays. -@param[out] pAllocationsChanged Array of boolean values that will indicate whether matching allocation in pAllocations array has been moved. This parameter is optional. Pass null if you don't need this information. -@param pDefragmentationInfo Configuration parameters. Optional - pass null to use default values. -@param[out] pDefragmentationStats Statistics returned by the function. Optional - pass null if you don't need this information. -@return `VK_SUCCESS` if completed, negative error code in case of error. - -\deprecated This is a part of the old interface. It is recommended to use structure #VmaDefragmentationInfo2 and function vmaDefragmentationBegin() instead. - -This function works by moving allocations to different places (different -`VkDeviceMemory` objects and/or different offsets) in order to optimize memory -usage. Only allocations that are in `pAllocations` array can be moved. All other -allocations are considered nonmovable in this call. Basic rules: - -- Only allocations made in memory types that have - `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` and `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT` - flags can be compacted. You may pass other allocations but it makes no sense - - these will never be moved. -- Custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT or - #VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT flag are not defragmented. Allocations - passed to this function that come from such pools are ignored. -- Allocations created with #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT or - created as dedicated allocations for any other reason are also ignored. -- Both allocations made with or without #VMA_ALLOCATION_CREATE_MAPPED_BIT - flag can be compacted. If not persistently mapped, memory will be mapped - temporarily inside this function if needed. -- You must not pass same #VmaAllocation object multiple times in `pAllocations` array. - -The function also frees empty `VkDeviceMemory` blocks. - -Warning: This function may be time-consuming, so you shouldn't call it too often -(like after every resource creation/destruction). -You can call it on special occasions (like when reloading a game level or -when you just destroyed a lot of objects). Calling it every frame may be OK, but -you should measure that on your platform. - -For more information, see [Defragmentation](@ref defragmentation) chapter. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragment( - VmaAllocator allocator, - VmaAllocation* pAllocations, - size_t allocationCount, - VkBool32* pAllocationsChanged, - const VmaDefragmentationInfo *pDefragmentationInfo, - VmaDefragmentationStats* pDefragmentationStats); - -/** \brief Binds buffer to allocation. - -Binds specified buffer to region of memory represented by specified allocation. -Gets `VkDeviceMemory` handle and offset from the allocation. -If you want to create a buffer, allocate memory for it and bind them together separately, -you should use this function for binding instead of standard `vkBindBufferMemory()`, -because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple -allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously -(which is illegal in Vulkan). - -It is recommended to use function vmaCreateBuffer() instead of this one. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory( - VmaAllocator allocator, - VmaAllocation allocation, - VkBuffer buffer); - -/** \brief Binds buffer to allocation with additional parameters. - -@param allocationLocalOffset Additional offset to be added while binding, relative to the beginnig of the `allocation`. Normally it should be 0. -@param pNext A chain of structures to be attached to `VkBindBufferMemoryInfoKHR` structure used internally. Normally it should be null. - -This function is similar to vmaBindBufferMemory(), but it provides additional parameters. - -If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag -or with VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_1`. Otherwise the call fails. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize allocationLocalOffset, - VkBuffer buffer, - const void* pNext); - -/** \brief Binds image to allocation. - -Binds specified image to region of memory represented by specified allocation. -Gets `VkDeviceMemory` handle and offset from the allocation. -If you want to create an image, allocate memory for it and bind them together separately, -you should use this function for binding instead of standard `vkBindImageMemory()`, -because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple -allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously -(which is illegal in Vulkan). - -It is recommended to use function vmaCreateImage() instead of this one. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory( - VmaAllocator allocator, - VmaAllocation allocation, - VkImage image); - -/** \brief Binds image to allocation with additional parameters. - -@param allocationLocalOffset Additional offset to be added while binding, relative to the beginnig of the `allocation`. Normally it should be 0. -@param pNext A chain of structures to be attached to `VkBindImageMemoryInfoKHR` structure used internally. Normally it should be null. - -This function is similar to vmaBindImageMemory(), but it provides additional parameters. - -If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag -or with VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_1`. Otherwise the call fails. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize allocationLocalOffset, - VkImage image, - const void* pNext); - -/** -@param[out] pBuffer Buffer that was created. -@param[out] pAllocation Allocation that was created. -@param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo(). - -This function automatically: - --# Creates buffer. --# Allocates appropriate memory for it. --# Binds the buffer with the memory. - -If any of these operations fail, buffer and allocation are not created, -returned value is negative error code, *pBuffer and *pAllocation are null. - -If the function succeeded, you must destroy both buffer and allocation when you -no longer need them using either convenience function vmaDestroyBuffer() or -separately, using `vkDestroyBuffer()` and vmaFreeMemory(). - -If VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag was used, -VK_KHR_dedicated_allocation extension is used internally to query driver whether -it requires or prefers the new buffer to have dedicated allocation. If yes, -and if dedicated allocation is possible (VmaAllocationCreateInfo::pool is null -and VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT is not used), it creates dedicated -allocation for this buffer, just like when using -VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer( - VmaAllocator allocator, - const VkBufferCreateInfo* pBufferCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkBuffer* pBuffer, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo); - -/** \brief Destroys Vulkan buffer and frees allocated memory. - -This is just a convenience function equivalent to: - -\code -vkDestroyBuffer(device, buffer, allocationCallbacks); -vmaFreeMemory(allocator, allocation); -\endcode - -It it safe to pass null as buffer and/or allocation. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer( - VmaAllocator allocator, - VkBuffer buffer, - VmaAllocation allocation); - -/// Function similar to vmaCreateBuffer(). -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage( - VmaAllocator allocator, - const VkImageCreateInfo* pImageCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkImage* pImage, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo); - -/** \brief Destroys Vulkan image and frees allocated memory. - -This is just a convenience function equivalent to: - -\code -vkDestroyImage(device, image, allocationCallbacks); -vmaFreeMemory(allocator, allocation); -\endcode - -It it safe to pass null as image and/or allocation. -*/ -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage( - VmaAllocator allocator, - VkImage image, - VmaAllocation allocation); - -#ifdef __cplusplus -} -#endif - -#endif // AMD_VULKAN_MEMORY_ALLOCATOR_H - -// For Visual Studio IntelliSense. -#if defined(__cplusplus) && defined(__INTELLISENSE__) -#define VMA_IMPLEMENTATION -#endif - -#ifdef VMA_IMPLEMENTATION -#undef VMA_IMPLEMENTATION - -#include -#include -#include - -/******************************************************************************* -CONFIGURATION SECTION - -Define some of these macros before each #include of this header or change them -here if you need other then default behavior depending on your environment. -*/ - -/* -Define this macro to 1 to make the library fetch pointers to Vulkan functions -internally, like: - - vulkanFunctions.vkAllocateMemory = &vkAllocateMemory; - -Define to 0 if you are going to provide you own pointers to Vulkan functions via -VmaAllocatorCreateInfo::pVulkanFunctions. -*/ -#if !defined(VMA_STATIC_VULKAN_FUNCTIONS) && !defined(VK_NO_PROTOTYPES) -#define VMA_STATIC_VULKAN_FUNCTIONS 1 -#endif - -// Define this macro to 1 to make the library use STL containers instead of its own implementation. -//#define VMA_USE_STL_CONTAINERS 1 - -/* Set this macro to 1 to make the library including and using STL containers: -std::pair, std::vector, std::list, std::unordered_map. - -Set it to 0 or undefined to make the library using its own implementation of -the containers. -*/ -#if VMA_USE_STL_CONTAINERS - #define VMA_USE_STL_VECTOR 1 - #define VMA_USE_STL_UNORDERED_MAP 1 - #define VMA_USE_STL_LIST 1 -#endif - -#ifndef VMA_USE_STL_SHARED_MUTEX - // Compiler conforms to C++17. - #if __cplusplus >= 201703L - #define VMA_USE_STL_SHARED_MUTEX 1 - // Visual studio defines __cplusplus properly only when passed additional parameter: /Zc:__cplusplus - // Otherwise it's always 199711L, despite shared_mutex works since Visual Studio 2015 Update 2. - // See: https://blogs.msdn.microsoft.com/vcblog/2018/04/09/msvc-now-correctly-reports-__cplusplus/ - #elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && __cplusplus == 199711L && _MSVC_LANG >= 201703L - #define VMA_USE_STL_SHARED_MUTEX 1 - #else - #define VMA_USE_STL_SHARED_MUTEX 0 - #endif -#endif - -/* -THESE INCLUDES ARE NOT ENABLED BY DEFAULT. -Library has its own container implementation. -*/ -#if VMA_USE_STL_VECTOR - #include -#endif - -#if VMA_USE_STL_UNORDERED_MAP - #include -#endif - -#if VMA_USE_STL_LIST - #include -#endif - -/* -Following headers are used in this CONFIGURATION section only, so feel free to -remove them if not needed. -*/ -#include // for assert -#include // for min, max -#include - -#ifndef VMA_NULL - // Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0. - #define VMA_NULL nullptr -#endif - -#if defined(__ANDROID_API__) && (__ANDROID_API__ < 16) -#include -void *aligned_alloc(size_t alignment, size_t size) -{ - // alignment must be >= sizeof(void*) - if(alignment < sizeof(void*)) - { - alignment = sizeof(void*); - } - - return memalign(alignment, size); -} -#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) -#include -void *aligned_alloc(size_t alignment, size_t size) -{ - // alignment must be >= sizeof(void*) - if(alignment < sizeof(void*)) - { - alignment = sizeof(void*); - } - - void *pointer; - if(posix_memalign(&pointer, alignment, size) == 0) - return pointer; - return VMA_NULL; -} -#endif - -// If your compiler is not compatible with C++11 and definition of -// aligned_alloc() function is missing, uncommeting following line may help: - -//#include - -// Normal assert to check for programmer's errors, especially in Debug configuration. -#ifndef VMA_ASSERT - #ifdef NDEBUG - #define VMA_ASSERT(expr) - #else - #define VMA_ASSERT(expr) assert(expr) - #endif -#endif - -// Assert that will be called very often, like inside data structures e.g. operator[]. -// Making it non-empty can make program slow. -#ifndef VMA_HEAVY_ASSERT - #ifdef NDEBUG - #define VMA_HEAVY_ASSERT(expr) - #else - #define VMA_HEAVY_ASSERT(expr) //VMA_ASSERT(expr) - #endif -#endif - -#ifndef VMA_ALIGN_OF - #define VMA_ALIGN_OF(type) (__alignof(type)) -#endif - -#ifndef VMA_SYSTEM_ALIGNED_MALLOC - #if defined(_WIN32) - #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) (_aligned_malloc((size), (alignment))) - #else - #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) (aligned_alloc((alignment), (size) )) - #endif -#endif - -#ifndef VMA_SYSTEM_FREE - #if defined(_WIN32) - #define VMA_SYSTEM_FREE(ptr) _aligned_free(ptr) - #else - #define VMA_SYSTEM_FREE(ptr) free(ptr) - #endif -#endif - -#ifndef VMA_MIN - #define VMA_MIN(v1, v2) (std::min((v1), (v2))) -#endif - -#ifndef VMA_MAX - #define VMA_MAX(v1, v2) (std::max((v1), (v2))) -#endif - -#ifndef VMA_SWAP - #define VMA_SWAP(v1, v2) std::swap((v1), (v2)) -#endif - -#ifndef VMA_SORT - #define VMA_SORT(beg, end, cmp) std::sort(beg, end, cmp) -#endif - -#ifndef VMA_DEBUG_LOG - #define VMA_DEBUG_LOG(format, ...) - /* - #define VMA_DEBUG_LOG(format, ...) do { \ - printf(format, __VA_ARGS__); \ - printf("\n"); \ - } while(false) - */ -#endif - -// Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString. -#if VMA_STATS_STRING_ENABLED - static inline void VmaUint32ToStr(char* outStr, size_t strLen, uint32_t num) - { - snprintf(outStr, strLen, "%u", static_cast(num)); - } - static inline void VmaUint64ToStr(char* outStr, size_t strLen, uint64_t num) - { - snprintf(outStr, strLen, "%llu", static_cast(num)); - } - static inline void VmaPtrToStr(char* outStr, size_t strLen, const void* ptr) - { - snprintf(outStr, strLen, "%p", ptr); - } -#endif - -#ifndef VMA_MUTEX - class VmaMutex - { - public: - void Lock() { m_Mutex.lock(); } - void Unlock() { m_Mutex.unlock(); } - bool TryLock() { return m_Mutex.try_lock(); } - private: - std::mutex m_Mutex; - }; - #define VMA_MUTEX VmaMutex -#endif - -// Read-write mutex, where "read" is shared access, "write" is exclusive access. -#ifndef VMA_RW_MUTEX - #if VMA_USE_STL_SHARED_MUTEX - // Use std::shared_mutex from C++17. - #include - class VmaRWMutex - { - public: - void LockRead() { m_Mutex.lock_shared(); } - void UnlockRead() { m_Mutex.unlock_shared(); } - bool TryLockRead() { return m_Mutex.try_lock_shared(); } - void LockWrite() { m_Mutex.lock(); } - void UnlockWrite() { m_Mutex.unlock(); } - bool TryLockWrite() { return m_Mutex.try_lock(); } - private: - std::shared_mutex m_Mutex; - }; - #define VMA_RW_MUTEX VmaRWMutex - #elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600 - // Use SRWLOCK from WinAPI. - // Minimum supported client = Windows Vista, server = Windows Server 2008. - class VmaRWMutex - { - public: - VmaRWMutex() { InitializeSRWLock(&m_Lock); } - void LockRead() { AcquireSRWLockShared(&m_Lock); } - void UnlockRead() { ReleaseSRWLockShared(&m_Lock); } - bool TryLockRead() { return TryAcquireSRWLockShared(&m_Lock) != FALSE; } - void LockWrite() { AcquireSRWLockExclusive(&m_Lock); } - void UnlockWrite() { ReleaseSRWLockExclusive(&m_Lock); } - bool TryLockWrite() { return TryAcquireSRWLockExclusive(&m_Lock) != FALSE; } - private: - SRWLOCK m_Lock; - }; - #define VMA_RW_MUTEX VmaRWMutex - #else - // Less efficient fallback: Use normal mutex. - class VmaRWMutex - { - public: - void LockRead() { m_Mutex.Lock(); } - void UnlockRead() { m_Mutex.Unlock(); } - bool TryLockRead() { return m_Mutex.TryLock(); } - void LockWrite() { m_Mutex.Lock(); } - void UnlockWrite() { m_Mutex.Unlock(); } - bool TryLockWrite() { return m_Mutex.TryLock(); } - private: - VMA_MUTEX m_Mutex; - }; - #define VMA_RW_MUTEX VmaRWMutex - #endif // #if VMA_USE_STL_SHARED_MUTEX -#endif // #ifndef VMA_RW_MUTEX - -/* -If providing your own implementation, you need to implement a subset of std::atomic. -*/ -#ifndef VMA_ATOMIC_UINT32 - #include - #define VMA_ATOMIC_UINT32 std::atomic -#endif - -#ifndef VMA_ATOMIC_UINT64 - #include - #define VMA_ATOMIC_UINT64 std::atomic -#endif - -#ifndef VMA_DEBUG_ALWAYS_DEDICATED_MEMORY - /** - Every allocation will have its own memory block. - Define to 1 for debugging purposes only. - */ - #define VMA_DEBUG_ALWAYS_DEDICATED_MEMORY (0) -#endif - -#ifndef VMA_DEBUG_ALIGNMENT - /** - Minimum alignment of all allocations, in bytes. - Set to more than 1 for debugging purposes only. Must be power of two. - */ - #define VMA_DEBUG_ALIGNMENT (1) -#endif - -#ifndef VMA_DEBUG_MARGIN - /** - Minimum margin before and after every allocation, in bytes. - Set nonzero for debugging purposes only. - */ - #define VMA_DEBUG_MARGIN (0) -#endif - -#ifndef VMA_DEBUG_INITIALIZE_ALLOCATIONS - /** - Define this macro to 1 to automatically fill new allocations and destroyed - allocations with some bit pattern. - */ - #define VMA_DEBUG_INITIALIZE_ALLOCATIONS (0) -#endif - -#ifndef VMA_DEBUG_DETECT_CORRUPTION - /** - Define this macro to 1 together with non-zero value of VMA_DEBUG_MARGIN to - enable writing magic value to the margin before and after every allocation and - validating it, so that memory corruptions (out-of-bounds writes) are detected. - */ - #define VMA_DEBUG_DETECT_CORRUPTION (0) -#endif - -#ifndef VMA_DEBUG_GLOBAL_MUTEX - /** - Set this to 1 for debugging purposes only, to enable single mutex protecting all - entry calls to the library. Can be useful for debugging multithreading issues. - */ - #define VMA_DEBUG_GLOBAL_MUTEX (0) -#endif - -#ifndef VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY - /** - Minimum value for VkPhysicalDeviceLimits::bufferImageGranularity. - Set to more than 1 for debugging purposes only. Must be power of two. - */ - #define VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY (1) -#endif - -#ifndef VMA_SMALL_HEAP_MAX_SIZE - /// Maximum size of a memory heap in Vulkan to consider it "small". - #define VMA_SMALL_HEAP_MAX_SIZE (1024ull * 1024 * 1024) -#endif - -#ifndef VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE - /// Default size of a block allocated as single VkDeviceMemory from a "large" heap. - #define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ull * 1024 * 1024) -#endif - -#ifndef VMA_CLASS_NO_COPY - #define VMA_CLASS_NO_COPY(className) \ - private: \ - className(const className&) = delete; \ - className& operator=(const className&) = delete; -#endif - -static const uint32_t VMA_FRAME_INDEX_LOST = UINT32_MAX; - -// Decimal 2139416166, float NaN, little-endian binary 66 E6 84 7F. -static const uint32_t VMA_CORRUPTION_DETECTION_MAGIC_VALUE = 0x7F84E666; - -static const uint8_t VMA_ALLOCATION_FILL_PATTERN_CREATED = 0xDC; -static const uint8_t VMA_ALLOCATION_FILL_PATTERN_DESTROYED = 0xEF; - -/******************************************************************************* -END OF CONFIGURATION -*/ - -static const uint32_t VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET = 0x10000000u; - -static VkAllocationCallbacks VmaEmptyAllocationCallbacks = { - VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL }; - -// Returns number of bits set to 1 in (v). -static inline uint32_t VmaCountBitsSet(uint32_t v) -{ - uint32_t c = v - ((v >> 1) & 0x55555555); - c = ((c >> 2) & 0x33333333) + (c & 0x33333333); - c = ((c >> 4) + c) & 0x0F0F0F0F; - c = ((c >> 8) + c) & 0x00FF00FF; - c = ((c >> 16) + c) & 0x0000FFFF; - return c; -} - -// Aligns given value up to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 16. -// Use types like uint32_t, uint64_t as T. -template -static inline T VmaAlignUp(T val, T align) -{ - return (val + align - 1) / align * align; -} -// Aligns given value down to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 8. -// Use types like uint32_t, uint64_t as T. -template -static inline T VmaAlignDown(T val, T align) -{ - return val / align * align; -} - -// Division with mathematical rounding to nearest number. -template -static inline T VmaRoundDiv(T x, T y) -{ - return (x + (y / (T)2)) / y; -} - -/* -Returns true if given number is a power of two. -T must be unsigned integer number or signed integer but always nonnegative. -For 0 returns true. -*/ -template -inline bool VmaIsPow2(T x) -{ - return (x & (x-1)) == 0; -} - -// Returns smallest power of 2 greater or equal to v. -static inline uint32_t VmaNextPow2(uint32_t v) -{ - v--; - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v++; - return v; -} -static inline uint64_t VmaNextPow2(uint64_t v) -{ - v--; - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v |= v >> 32; - v++; - return v; -} - -// Returns largest power of 2 less or equal to v. -static inline uint32_t VmaPrevPow2(uint32_t v) -{ - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v = v ^ (v >> 1); - return v; -} -static inline uint64_t VmaPrevPow2(uint64_t v) -{ - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v |= v >> 32; - v = v ^ (v >> 1); - return v; -} - -static inline bool VmaStrIsEmpty(const char* pStr) -{ - return pStr == VMA_NULL || *pStr == '\0'; -} - -#if VMA_STATS_STRING_ENABLED - -static const char* VmaAlgorithmToStr(uint32_t algorithm) -{ - switch(algorithm) - { - case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT: - return "Linear"; - case VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT: - return "Buddy"; - case 0: - return "Default"; - default: - VMA_ASSERT(0); - return ""; - } -} - -#endif // #if VMA_STATS_STRING_ENABLED - -#ifndef VMA_SORT - -template -Iterator VmaQuickSortPartition(Iterator beg, Iterator end, Compare cmp) -{ - Iterator centerValue = end; --centerValue; - Iterator insertIndex = beg; - for(Iterator memTypeIndex = beg; memTypeIndex < centerValue; ++memTypeIndex) - { - if(cmp(*memTypeIndex, *centerValue)) - { - if(insertIndex != memTypeIndex) - { - VMA_SWAP(*memTypeIndex, *insertIndex); - } - ++insertIndex; - } - } - if(insertIndex != centerValue) - { - VMA_SWAP(*insertIndex, *centerValue); - } - return insertIndex; -} - -template -void VmaQuickSort(Iterator beg, Iterator end, Compare cmp) -{ - if(beg < end) - { - Iterator it = VmaQuickSortPartition(beg, end, cmp); - VmaQuickSort(beg, it, cmp); - VmaQuickSort(it + 1, end, cmp); - } -} - -#define VMA_SORT(beg, end, cmp) VmaQuickSort(beg, end, cmp) - -#endif // #ifndef VMA_SORT - -/* -Returns true if two memory blocks occupy overlapping pages. -ResourceA must be in less memory offset than ResourceB. - -Algorithm is based on "Vulkan 1.0.39 - A Specification (with all registered Vulkan extensions)" -chapter 11.6 "Resource Memory Association", paragraph "Buffer-Image Granularity". -*/ -static inline bool VmaBlocksOnSamePage( - VkDeviceSize resourceAOffset, - VkDeviceSize resourceASize, - VkDeviceSize resourceBOffset, - VkDeviceSize pageSize) -{ - VMA_ASSERT(resourceAOffset + resourceASize <= resourceBOffset && resourceASize > 0 && pageSize > 0); - VkDeviceSize resourceAEnd = resourceAOffset + resourceASize - 1; - VkDeviceSize resourceAEndPage = resourceAEnd & ~(pageSize - 1); - VkDeviceSize resourceBStart = resourceBOffset; - VkDeviceSize resourceBStartPage = resourceBStart & ~(pageSize - 1); - return resourceAEndPage == resourceBStartPage; -} - -enum VmaSuballocationType -{ - VMA_SUBALLOCATION_TYPE_FREE = 0, - VMA_SUBALLOCATION_TYPE_UNKNOWN = 1, - VMA_SUBALLOCATION_TYPE_BUFFER = 2, - VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN = 3, - VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR = 4, - VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL = 5, - VMA_SUBALLOCATION_TYPE_MAX_ENUM = 0x7FFFFFFF -}; - -/* -Returns true if given suballocation types could conflict and must respect -VkPhysicalDeviceLimits::bufferImageGranularity. They conflict if one is buffer -or linear image and another one is optimal image. If type is unknown, behave -conservatively. -*/ -static inline bool VmaIsBufferImageGranularityConflict( - VmaSuballocationType suballocType1, - VmaSuballocationType suballocType2) -{ - if(suballocType1 > suballocType2) - { - VMA_SWAP(suballocType1, suballocType2); - } - - switch(suballocType1) - { - case VMA_SUBALLOCATION_TYPE_FREE: - return false; - case VMA_SUBALLOCATION_TYPE_UNKNOWN: - return true; - case VMA_SUBALLOCATION_TYPE_BUFFER: - return - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; - case VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN: - return - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR || - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; - case VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR: - return - suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL; - case VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL: - return false; - default: - VMA_ASSERT(0); - return true; - } -} - -static void VmaWriteMagicValue(void* pData, VkDeviceSize offset) -{ -#if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION - uint32_t* pDst = (uint32_t*)((char*)pData + offset); - const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); - for(size_t i = 0; i < numberCount; ++i, ++pDst) - { - *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE; - } -#else - // no-op -#endif -} - -static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset) -{ -#if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION - const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset); - const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); - for(size_t i = 0; i < numberCount; ++i, ++pSrc) - { - if(*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE) - { - return false; - } - } -#endif - return true; -} - -/* -Fills structure with parameters of an example buffer to be used for transfers -during GPU memory defragmentation. -*/ -static void VmaFillGpuDefragmentationBufferCreateInfo(VkBufferCreateInfo& outBufCreateInfo) -{ - memset(&outBufCreateInfo, 0, sizeof(outBufCreateInfo)); - outBufCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; - outBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; - outBufCreateInfo.size = (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE; // Example size. -} - -// Helper RAII class to lock a mutex in constructor and unlock it in destructor (at the end of scope). -struct VmaMutexLock -{ - VMA_CLASS_NO_COPY(VmaMutexLock) -public: - VmaMutexLock(VMA_MUTEX& mutex, bool useMutex = true) : - m_pMutex(useMutex ? &mutex : VMA_NULL) - { if(m_pMutex) { m_pMutex->Lock(); } } - ~VmaMutexLock() - { if(m_pMutex) { m_pMutex->Unlock(); } } -private: - VMA_MUTEX* m_pMutex; -}; - -// Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for reading. -struct VmaMutexLockRead -{ - VMA_CLASS_NO_COPY(VmaMutexLockRead) -public: - VmaMutexLockRead(VMA_RW_MUTEX& mutex, bool useMutex) : - m_pMutex(useMutex ? &mutex : VMA_NULL) - { if(m_pMutex) { m_pMutex->LockRead(); } } - ~VmaMutexLockRead() { if(m_pMutex) { m_pMutex->UnlockRead(); } } -private: - VMA_RW_MUTEX* m_pMutex; -}; - -// Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for writing. -struct VmaMutexLockWrite -{ - VMA_CLASS_NO_COPY(VmaMutexLockWrite) -public: - VmaMutexLockWrite(VMA_RW_MUTEX& mutex, bool useMutex) : - m_pMutex(useMutex ? &mutex : VMA_NULL) - { if(m_pMutex) { m_pMutex->LockWrite(); } } - ~VmaMutexLockWrite() { if(m_pMutex) { m_pMutex->UnlockWrite(); } } -private: - VMA_RW_MUTEX* m_pMutex; -}; - -#if VMA_DEBUG_GLOBAL_MUTEX - static VMA_MUTEX gDebugGlobalMutex; - #define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex, true); -#else - #define VMA_DEBUG_GLOBAL_MUTEX_LOCK -#endif - -// Minimum size of a free suballocation to register it in the free suballocation collection. -static const VkDeviceSize VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER = 16; - -/* -Performs binary search and returns iterator to first element that is greater or -equal to (key), according to comparison (cmp). - -Cmp should return true if first argument is less than second argument. - -Returned value is the found element, if present in the collection or place where -new element with value (key) should be inserted. -*/ -template -static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT &key, const CmpLess& cmp) -{ - size_t down = 0, up = (end - beg); - while(down < up) - { - const size_t mid = (down + up) / 2; - if(cmp(*(beg+mid), key)) - { - down = mid + 1; - } - else - { - up = mid; - } - } - return beg + down; -} - -template -IterT VmaBinaryFindSorted(const IterT& beg, const IterT& end, const KeyT& value, const CmpLess& cmp) -{ - IterT it = VmaBinaryFindFirstNotLess( - beg, end, value, cmp); - if(it == end || - (!cmp(*it, value) && !cmp(value, *it))) - { - return it; - } - return end; -} - -/* -Returns true if all pointers in the array are not-null and unique. -Warning! O(n^2) complexity. Use only inside VMA_HEAVY_ASSERT. -T must be pointer type, e.g. VmaAllocation, VmaPool. -*/ -template -static bool VmaValidatePointerArray(uint32_t count, const T* arr) -{ - for(uint32_t i = 0; i < count; ++i) - { - const T iPtr = arr[i]; - if(iPtr == VMA_NULL) - { - return false; - } - for(uint32_t j = i + 1; j < count; ++j) - { - if(iPtr == arr[j]) - { - return false; - } - } - } - return true; -} - -//////////////////////////////////////////////////////////////////////////////// -// Memory allocation - -static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t size, size_t alignment) -{ - if((pAllocationCallbacks != VMA_NULL) && - (pAllocationCallbacks->pfnAllocation != VMA_NULL)) - { - return (*pAllocationCallbacks->pfnAllocation)( - pAllocationCallbacks->pUserData, - size, - alignment, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - } - else - { - return VMA_SYSTEM_ALIGNED_MALLOC(size, alignment); - } -} - -static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr) -{ - if((pAllocationCallbacks != VMA_NULL) && - (pAllocationCallbacks->pfnFree != VMA_NULL)) - { - (*pAllocationCallbacks->pfnFree)(pAllocationCallbacks->pUserData, ptr); - } - else - { - VMA_SYSTEM_FREE(ptr); - } -} - -template -static T* VmaAllocate(const VkAllocationCallbacks* pAllocationCallbacks) -{ - return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T), VMA_ALIGN_OF(T)); -} - -template -static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, size_t count) -{ - return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T) * count, VMA_ALIGN_OF(T)); -} - -#define vma_new(allocator, type) new(VmaAllocate(allocator))(type) - -#define vma_new_array(allocator, type, count) new(VmaAllocateArray((allocator), (count)))(type) - -template -static void vma_delete(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr) -{ - ptr->~T(); - VmaFree(pAllocationCallbacks, ptr); -} - -template -static void vma_delete_array(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr, size_t count) -{ - if(ptr != VMA_NULL) - { - for(size_t i = count; i--; ) - { - ptr[i].~T(); - } - VmaFree(pAllocationCallbacks, ptr); - } -} - -static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr) -{ - if(srcStr != VMA_NULL) - { - const size_t len = strlen(srcStr); - char* const result = vma_new_array(allocs, char, len + 1); - memcpy(result, srcStr, len + 1); - return result; - } - else - { - return VMA_NULL; - } -} - -static void VmaFreeString(const VkAllocationCallbacks* allocs, char* str) -{ - if(str != VMA_NULL) - { - const size_t len = strlen(str); - vma_delete_array(allocs, str, len + 1); - } -} - -// STL-compatible allocator. -template -class VmaStlAllocator -{ -public: - const VkAllocationCallbacks* const m_pCallbacks; - typedef T value_type; - - VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) { } - template VmaStlAllocator(const VmaStlAllocator& src) : m_pCallbacks(src.m_pCallbacks) { } - - T* allocate(size_t n) { return VmaAllocateArray(m_pCallbacks, n); } - void deallocate(T* p, size_t n) { VmaFree(m_pCallbacks, p); } - - template - bool operator==(const VmaStlAllocator& rhs) const - { - return m_pCallbacks == rhs.m_pCallbacks; - } - template - bool operator!=(const VmaStlAllocator& rhs) const - { - return m_pCallbacks != rhs.m_pCallbacks; - } - - VmaStlAllocator& operator=(const VmaStlAllocator& x) = delete; -}; - -#if VMA_USE_STL_VECTOR - -#define VmaVector std::vector - -template -static void VmaVectorInsert(std::vector& vec, size_t index, const T& item) -{ - vec.insert(vec.begin() + index, item); -} - -template -static void VmaVectorRemove(std::vector& vec, size_t index) -{ - vec.erase(vec.begin() + index); -} - -#else // #if VMA_USE_STL_VECTOR - -/* Class with interface compatible with subset of std::vector. -T must be POD because constructors and destructors are not called and memcpy is -used for these objects. */ -template -class VmaVector -{ -public: - typedef T value_type; - - VmaVector(const AllocatorT& allocator) : - m_Allocator(allocator), - m_pArray(VMA_NULL), - m_Count(0), - m_Capacity(0) - { - } - - VmaVector(size_t count, const AllocatorT& allocator) : - m_Allocator(allocator), - m_pArray(count ? (T*)VmaAllocateArray(allocator.m_pCallbacks, count) : VMA_NULL), - m_Count(count), - m_Capacity(count) - { - } - - // This version of the constructor is here for compatibility with pre-C++14 std::vector. - // value is unused. - VmaVector(size_t count, const T& value, const AllocatorT& allocator) - : VmaVector(count, allocator) {} - - VmaVector(const VmaVector& src) : - m_Allocator(src.m_Allocator), - m_pArray(src.m_Count ? (T*)VmaAllocateArray(src.m_Allocator.m_pCallbacks, src.m_Count) : VMA_NULL), - m_Count(src.m_Count), - m_Capacity(src.m_Count) - { - if(m_Count != 0) - { - memcpy(m_pArray, src.m_pArray, m_Count * sizeof(T)); - } - } - - ~VmaVector() - { - VmaFree(m_Allocator.m_pCallbacks, m_pArray); - } - - VmaVector& operator=(const VmaVector& rhs) - { - if(&rhs != this) - { - resize(rhs.m_Count); - if(m_Count != 0) - { - memcpy(m_pArray, rhs.m_pArray, m_Count * sizeof(T)); - } - } - return *this; - } - - bool empty() const { return m_Count == 0; } - size_t size() const { return m_Count; } - T* data() { return m_pArray; } - const T* data() const { return m_pArray; } - - T& operator[](size_t index) - { - VMA_HEAVY_ASSERT(index < m_Count); - return m_pArray[index]; - } - const T& operator[](size_t index) const - { - VMA_HEAVY_ASSERT(index < m_Count); - return m_pArray[index]; - } - - T& front() - { - VMA_HEAVY_ASSERT(m_Count > 0); - return m_pArray[0]; - } - const T& front() const - { - VMA_HEAVY_ASSERT(m_Count > 0); - return m_pArray[0]; - } - T& back() - { - VMA_HEAVY_ASSERT(m_Count > 0); - return m_pArray[m_Count - 1]; - } - const T& back() const - { - VMA_HEAVY_ASSERT(m_Count > 0); - return m_pArray[m_Count - 1]; - } - - void reserve(size_t newCapacity, bool freeMemory = false) - { - newCapacity = VMA_MAX(newCapacity, m_Count); - - if((newCapacity < m_Capacity) && !freeMemory) - { - newCapacity = m_Capacity; - } - - if(newCapacity != m_Capacity) - { - T* const newArray = newCapacity ? VmaAllocateArray(m_Allocator, newCapacity) : VMA_NULL; - if(m_Count != 0) - { - memcpy(newArray, m_pArray, m_Count * sizeof(T)); - } - VmaFree(m_Allocator.m_pCallbacks, m_pArray); - m_Capacity = newCapacity; - m_pArray = newArray; - } - } - - void resize(size_t newCount, bool freeMemory = false) - { - size_t newCapacity = m_Capacity; - if(newCount > m_Capacity) - { - newCapacity = VMA_MAX(newCount, VMA_MAX(m_Capacity * 3 / 2, (size_t)8)); - } - else if(freeMemory) - { - newCapacity = newCount; - } - - if(newCapacity != m_Capacity) - { - T* const newArray = newCapacity ? VmaAllocateArray(m_Allocator.m_pCallbacks, newCapacity) : VMA_NULL; - const size_t elementsToCopy = VMA_MIN(m_Count, newCount); - if(elementsToCopy != 0) - { - memcpy(newArray, m_pArray, elementsToCopy * sizeof(T)); - } - VmaFree(m_Allocator.m_pCallbacks, m_pArray); - m_Capacity = newCapacity; - m_pArray = newArray; - } - - m_Count = newCount; - } - - void clear(bool freeMemory = false) - { - resize(0, freeMemory); - } - - void insert(size_t index, const T& src) - { - VMA_HEAVY_ASSERT(index <= m_Count); - const size_t oldCount = size(); - resize(oldCount + 1); - if(index < oldCount) - { - memmove(m_pArray + (index + 1), m_pArray + index, (oldCount - index) * sizeof(T)); - } - m_pArray[index] = src; - } - - void remove(size_t index) - { - VMA_HEAVY_ASSERT(index < m_Count); - const size_t oldCount = size(); - if(index < oldCount - 1) - { - memmove(m_pArray + index, m_pArray + (index + 1), (oldCount - index - 1) * sizeof(T)); - } - resize(oldCount - 1); - } - - void push_back(const T& src) - { - const size_t newIndex = size(); - resize(newIndex + 1); - m_pArray[newIndex] = src; - } - - void pop_back() - { - VMA_HEAVY_ASSERT(m_Count > 0); - resize(size() - 1); - } - - void push_front(const T& src) - { - insert(0, src); - } - - void pop_front() - { - VMA_HEAVY_ASSERT(m_Count > 0); - remove(0); - } - - typedef T* iterator; - - iterator begin() { return m_pArray; } - iterator end() { return m_pArray + m_Count; } - -private: - AllocatorT m_Allocator; - T* m_pArray; - size_t m_Count; - size_t m_Capacity; -}; - -template -static void VmaVectorInsert(VmaVector& vec, size_t index, const T& item) -{ - vec.insert(index, item); -} - -template -static void VmaVectorRemove(VmaVector& vec, size_t index) -{ - vec.remove(index); -} - -#endif // #if VMA_USE_STL_VECTOR - -template -size_t VmaVectorInsertSorted(VectorT& vector, const typename VectorT::value_type& value) -{ - const size_t indexToInsert = VmaBinaryFindFirstNotLess( - vector.data(), - vector.data() + vector.size(), - value, - CmpLess()) - vector.data(); - VmaVectorInsert(vector, indexToInsert, value); - return indexToInsert; -} - -template -bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& value) -{ - CmpLess comparator; - typename VectorT::iterator it = VmaBinaryFindFirstNotLess( - vector.begin(), - vector.end(), - value, - comparator); - if((it != vector.end()) && !comparator(*it, value) && !comparator(value, *it)) - { - size_t indexToRemove = it - vector.begin(); - VmaVectorRemove(vector, indexToRemove); - return true; - } - return false; -} - -//////////////////////////////////////////////////////////////////////////////// -// class VmaPoolAllocator - -/* -Allocator for objects of type T using a list of arrays (pools) to speed up -allocation. Number of elements that can be allocated is not bounded because -allocator can create multiple blocks. -*/ -template -class VmaPoolAllocator -{ - VMA_CLASS_NO_COPY(VmaPoolAllocator) -public: - VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity); - ~VmaPoolAllocator(); - T* Alloc(); - void Free(T* ptr); - -private: - union Item - { - uint32_t NextFreeIndex; - alignas(T) char Value[sizeof(T)]; - }; - - struct ItemBlock - { - Item* pItems; - uint32_t Capacity; - uint32_t FirstFreeIndex; - }; - - const VkAllocationCallbacks* m_pAllocationCallbacks; - const uint32_t m_FirstBlockCapacity; - VmaVector< ItemBlock, VmaStlAllocator > m_ItemBlocks; - - ItemBlock& CreateNewBlock(); -}; - -template -VmaPoolAllocator::VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity) : - m_pAllocationCallbacks(pAllocationCallbacks), - m_FirstBlockCapacity(firstBlockCapacity), - m_ItemBlocks(VmaStlAllocator(pAllocationCallbacks)) -{ - VMA_ASSERT(m_FirstBlockCapacity > 1); -} - -template -VmaPoolAllocator::~VmaPoolAllocator() -{ - for(size_t i = m_ItemBlocks.size(); i--; ) - vma_delete_array(m_pAllocationCallbacks, m_ItemBlocks[i].pItems, m_ItemBlocks[i].Capacity); - m_ItemBlocks.clear(); -} - -template -T* VmaPoolAllocator::Alloc() -{ - for(size_t i = m_ItemBlocks.size(); i--; ) - { - ItemBlock& block = m_ItemBlocks[i]; - // This block has some free items: Use first one. - if(block.FirstFreeIndex != UINT32_MAX) - { - Item* const pItem = &block.pItems[block.FirstFreeIndex]; - block.FirstFreeIndex = pItem->NextFreeIndex; - T* result = (T*)&pItem->Value; - new(result)T(); // Explicit constructor call. - return result; - } - } - - // No block has free item: Create new one and use it. - ItemBlock& newBlock = CreateNewBlock(); - Item* const pItem = &newBlock.pItems[0]; - newBlock.FirstFreeIndex = pItem->NextFreeIndex; - T* result = (T*)&pItem->Value; - new(result)T(); // Explicit constructor call. - return result; -} - -template -void VmaPoolAllocator::Free(T* ptr) -{ - // Search all memory blocks to find ptr. - for(size_t i = m_ItemBlocks.size(); i--; ) - { - ItemBlock& block = m_ItemBlocks[i]; - - // Casting to union. - Item* pItemPtr; - memcpy(&pItemPtr, &ptr, sizeof(pItemPtr)); - - // Check if pItemPtr is in address range of this block. - if((pItemPtr >= block.pItems) && (pItemPtr < block.pItems + block.Capacity)) - { - ptr->~T(); // Explicit destructor call. - const uint32_t index = static_cast(pItemPtr - block.pItems); - pItemPtr->NextFreeIndex = block.FirstFreeIndex; - block.FirstFreeIndex = index; - return; - } - } - VMA_ASSERT(0 && "Pointer doesn't belong to this memory pool."); -} - -template -typename VmaPoolAllocator::ItemBlock& VmaPoolAllocator::CreateNewBlock() -{ - const uint32_t newBlockCapacity = m_ItemBlocks.empty() ? - m_FirstBlockCapacity : m_ItemBlocks.back().Capacity * 3 / 2; - - const ItemBlock newBlock = { - vma_new_array(m_pAllocationCallbacks, Item, newBlockCapacity), - newBlockCapacity, - 0 }; - - m_ItemBlocks.push_back(newBlock); - - // Setup singly-linked list of all free items in this block. - for(uint32_t i = 0; i < newBlockCapacity - 1; ++i) - newBlock.pItems[i].NextFreeIndex = i + 1; - newBlock.pItems[newBlockCapacity - 1].NextFreeIndex = UINT32_MAX; - return m_ItemBlocks.back(); -} - -//////////////////////////////////////////////////////////////////////////////// -// class VmaRawList, VmaList - -#if VMA_USE_STL_LIST - -#define VmaList std::list - -#else // #if VMA_USE_STL_LIST - -template -struct VmaListItem -{ - VmaListItem* pPrev; - VmaListItem* pNext; - T Value; -}; - -// Doubly linked list. -template -class VmaRawList -{ - VMA_CLASS_NO_COPY(VmaRawList) -public: - typedef VmaListItem ItemType; - - VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks); - ~VmaRawList(); - void Clear(); - - size_t GetCount() const { return m_Count; } - bool IsEmpty() const { return m_Count == 0; } - - ItemType* Front() { return m_pFront; } - const ItemType* Front() const { return m_pFront; } - ItemType* Back() { return m_pBack; } - const ItemType* Back() const { return m_pBack; } - - ItemType* PushBack(); - ItemType* PushFront(); - ItemType* PushBack(const T& value); - ItemType* PushFront(const T& value); - void PopBack(); - void PopFront(); - - // Item can be null - it means PushBack. - ItemType* InsertBefore(ItemType* pItem); - // Item can be null - it means PushFront. - ItemType* InsertAfter(ItemType* pItem); - - ItemType* InsertBefore(ItemType* pItem, const T& value); - ItemType* InsertAfter(ItemType* pItem, const T& value); - - void Remove(ItemType* pItem); - -private: - const VkAllocationCallbacks* const m_pAllocationCallbacks; - VmaPoolAllocator m_ItemAllocator; - ItemType* m_pFront; - ItemType* m_pBack; - size_t m_Count; -}; - -template -VmaRawList::VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks) : - m_pAllocationCallbacks(pAllocationCallbacks), - m_ItemAllocator(pAllocationCallbacks, 128), - m_pFront(VMA_NULL), - m_pBack(VMA_NULL), - m_Count(0) -{ -} - -template -VmaRawList::~VmaRawList() -{ - // Intentionally not calling Clear, because that would be unnecessary - // computations to return all items to m_ItemAllocator as free. -} - -template -void VmaRawList::Clear() -{ - if(IsEmpty() == false) - { - ItemType* pItem = m_pBack; - while(pItem != VMA_NULL) - { - ItemType* const pPrevItem = pItem->pPrev; - m_ItemAllocator.Free(pItem); - pItem = pPrevItem; - } - m_pFront = VMA_NULL; - m_pBack = VMA_NULL; - m_Count = 0; - } -} - -template -VmaListItem* VmaRawList::PushBack() -{ - ItemType* const pNewItem = m_ItemAllocator.Alloc(); - pNewItem->pNext = VMA_NULL; - if(IsEmpty()) - { - pNewItem->pPrev = VMA_NULL; - m_pFront = pNewItem; - m_pBack = pNewItem; - m_Count = 1; - } - else - { - pNewItem->pPrev = m_pBack; - m_pBack->pNext = pNewItem; - m_pBack = pNewItem; - ++m_Count; - } - return pNewItem; -} - -template -VmaListItem* VmaRawList::PushFront() -{ - ItemType* const pNewItem = m_ItemAllocator.Alloc(); - pNewItem->pPrev = VMA_NULL; - if(IsEmpty()) - { - pNewItem->pNext = VMA_NULL; - m_pFront = pNewItem; - m_pBack = pNewItem; - m_Count = 1; - } - else - { - pNewItem->pNext = m_pFront; - m_pFront->pPrev = pNewItem; - m_pFront = pNewItem; - ++m_Count; - } - return pNewItem; -} - -template -VmaListItem* VmaRawList::PushBack(const T& value) -{ - ItemType* const pNewItem = PushBack(); - pNewItem->Value = value; - return pNewItem; -} - -template -VmaListItem* VmaRawList::PushFront(const T& value) -{ - ItemType* const pNewItem = PushFront(); - pNewItem->Value = value; - return pNewItem; -} - -template -void VmaRawList::PopBack() -{ - VMA_HEAVY_ASSERT(m_Count > 0); - ItemType* const pBackItem = m_pBack; - ItemType* const pPrevItem = pBackItem->pPrev; - if(pPrevItem != VMA_NULL) - { - pPrevItem->pNext = VMA_NULL; - } - m_pBack = pPrevItem; - m_ItemAllocator.Free(pBackItem); - --m_Count; -} - -template -void VmaRawList::PopFront() -{ - VMA_HEAVY_ASSERT(m_Count > 0); - ItemType* const pFrontItem = m_pFront; - ItemType* const pNextItem = pFrontItem->pNext; - if(pNextItem != VMA_NULL) - { - pNextItem->pPrev = VMA_NULL; - } - m_pFront = pNextItem; - m_ItemAllocator.Free(pFrontItem); - --m_Count; -} - -template -void VmaRawList::Remove(ItemType* pItem) -{ - VMA_HEAVY_ASSERT(pItem != VMA_NULL); - VMA_HEAVY_ASSERT(m_Count > 0); - - if(pItem->pPrev != VMA_NULL) - { - pItem->pPrev->pNext = pItem->pNext; - } - else - { - VMA_HEAVY_ASSERT(m_pFront == pItem); - m_pFront = pItem->pNext; - } - - if(pItem->pNext != VMA_NULL) - { - pItem->pNext->pPrev = pItem->pPrev; - } - else - { - VMA_HEAVY_ASSERT(m_pBack == pItem); - m_pBack = pItem->pPrev; - } - - m_ItemAllocator.Free(pItem); - --m_Count; -} - -template -VmaListItem* VmaRawList::InsertBefore(ItemType* pItem) -{ - if(pItem != VMA_NULL) - { - ItemType* const prevItem = pItem->pPrev; - ItemType* const newItem = m_ItemAllocator.Alloc(); - newItem->pPrev = prevItem; - newItem->pNext = pItem; - pItem->pPrev = newItem; - if(prevItem != VMA_NULL) - { - prevItem->pNext = newItem; - } - else - { - VMA_HEAVY_ASSERT(m_pFront == pItem); - m_pFront = newItem; - } - ++m_Count; - return newItem; - } - else - return PushBack(); -} - -template -VmaListItem* VmaRawList::InsertAfter(ItemType* pItem) -{ - if(pItem != VMA_NULL) - { - ItemType* const nextItem = pItem->pNext; - ItemType* const newItem = m_ItemAllocator.Alloc(); - newItem->pNext = nextItem; - newItem->pPrev = pItem; - pItem->pNext = newItem; - if(nextItem != VMA_NULL) - { - nextItem->pPrev = newItem; - } - else - { - VMA_HEAVY_ASSERT(m_pBack == pItem); - m_pBack = newItem; - } - ++m_Count; - return newItem; - } - else - return PushFront(); -} - -template -VmaListItem* VmaRawList::InsertBefore(ItemType* pItem, const T& value) -{ - ItemType* const newItem = InsertBefore(pItem); - newItem->Value = value; - return newItem; -} - -template -VmaListItem* VmaRawList::InsertAfter(ItemType* pItem, const T& value) -{ - ItemType* const newItem = InsertAfter(pItem); - newItem->Value = value; - return newItem; -} - -template -class VmaList -{ - VMA_CLASS_NO_COPY(VmaList) -public: - class iterator - { - public: - iterator() : - m_pList(VMA_NULL), - m_pItem(VMA_NULL) - { - } - - T& operator*() const - { - VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); - return m_pItem->Value; - } - T* operator->() const - { - VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); - return &m_pItem->Value; - } - - iterator& operator++() - { - VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); - m_pItem = m_pItem->pNext; - return *this; - } - iterator& operator--() - { - if(m_pItem != VMA_NULL) - { - m_pItem = m_pItem->pPrev; - } - else - { - VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); - m_pItem = m_pList->Back(); - } - return *this; - } - - iterator operator++(int) - { - iterator result = *this; - ++*this; - return result; - } - iterator operator--(int) - { - iterator result = *this; - --*this; - return result; - } - - bool operator==(const iterator& rhs) const - { - VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); - return m_pItem == rhs.m_pItem; - } - bool operator!=(const iterator& rhs) const - { - VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); - return m_pItem != rhs.m_pItem; - } - - private: - VmaRawList* m_pList; - VmaListItem* m_pItem; - - iterator(VmaRawList* pList, VmaListItem* pItem) : - m_pList(pList), - m_pItem(pItem) - { - } - - friend class VmaList; - }; - - class const_iterator - { - public: - const_iterator() : - m_pList(VMA_NULL), - m_pItem(VMA_NULL) - { - } - - const_iterator(const iterator& src) : - m_pList(src.m_pList), - m_pItem(src.m_pItem) - { - } - - const T& operator*() const - { - VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); - return m_pItem->Value; - } - const T* operator->() const - { - VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); - return &m_pItem->Value; - } - - const_iterator& operator++() - { - VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); - m_pItem = m_pItem->pNext; - return *this; - } - const_iterator& operator--() - { - if(m_pItem != VMA_NULL) - { - m_pItem = m_pItem->pPrev; - } - else - { - VMA_HEAVY_ASSERT(!m_pList->IsEmpty()); - m_pItem = m_pList->Back(); - } - return *this; - } - - const_iterator operator++(int) - { - const_iterator result = *this; - ++*this; - return result; - } - const_iterator operator--(int) - { - const_iterator result = *this; - --*this; - return result; - } - - bool operator==(const const_iterator& rhs) const - { - VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); - return m_pItem == rhs.m_pItem; - } - bool operator!=(const const_iterator& rhs) const - { - VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); - return m_pItem != rhs.m_pItem; - } - - private: - const_iterator(const VmaRawList* pList, const VmaListItem* pItem) : - m_pList(pList), - m_pItem(pItem) - { - } - - const VmaRawList* m_pList; - const VmaListItem* m_pItem; - - friend class VmaList; - }; - - VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) { } - - bool empty() const { return m_RawList.IsEmpty(); } - size_t size() const { return m_RawList.GetCount(); } - - iterator begin() { return iterator(&m_RawList, m_RawList.Front()); } - iterator end() { return iterator(&m_RawList, VMA_NULL); } - - const_iterator cbegin() const { return const_iterator(&m_RawList, m_RawList.Front()); } - const_iterator cend() const { return const_iterator(&m_RawList, VMA_NULL); } - - void clear() { m_RawList.Clear(); } - void push_back(const T& value) { m_RawList.PushBack(value); } - void erase(iterator it) { m_RawList.Remove(it.m_pItem); } - iterator insert(iterator it, const T& value) { return iterator(&m_RawList, m_RawList.InsertBefore(it.m_pItem, value)); } - -private: - VmaRawList m_RawList; -}; - -#endif // #if VMA_USE_STL_LIST - -//////////////////////////////////////////////////////////////////////////////// -// class VmaMap - -// Unused in this version. -#if 0 - -#if VMA_USE_STL_UNORDERED_MAP - -#define VmaPair std::pair - -#define VMA_MAP_TYPE(KeyT, ValueT) \ - std::unordered_map< KeyT, ValueT, std::hash, std::equal_to, VmaStlAllocator< std::pair > > - -#else // #if VMA_USE_STL_UNORDERED_MAP - -template -struct VmaPair -{ - T1 first; - T2 second; - - VmaPair() : first(), second() { } - VmaPair(const T1& firstSrc, const T2& secondSrc) : first(firstSrc), second(secondSrc) { } -}; - -/* Class compatible with subset of interface of std::unordered_map. -KeyT, ValueT must be POD because they will be stored in VmaVector. -*/ -template -class VmaMap -{ -public: - typedef VmaPair PairType; - typedef PairType* iterator; - - VmaMap(const VmaStlAllocator& allocator) : m_Vector(allocator) { } - - iterator begin() { return m_Vector.begin(); } - iterator end() { return m_Vector.end(); } - - void insert(const PairType& pair); - iterator find(const KeyT& key); - void erase(iterator it); - -private: - VmaVector< PairType, VmaStlAllocator > m_Vector; -}; - -#define VMA_MAP_TYPE(KeyT, ValueT) VmaMap - -template -struct VmaPairFirstLess -{ - bool operator()(const VmaPair& lhs, const VmaPair& rhs) const - { - return lhs.first < rhs.first; - } - bool operator()(const VmaPair& lhs, const FirstT& rhsFirst) const - { - return lhs.first < rhsFirst; - } -}; - -template -void VmaMap::insert(const PairType& pair) -{ - const size_t indexToInsert = VmaBinaryFindFirstNotLess( - m_Vector.data(), - m_Vector.data() + m_Vector.size(), - pair, - VmaPairFirstLess()) - m_Vector.data(); - VmaVectorInsert(m_Vector, indexToInsert, pair); -} - -template -VmaPair* VmaMap::find(const KeyT& key) -{ - PairType* it = VmaBinaryFindFirstNotLess( - m_Vector.data(), - m_Vector.data() + m_Vector.size(), - key, - VmaPairFirstLess()); - if((it != m_Vector.end()) && (it->first == key)) - { - return it; - } - else - { - return m_Vector.end(); - } -} - -template -void VmaMap::erase(iterator it) -{ - VmaVectorRemove(m_Vector, it - m_Vector.begin()); -} - -#endif // #if VMA_USE_STL_UNORDERED_MAP - -#endif // #if 0 - -//////////////////////////////////////////////////////////////////////////////// - -class VmaDeviceMemoryBlock; - -enum VMA_CACHE_OPERATION { VMA_CACHE_FLUSH, VMA_CACHE_INVALIDATE }; - -struct VmaAllocation_T -{ -private: - static const uint8_t MAP_COUNT_FLAG_PERSISTENT_MAP = 0x80; - - enum FLAGS - { - FLAG_USER_DATA_STRING = 0x01, - }; - -public: - enum ALLOCATION_TYPE - { - ALLOCATION_TYPE_NONE, - ALLOCATION_TYPE_BLOCK, - ALLOCATION_TYPE_DEDICATED, - }; - - /* - This struct is allocated using VmaPoolAllocator. - */ - - void Ctor(uint32_t currentFrameIndex, bool userDataString) - { - m_Alignment = 1; - m_Size = 0; - m_MemoryTypeIndex = 0; - m_pUserData = VMA_NULL; - m_LastUseFrameIndex = currentFrameIndex; - m_Type = (uint8_t)ALLOCATION_TYPE_NONE; - m_SuballocationType = (uint8_t)VMA_SUBALLOCATION_TYPE_UNKNOWN; - m_MapCount = 0; - m_Flags = userDataString ? (uint8_t)FLAG_USER_DATA_STRING : 0; - -#if VMA_STATS_STRING_ENABLED - m_CreationFrameIndex = currentFrameIndex; - m_BufferImageUsage = 0; -#endif - } - - void Dtor() - { - VMA_ASSERT((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) == 0 && "Allocation was not unmapped before destruction."); - - // Check if owned string was freed. - VMA_ASSERT(m_pUserData == VMA_NULL); - } - - void InitBlockAllocation( - VmaDeviceMemoryBlock* block, - VkDeviceSize offset, - VkDeviceSize alignment, - VkDeviceSize size, - uint32_t memoryTypeIndex, - VmaSuballocationType suballocationType, - bool mapped, - bool canBecomeLost) - { - VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE); - VMA_ASSERT(block != VMA_NULL); - m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK; - m_Alignment = alignment; - m_Size = size; - m_MemoryTypeIndex = memoryTypeIndex; - m_MapCount = mapped ? MAP_COUNT_FLAG_PERSISTENT_MAP : 0; - m_SuballocationType = (uint8_t)suballocationType; - m_BlockAllocation.m_Block = block; - m_BlockAllocation.m_Offset = offset; - m_BlockAllocation.m_CanBecomeLost = canBecomeLost; - } - - void InitLost() - { - VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE); - VMA_ASSERT(m_LastUseFrameIndex.load() == VMA_FRAME_INDEX_LOST); - m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK; - m_MemoryTypeIndex = 0; - m_BlockAllocation.m_Block = VMA_NULL; - m_BlockAllocation.m_Offset = 0; - m_BlockAllocation.m_CanBecomeLost = true; - } - - void ChangeBlockAllocation( - VmaAllocator hAllocator, - VmaDeviceMemoryBlock* block, - VkDeviceSize offset); - - void ChangeOffset(VkDeviceSize newOffset); - - // pMappedData not null means allocation is created with MAPPED flag. - void InitDedicatedAllocation( - uint32_t memoryTypeIndex, - VkDeviceMemory hMemory, - VmaSuballocationType suballocationType, - void* pMappedData, - VkDeviceSize size) - { - VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE); - VMA_ASSERT(hMemory != VK_NULL_HANDLE); - m_Type = (uint8_t)ALLOCATION_TYPE_DEDICATED; - m_Alignment = 0; - m_Size = size; - m_MemoryTypeIndex = memoryTypeIndex; - m_SuballocationType = (uint8_t)suballocationType; - m_MapCount = (pMappedData != VMA_NULL) ? MAP_COUNT_FLAG_PERSISTENT_MAP : 0; - m_DedicatedAllocation.m_hMemory = hMemory; - m_DedicatedAllocation.m_pMappedData = pMappedData; - } - - ALLOCATION_TYPE GetType() const { return (ALLOCATION_TYPE)m_Type; } - VkDeviceSize GetAlignment() const { return m_Alignment; } - VkDeviceSize GetSize() const { return m_Size; } - bool IsUserDataString() const { return (m_Flags & FLAG_USER_DATA_STRING) != 0; } - void* GetUserData() const { return m_pUserData; } - void SetUserData(VmaAllocator hAllocator, void* pUserData); - VmaSuballocationType GetSuballocationType() const { return (VmaSuballocationType)m_SuballocationType; } - - VmaDeviceMemoryBlock* GetBlock() const - { - VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); - return m_BlockAllocation.m_Block; - } - VkDeviceSize GetOffset() const; - VkDeviceMemory GetMemory() const; - uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } - bool IsPersistentMap() const { return (m_MapCount & MAP_COUNT_FLAG_PERSISTENT_MAP) != 0; } - void* GetMappedData() const; - bool CanBecomeLost() const; - - uint32_t GetLastUseFrameIndex() const - { - return m_LastUseFrameIndex.load(); - } - bool CompareExchangeLastUseFrameIndex(uint32_t& expected, uint32_t desired) - { - return m_LastUseFrameIndex.compare_exchange_weak(expected, desired); - } - /* - - If hAllocation.LastUseFrameIndex + frameInUseCount < allocator.CurrentFrameIndex, - makes it lost by setting LastUseFrameIndex = VMA_FRAME_INDEX_LOST and returns true. - - Else, returns false. - - If hAllocation is already lost, assert - you should not call it then. - If hAllocation was not created with CAN_BECOME_LOST_BIT, assert. - */ - bool MakeLost(uint32_t currentFrameIndex, uint32_t frameInUseCount); - - void DedicatedAllocCalcStatsInfo(VmaStatInfo& outInfo) - { - VMA_ASSERT(m_Type == ALLOCATION_TYPE_DEDICATED); - outInfo.blockCount = 1; - outInfo.allocationCount = 1; - outInfo.unusedRangeCount = 0; - outInfo.usedBytes = m_Size; - outInfo.unusedBytes = 0; - outInfo.allocationSizeMin = outInfo.allocationSizeMax = m_Size; - outInfo.unusedRangeSizeMin = UINT64_MAX; - outInfo.unusedRangeSizeMax = 0; - } - - void BlockAllocMap(); - void BlockAllocUnmap(); - VkResult DedicatedAllocMap(VmaAllocator hAllocator, void** ppData); - void DedicatedAllocUnmap(VmaAllocator hAllocator); - -#if VMA_STATS_STRING_ENABLED - uint32_t GetCreationFrameIndex() const { return m_CreationFrameIndex; } - uint32_t GetBufferImageUsage() const { return m_BufferImageUsage; } - - void InitBufferImageUsage(uint32_t bufferImageUsage) - { - VMA_ASSERT(m_BufferImageUsage == 0); - m_BufferImageUsage = bufferImageUsage; - } - - void PrintParameters(class VmaJsonWriter& json) const; -#endif - -private: - VkDeviceSize m_Alignment; - VkDeviceSize m_Size; - void* m_pUserData; - VMA_ATOMIC_UINT32 m_LastUseFrameIndex; - uint32_t m_MemoryTypeIndex; - uint8_t m_Type; // ALLOCATION_TYPE - uint8_t m_SuballocationType; // VmaSuballocationType - // Bit 0x80 is set when allocation was created with VMA_ALLOCATION_CREATE_MAPPED_BIT. - // Bits with mask 0x7F are reference counter for vmaMapMemory()/vmaUnmapMemory(). - uint8_t m_MapCount; - uint8_t m_Flags; // enum FLAGS - - // Allocation out of VmaDeviceMemoryBlock. - struct BlockAllocation - { - VmaDeviceMemoryBlock* m_Block; - VkDeviceSize m_Offset; - bool m_CanBecomeLost; - }; - - // Allocation for an object that has its own private VkDeviceMemory. - struct DedicatedAllocation - { - VkDeviceMemory m_hMemory; - void* m_pMappedData; // Not null means memory is mapped. - }; - - union - { - // Allocation out of VmaDeviceMemoryBlock. - BlockAllocation m_BlockAllocation; - // Allocation for an object that has its own private VkDeviceMemory. - DedicatedAllocation m_DedicatedAllocation; - }; - -#if VMA_STATS_STRING_ENABLED - uint32_t m_CreationFrameIndex; - uint32_t m_BufferImageUsage; // 0 if unknown. -#endif - - void FreeUserDataString(VmaAllocator hAllocator); -}; - -/* -Represents a region of VmaDeviceMemoryBlock that is either assigned and returned as -allocated memory block or free. -*/ -struct VmaSuballocation -{ - VkDeviceSize offset; - VkDeviceSize size; - VmaAllocation hAllocation; - VmaSuballocationType type; -}; - -// Comparator for offsets. -struct VmaSuballocationOffsetLess -{ - bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const - { - return lhs.offset < rhs.offset; - } -}; -struct VmaSuballocationOffsetGreater -{ - bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const - { - return lhs.offset > rhs.offset; - } -}; - -typedef VmaList< VmaSuballocation, VmaStlAllocator > VmaSuballocationList; - -// Cost of one additional allocation lost, as equivalent in bytes. -static const VkDeviceSize VMA_LOST_ALLOCATION_COST = 1048576; - -enum class VmaAllocationRequestType -{ - Normal, - // Used by "Linear" algorithm. - UpperAddress, - EndOf1st, - EndOf2nd, -}; - -/* -Parameters of planned allocation inside a VmaDeviceMemoryBlock. - -If canMakeOtherLost was false: -- item points to a FREE suballocation. -- itemsToMakeLostCount is 0. - -If canMakeOtherLost was true: -- item points to first of sequence of suballocations, which are either FREE, - or point to VmaAllocations that can become lost. -- itemsToMakeLostCount is the number of VmaAllocations that need to be made lost for - the requested allocation to succeed. -*/ -struct VmaAllocationRequest -{ - VkDeviceSize offset; - VkDeviceSize sumFreeSize; // Sum size of free items that overlap with proposed allocation. - VkDeviceSize sumItemSize; // Sum size of items to make lost that overlap with proposed allocation. - VmaSuballocationList::iterator item; - size_t itemsToMakeLostCount; - void* customData; - VmaAllocationRequestType type; - - VkDeviceSize CalcCost() const - { - return sumItemSize + itemsToMakeLostCount * VMA_LOST_ALLOCATION_COST; - } -}; - -/* -Data structure used for bookkeeping of allocations and unused ranges of memory -in a single VkDeviceMemory block. -*/ -class VmaBlockMetadata -{ -public: - VmaBlockMetadata(VmaAllocator hAllocator); - virtual ~VmaBlockMetadata() { } - virtual void Init(VkDeviceSize size) { m_Size = size; } - - // Validates all data structures inside this object. If not valid, returns false. - virtual bool Validate() const = 0; - VkDeviceSize GetSize() const { return m_Size; } - virtual size_t GetAllocationCount() const = 0; - virtual VkDeviceSize GetSumFreeSize() const = 0; - virtual VkDeviceSize GetUnusedRangeSizeMax() const = 0; - // Returns true if this block is empty - contains only single free suballocation. - virtual bool IsEmpty() const = 0; - - virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const = 0; - // Shouldn't modify blockCount. - virtual void AddPoolStats(VmaPoolStats& inoutStats) const = 0; - -#if VMA_STATS_STRING_ENABLED - virtual void PrintDetailedMap(class VmaJsonWriter& json) const = 0; -#endif - - // Tries to find a place for suballocation with given parameters inside this block. - // If succeeded, fills pAllocationRequest and returns true. - // If failed, returns false. - virtual bool CreateAllocationRequest( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - bool canMakeOtherLost, - // Always one of VMA_ALLOCATION_CREATE_STRATEGY_* or VMA_ALLOCATION_INTERNAL_STRATEGY_* flags. - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) = 0; - - virtual bool MakeRequestedAllocationsLost( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VmaAllocationRequest* pAllocationRequest) = 0; - - virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) = 0; - - virtual VkResult CheckCorruption(const void* pBlockData) = 0; - - // Makes actual allocation based on request. Request must already be checked and valid. - virtual void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - VkDeviceSize allocSize, - VmaAllocation hAllocation) = 0; - - // Frees suballocation assigned to given memory region. - virtual void Free(const VmaAllocation allocation) = 0; - virtual void FreeAtOffset(VkDeviceSize offset) = 0; - -protected: - const VkAllocationCallbacks* GetAllocationCallbacks() const { return m_pAllocationCallbacks; } - -#if VMA_STATS_STRING_ENABLED - void PrintDetailedMap_Begin(class VmaJsonWriter& json, - VkDeviceSize unusedBytes, - size_t allocationCount, - size_t unusedRangeCount) const; - void PrintDetailedMap_Allocation(class VmaJsonWriter& json, - VkDeviceSize offset, - VmaAllocation hAllocation) const; - void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json, - VkDeviceSize offset, - VkDeviceSize size) const; - void PrintDetailedMap_End(class VmaJsonWriter& json) const; -#endif - -private: - VkDeviceSize m_Size; - const VkAllocationCallbacks* m_pAllocationCallbacks; -}; - -#define VMA_VALIDATE(cond) do { if(!(cond)) { \ - VMA_ASSERT(0 && "Validation failed: " #cond); \ - return false; \ - } } while(false) - -class VmaBlockMetadata_Generic : public VmaBlockMetadata -{ - VMA_CLASS_NO_COPY(VmaBlockMetadata_Generic) -public: - VmaBlockMetadata_Generic(VmaAllocator hAllocator); - virtual ~VmaBlockMetadata_Generic(); - virtual void Init(VkDeviceSize size); - - virtual bool Validate() const; - virtual size_t GetAllocationCount() const { return m_Suballocations.size() - m_FreeCount; } - virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; } - virtual VkDeviceSize GetUnusedRangeSizeMax() const; - virtual bool IsEmpty() const; - - virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const; - virtual void AddPoolStats(VmaPoolStats& inoutStats) const; - -#if VMA_STATS_STRING_ENABLED - virtual void PrintDetailedMap(class VmaJsonWriter& json) const; -#endif - - virtual bool CreateAllocationRequest( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest); - - virtual bool MakeRequestedAllocationsLost( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VmaAllocationRequest* pAllocationRequest); - - virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount); - - virtual VkResult CheckCorruption(const void* pBlockData); - - virtual void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - VkDeviceSize allocSize, - VmaAllocation hAllocation); - - virtual void Free(const VmaAllocation allocation); - virtual void FreeAtOffset(VkDeviceSize offset); - - //////////////////////////////////////////////////////////////////////////////// - // For defragmentation - - bool IsBufferImageGranularityConflictPossible( - VkDeviceSize bufferImageGranularity, - VmaSuballocationType& inOutPrevSuballocType) const; - -private: - friend class VmaDefragmentationAlgorithm_Generic; - friend class VmaDefragmentationAlgorithm_Fast; - - uint32_t m_FreeCount; - VkDeviceSize m_SumFreeSize; - VmaSuballocationList m_Suballocations; - // Suballocations that are free and have size greater than certain threshold. - // Sorted by size, ascending. - VmaVector< VmaSuballocationList::iterator, VmaStlAllocator< VmaSuballocationList::iterator > > m_FreeSuballocationsBySize; - - bool ValidateFreeSuballocationList() const; - - // Checks if requested suballocation with given parameters can be placed in given pFreeSuballocItem. - // If yes, fills pOffset and returns true. If no, returns false. - bool CheckAllocation( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - VmaSuballocationList::const_iterator suballocItem, - bool canMakeOtherLost, - VkDeviceSize* pOffset, - size_t* itemsToMakeLostCount, - VkDeviceSize* pSumFreeSize, - VkDeviceSize* pSumItemSize) const; - // Given free suballocation, it merges it with following one, which must also be free. - void MergeFreeWithNext(VmaSuballocationList::iterator item); - // Releases given suballocation, making it free. - // Merges it with adjacent free suballocations if applicable. - // Returns iterator to new free suballocation at this place. - VmaSuballocationList::iterator FreeSuballocation(VmaSuballocationList::iterator suballocItem); - // Given free suballocation, it inserts it into sorted list of - // m_FreeSuballocationsBySize if it's suitable. - void RegisterFreeSuballocation(VmaSuballocationList::iterator item); - // Given free suballocation, it removes it from sorted list of - // m_FreeSuballocationsBySize if it's suitable. - void UnregisterFreeSuballocation(VmaSuballocationList::iterator item); -}; - -/* -Allocations and their references in internal data structure look like this: - -if(m_2ndVectorMode == SECOND_VECTOR_EMPTY): - - 0 +-------+ - | | - | | - | | - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount] - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount + 1] - +-------+ - | ... | - +-------+ - | Alloc | 1st[1st.size() - 1] - +-------+ - | | - | | - | | -GetSize() +-------+ - -if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER): - - 0 +-------+ - | Alloc | 2nd[0] - +-------+ - | Alloc | 2nd[1] - +-------+ - | ... | - +-------+ - | Alloc | 2nd[2nd.size() - 1] - +-------+ - | | - | | - | | - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount] - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount + 1] - +-------+ - | ... | - +-------+ - | Alloc | 1st[1st.size() - 1] - +-------+ - | | -GetSize() +-------+ - -if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK): - - 0 +-------+ - | | - | | - | | - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount] - +-------+ - | Alloc | 1st[m_1stNullItemsBeginCount + 1] - +-------+ - | ... | - +-------+ - | Alloc | 1st[1st.size() - 1] - +-------+ - | | - | | - | | - +-------+ - | Alloc | 2nd[2nd.size() - 1] - +-------+ - | ... | - +-------+ - | Alloc | 2nd[1] - +-------+ - | Alloc | 2nd[0] -GetSize() +-------+ - -*/ -class VmaBlockMetadata_Linear : public VmaBlockMetadata -{ - VMA_CLASS_NO_COPY(VmaBlockMetadata_Linear) -public: - VmaBlockMetadata_Linear(VmaAllocator hAllocator); - virtual ~VmaBlockMetadata_Linear(); - virtual void Init(VkDeviceSize size); - - virtual bool Validate() const; - virtual size_t GetAllocationCount() const; - virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; } - virtual VkDeviceSize GetUnusedRangeSizeMax() const; - virtual bool IsEmpty() const { return GetAllocationCount() == 0; } - - virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const; - virtual void AddPoolStats(VmaPoolStats& inoutStats) const; - -#if VMA_STATS_STRING_ENABLED - virtual void PrintDetailedMap(class VmaJsonWriter& json) const; -#endif - - virtual bool CreateAllocationRequest( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest); - - virtual bool MakeRequestedAllocationsLost( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VmaAllocationRequest* pAllocationRequest); - - virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount); - - virtual VkResult CheckCorruption(const void* pBlockData); - - virtual void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - VkDeviceSize allocSize, - VmaAllocation hAllocation); - - virtual void Free(const VmaAllocation allocation); - virtual void FreeAtOffset(VkDeviceSize offset); - -private: - /* - There are two suballocation vectors, used in ping-pong way. - The one with index m_1stVectorIndex is called 1st. - The one with index (m_1stVectorIndex ^ 1) is called 2nd. - 2nd can be non-empty only when 1st is not empty. - When 2nd is not empty, m_2ndVectorMode indicates its mode of operation. - */ - typedef VmaVector< VmaSuballocation, VmaStlAllocator > SuballocationVectorType; - - enum SECOND_VECTOR_MODE - { - SECOND_VECTOR_EMPTY, - /* - Suballocations in 2nd vector are created later than the ones in 1st, but they - all have smaller offset. - */ - SECOND_VECTOR_RING_BUFFER, - /* - Suballocations in 2nd vector are upper side of double stack. - They all have offsets higher than those in 1st vector. - Top of this stack means smaller offsets, but higher indices in this vector. - */ - SECOND_VECTOR_DOUBLE_STACK, - }; - - VkDeviceSize m_SumFreeSize; - SuballocationVectorType m_Suballocations0, m_Suballocations1; - uint32_t m_1stVectorIndex; - SECOND_VECTOR_MODE m_2ndVectorMode; - - SuballocationVectorType& AccessSuballocations1st() { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; } - SuballocationVectorType& AccessSuballocations2nd() { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; } - const SuballocationVectorType& AccessSuballocations1st() const { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; } - const SuballocationVectorType& AccessSuballocations2nd() const { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; } - - // Number of items in 1st vector with hAllocation = null at the beginning. - size_t m_1stNullItemsBeginCount; - // Number of other items in 1st vector with hAllocation = null somewhere in the middle. - size_t m_1stNullItemsMiddleCount; - // Number of items in 2nd vector with hAllocation = null. - size_t m_2ndNullItemsCount; - - bool ShouldCompact1st() const; - void CleanupAfterFree(); - - bool CreateAllocationRequest_LowerAddress( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest); - bool CreateAllocationRequest_UpperAddress( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest); -}; - -/* -- GetSize() is the original size of allocated memory block. -- m_UsableSize is this size aligned down to a power of two. - All allocations and calculations happen relative to m_UsableSize. -- GetUnusableSize() is the difference between them. - It is repoted as separate, unused range, not available for allocations. - -Node at level 0 has size = m_UsableSize. -Each next level contains nodes with size 2 times smaller than current level. -m_LevelCount is the maximum number of levels to use in the current object. -*/ -class VmaBlockMetadata_Buddy : public VmaBlockMetadata -{ - VMA_CLASS_NO_COPY(VmaBlockMetadata_Buddy) -public: - VmaBlockMetadata_Buddy(VmaAllocator hAllocator); - virtual ~VmaBlockMetadata_Buddy(); - virtual void Init(VkDeviceSize size); - - virtual bool Validate() const; - virtual size_t GetAllocationCount() const { return m_AllocationCount; } - virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize + GetUnusableSize(); } - virtual VkDeviceSize GetUnusedRangeSizeMax() const; - virtual bool IsEmpty() const { return m_Root->type == Node::TYPE_FREE; } - - virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const; - virtual void AddPoolStats(VmaPoolStats& inoutStats) const; - -#if VMA_STATS_STRING_ENABLED - virtual void PrintDetailedMap(class VmaJsonWriter& json) const; -#endif - - virtual bool CreateAllocationRequest( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest); - - virtual bool MakeRequestedAllocationsLost( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VmaAllocationRequest* pAllocationRequest); - - virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount); - - virtual VkResult CheckCorruption(const void* pBlockData) { return VK_ERROR_FEATURE_NOT_PRESENT; } - - virtual void Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - VkDeviceSize allocSize, - VmaAllocation hAllocation); - - virtual void Free(const VmaAllocation allocation) { FreeAtOffset(allocation, allocation->GetOffset()); } - virtual void FreeAtOffset(VkDeviceSize offset) { FreeAtOffset(VMA_NULL, offset); } - -private: - static const VkDeviceSize MIN_NODE_SIZE = 32; - static const size_t MAX_LEVELS = 30; - - struct ValidationContext - { - size_t calculatedAllocationCount; - size_t calculatedFreeCount; - VkDeviceSize calculatedSumFreeSize; - - ValidationContext() : - calculatedAllocationCount(0), - calculatedFreeCount(0), - calculatedSumFreeSize(0) { } - }; - - struct Node - { - VkDeviceSize offset; - enum TYPE - { - TYPE_FREE, - TYPE_ALLOCATION, - TYPE_SPLIT, - TYPE_COUNT - } type; - Node* parent; - Node* buddy; - - union - { - struct - { - Node* prev; - Node* next; - } free; - struct - { - VmaAllocation alloc; - } allocation; - struct - { - Node* leftChild; - } split; - }; - }; - - // Size of the memory block aligned down to a power of two. - VkDeviceSize m_UsableSize; - uint32_t m_LevelCount; - - Node* m_Root; - struct { - Node* front; - Node* back; - } m_FreeList[MAX_LEVELS]; - // Number of nodes in the tree with type == TYPE_ALLOCATION. - size_t m_AllocationCount; - // Number of nodes in the tree with type == TYPE_FREE. - size_t m_FreeCount; - // This includes space wasted due to internal fragmentation. Doesn't include unusable size. - VkDeviceSize m_SumFreeSize; - - VkDeviceSize GetUnusableSize() const { return GetSize() - m_UsableSize; } - void DeleteNode(Node* node); - bool ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const; - uint32_t AllocSizeToLevel(VkDeviceSize allocSize) const; - inline VkDeviceSize LevelToNodeSize(uint32_t level) const { return m_UsableSize >> level; } - // Alloc passed just for validation. Can be null. - void FreeAtOffset(VmaAllocation alloc, VkDeviceSize offset); - void CalcAllocationStatInfoNode(VmaStatInfo& outInfo, const Node* node, VkDeviceSize levelNodeSize) const; - // Adds node to the front of FreeList at given level. - // node->type must be FREE. - // node->free.prev, next can be undefined. - void AddToFreeListFront(uint32_t level, Node* node); - // Removes node from FreeList at given level. - // node->type must be FREE. - // node->free.prev, next stay untouched. - void RemoveFromFreeList(uint32_t level, Node* node); - -#if VMA_STATS_STRING_ENABLED - void PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const; -#endif -}; - -/* -Represents a single block of device memory (`VkDeviceMemory`) with all the -data about its regions (aka suballocations, #VmaAllocation), assigned and free. - -Thread-safety: This class must be externally synchronized. -*/ -class VmaDeviceMemoryBlock -{ - VMA_CLASS_NO_COPY(VmaDeviceMemoryBlock) -public: - VmaBlockMetadata* m_pMetadata; - - VmaDeviceMemoryBlock(VmaAllocator hAllocator); - - ~VmaDeviceMemoryBlock() - { - VMA_ASSERT(m_MapCount == 0 && "VkDeviceMemory block is being destroyed while it is still mapped."); - VMA_ASSERT(m_hMemory == VK_NULL_HANDLE); - } - - // Always call after construction. - void Init( - VmaAllocator hAllocator, - VmaPool hParentPool, - uint32_t newMemoryTypeIndex, - VkDeviceMemory newMemory, - VkDeviceSize newSize, - uint32_t id, - uint32_t algorithm); - // Always call before destruction. - void Destroy(VmaAllocator allocator); - - VmaPool GetParentPool() const { return m_hParentPool; } - VkDeviceMemory GetDeviceMemory() const { return m_hMemory; } - uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } - uint32_t GetId() const { return m_Id; } - void* GetMappedData() const { return m_pMappedData; } - - // Validates all data structures inside this object. If not valid, returns false. - bool Validate() const; - - VkResult CheckCorruption(VmaAllocator hAllocator); - - // ppData can be null. - VkResult Map(VmaAllocator hAllocator, uint32_t count, void** ppData); - void Unmap(VmaAllocator hAllocator, uint32_t count); - - VkResult WriteMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize); - VkResult ValidateMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize); - - VkResult BindBufferMemory( - const VmaAllocator hAllocator, - const VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkBuffer hBuffer, - const void* pNext); - VkResult BindImageMemory( - const VmaAllocator hAllocator, - const VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkImage hImage, - const void* pNext); - -private: - VmaPool m_hParentPool; // VK_NULL_HANDLE if not belongs to custom pool. - uint32_t m_MemoryTypeIndex; - uint32_t m_Id; - VkDeviceMemory m_hMemory; - - /* - Protects access to m_hMemory so it's not used by multiple threads simultaneously, e.g. vkMapMemory, vkBindBufferMemory. - Also protects m_MapCount, m_pMappedData. - Allocations, deallocations, any change in m_pMetadata is protected by parent's VmaBlockVector::m_Mutex. - */ - VMA_MUTEX m_Mutex; - uint32_t m_MapCount; - void* m_pMappedData; -}; - -struct VmaPointerLess -{ - bool operator()(const void* lhs, const void* rhs) const - { - return lhs < rhs; - } -}; - -struct VmaDefragmentationMove -{ - size_t srcBlockIndex; - size_t dstBlockIndex; - VkDeviceSize srcOffset; - VkDeviceSize dstOffset; - VkDeviceSize size; - VmaAllocation hAllocation; - VmaDeviceMemoryBlock* pSrcBlock; - VmaDeviceMemoryBlock* pDstBlock; -}; - -class VmaDefragmentationAlgorithm; - -/* -Sequence of VmaDeviceMemoryBlock. Represents memory blocks allocated for a specific -Vulkan memory type. - -Synchronized internally with a mutex. -*/ -struct VmaBlockVector -{ - VMA_CLASS_NO_COPY(VmaBlockVector) -public: - VmaBlockVector( - VmaAllocator hAllocator, - VmaPool hParentPool, - uint32_t memoryTypeIndex, - VkDeviceSize preferredBlockSize, - size_t minBlockCount, - size_t maxBlockCount, - VkDeviceSize bufferImageGranularity, - uint32_t frameInUseCount, - bool explicitBlockSize, - uint32_t algorithm); - ~VmaBlockVector(); - - VkResult CreateMinBlocks(); - - VmaAllocator GetAllocator() const { return m_hAllocator; } - VmaPool GetParentPool() const { return m_hParentPool; } - bool IsCustomPool() const { return m_hParentPool != VMA_NULL; } - uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; } - VkDeviceSize GetPreferredBlockSize() const { return m_PreferredBlockSize; } - VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; } - uint32_t GetFrameInUseCount() const { return m_FrameInUseCount; } - uint32_t GetAlgorithm() const { return m_Algorithm; } - - void GetPoolStats(VmaPoolStats* pStats); - - bool IsEmpty(); - bool IsCorruptionDetectionEnabled() const; - - VkResult Allocate( - uint32_t currentFrameIndex, - VkDeviceSize size, - VkDeviceSize alignment, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations); - - void Free(const VmaAllocation hAllocation); - - // Adds statistics of this BlockVector to pStats. - void AddStats(VmaStats* pStats); - -#if VMA_STATS_STRING_ENABLED - void PrintDetailedMap(class VmaJsonWriter& json); -#endif - - void MakePoolAllocationsLost( - uint32_t currentFrameIndex, - size_t* pLostAllocationCount); - VkResult CheckCorruption(); - - // Saves results in pCtx->res. - void Defragment( - class VmaBlockVectorDefragmentationContext* pCtx, - VmaDefragmentationStats* pStats, VmaDefragmentationFlags flags, - VkDeviceSize& maxCpuBytesToMove, uint32_t& maxCpuAllocationsToMove, - VkDeviceSize& maxGpuBytesToMove, uint32_t& maxGpuAllocationsToMove, - VkCommandBuffer commandBuffer); - void DefragmentationEnd( - class VmaBlockVectorDefragmentationContext* pCtx, - VmaDefragmentationStats* pStats); - - uint32_t ProcessDefragmentations( - class VmaBlockVectorDefragmentationContext *pCtx, - VmaDefragmentationPassMoveInfo* pMove, uint32_t maxMoves); - - void CommitDefragmentations( - class VmaBlockVectorDefragmentationContext *pCtx, - VmaDefragmentationStats* pStats); - - //////////////////////////////////////////////////////////////////////////////// - // To be used only while the m_Mutex is locked. Used during defragmentation. - - size_t GetBlockCount() const { return m_Blocks.size(); } - VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; } - size_t CalcAllocationCount() const; - bool IsBufferImageGranularityConflictPossible() const; - -private: - friend class VmaDefragmentationAlgorithm_Generic; - - const VmaAllocator m_hAllocator; - const VmaPool m_hParentPool; - const uint32_t m_MemoryTypeIndex; - const VkDeviceSize m_PreferredBlockSize; - const size_t m_MinBlockCount; - const size_t m_MaxBlockCount; - const VkDeviceSize m_BufferImageGranularity; - const uint32_t m_FrameInUseCount; - const bool m_ExplicitBlockSize; - const uint32_t m_Algorithm; - VMA_RW_MUTEX m_Mutex; - - /* There can be at most one allocation that is completely empty (except when minBlockCount > 0) - - a hysteresis to avoid pessimistic case of alternating creation and destruction of a VkDeviceMemory. */ - bool m_HasEmptyBlock; - // Incrementally sorted by sumFreeSize, ascending. - VmaVector< VmaDeviceMemoryBlock*, VmaStlAllocator > m_Blocks; - uint32_t m_NextBlockId; - - VkDeviceSize CalcMaxBlockSize() const; - - // Finds and removes given block from vector. - void Remove(VmaDeviceMemoryBlock* pBlock); - - // Performs single step in sorting m_Blocks. They may not be fully sorted - // after this call. - void IncrementallySortBlocks(); - - VkResult AllocatePage( - uint32_t currentFrameIndex, - VkDeviceSize size, - VkDeviceSize alignment, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - VmaAllocation* pAllocation); - - // To be used only without CAN_MAKE_OTHER_LOST flag. - VkResult AllocateFromBlock( - VmaDeviceMemoryBlock* pBlock, - uint32_t currentFrameIndex, - VkDeviceSize size, - VkDeviceSize alignment, - VmaAllocationCreateFlags allocFlags, - void* pUserData, - VmaSuballocationType suballocType, - uint32_t strategy, - VmaAllocation* pAllocation); - - VkResult CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex); - - // Saves result to pCtx->res. - void ApplyDefragmentationMovesCpu( - class VmaBlockVectorDefragmentationContext* pDefragCtx, - const VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves); - // Saves result to pCtx->res. - void ApplyDefragmentationMovesGpu( - class VmaBlockVectorDefragmentationContext* pDefragCtx, - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkCommandBuffer commandBuffer); - - /* - Used during defragmentation. pDefragmentationStats is optional. It's in/out - - updated with new data. - */ - void FreeEmptyBlocks(VmaDefragmentationStats* pDefragmentationStats); - - void UpdateHasEmptyBlock(); -}; - -struct VmaPool_T -{ - VMA_CLASS_NO_COPY(VmaPool_T) -public: - VmaBlockVector m_BlockVector; - - VmaPool_T( - VmaAllocator hAllocator, - const VmaPoolCreateInfo& createInfo, - VkDeviceSize preferredBlockSize); - ~VmaPool_T(); - - uint32_t GetId() const { return m_Id; } - void SetId(uint32_t id) { VMA_ASSERT(m_Id == 0); m_Id = id; } - - const char* GetName() const { return m_Name; } - void SetName(const char* pName); - -#if VMA_STATS_STRING_ENABLED - //void PrintDetailedMap(class VmaStringBuilder& sb); -#endif - -private: - uint32_t m_Id; - char* m_Name; -}; - -/* -Performs defragmentation: - -- Updates `pBlockVector->m_pMetadata`. -- Updates allocations by calling ChangeBlockAllocation() or ChangeOffset(). -- Does not move actual data, only returns requested moves as `moves`. -*/ -class VmaDefragmentationAlgorithm -{ - VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm) -public: - VmaDefragmentationAlgorithm( - VmaAllocator hAllocator, - VmaBlockVector* pBlockVector, - uint32_t currentFrameIndex) : - m_hAllocator(hAllocator), - m_pBlockVector(pBlockVector), - m_CurrentFrameIndex(currentFrameIndex) - { - } - virtual ~VmaDefragmentationAlgorithm() - { - } - - virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) = 0; - virtual void AddAll() = 0; - - virtual VkResult Defragment( - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkDeviceSize maxBytesToMove, - uint32_t maxAllocationsToMove, - VmaDefragmentationFlags flags) = 0; - - virtual VkDeviceSize GetBytesMoved() const = 0; - virtual uint32_t GetAllocationsMoved() const = 0; - -protected: - VmaAllocator const m_hAllocator; - VmaBlockVector* const m_pBlockVector; - const uint32_t m_CurrentFrameIndex; - - struct AllocationInfo - { - VmaAllocation m_hAllocation; - VkBool32* m_pChanged; - - AllocationInfo() : - m_hAllocation(VK_NULL_HANDLE), - m_pChanged(VMA_NULL) - { - } - AllocationInfo(VmaAllocation hAlloc, VkBool32* pChanged) : - m_hAllocation(hAlloc), - m_pChanged(pChanged) - { - } - }; -}; - -class VmaDefragmentationAlgorithm_Generic : public VmaDefragmentationAlgorithm -{ - VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm_Generic) -public: - VmaDefragmentationAlgorithm_Generic( - VmaAllocator hAllocator, - VmaBlockVector* pBlockVector, - uint32_t currentFrameIndex, - bool overlappingMoveSupported); - virtual ~VmaDefragmentationAlgorithm_Generic(); - - virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged); - virtual void AddAll() { m_AllAllocations = true; } - - virtual VkResult Defragment( - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkDeviceSize maxBytesToMove, - uint32_t maxAllocationsToMove, - VmaDefragmentationFlags flags); - - virtual VkDeviceSize GetBytesMoved() const { return m_BytesMoved; } - virtual uint32_t GetAllocationsMoved() const { return m_AllocationsMoved; } - -private: - uint32_t m_AllocationCount; - bool m_AllAllocations; - - VkDeviceSize m_BytesMoved; - uint32_t m_AllocationsMoved; - - struct AllocationInfoSizeGreater - { - bool operator()(const AllocationInfo& lhs, const AllocationInfo& rhs) const - { - return lhs.m_hAllocation->GetSize() > rhs.m_hAllocation->GetSize(); - } - }; - - struct AllocationInfoOffsetGreater - { - bool operator()(const AllocationInfo& lhs, const AllocationInfo& rhs) const - { - return lhs.m_hAllocation->GetOffset() > rhs.m_hAllocation->GetOffset(); - } - }; - - struct BlockInfo - { - size_t m_OriginalBlockIndex; - VmaDeviceMemoryBlock* m_pBlock; - bool m_HasNonMovableAllocations; - VmaVector< AllocationInfo, VmaStlAllocator > m_Allocations; - - BlockInfo(const VkAllocationCallbacks* pAllocationCallbacks) : - m_OriginalBlockIndex(SIZE_MAX), - m_pBlock(VMA_NULL), - m_HasNonMovableAllocations(true), - m_Allocations(pAllocationCallbacks) - { - } - - void CalcHasNonMovableAllocations() - { - const size_t blockAllocCount = m_pBlock->m_pMetadata->GetAllocationCount(); - const size_t defragmentAllocCount = m_Allocations.size(); - m_HasNonMovableAllocations = blockAllocCount != defragmentAllocCount; - } - - void SortAllocationsBySizeDescending() - { - VMA_SORT(m_Allocations.begin(), m_Allocations.end(), AllocationInfoSizeGreater()); - } - - void SortAllocationsByOffsetDescending() - { - VMA_SORT(m_Allocations.begin(), m_Allocations.end(), AllocationInfoOffsetGreater()); - } - }; - - struct BlockPointerLess - { - bool operator()(const BlockInfo* pLhsBlockInfo, const VmaDeviceMemoryBlock* pRhsBlock) const - { - return pLhsBlockInfo->m_pBlock < pRhsBlock; - } - bool operator()(const BlockInfo* pLhsBlockInfo, const BlockInfo* pRhsBlockInfo) const - { - return pLhsBlockInfo->m_pBlock < pRhsBlockInfo->m_pBlock; - } - }; - - // 1. Blocks with some non-movable allocations go first. - // 2. Blocks with smaller sumFreeSize go first. - struct BlockInfoCompareMoveDestination - { - bool operator()(const BlockInfo* pLhsBlockInfo, const BlockInfo* pRhsBlockInfo) const - { - if(pLhsBlockInfo->m_HasNonMovableAllocations && !pRhsBlockInfo->m_HasNonMovableAllocations) - { - return true; - } - if(!pLhsBlockInfo->m_HasNonMovableAllocations && pRhsBlockInfo->m_HasNonMovableAllocations) - { - return false; - } - if(pLhsBlockInfo->m_pBlock->m_pMetadata->GetSumFreeSize() < pRhsBlockInfo->m_pBlock->m_pMetadata->GetSumFreeSize()) - { - return true; - } - return false; - } - }; - - typedef VmaVector< BlockInfo*, VmaStlAllocator > BlockInfoVector; - BlockInfoVector m_Blocks; - - VkResult DefragmentRound( - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkDeviceSize maxBytesToMove, - uint32_t maxAllocationsToMove, - bool freeOldAllocations); - - size_t CalcBlocksWithNonMovableCount() const; - - static bool MoveMakesSense( - size_t dstBlockIndex, VkDeviceSize dstOffset, - size_t srcBlockIndex, VkDeviceSize srcOffset); -}; - -class VmaDefragmentationAlgorithm_Fast : public VmaDefragmentationAlgorithm -{ - VMA_CLASS_NO_COPY(VmaDefragmentationAlgorithm_Fast) -public: - VmaDefragmentationAlgorithm_Fast( - VmaAllocator hAllocator, - VmaBlockVector* pBlockVector, - uint32_t currentFrameIndex, - bool overlappingMoveSupported); - virtual ~VmaDefragmentationAlgorithm_Fast(); - - virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) { ++m_AllocationCount; } - virtual void AddAll() { m_AllAllocations = true; } - - virtual VkResult Defragment( - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkDeviceSize maxBytesToMove, - uint32_t maxAllocationsToMove, - VmaDefragmentationFlags flags); - - virtual VkDeviceSize GetBytesMoved() const { return m_BytesMoved; } - virtual uint32_t GetAllocationsMoved() const { return m_AllocationsMoved; } - -private: - struct BlockInfo - { - size_t origBlockIndex; - }; - - class FreeSpaceDatabase - { - public: - FreeSpaceDatabase() - { - FreeSpace s = {}; - s.blockInfoIndex = SIZE_MAX; - for(size_t i = 0; i < MAX_COUNT; ++i) - { - m_FreeSpaces[i] = s; - } - } - - void Register(size_t blockInfoIndex, VkDeviceSize offset, VkDeviceSize size) - { - if(size < VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER) - { - return; - } - - // Find first invalid or the smallest structure. - size_t bestIndex = SIZE_MAX; - for(size_t i = 0; i < MAX_COUNT; ++i) - { - // Empty structure. - if(m_FreeSpaces[i].blockInfoIndex == SIZE_MAX) - { - bestIndex = i; - break; - } - if(m_FreeSpaces[i].size < size && - (bestIndex == SIZE_MAX || m_FreeSpaces[bestIndex].size > m_FreeSpaces[i].size)) - { - bestIndex = i; - } - } - - if(bestIndex != SIZE_MAX) - { - m_FreeSpaces[bestIndex].blockInfoIndex = blockInfoIndex; - m_FreeSpaces[bestIndex].offset = offset; - m_FreeSpaces[bestIndex].size = size; - } - } - - bool Fetch(VkDeviceSize alignment, VkDeviceSize size, - size_t& outBlockInfoIndex, VkDeviceSize& outDstOffset) - { - size_t bestIndex = SIZE_MAX; - VkDeviceSize bestFreeSpaceAfter = 0; - for(size_t i = 0; i < MAX_COUNT; ++i) - { - // Structure is valid. - if(m_FreeSpaces[i].blockInfoIndex != SIZE_MAX) - { - const VkDeviceSize dstOffset = VmaAlignUp(m_FreeSpaces[i].offset, alignment); - // Allocation fits into this structure. - if(dstOffset + size <= m_FreeSpaces[i].offset + m_FreeSpaces[i].size) - { - const VkDeviceSize freeSpaceAfter = (m_FreeSpaces[i].offset + m_FreeSpaces[i].size) - - (dstOffset + size); - if(bestIndex == SIZE_MAX || freeSpaceAfter > bestFreeSpaceAfter) - { - bestIndex = i; - bestFreeSpaceAfter = freeSpaceAfter; - } - } - } - } - - if(bestIndex != SIZE_MAX) - { - outBlockInfoIndex = m_FreeSpaces[bestIndex].blockInfoIndex; - outDstOffset = VmaAlignUp(m_FreeSpaces[bestIndex].offset, alignment); - - if(bestFreeSpaceAfter >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER) - { - // Leave this structure for remaining empty space. - const VkDeviceSize alignmentPlusSize = (outDstOffset - m_FreeSpaces[bestIndex].offset) + size; - m_FreeSpaces[bestIndex].offset += alignmentPlusSize; - m_FreeSpaces[bestIndex].size -= alignmentPlusSize; - } - else - { - // This structure becomes invalid. - m_FreeSpaces[bestIndex].blockInfoIndex = SIZE_MAX; - } - - return true; - } - - return false; - } - - private: - static const size_t MAX_COUNT = 4; - - struct FreeSpace - { - size_t blockInfoIndex; // SIZE_MAX means this structure is invalid. - VkDeviceSize offset; - VkDeviceSize size; - } m_FreeSpaces[MAX_COUNT]; - }; - - const bool m_OverlappingMoveSupported; - - uint32_t m_AllocationCount; - bool m_AllAllocations; - - VkDeviceSize m_BytesMoved; - uint32_t m_AllocationsMoved; - - VmaVector< BlockInfo, VmaStlAllocator > m_BlockInfos; - - void PreprocessMetadata(); - void PostprocessMetadata(); - void InsertSuballoc(VmaBlockMetadata_Generic* pMetadata, const VmaSuballocation& suballoc); -}; - -struct VmaBlockDefragmentationContext -{ - enum BLOCK_FLAG - { - BLOCK_FLAG_USED = 0x00000001, - }; - uint32_t flags; - VkBuffer hBuffer; -}; - -class VmaBlockVectorDefragmentationContext -{ - VMA_CLASS_NO_COPY(VmaBlockVectorDefragmentationContext) -public: - VkResult res; - bool mutexLocked; - VmaVector< VmaBlockDefragmentationContext, VmaStlAllocator > blockContexts; - VmaVector< VmaDefragmentationMove, VmaStlAllocator > defragmentationMoves; - uint32_t defragmentationMovesProcessed; - uint32_t defragmentationMovesCommitted; - bool hasDefragmentationPlan; - - VmaBlockVectorDefragmentationContext( - VmaAllocator hAllocator, - VmaPool hCustomPool, // Optional. - VmaBlockVector* pBlockVector, - uint32_t currFrameIndex); - ~VmaBlockVectorDefragmentationContext(); - - VmaPool GetCustomPool() const { return m_hCustomPool; } - VmaBlockVector* GetBlockVector() const { return m_pBlockVector; } - VmaDefragmentationAlgorithm* GetAlgorithm() const { return m_pAlgorithm; } - - void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged); - void AddAll() { m_AllAllocations = true; } - - void Begin(bool overlappingMoveSupported, VmaDefragmentationFlags flags); - -private: - const VmaAllocator m_hAllocator; - // Null if not from custom pool. - const VmaPool m_hCustomPool; - // Redundant, for convenience not to fetch from m_hCustomPool->m_BlockVector or m_hAllocator->m_pBlockVectors. - VmaBlockVector* const m_pBlockVector; - const uint32_t m_CurrFrameIndex; - // Owner of this object. - VmaDefragmentationAlgorithm* m_pAlgorithm; - - struct AllocInfo - { - VmaAllocation hAlloc; - VkBool32* pChanged; - }; - // Used between constructor and Begin. - VmaVector< AllocInfo, VmaStlAllocator > m_Allocations; - bool m_AllAllocations; -}; - -struct VmaDefragmentationContext_T -{ -private: - VMA_CLASS_NO_COPY(VmaDefragmentationContext_T) -public: - VmaDefragmentationContext_T( - VmaAllocator hAllocator, - uint32_t currFrameIndex, - uint32_t flags, - VmaDefragmentationStats* pStats); - ~VmaDefragmentationContext_T(); - - void AddPools(uint32_t poolCount, VmaPool* pPools); - void AddAllocations( - uint32_t allocationCount, - VmaAllocation* pAllocations, - VkBool32* pAllocationsChanged); - - /* - Returns: - - `VK_SUCCESS` if succeeded and object can be destroyed immediately. - - `VK_NOT_READY` if succeeded but the object must remain alive until vmaDefragmentationEnd(). - - Negative value if error occured and object can be destroyed immediately. - */ - VkResult Defragment( - VkDeviceSize maxCpuBytesToMove, uint32_t maxCpuAllocationsToMove, - VkDeviceSize maxGpuBytesToMove, uint32_t maxGpuAllocationsToMove, - VkCommandBuffer commandBuffer, VmaDefragmentationStats* pStats, VmaDefragmentationFlags flags); - - VkResult DefragmentPassBegin(VmaDefragmentationPassInfo* pInfo); - VkResult DefragmentPassEnd(); - -private: - const VmaAllocator m_hAllocator; - const uint32_t m_CurrFrameIndex; - const uint32_t m_Flags; - VmaDefragmentationStats* const m_pStats; - - VkDeviceSize m_MaxCpuBytesToMove; - uint32_t m_MaxCpuAllocationsToMove; - VkDeviceSize m_MaxGpuBytesToMove; - uint32_t m_MaxGpuAllocationsToMove; - - // Owner of these objects. - VmaBlockVectorDefragmentationContext* m_DefaultPoolContexts[VK_MAX_MEMORY_TYPES]; - // Owner of these objects. - VmaVector< VmaBlockVectorDefragmentationContext*, VmaStlAllocator > m_CustomPoolContexts; -}; - -#if VMA_RECORDING_ENABLED - -class VmaRecorder -{ -public: - VmaRecorder(); - VkResult Init(const VmaRecordSettings& settings, bool useMutex); - void WriteConfiguration( - const VkPhysicalDeviceProperties& devProps, - const VkPhysicalDeviceMemoryProperties& memProps, - uint32_t vulkanApiVersion, - bool dedicatedAllocationExtensionEnabled, - bool bindMemory2ExtensionEnabled, - bool memoryBudgetExtensionEnabled); - ~VmaRecorder(); - - void RecordCreateAllocator(uint32_t frameIndex); - void RecordDestroyAllocator(uint32_t frameIndex); - void RecordCreatePool(uint32_t frameIndex, - const VmaPoolCreateInfo& createInfo, - VmaPool pool); - void RecordDestroyPool(uint32_t frameIndex, VmaPool pool); - void RecordAllocateMemory(uint32_t frameIndex, - const VkMemoryRequirements& vkMemReq, - const VmaAllocationCreateInfo& createInfo, - VmaAllocation allocation); - void RecordAllocateMemoryPages(uint32_t frameIndex, - const VkMemoryRequirements& vkMemReq, - const VmaAllocationCreateInfo& createInfo, - uint64_t allocationCount, - const VmaAllocation* pAllocations); - void RecordAllocateMemoryForBuffer(uint32_t frameIndex, - const VkMemoryRequirements& vkMemReq, - bool requiresDedicatedAllocation, - bool prefersDedicatedAllocation, - const VmaAllocationCreateInfo& createInfo, - VmaAllocation allocation); - void RecordAllocateMemoryForImage(uint32_t frameIndex, - const VkMemoryRequirements& vkMemReq, - bool requiresDedicatedAllocation, - bool prefersDedicatedAllocation, - const VmaAllocationCreateInfo& createInfo, - VmaAllocation allocation); - void RecordFreeMemory(uint32_t frameIndex, - VmaAllocation allocation); - void RecordFreeMemoryPages(uint32_t frameIndex, - uint64_t allocationCount, - const VmaAllocation* pAllocations); - void RecordSetAllocationUserData(uint32_t frameIndex, - VmaAllocation allocation, - const void* pUserData); - void RecordCreateLostAllocation(uint32_t frameIndex, - VmaAllocation allocation); - void RecordMapMemory(uint32_t frameIndex, - VmaAllocation allocation); - void RecordUnmapMemory(uint32_t frameIndex, - VmaAllocation allocation); - void RecordFlushAllocation(uint32_t frameIndex, - VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size); - void RecordInvalidateAllocation(uint32_t frameIndex, - VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size); - void RecordCreateBuffer(uint32_t frameIndex, - const VkBufferCreateInfo& bufCreateInfo, - const VmaAllocationCreateInfo& allocCreateInfo, - VmaAllocation allocation); - void RecordCreateImage(uint32_t frameIndex, - const VkImageCreateInfo& imageCreateInfo, - const VmaAllocationCreateInfo& allocCreateInfo, - VmaAllocation allocation); - void RecordDestroyBuffer(uint32_t frameIndex, - VmaAllocation allocation); - void RecordDestroyImage(uint32_t frameIndex, - VmaAllocation allocation); - void RecordTouchAllocation(uint32_t frameIndex, - VmaAllocation allocation); - void RecordGetAllocationInfo(uint32_t frameIndex, - VmaAllocation allocation); - void RecordMakePoolAllocationsLost(uint32_t frameIndex, - VmaPool pool); - void RecordDefragmentationBegin(uint32_t frameIndex, - const VmaDefragmentationInfo2& info, - VmaDefragmentationContext ctx); - void RecordDefragmentationEnd(uint32_t frameIndex, - VmaDefragmentationContext ctx); - void RecordSetPoolName(uint32_t frameIndex, - VmaPool pool, - const char* name); - -private: - struct CallParams - { - uint32_t threadId; - double time; - }; - - class UserDataString - { - public: - UserDataString(VmaAllocationCreateFlags allocFlags, const void* pUserData); - const char* GetString() const { return m_Str; } - - private: - char m_PtrStr[17]; - const char* m_Str; - }; - - bool m_UseMutex; - VmaRecordFlags m_Flags; - FILE* m_File; - VMA_MUTEX m_FileMutex; - int64_t m_Freq; - int64_t m_StartCounter; - - void GetBasicParams(CallParams& outParams); - - // T must be a pointer type, e.g. VmaAllocation, VmaPool. - template - void PrintPointerList(uint64_t count, const T* pItems) - { - if(count) - { - fprintf(m_File, "%p", pItems[0]); - for(uint64_t i = 1; i < count; ++i) - { - fprintf(m_File, " %p", pItems[i]); - } - } - } - - void PrintPointerList(uint64_t count, const VmaAllocation* pItems); - void Flush(); -}; - -#endif // #if VMA_RECORDING_ENABLED - -/* -Thread-safe wrapper over VmaPoolAllocator free list, for allocation of VmaAllocation_T objects. -*/ -class VmaAllocationObjectAllocator -{ - VMA_CLASS_NO_COPY(VmaAllocationObjectAllocator) -public: - VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks); - - VmaAllocation Allocate(); - void Free(VmaAllocation hAlloc); - -private: - VMA_MUTEX m_Mutex; - VmaPoolAllocator m_Allocator; -}; - -struct VmaCurrentBudgetData -{ - VMA_ATOMIC_UINT64 m_BlockBytes[VK_MAX_MEMORY_HEAPS]; - VMA_ATOMIC_UINT64 m_AllocationBytes[VK_MAX_MEMORY_HEAPS]; - -#if VMA_MEMORY_BUDGET - VMA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch; - VMA_RW_MUTEX m_BudgetMutex; - uint64_t m_VulkanUsage[VK_MAX_MEMORY_HEAPS]; - uint64_t m_VulkanBudget[VK_MAX_MEMORY_HEAPS]; - uint64_t m_BlockBytesAtBudgetFetch[VK_MAX_MEMORY_HEAPS]; -#endif // #if VMA_MEMORY_BUDGET - - VmaCurrentBudgetData() - { - for(uint32_t heapIndex = 0; heapIndex < VK_MAX_MEMORY_HEAPS; ++heapIndex) - { - m_BlockBytes[heapIndex] = 0; - m_AllocationBytes[heapIndex] = 0; -#if VMA_MEMORY_BUDGET - m_VulkanUsage[heapIndex] = 0; - m_VulkanBudget[heapIndex] = 0; - m_BlockBytesAtBudgetFetch[heapIndex] = 0; -#endif - } - -#if VMA_MEMORY_BUDGET - m_OperationsSinceBudgetFetch = 0; -#endif - } - - void AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize) - { - m_AllocationBytes[heapIndex] += allocationSize; -#if VMA_MEMORY_BUDGET - ++m_OperationsSinceBudgetFetch; -#endif - } - - void RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize) - { - VMA_ASSERT(m_AllocationBytes[heapIndex] >= allocationSize); // DELME - m_AllocationBytes[heapIndex] -= allocationSize; -#if VMA_MEMORY_BUDGET - ++m_OperationsSinceBudgetFetch; -#endif - } -}; - -// Main allocator object. -struct VmaAllocator_T -{ - VMA_CLASS_NO_COPY(VmaAllocator_T) -public: - bool m_UseMutex; - uint32_t m_VulkanApiVersion; - bool m_UseKhrDedicatedAllocation; // Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0). - bool m_UseKhrBindMemory2; // Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0). - bool m_UseExtMemoryBudget; - VkDevice m_hDevice; - VkInstance m_hInstance; - bool m_AllocationCallbacksSpecified; - VkAllocationCallbacks m_AllocationCallbacks; - VmaDeviceMemoryCallbacks m_DeviceMemoryCallbacks; - VmaAllocationObjectAllocator m_AllocationObjectAllocator; - - // Each bit (1 << i) is set if HeapSizeLimit is enabled for that heap, so cannot allocate more than the heap size. - uint32_t m_HeapSizeLimitMask; - - VkPhysicalDeviceProperties m_PhysicalDeviceProperties; - VkPhysicalDeviceMemoryProperties m_MemProps; - - // Default pools. - VmaBlockVector* m_pBlockVectors[VK_MAX_MEMORY_TYPES]; - - // Each vector is sorted by memory (handle value). - typedef VmaVector< VmaAllocation, VmaStlAllocator > AllocationVectorType; - AllocationVectorType* m_pDedicatedAllocations[VK_MAX_MEMORY_TYPES]; - VMA_RW_MUTEX m_DedicatedAllocationsMutex[VK_MAX_MEMORY_TYPES]; - - VmaCurrentBudgetData m_Budget; - - VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo); - VkResult Init(const VmaAllocatorCreateInfo* pCreateInfo); - ~VmaAllocator_T(); - - const VkAllocationCallbacks* GetAllocationCallbacks() const - { - return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : 0; - } - const VmaVulkanFunctions& GetVulkanFunctions() const - { - return m_VulkanFunctions; - } - - VkDeviceSize GetBufferImageGranularity() const - { - return VMA_MAX( - static_cast(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY), - m_PhysicalDeviceProperties.limits.bufferImageGranularity); - } - - uint32_t GetMemoryHeapCount() const { return m_MemProps.memoryHeapCount; } - uint32_t GetMemoryTypeCount() const { return m_MemProps.memoryTypeCount; } - - uint32_t MemoryTypeIndexToHeapIndex(uint32_t memTypeIndex) const - { - VMA_ASSERT(memTypeIndex < m_MemProps.memoryTypeCount); - return m_MemProps.memoryTypes[memTypeIndex].heapIndex; - } - // True when specific memory type is HOST_VISIBLE but not HOST_COHERENT. - bool IsMemoryTypeNonCoherent(uint32_t memTypeIndex) const - { - return (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) == - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - } - // Minimum alignment for all allocations in specific memory type. - VkDeviceSize GetMemoryTypeMinAlignment(uint32_t memTypeIndex) const - { - return IsMemoryTypeNonCoherent(memTypeIndex) ? - VMA_MAX((VkDeviceSize)VMA_DEBUG_ALIGNMENT, m_PhysicalDeviceProperties.limits.nonCoherentAtomSize) : - (VkDeviceSize)VMA_DEBUG_ALIGNMENT; - } - - bool IsIntegratedGpu() const - { - return m_PhysicalDeviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU; - } - -#if VMA_RECORDING_ENABLED - VmaRecorder* GetRecorder() const { return m_pRecorder; } -#endif - - void GetBufferMemoryRequirements( - VkBuffer hBuffer, - VkMemoryRequirements& memReq, - bool& requiresDedicatedAllocation, - bool& prefersDedicatedAllocation) const; - void GetImageMemoryRequirements( - VkImage hImage, - VkMemoryRequirements& memReq, - bool& requiresDedicatedAllocation, - bool& prefersDedicatedAllocation) const; - - // Main allocation function. - VkResult AllocateMemory( - const VkMemoryRequirements& vkMemReq, - bool requiresDedicatedAllocation, - bool prefersDedicatedAllocation, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations); - - // Main deallocation function. - void FreeMemory( - size_t allocationCount, - const VmaAllocation* pAllocations); - - VkResult ResizeAllocation( - const VmaAllocation alloc, - VkDeviceSize newSize); - - void CalculateStats(VmaStats* pStats); - - void GetBudget( - VmaBudget* outBudget, uint32_t firstHeap, uint32_t heapCount); - -#if VMA_STATS_STRING_ENABLED - void PrintDetailedMap(class VmaJsonWriter& json); -#endif - - VkResult DefragmentationBegin( - const VmaDefragmentationInfo2& info, - VmaDefragmentationStats* pStats, - VmaDefragmentationContext* pContext); - VkResult DefragmentationEnd( - VmaDefragmentationContext context); - - VkResult DefragmentationPassBegin( - VmaDefragmentationPassInfo* pInfo, - VmaDefragmentationContext context); - VkResult DefragmentationPassEnd( - VmaDefragmentationContext context); - - void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo); - bool TouchAllocation(VmaAllocation hAllocation); - - VkResult CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool); - void DestroyPool(VmaPool pool); - void GetPoolStats(VmaPool pool, VmaPoolStats* pPoolStats); - - void SetCurrentFrameIndex(uint32_t frameIndex); - uint32_t GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); } - - void MakePoolAllocationsLost( - VmaPool hPool, - size_t* pLostAllocationCount); - VkResult CheckPoolCorruption(VmaPool hPool); - VkResult CheckCorruption(uint32_t memoryTypeBits); - - void CreateLostAllocation(VmaAllocation* pAllocation); - - // Call to Vulkan function vkAllocateMemory with accompanying bookkeeping. - VkResult AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory); - // Call to Vulkan function vkFreeMemory with accompanying bookkeeping. - void FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory); - // Call to Vulkan function vkBindBufferMemory or vkBindBufferMemory2KHR. - VkResult BindVulkanBuffer( - VkDeviceMemory memory, - VkDeviceSize memoryOffset, - VkBuffer buffer, - const void* pNext); - // Call to Vulkan function vkBindImageMemory or vkBindImageMemory2KHR. - VkResult BindVulkanImage( - VkDeviceMemory memory, - VkDeviceSize memoryOffset, - VkImage image, - const void* pNext); - - VkResult Map(VmaAllocation hAllocation, void** ppData); - void Unmap(VmaAllocation hAllocation); - - VkResult BindBufferMemory( - VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkBuffer hBuffer, - const void* pNext); - VkResult BindImageMemory( - VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkImage hImage, - const void* pNext); - - void FlushOrInvalidateAllocation( - VmaAllocation hAllocation, - VkDeviceSize offset, VkDeviceSize size, - VMA_CACHE_OPERATION op); - - void FillAllocation(const VmaAllocation hAllocation, uint8_t pattern); - - /* - Returns bit mask of memory types that can support defragmentation on GPU as - they support creation of required buffer for copy operations. - */ - uint32_t GetGpuDefragmentationMemoryTypeBits(); - -private: - VkDeviceSize m_PreferredLargeHeapBlockSize; - - VkPhysicalDevice m_PhysicalDevice; - VMA_ATOMIC_UINT32 m_CurrentFrameIndex; - VMA_ATOMIC_UINT32 m_GpuDefragmentationMemoryTypeBits; // UINT32_MAX means uninitialized. - - VMA_RW_MUTEX m_PoolsMutex; - // Protected by m_PoolsMutex. Sorted by pointer value. - VmaVector > m_Pools; - uint32_t m_NextPoolId; - - VmaVulkanFunctions m_VulkanFunctions; - -#if VMA_RECORDING_ENABLED - VmaRecorder* m_pRecorder; -#endif - - void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions); - - VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex); - - VkResult AllocateMemoryOfType( - VkDeviceSize size, - VkDeviceSize alignment, - bool dedicatedAllocation, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - const VmaAllocationCreateInfo& createInfo, - uint32_t memTypeIndex, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations); - - // Helper function only to be used inside AllocateDedicatedMemory. - VkResult AllocateDedicatedMemoryPage( - VkDeviceSize size, - VmaSuballocationType suballocType, - uint32_t memTypeIndex, - const VkMemoryAllocateInfo& allocInfo, - bool map, - bool isUserDataString, - void* pUserData, - VmaAllocation* pAllocation); - - // Allocates and registers new VkDeviceMemory specifically for dedicated allocations. - VkResult AllocateDedicatedMemory( - VkDeviceSize size, - VmaSuballocationType suballocType, - uint32_t memTypeIndex, - bool withinBudget, - bool map, - bool isUserDataString, - void* pUserData, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - size_t allocationCount, - VmaAllocation* pAllocations); - - void FreeDedicatedMemory(const VmaAllocation allocation); - - /* - Calculates and returns bit mask of memory types that can support defragmentation - on GPU as they support creation of required buffer for copy operations. - */ - uint32_t CalculateGpuDefragmentationMemoryTypeBits() const; - -#if VMA_MEMORY_BUDGET - void UpdateVulkanBudget(); -#endif // #if VMA_MEMORY_BUDGET -}; - -//////////////////////////////////////////////////////////////////////////////// -// Memory allocation #2 after VmaAllocator_T definition - -static void* VmaMalloc(VmaAllocator hAllocator, size_t size, size_t alignment) -{ - return VmaMalloc(&hAllocator->m_AllocationCallbacks, size, alignment); -} - -static void VmaFree(VmaAllocator hAllocator, void* ptr) -{ - VmaFree(&hAllocator->m_AllocationCallbacks, ptr); -} - -template -static T* VmaAllocate(VmaAllocator hAllocator) -{ - return (T*)VmaMalloc(hAllocator, sizeof(T), VMA_ALIGN_OF(T)); -} - -template -static T* VmaAllocateArray(VmaAllocator hAllocator, size_t count) -{ - return (T*)VmaMalloc(hAllocator, sizeof(T) * count, VMA_ALIGN_OF(T)); -} - -template -static void vma_delete(VmaAllocator hAllocator, T* ptr) -{ - if(ptr != VMA_NULL) - { - ptr->~T(); - VmaFree(hAllocator, ptr); - } -} - -template -static void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count) -{ - if(ptr != VMA_NULL) - { - for(size_t i = count; i--; ) - ptr[i].~T(); - VmaFree(hAllocator, ptr); - } -} - -//////////////////////////////////////////////////////////////////////////////// -// VmaStringBuilder - -#if VMA_STATS_STRING_ENABLED - -class VmaStringBuilder -{ -public: - VmaStringBuilder(VmaAllocator alloc) : m_Data(VmaStlAllocator(alloc->GetAllocationCallbacks())) { } - size_t GetLength() const { return m_Data.size(); } - const char* GetData() const { return m_Data.data(); } - - void Add(char ch) { m_Data.push_back(ch); } - void Add(const char* pStr); - void AddNewLine() { Add('\n'); } - void AddNumber(uint32_t num); - void AddNumber(uint64_t num); - void AddPointer(const void* ptr); - -private: - VmaVector< char, VmaStlAllocator > m_Data; -}; - -void VmaStringBuilder::Add(const char* pStr) -{ - const size_t strLen = strlen(pStr); - if(strLen > 0) - { - const size_t oldCount = m_Data.size(); - m_Data.resize(oldCount + strLen); - memcpy(m_Data.data() + oldCount, pStr, strLen); - } -} - -void VmaStringBuilder::AddNumber(uint32_t num) -{ - char buf[11]; - buf[10] = '\0'; - char *p = &buf[10]; - do - { - *--p = '0' + (num % 10); - num /= 10; - } - while(num); - Add(p); -} - -void VmaStringBuilder::AddNumber(uint64_t num) -{ - char buf[21]; - buf[20] = '\0'; - char *p = &buf[20]; - do - { - *--p = '0' + (num % 10); - num /= 10; - } - while(num); - Add(p); -} - -void VmaStringBuilder::AddPointer(const void* ptr) -{ - char buf[21]; - VmaPtrToStr(buf, sizeof(buf), ptr); - Add(buf); -} - -#endif // #if VMA_STATS_STRING_ENABLED - -//////////////////////////////////////////////////////////////////////////////// -// VmaJsonWriter - -#if VMA_STATS_STRING_ENABLED - -class VmaJsonWriter -{ - VMA_CLASS_NO_COPY(VmaJsonWriter) -public: - VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb); - ~VmaJsonWriter(); - - void BeginObject(bool singleLine = false); - void EndObject(); - - void BeginArray(bool singleLine = false); - void EndArray(); - - void WriteString(const char* pStr); - void BeginString(const char* pStr = VMA_NULL); - void ContinueString(const char* pStr); - void ContinueString(uint32_t n); - void ContinueString(uint64_t n); - void ContinueString_Pointer(const void* ptr); - void EndString(const char* pStr = VMA_NULL); - - void WriteNumber(uint32_t n); - void WriteNumber(uint64_t n); - void WriteBool(bool b); - void WriteNull(); - -private: - static const char* const INDENT; - - enum COLLECTION_TYPE - { - COLLECTION_TYPE_OBJECT, - COLLECTION_TYPE_ARRAY, - }; - struct StackItem - { - COLLECTION_TYPE type; - uint32_t valueCount; - bool singleLineMode; - }; - - VmaStringBuilder& m_SB; - VmaVector< StackItem, VmaStlAllocator > m_Stack; - bool m_InsideString; - - void BeginValue(bool isString); - void WriteIndent(bool oneLess = false); -}; - -const char* const VmaJsonWriter::INDENT = " "; - -VmaJsonWriter::VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb) : - m_SB(sb), - m_Stack(VmaStlAllocator(pAllocationCallbacks)), - m_InsideString(false) -{ -} - -VmaJsonWriter::~VmaJsonWriter() -{ - VMA_ASSERT(!m_InsideString); - VMA_ASSERT(m_Stack.empty()); -} - -void VmaJsonWriter::BeginObject(bool singleLine) -{ - VMA_ASSERT(!m_InsideString); - - BeginValue(false); - m_SB.Add('{'); - - StackItem item; - item.type = COLLECTION_TYPE_OBJECT; - item.valueCount = 0; - item.singleLineMode = singleLine; - m_Stack.push_back(item); -} - -void VmaJsonWriter::EndObject() -{ - VMA_ASSERT(!m_InsideString); - - WriteIndent(true); - m_SB.Add('}'); - - VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_OBJECT); - m_Stack.pop_back(); -} - -void VmaJsonWriter::BeginArray(bool singleLine) -{ - VMA_ASSERT(!m_InsideString); - - BeginValue(false); - m_SB.Add('['); - - StackItem item; - item.type = COLLECTION_TYPE_ARRAY; - item.valueCount = 0; - item.singleLineMode = singleLine; - m_Stack.push_back(item); -} - -void VmaJsonWriter::EndArray() -{ - VMA_ASSERT(!m_InsideString); - - WriteIndent(true); - m_SB.Add(']'); - - VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_ARRAY); - m_Stack.pop_back(); -} - -void VmaJsonWriter::WriteString(const char* pStr) -{ - BeginString(pStr); - EndString(); -} - -void VmaJsonWriter::BeginString(const char* pStr) -{ - VMA_ASSERT(!m_InsideString); - - BeginValue(true); - m_SB.Add('"'); - m_InsideString = true; - if(pStr != VMA_NULL && pStr[0] != '\0') - { - ContinueString(pStr); - } -} - -void VmaJsonWriter::ContinueString(const char* pStr) -{ - VMA_ASSERT(m_InsideString); - - const size_t strLen = strlen(pStr); - for(size_t i = 0; i < strLen; ++i) - { - char ch = pStr[i]; - if(ch == '\\') - { - m_SB.Add("\\\\"); - } - else if(ch == '"') - { - m_SB.Add("\\\""); - } - else if(ch >= 32) - { - m_SB.Add(ch); - } - else switch(ch) - { - case '\b': - m_SB.Add("\\b"); - break; - case '\f': - m_SB.Add("\\f"); - break; - case '\n': - m_SB.Add("\\n"); - break; - case '\r': - m_SB.Add("\\r"); - break; - case '\t': - m_SB.Add("\\t"); - break; - default: - VMA_ASSERT(0 && "Character not currently supported."); - break; - } - } -} - -void VmaJsonWriter::ContinueString(uint32_t n) -{ - VMA_ASSERT(m_InsideString); - m_SB.AddNumber(n); -} - -void VmaJsonWriter::ContinueString(uint64_t n) -{ - VMA_ASSERT(m_InsideString); - m_SB.AddNumber(n); -} - -void VmaJsonWriter::ContinueString_Pointer(const void* ptr) -{ - VMA_ASSERT(m_InsideString); - m_SB.AddPointer(ptr); -} - -void VmaJsonWriter::EndString(const char* pStr) -{ - VMA_ASSERT(m_InsideString); - if(pStr != VMA_NULL && pStr[0] != '\0') - { - ContinueString(pStr); - } - m_SB.Add('"'); - m_InsideString = false; -} - -void VmaJsonWriter::WriteNumber(uint32_t n) -{ - VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.AddNumber(n); -} - -void VmaJsonWriter::WriteNumber(uint64_t n) -{ - VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.AddNumber(n); -} - -void VmaJsonWriter::WriteBool(bool b) -{ - VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.Add(b ? "true" : "false"); -} - -void VmaJsonWriter::WriteNull() -{ - VMA_ASSERT(!m_InsideString); - BeginValue(false); - m_SB.Add("null"); -} - -void VmaJsonWriter::BeginValue(bool isString) -{ - if(!m_Stack.empty()) - { - StackItem& currItem = m_Stack.back(); - if(currItem.type == COLLECTION_TYPE_OBJECT && - currItem.valueCount % 2 == 0) - { - VMA_ASSERT(isString); - } - - if(currItem.type == COLLECTION_TYPE_OBJECT && - currItem.valueCount % 2 != 0) - { - m_SB.Add(": "); - } - else if(currItem.valueCount > 0) - { - m_SB.Add(", "); - WriteIndent(); - } - else - { - WriteIndent(); - } - ++currItem.valueCount; - } -} - -void VmaJsonWriter::WriteIndent(bool oneLess) -{ - if(!m_Stack.empty() && !m_Stack.back().singleLineMode) - { - m_SB.AddNewLine(); - - size_t count = m_Stack.size(); - if(count > 0 && oneLess) - { - --count; - } - for(size_t i = 0; i < count; ++i) - { - m_SB.Add(INDENT); - } - } -} - -#endif // #if VMA_STATS_STRING_ENABLED - -//////////////////////////////////////////////////////////////////////////////// - -void VmaAllocation_T::SetUserData(VmaAllocator hAllocator, void* pUserData) -{ - if(IsUserDataString()) - { - VMA_ASSERT(pUserData == VMA_NULL || pUserData != m_pUserData); - - FreeUserDataString(hAllocator); - - if(pUserData != VMA_NULL) - { - m_pUserData = VmaCreateStringCopy(hAllocator->GetAllocationCallbacks(), (const char*)pUserData); - } - } - else - { - m_pUserData = pUserData; - } -} - -void VmaAllocation_T::ChangeBlockAllocation( - VmaAllocator hAllocator, - VmaDeviceMemoryBlock* block, - VkDeviceSize offset) -{ - VMA_ASSERT(block != VMA_NULL); - VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); - - // Move mapping reference counter from old block to new block. - if(block != m_BlockAllocation.m_Block) - { - uint32_t mapRefCount = m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP; - if(IsPersistentMap()) - ++mapRefCount; - m_BlockAllocation.m_Block->Unmap(hAllocator, mapRefCount); - block->Map(hAllocator, mapRefCount, VMA_NULL); - } - - m_BlockAllocation.m_Block = block; - m_BlockAllocation.m_Offset = offset; -} - -void VmaAllocation_T::ChangeOffset(VkDeviceSize newOffset) -{ - VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); - m_BlockAllocation.m_Offset = newOffset; -} - -VkDeviceSize VmaAllocation_T::GetOffset() const -{ - switch(m_Type) - { - case ALLOCATION_TYPE_BLOCK: - return m_BlockAllocation.m_Offset; - case ALLOCATION_TYPE_DEDICATED: - return 0; - default: - VMA_ASSERT(0); - return 0; - } -} - -VkDeviceMemory VmaAllocation_T::GetMemory() const -{ - switch(m_Type) - { - case ALLOCATION_TYPE_BLOCK: - return m_BlockAllocation.m_Block->GetDeviceMemory(); - case ALLOCATION_TYPE_DEDICATED: - return m_DedicatedAllocation.m_hMemory; - default: - VMA_ASSERT(0); - return VK_NULL_HANDLE; - } -} - -void* VmaAllocation_T::GetMappedData() const -{ - switch(m_Type) - { - case ALLOCATION_TYPE_BLOCK: - if(m_MapCount != 0) - { - void* pBlockData = m_BlockAllocation.m_Block->GetMappedData(); - VMA_ASSERT(pBlockData != VMA_NULL); - return (char*)pBlockData + m_BlockAllocation.m_Offset; - } - else - { - return VMA_NULL; - } - break; - case ALLOCATION_TYPE_DEDICATED: - VMA_ASSERT((m_DedicatedAllocation.m_pMappedData != VMA_NULL) == (m_MapCount != 0)); - return m_DedicatedAllocation.m_pMappedData; - default: - VMA_ASSERT(0); - return VMA_NULL; - } -} - -bool VmaAllocation_T::CanBecomeLost() const -{ - switch(m_Type) - { - case ALLOCATION_TYPE_BLOCK: - return m_BlockAllocation.m_CanBecomeLost; - case ALLOCATION_TYPE_DEDICATED: - return false; - default: - VMA_ASSERT(0); - return false; - } -} - -bool VmaAllocation_T::MakeLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) -{ - VMA_ASSERT(CanBecomeLost()); - - /* - Warning: This is a carefully designed algorithm. - Do not modify unless you really know what you're doing :) - */ - uint32_t localLastUseFrameIndex = GetLastUseFrameIndex(); - for(;;) - { - if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST) - { - VMA_ASSERT(0); - return false; - } - else if(localLastUseFrameIndex + frameInUseCount >= currentFrameIndex) - { - return false; - } - else // Last use time earlier than current time. - { - if(CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, VMA_FRAME_INDEX_LOST)) - { - // Setting hAllocation.LastUseFrameIndex atomic to VMA_FRAME_INDEX_LOST is enough to mark it as LOST. - // Calling code just needs to unregister this allocation in owning VmaDeviceMemoryBlock. - return true; - } - } - } -} - -#if VMA_STATS_STRING_ENABLED - -// Correspond to values of enum VmaSuballocationType. -static const char* VMA_SUBALLOCATION_TYPE_NAMES[] = { - "FREE", - "UNKNOWN", - "BUFFER", - "IMAGE_UNKNOWN", - "IMAGE_LINEAR", - "IMAGE_OPTIMAL", -}; - -void VmaAllocation_T::PrintParameters(class VmaJsonWriter& json) const -{ - json.WriteString("Type"); - json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[m_SuballocationType]); - - json.WriteString("Size"); - json.WriteNumber(m_Size); - - if(m_pUserData != VMA_NULL) - { - json.WriteString("UserData"); - if(IsUserDataString()) - { - json.WriteString((const char*)m_pUserData); - } - else - { - json.BeginString(); - json.ContinueString_Pointer(m_pUserData); - json.EndString(); - } - } - - json.WriteString("CreationFrameIndex"); - json.WriteNumber(m_CreationFrameIndex); - - json.WriteString("LastUseFrameIndex"); - json.WriteNumber(GetLastUseFrameIndex()); - - if(m_BufferImageUsage != 0) - { - json.WriteString("Usage"); - json.WriteNumber(m_BufferImageUsage); - } -} - -#endif - -void VmaAllocation_T::FreeUserDataString(VmaAllocator hAllocator) -{ - VMA_ASSERT(IsUserDataString()); - VmaFreeString(hAllocator->GetAllocationCallbacks(), (char*)m_pUserData); - m_pUserData = VMA_NULL; -} - -void VmaAllocation_T::BlockAllocMap() -{ - VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK); - - if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) < 0x7F) - { - ++m_MapCount; - } - else - { - VMA_ASSERT(0 && "Allocation mapped too many times simultaneously."); - } -} - -void VmaAllocation_T::BlockAllocUnmap() -{ - VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK); - - if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) != 0) - { - --m_MapCount; - } - else - { - VMA_ASSERT(0 && "Unmapping allocation not previously mapped."); - } -} - -VkResult VmaAllocation_T::DedicatedAllocMap(VmaAllocator hAllocator, void** ppData) -{ - VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED); - - if(m_MapCount != 0) - { - if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) < 0x7F) - { - VMA_ASSERT(m_DedicatedAllocation.m_pMappedData != VMA_NULL); - *ppData = m_DedicatedAllocation.m_pMappedData; - ++m_MapCount; - return VK_SUCCESS; - } - else - { - VMA_ASSERT(0 && "Dedicated allocation mapped too many times simultaneously."); - return VK_ERROR_MEMORY_MAP_FAILED; - } - } - else - { - VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)( - hAllocator->m_hDevice, - m_DedicatedAllocation.m_hMemory, - 0, // offset - VK_WHOLE_SIZE, - 0, // flags - ppData); - if(result == VK_SUCCESS) - { - m_DedicatedAllocation.m_pMappedData = *ppData; - m_MapCount = 1; - } - return result; - } -} - -void VmaAllocation_T::DedicatedAllocUnmap(VmaAllocator hAllocator) -{ - VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED); - - if((m_MapCount & ~MAP_COUNT_FLAG_PERSISTENT_MAP) != 0) - { - --m_MapCount; - if(m_MapCount == 0) - { - m_DedicatedAllocation.m_pMappedData = VMA_NULL; - (*hAllocator->GetVulkanFunctions().vkUnmapMemory)( - hAllocator->m_hDevice, - m_DedicatedAllocation.m_hMemory); - } - } - else - { - VMA_ASSERT(0 && "Unmapping dedicated allocation not previously mapped."); - } -} - -#if VMA_STATS_STRING_ENABLED - -static void VmaPrintStatInfo(VmaJsonWriter& json, const VmaStatInfo& stat) -{ - json.BeginObject(); - - json.WriteString("Blocks"); - json.WriteNumber(stat.blockCount); - - json.WriteString("Allocations"); - json.WriteNumber(stat.allocationCount); - - json.WriteString("UnusedRanges"); - json.WriteNumber(stat.unusedRangeCount); - - json.WriteString("UsedBytes"); - json.WriteNumber(stat.usedBytes); - - json.WriteString("UnusedBytes"); - json.WriteNumber(stat.unusedBytes); - - if(stat.allocationCount > 1) - { - json.WriteString("AllocationSize"); - json.BeginObject(true); - json.WriteString("Min"); - json.WriteNumber(stat.allocationSizeMin); - json.WriteString("Avg"); - json.WriteNumber(stat.allocationSizeAvg); - json.WriteString("Max"); - json.WriteNumber(stat.allocationSizeMax); - json.EndObject(); - } - - if(stat.unusedRangeCount > 1) - { - json.WriteString("UnusedRangeSize"); - json.BeginObject(true); - json.WriteString("Min"); - json.WriteNumber(stat.unusedRangeSizeMin); - json.WriteString("Avg"); - json.WriteNumber(stat.unusedRangeSizeAvg); - json.WriteString("Max"); - json.WriteNumber(stat.unusedRangeSizeMax); - json.EndObject(); - } - - json.EndObject(); -} - -#endif // #if VMA_STATS_STRING_ENABLED - -struct VmaSuballocationItemSizeLess -{ - bool operator()( - const VmaSuballocationList::iterator lhs, - const VmaSuballocationList::iterator rhs) const - { - return lhs->size < rhs->size; - } - bool operator()( - const VmaSuballocationList::iterator lhs, - VkDeviceSize rhsSize) const - { - return lhs->size < rhsSize; - } -}; - - -//////////////////////////////////////////////////////////////////////////////// -// class VmaBlockMetadata - -VmaBlockMetadata::VmaBlockMetadata(VmaAllocator hAllocator) : - m_Size(0), - m_pAllocationCallbacks(hAllocator->GetAllocationCallbacks()) -{ -} - -#if VMA_STATS_STRING_ENABLED - -void VmaBlockMetadata::PrintDetailedMap_Begin(class VmaJsonWriter& json, - VkDeviceSize unusedBytes, - size_t allocationCount, - size_t unusedRangeCount) const -{ - json.BeginObject(); - - json.WriteString("TotalBytes"); - json.WriteNumber(GetSize()); - - json.WriteString("UnusedBytes"); - json.WriteNumber(unusedBytes); - - json.WriteString("Allocations"); - json.WriteNumber((uint64_t)allocationCount); - - json.WriteString("UnusedRanges"); - json.WriteNumber((uint64_t)unusedRangeCount); - - json.WriteString("Suballocations"); - json.BeginArray(); -} - -void VmaBlockMetadata::PrintDetailedMap_Allocation(class VmaJsonWriter& json, - VkDeviceSize offset, - VmaAllocation hAllocation) const -{ - json.BeginObject(true); - - json.WriteString("Offset"); - json.WriteNumber(offset); - - hAllocation->PrintParameters(json); - - json.EndObject(); -} - -void VmaBlockMetadata::PrintDetailedMap_UnusedRange(class VmaJsonWriter& json, - VkDeviceSize offset, - VkDeviceSize size) const -{ - json.BeginObject(true); - - json.WriteString("Offset"); - json.WriteNumber(offset); - - json.WriteString("Type"); - json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[VMA_SUBALLOCATION_TYPE_FREE]); - - json.WriteString("Size"); - json.WriteNumber(size); - - json.EndObject(); -} - -void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json) const -{ - json.EndArray(); - json.EndObject(); -} - -#endif // #if VMA_STATS_STRING_ENABLED - -//////////////////////////////////////////////////////////////////////////////// -// class VmaBlockMetadata_Generic - -VmaBlockMetadata_Generic::VmaBlockMetadata_Generic(VmaAllocator hAllocator) : - VmaBlockMetadata(hAllocator), - m_FreeCount(0), - m_SumFreeSize(0), - m_Suballocations(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), - m_FreeSuballocationsBySize(VmaStlAllocator(hAllocator->GetAllocationCallbacks())) -{ -} - -VmaBlockMetadata_Generic::~VmaBlockMetadata_Generic() -{ -} - -void VmaBlockMetadata_Generic::Init(VkDeviceSize size) -{ - VmaBlockMetadata::Init(size); - - m_FreeCount = 1; - m_SumFreeSize = size; - - VmaSuballocation suballoc = {}; - suballoc.offset = 0; - suballoc.size = size; - suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - suballoc.hAllocation = VK_NULL_HANDLE; - - VMA_ASSERT(size > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER); - m_Suballocations.push_back(suballoc); - VmaSuballocationList::iterator suballocItem = m_Suballocations.end(); - --suballocItem; - m_FreeSuballocationsBySize.push_back(suballocItem); -} - -bool VmaBlockMetadata_Generic::Validate() const -{ - VMA_VALIDATE(!m_Suballocations.empty()); - - // Expected offset of new suballocation as calculated from previous ones. - VkDeviceSize calculatedOffset = 0; - // Expected number of free suballocations as calculated from traversing their list. - uint32_t calculatedFreeCount = 0; - // Expected sum size of free suballocations as calculated from traversing their list. - VkDeviceSize calculatedSumFreeSize = 0; - // Expected number of free suballocations that should be registered in - // m_FreeSuballocationsBySize calculated from traversing their list. - size_t freeSuballocationsToRegister = 0; - // True if previous visited suballocation was free. - bool prevFree = false; - - for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin(); - suballocItem != m_Suballocations.cend(); - ++suballocItem) - { - const VmaSuballocation& subAlloc = *suballocItem; - - // Actual offset of this suballocation doesn't match expected one. - VMA_VALIDATE(subAlloc.offset == calculatedOffset); - - const bool currFree = (subAlloc.type == VMA_SUBALLOCATION_TYPE_FREE); - // Two adjacent free suballocations are invalid. They should be merged. - VMA_VALIDATE(!prevFree || !currFree); - - VMA_VALIDATE(currFree == (subAlloc.hAllocation == VK_NULL_HANDLE)); - - if(currFree) - { - calculatedSumFreeSize += subAlloc.size; - ++calculatedFreeCount; - if(subAlloc.size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER) - { - ++freeSuballocationsToRegister; - } - - // Margin required between allocations - every free space must be at least that large. - VMA_VALIDATE(subAlloc.size >= VMA_DEBUG_MARGIN); - } - else - { - VMA_VALIDATE(subAlloc.hAllocation->GetOffset() == subAlloc.offset); - VMA_VALIDATE(subAlloc.hAllocation->GetSize() == subAlloc.size); - - // Margin required between allocations - previous allocation must be free. - VMA_VALIDATE(VMA_DEBUG_MARGIN == 0 || prevFree); - } - - calculatedOffset += subAlloc.size; - prevFree = currFree; - } - - // Number of free suballocations registered in m_FreeSuballocationsBySize doesn't - // match expected one. - VMA_VALIDATE(m_FreeSuballocationsBySize.size() == freeSuballocationsToRegister); - - VkDeviceSize lastSize = 0; - for(size_t i = 0; i < m_FreeSuballocationsBySize.size(); ++i) - { - VmaSuballocationList::iterator suballocItem = m_FreeSuballocationsBySize[i]; - - // Only free suballocations can be registered in m_FreeSuballocationsBySize. - VMA_VALIDATE(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE); - // They must be sorted by size ascending. - VMA_VALIDATE(suballocItem->size >= lastSize); - - lastSize = suballocItem->size; - } - - // Check if totals match calculacted values. - VMA_VALIDATE(ValidateFreeSuballocationList()); - VMA_VALIDATE(calculatedOffset == GetSize()); - VMA_VALIDATE(calculatedSumFreeSize == m_SumFreeSize); - VMA_VALIDATE(calculatedFreeCount == m_FreeCount); - - return true; -} - -VkDeviceSize VmaBlockMetadata_Generic::GetUnusedRangeSizeMax() const -{ - if(!m_FreeSuballocationsBySize.empty()) - { - return m_FreeSuballocationsBySize.back()->size; - } - else - { - return 0; - } -} - -bool VmaBlockMetadata_Generic::IsEmpty() const -{ - return (m_Suballocations.size() == 1) && (m_FreeCount == 1); -} - -void VmaBlockMetadata_Generic::CalcAllocationStatInfo(VmaStatInfo& outInfo) const -{ - outInfo.blockCount = 1; - - const uint32_t rangeCount = (uint32_t)m_Suballocations.size(); - outInfo.allocationCount = rangeCount - m_FreeCount; - outInfo.unusedRangeCount = m_FreeCount; - - outInfo.unusedBytes = m_SumFreeSize; - outInfo.usedBytes = GetSize() - outInfo.unusedBytes; - - outInfo.allocationSizeMin = UINT64_MAX; - outInfo.allocationSizeMax = 0; - outInfo.unusedRangeSizeMin = UINT64_MAX; - outInfo.unusedRangeSizeMax = 0; - - for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin(); - suballocItem != m_Suballocations.cend(); - ++suballocItem) - { - const VmaSuballocation& suballoc = *suballocItem; - if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - { - outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size); - outInfo.allocationSizeMax = VMA_MAX(outInfo.allocationSizeMax, suballoc.size); - } - else - { - outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, suballoc.size); - outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, suballoc.size); - } - } -} - -void VmaBlockMetadata_Generic::AddPoolStats(VmaPoolStats& inoutStats) const -{ - const uint32_t rangeCount = (uint32_t)m_Suballocations.size(); - - inoutStats.size += GetSize(); - inoutStats.unusedSize += m_SumFreeSize; - inoutStats.allocationCount += rangeCount - m_FreeCount; - inoutStats.unusedRangeCount += m_FreeCount; - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, GetUnusedRangeSizeMax()); -} - -#if VMA_STATS_STRING_ENABLED - -void VmaBlockMetadata_Generic::PrintDetailedMap(class VmaJsonWriter& json) const -{ - PrintDetailedMap_Begin(json, - m_SumFreeSize, // unusedBytes - m_Suballocations.size() - (size_t)m_FreeCount, // allocationCount - m_FreeCount); // unusedRangeCount - - size_t i = 0; - for(VmaSuballocationList::const_iterator suballocItem = m_Suballocations.cbegin(); - suballocItem != m_Suballocations.cend(); - ++suballocItem, ++i) - { - if(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE) - { - PrintDetailedMap_UnusedRange(json, suballocItem->offset, suballocItem->size); - } - else - { - PrintDetailedMap_Allocation(json, suballocItem->offset, suballocItem->hAllocation); - } - } - - PrintDetailedMap_End(json); -} - -#endif // #if VMA_STATS_STRING_ENABLED - -bool VmaBlockMetadata_Generic::CreateAllocationRequest( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) -{ - VMA_ASSERT(allocSize > 0); - VMA_ASSERT(!upperAddress); - VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(pAllocationRequest != VMA_NULL); - VMA_HEAVY_ASSERT(Validate()); - - pAllocationRequest->type = VmaAllocationRequestType::Normal; - - // There is not enough total free space in this block to fullfill the request: Early return. - if(canMakeOtherLost == false && - m_SumFreeSize < allocSize + 2 * VMA_DEBUG_MARGIN) - { - return false; - } - - // New algorithm, efficiently searching freeSuballocationsBySize. - const size_t freeSuballocCount = m_FreeSuballocationsBySize.size(); - if(freeSuballocCount > 0) - { - if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT) - { - // Find first free suballocation with size not less than allocSize + 2 * VMA_DEBUG_MARGIN. - VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess( - m_FreeSuballocationsBySize.data(), - m_FreeSuballocationsBySize.data() + freeSuballocCount, - allocSize + 2 * VMA_DEBUG_MARGIN, - VmaSuballocationItemSizeLess()); - size_t index = it - m_FreeSuballocationsBySize.data(); - for(; index < freeSuballocCount; ++index) - { - if(CheckAllocation( - currentFrameIndex, - frameInUseCount, - bufferImageGranularity, - allocSize, - allocAlignment, - allocType, - m_FreeSuballocationsBySize[index], - false, // canMakeOtherLost - &pAllocationRequest->offset, - &pAllocationRequest->itemsToMakeLostCount, - &pAllocationRequest->sumFreeSize, - &pAllocationRequest->sumItemSize)) - { - pAllocationRequest->item = m_FreeSuballocationsBySize[index]; - return true; - } - } - } - else if(strategy == VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET) - { - for(VmaSuballocationList::iterator it = m_Suballocations.begin(); - it != m_Suballocations.end(); - ++it) - { - if(it->type == VMA_SUBALLOCATION_TYPE_FREE && CheckAllocation( - currentFrameIndex, - frameInUseCount, - bufferImageGranularity, - allocSize, - allocAlignment, - allocType, - it, - false, // canMakeOtherLost - &pAllocationRequest->offset, - &pAllocationRequest->itemsToMakeLostCount, - &pAllocationRequest->sumFreeSize, - &pAllocationRequest->sumItemSize)) - { - pAllocationRequest->item = it; - return true; - } - } - } - else // WORST_FIT, FIRST_FIT - { - // Search staring from biggest suballocations. - for(size_t index = freeSuballocCount; index--; ) - { - if(CheckAllocation( - currentFrameIndex, - frameInUseCount, - bufferImageGranularity, - allocSize, - allocAlignment, - allocType, - m_FreeSuballocationsBySize[index], - false, // canMakeOtherLost - &pAllocationRequest->offset, - &pAllocationRequest->itemsToMakeLostCount, - &pAllocationRequest->sumFreeSize, - &pAllocationRequest->sumItemSize)) - { - pAllocationRequest->item = m_FreeSuballocationsBySize[index]; - return true; - } - } - } - } - - if(canMakeOtherLost) - { - // Brute-force algorithm. TODO: Come up with something better. - - bool found = false; - VmaAllocationRequest tmpAllocRequest = {}; - tmpAllocRequest.type = VmaAllocationRequestType::Normal; - for(VmaSuballocationList::iterator suballocIt = m_Suballocations.begin(); - suballocIt != m_Suballocations.end(); - ++suballocIt) - { - if(suballocIt->type == VMA_SUBALLOCATION_TYPE_FREE || - suballocIt->hAllocation->CanBecomeLost()) - { - if(CheckAllocation( - currentFrameIndex, - frameInUseCount, - bufferImageGranularity, - allocSize, - allocAlignment, - allocType, - suballocIt, - canMakeOtherLost, - &tmpAllocRequest.offset, - &tmpAllocRequest.itemsToMakeLostCount, - &tmpAllocRequest.sumFreeSize, - &tmpAllocRequest.sumItemSize)) - { - if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT) - { - *pAllocationRequest = tmpAllocRequest; - pAllocationRequest->item = suballocIt; - break; - } - if(!found || tmpAllocRequest.CalcCost() < pAllocationRequest->CalcCost()) - { - *pAllocationRequest = tmpAllocRequest; - pAllocationRequest->item = suballocIt; - found = true; - } - } - } - } - - return found; - } - - return false; -} - -bool VmaBlockMetadata_Generic::MakeRequestedAllocationsLost( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VmaAllocationRequest* pAllocationRequest) -{ - VMA_ASSERT(pAllocationRequest && pAllocationRequest->type == VmaAllocationRequestType::Normal); - - while(pAllocationRequest->itemsToMakeLostCount > 0) - { - if(pAllocationRequest->item->type == VMA_SUBALLOCATION_TYPE_FREE) - { - ++pAllocationRequest->item; - } - VMA_ASSERT(pAllocationRequest->item != m_Suballocations.end()); - VMA_ASSERT(pAllocationRequest->item->hAllocation != VK_NULL_HANDLE); - VMA_ASSERT(pAllocationRequest->item->hAllocation->CanBecomeLost()); - if(pAllocationRequest->item->hAllocation->MakeLost(currentFrameIndex, frameInUseCount)) - { - pAllocationRequest->item = FreeSuballocation(pAllocationRequest->item); - --pAllocationRequest->itemsToMakeLostCount; - } - else - { - return false; - } - } - - VMA_HEAVY_ASSERT(Validate()); - VMA_ASSERT(pAllocationRequest->item != m_Suballocations.end()); - VMA_ASSERT(pAllocationRequest->item->type == VMA_SUBALLOCATION_TYPE_FREE); - - return true; -} - -uint32_t VmaBlockMetadata_Generic::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) -{ - uint32_t lostAllocationCount = 0; - for(VmaSuballocationList::iterator it = m_Suballocations.begin(); - it != m_Suballocations.end(); - ++it) - { - if(it->type != VMA_SUBALLOCATION_TYPE_FREE && - it->hAllocation->CanBecomeLost() && - it->hAllocation->MakeLost(currentFrameIndex, frameInUseCount)) - { - it = FreeSuballocation(it); - ++lostAllocationCount; - } - } - return lostAllocationCount; -} - -VkResult VmaBlockMetadata_Generic::CheckCorruption(const void* pBlockData) -{ - for(VmaSuballocationList::iterator it = m_Suballocations.begin(); - it != m_Suballocations.end(); - ++it) - { - if(it->type != VMA_SUBALLOCATION_TYPE_FREE) - { - if(!VmaValidateMagicValue(pBlockData, it->offset - VMA_DEBUG_MARGIN)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!"); - return VK_ERROR_VALIDATION_FAILED_EXT; - } - if(!VmaValidateMagicValue(pBlockData, it->offset + it->size)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); - return VK_ERROR_VALIDATION_FAILED_EXT; - } - } - } - - return VK_SUCCESS; -} - -void VmaBlockMetadata_Generic::Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - VkDeviceSize allocSize, - VmaAllocation hAllocation) -{ - VMA_ASSERT(request.type == VmaAllocationRequestType::Normal); - VMA_ASSERT(request.item != m_Suballocations.end()); - VmaSuballocation& suballoc = *request.item; - // Given suballocation is a free block. - VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - // Given offset is inside this suballocation. - VMA_ASSERT(request.offset >= suballoc.offset); - const VkDeviceSize paddingBegin = request.offset - suballoc.offset; - VMA_ASSERT(suballoc.size >= paddingBegin + allocSize); - const VkDeviceSize paddingEnd = suballoc.size - paddingBegin - allocSize; - - // Unregister this free suballocation from m_FreeSuballocationsBySize and update - // it to become used. - UnregisterFreeSuballocation(request.item); - - suballoc.offset = request.offset; - suballoc.size = allocSize; - suballoc.type = type; - suballoc.hAllocation = hAllocation; - - // If there are any free bytes remaining at the end, insert new free suballocation after current one. - if(paddingEnd) - { - VmaSuballocation paddingSuballoc = {}; - paddingSuballoc.offset = request.offset + allocSize; - paddingSuballoc.size = paddingEnd; - paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - VmaSuballocationList::iterator next = request.item; - ++next; - const VmaSuballocationList::iterator paddingEndItem = - m_Suballocations.insert(next, paddingSuballoc); - RegisterFreeSuballocation(paddingEndItem); - } - - // If there are any free bytes remaining at the beginning, insert new free suballocation before current one. - if(paddingBegin) - { - VmaSuballocation paddingSuballoc = {}; - paddingSuballoc.offset = request.offset - paddingBegin; - paddingSuballoc.size = paddingBegin; - paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - const VmaSuballocationList::iterator paddingBeginItem = - m_Suballocations.insert(request.item, paddingSuballoc); - RegisterFreeSuballocation(paddingBeginItem); - } - - // Update totals. - m_FreeCount = m_FreeCount - 1; - if(paddingBegin > 0) - { - ++m_FreeCount; - } - if(paddingEnd > 0) - { - ++m_FreeCount; - } - m_SumFreeSize -= allocSize; -} - -void VmaBlockMetadata_Generic::Free(const VmaAllocation allocation) -{ - for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin(); - suballocItem != m_Suballocations.end(); - ++suballocItem) - { - VmaSuballocation& suballoc = *suballocItem; - if(suballoc.hAllocation == allocation) - { - FreeSuballocation(suballocItem); - VMA_HEAVY_ASSERT(Validate()); - return; - } - } - VMA_ASSERT(0 && "Not found!"); -} - -void VmaBlockMetadata_Generic::FreeAtOffset(VkDeviceSize offset) -{ - for(VmaSuballocationList::iterator suballocItem = m_Suballocations.begin(); - suballocItem != m_Suballocations.end(); - ++suballocItem) - { - VmaSuballocation& suballoc = *suballocItem; - if(suballoc.offset == offset) - { - FreeSuballocation(suballocItem); - return; - } - } - VMA_ASSERT(0 && "Not found!"); -} - -bool VmaBlockMetadata_Generic::ValidateFreeSuballocationList() const -{ - VkDeviceSize lastSize = 0; - for(size_t i = 0, count = m_FreeSuballocationsBySize.size(); i < count; ++i) - { - const VmaSuballocationList::iterator it = m_FreeSuballocationsBySize[i]; - - VMA_VALIDATE(it->type == VMA_SUBALLOCATION_TYPE_FREE); - VMA_VALIDATE(it->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER); - VMA_VALIDATE(it->size >= lastSize); - lastSize = it->size; - } - return true; -} - -bool VmaBlockMetadata_Generic::CheckAllocation( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - VmaSuballocationList::const_iterator suballocItem, - bool canMakeOtherLost, - VkDeviceSize* pOffset, - size_t* itemsToMakeLostCount, - VkDeviceSize* pSumFreeSize, - VkDeviceSize* pSumItemSize) const -{ - VMA_ASSERT(allocSize > 0); - VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(suballocItem != m_Suballocations.cend()); - VMA_ASSERT(pOffset != VMA_NULL); - - *itemsToMakeLostCount = 0; - *pSumFreeSize = 0; - *pSumItemSize = 0; - - if(canMakeOtherLost) - { - if(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE) - { - *pSumFreeSize = suballocItem->size; - } - else - { - if(suballocItem->hAllocation->CanBecomeLost() && - suballocItem->hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex) - { - ++*itemsToMakeLostCount; - *pSumItemSize = suballocItem->size; - } - else - { - return false; - } - } - - // Remaining size is too small for this request: Early return. - if(GetSize() - suballocItem->offset < allocSize) - { - return false; - } - - // Start from offset equal to beginning of this suballocation. - *pOffset = suballocItem->offset; - - // Apply VMA_DEBUG_MARGIN at the beginning. - if(VMA_DEBUG_MARGIN > 0) - { - *pOffset += VMA_DEBUG_MARGIN; - } - - // Apply alignment. - *pOffset = VmaAlignUp(*pOffset, allocAlignment); - - // Check previous suballocations for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment) - { - bool bufferImageGranularityConflict = false; - VmaSuballocationList::const_iterator prevSuballocItem = suballocItem; - while(prevSuballocItem != m_Suballocations.cbegin()) - { - --prevSuballocItem; - const VmaSuballocation& prevSuballoc = *prevSuballocItem; - if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, *pOffset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if(bufferImageGranularityConflict) - { - *pOffset = VmaAlignUp(*pOffset, bufferImageGranularity); - } - } - - // Now that we have final *pOffset, check if we are past suballocItem. - // If yes, return false - this function should be called for another suballocItem as starting point. - if(*pOffset >= suballocItem->offset + suballocItem->size) - { - return false; - } - - // Calculate padding at the beginning based on current offset. - const VkDeviceSize paddingBegin = *pOffset - suballocItem->offset; - - // Calculate required margin at the end. - const VkDeviceSize requiredEndMargin = VMA_DEBUG_MARGIN; - - const VkDeviceSize totalSize = paddingBegin + allocSize + requiredEndMargin; - // Another early return check. - if(suballocItem->offset + totalSize > GetSize()) - { - return false; - } - - // Advance lastSuballocItem until desired size is reached. - // Update itemsToMakeLostCount. - VmaSuballocationList::const_iterator lastSuballocItem = suballocItem; - if(totalSize > suballocItem->size) - { - VkDeviceSize remainingSize = totalSize - suballocItem->size; - while(remainingSize > 0) - { - ++lastSuballocItem; - if(lastSuballocItem == m_Suballocations.cend()) - { - return false; - } - if(lastSuballocItem->type == VMA_SUBALLOCATION_TYPE_FREE) - { - *pSumFreeSize += lastSuballocItem->size; - } - else - { - VMA_ASSERT(lastSuballocItem->hAllocation != VK_NULL_HANDLE); - if(lastSuballocItem->hAllocation->CanBecomeLost() && - lastSuballocItem->hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex) - { - ++*itemsToMakeLostCount; - *pSumItemSize += lastSuballocItem->size; - } - else - { - return false; - } - } - remainingSize = (lastSuballocItem->size < remainingSize) ? - remainingSize - lastSuballocItem->size : 0; - } - } - - // Check next suballocations for BufferImageGranularity conflicts. - // If conflict exists, we must mark more allocations lost or fail. - if(bufferImageGranularity > 1 && (allocSize % bufferImageGranularity || *pOffset % bufferImageGranularity)) - { - VmaSuballocationList::const_iterator nextSuballocItem = lastSuballocItem; - ++nextSuballocItem; - while(nextSuballocItem != m_Suballocations.cend()) - { - const VmaSuballocation& nextSuballoc = *nextSuballocItem; - if(VmaBlocksOnSamePage(*pOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) - { - VMA_ASSERT(nextSuballoc.hAllocation != VK_NULL_HANDLE); - if(nextSuballoc.hAllocation->CanBecomeLost() && - nextSuballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex) - { - ++*itemsToMakeLostCount; - } - else - { - return false; - } - } - } - else - { - // Already on next page. - break; - } - ++nextSuballocItem; - } - } - } - else - { - const VmaSuballocation& suballoc = *suballocItem; - VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - - *pSumFreeSize = suballoc.size; - - // Size of this suballocation is too small for this request: Early return. - if(suballoc.size < allocSize) - { - return false; - } - - // Start from offset equal to beginning of this suballocation. - *pOffset = suballoc.offset; - - // Apply VMA_DEBUG_MARGIN at the beginning. - if(VMA_DEBUG_MARGIN > 0) - { - *pOffset += VMA_DEBUG_MARGIN; - } - - // Apply alignment. - *pOffset = VmaAlignUp(*pOffset, allocAlignment); - - // Check previous suballocations for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment) - { - bool bufferImageGranularityConflict = false; - VmaSuballocationList::const_iterator prevSuballocItem = suballocItem; - while(prevSuballocItem != m_Suballocations.cbegin()) - { - --prevSuballocItem; - const VmaSuballocation& prevSuballoc = *prevSuballocItem; - if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, *pOffset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if(bufferImageGranularityConflict) - { - *pOffset = VmaAlignUp(*pOffset, bufferImageGranularity); - } - } - - // Calculate padding at the beginning based on current offset. - const VkDeviceSize paddingBegin = *pOffset - suballoc.offset; - - // Calculate required margin at the end. - const VkDeviceSize requiredEndMargin = VMA_DEBUG_MARGIN; - - // Fail if requested size plus margin before and after is bigger than size of this suballocation. - if(paddingBegin + allocSize + requiredEndMargin > suballoc.size) - { - return false; - } - - // Check next suballocations for BufferImageGranularity conflicts. - // If conflict exists, allocation cannot be made here. - if(bufferImageGranularity > 1 && (allocSize % bufferImageGranularity || *pOffset % bufferImageGranularity)) - { - VmaSuballocationList::const_iterator nextSuballocItem = suballocItem; - ++nextSuballocItem; - while(nextSuballocItem != m_Suballocations.cend()) - { - const VmaSuballocation& nextSuballoc = *nextSuballocItem; - if(VmaBlocksOnSamePage(*pOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) - { - return false; - } - } - else - { - // Already on next page. - break; - } - ++nextSuballocItem; - } - } - } - - // All tests passed: Success. pOffset is already filled. - return true; -} - -void VmaBlockMetadata_Generic::MergeFreeWithNext(VmaSuballocationList::iterator item) -{ - VMA_ASSERT(item != m_Suballocations.end()); - VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE); - - VmaSuballocationList::iterator nextItem = item; - ++nextItem; - VMA_ASSERT(nextItem != m_Suballocations.end()); - VMA_ASSERT(nextItem->type == VMA_SUBALLOCATION_TYPE_FREE); - - item->size += nextItem->size; - --m_FreeCount; - m_Suballocations.erase(nextItem); -} - -VmaSuballocationList::iterator VmaBlockMetadata_Generic::FreeSuballocation(VmaSuballocationList::iterator suballocItem) -{ - // Change this suballocation to be marked as free. - VmaSuballocation& suballoc = *suballocItem; - suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - suballoc.hAllocation = VK_NULL_HANDLE; - - // Update totals. - ++m_FreeCount; - m_SumFreeSize += suballoc.size; - - // Merge with previous and/or next suballocation if it's also free. - bool mergeWithNext = false; - bool mergeWithPrev = false; - - VmaSuballocationList::iterator nextItem = suballocItem; - ++nextItem; - if((nextItem != m_Suballocations.end()) && (nextItem->type == VMA_SUBALLOCATION_TYPE_FREE)) - { - mergeWithNext = true; - } - - VmaSuballocationList::iterator prevItem = suballocItem; - if(suballocItem != m_Suballocations.begin()) - { - --prevItem; - if(prevItem->type == VMA_SUBALLOCATION_TYPE_FREE) - { - mergeWithPrev = true; - } - } - - if(mergeWithNext) - { - UnregisterFreeSuballocation(nextItem); - MergeFreeWithNext(suballocItem); - } - - if(mergeWithPrev) - { - UnregisterFreeSuballocation(prevItem); - MergeFreeWithNext(prevItem); - RegisterFreeSuballocation(prevItem); - return prevItem; - } - else - { - RegisterFreeSuballocation(suballocItem); - return suballocItem; - } -} - -void VmaBlockMetadata_Generic::RegisterFreeSuballocation(VmaSuballocationList::iterator item) -{ - VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(item->size > 0); - - // You may want to enable this validation at the beginning or at the end of - // this function, depending on what do you want to check. - VMA_HEAVY_ASSERT(ValidateFreeSuballocationList()); - - if(item->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER) - { - if(m_FreeSuballocationsBySize.empty()) - { - m_FreeSuballocationsBySize.push_back(item); - } - else - { - VmaVectorInsertSorted(m_FreeSuballocationsBySize, item); - } - } - - //VMA_HEAVY_ASSERT(ValidateFreeSuballocationList()); -} - - -void VmaBlockMetadata_Generic::UnregisterFreeSuballocation(VmaSuballocationList::iterator item) -{ - VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(item->size > 0); - - // You may want to enable this validation at the beginning or at the end of - // this function, depending on what do you want to check. - VMA_HEAVY_ASSERT(ValidateFreeSuballocationList()); - - if(item->size >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER) - { - VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess( - m_FreeSuballocationsBySize.data(), - m_FreeSuballocationsBySize.data() + m_FreeSuballocationsBySize.size(), - item, - VmaSuballocationItemSizeLess()); - for(size_t index = it - m_FreeSuballocationsBySize.data(); - index < m_FreeSuballocationsBySize.size(); - ++index) - { - if(m_FreeSuballocationsBySize[index] == item) - { - VmaVectorRemove(m_FreeSuballocationsBySize, index); - return; - } - VMA_ASSERT((m_FreeSuballocationsBySize[index]->size == item->size) && "Not found."); - } - VMA_ASSERT(0 && "Not found."); - } - - //VMA_HEAVY_ASSERT(ValidateFreeSuballocationList()); -} - -bool VmaBlockMetadata_Generic::IsBufferImageGranularityConflictPossible( - VkDeviceSize bufferImageGranularity, - VmaSuballocationType& inOutPrevSuballocType) const -{ - if(bufferImageGranularity == 1 || IsEmpty()) - { - return false; - } - - VkDeviceSize minAlignment = VK_WHOLE_SIZE; - bool typeConflictFound = false; - for(VmaSuballocationList::const_iterator it = m_Suballocations.cbegin(); - it != m_Suballocations.cend(); - ++it) - { - const VmaSuballocationType suballocType = it->type; - if(suballocType != VMA_SUBALLOCATION_TYPE_FREE) - { - minAlignment = VMA_MIN(minAlignment, it->hAllocation->GetAlignment()); - if(VmaIsBufferImageGranularityConflict(inOutPrevSuballocType, suballocType)) - { - typeConflictFound = true; - } - inOutPrevSuballocType = suballocType; - } - } - - return typeConflictFound || minAlignment >= bufferImageGranularity; -} - -//////////////////////////////////////////////////////////////////////////////// -// class VmaBlockMetadata_Linear - -VmaBlockMetadata_Linear::VmaBlockMetadata_Linear(VmaAllocator hAllocator) : - VmaBlockMetadata(hAllocator), - m_SumFreeSize(0), - m_Suballocations0(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), - m_Suballocations1(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), - m_1stVectorIndex(0), - m_2ndVectorMode(SECOND_VECTOR_EMPTY), - m_1stNullItemsBeginCount(0), - m_1stNullItemsMiddleCount(0), - m_2ndNullItemsCount(0) -{ -} - -VmaBlockMetadata_Linear::~VmaBlockMetadata_Linear() -{ -} - -void VmaBlockMetadata_Linear::Init(VkDeviceSize size) -{ - VmaBlockMetadata::Init(size); - m_SumFreeSize = size; -} - -bool VmaBlockMetadata_Linear::Validate() const -{ - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - - VMA_VALIDATE(suballocations2nd.empty() == (m_2ndVectorMode == SECOND_VECTOR_EMPTY)); - VMA_VALIDATE(!suballocations1st.empty() || - suballocations2nd.empty() || - m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER); - - if(!suballocations1st.empty()) - { - // Null item at the beginning should be accounted into m_1stNullItemsBeginCount. - VMA_VALIDATE(suballocations1st[m_1stNullItemsBeginCount].hAllocation != VK_NULL_HANDLE); - // Null item at the end should be just pop_back(). - VMA_VALIDATE(suballocations1st.back().hAllocation != VK_NULL_HANDLE); - } - if(!suballocations2nd.empty()) - { - // Null item at the end should be just pop_back(). - VMA_VALIDATE(suballocations2nd.back().hAllocation != VK_NULL_HANDLE); - } - - VMA_VALIDATE(m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount <= suballocations1st.size()); - VMA_VALIDATE(m_2ndNullItemsCount <= suballocations2nd.size()); - - VkDeviceSize sumUsedSize = 0; - const size_t suballoc1stCount = suballocations1st.size(); - VkDeviceSize offset = VMA_DEBUG_MARGIN; - - if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const size_t suballoc2ndCount = suballocations2nd.size(); - size_t nullItem2ndCount = 0; - for(size_t i = 0; i < suballoc2ndCount; ++i) - { - const VmaSuballocation& suballoc = suballocations2nd[i]; - const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - - VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE)); - VMA_VALIDATE(suballoc.offset >= offset); - - if(!currFree) - { - VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset); - VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size); - sumUsedSize += suballoc.size; - } - else - { - ++nullItem2ndCount; - } - - offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN; - } - - VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount); - } - - for(size_t i = 0; i < m_1stNullItemsBeginCount; ++i) - { - const VmaSuballocation& suballoc = suballocations1st[i]; - VMA_VALIDATE(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE && - suballoc.hAllocation == VK_NULL_HANDLE); - } - - size_t nullItem1stCount = m_1stNullItemsBeginCount; - - for(size_t i = m_1stNullItemsBeginCount; i < suballoc1stCount; ++i) - { - const VmaSuballocation& suballoc = suballocations1st[i]; - const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - - VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE)); - VMA_VALIDATE(suballoc.offset >= offset); - VMA_VALIDATE(i >= m_1stNullItemsBeginCount || currFree); - - if(!currFree) - { - VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset); - VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size); - sumUsedSize += suballoc.size; - } - else - { - ++nullItem1stCount; - } - - offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN; - } - VMA_VALIDATE(nullItem1stCount == m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount); - - if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - const size_t suballoc2ndCount = suballocations2nd.size(); - size_t nullItem2ndCount = 0; - for(size_t i = suballoc2ndCount; i--; ) - { - const VmaSuballocation& suballoc = suballocations2nd[i]; - const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE); - - VMA_VALIDATE(currFree == (suballoc.hAllocation == VK_NULL_HANDLE)); - VMA_VALIDATE(suballoc.offset >= offset); - - if(!currFree) - { - VMA_VALIDATE(suballoc.hAllocation->GetOffset() == suballoc.offset); - VMA_VALIDATE(suballoc.hAllocation->GetSize() == suballoc.size); - sumUsedSize += suballoc.size; - } - else - { - ++nullItem2ndCount; - } - - offset = suballoc.offset + suballoc.size + VMA_DEBUG_MARGIN; - } - - VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount); - } - - VMA_VALIDATE(offset <= GetSize()); - VMA_VALIDATE(m_SumFreeSize == GetSize() - sumUsedSize); - - return true; -} - -size_t VmaBlockMetadata_Linear::GetAllocationCount() const -{ - return AccessSuballocations1st().size() - (m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount) + - AccessSuballocations2nd().size() - m_2ndNullItemsCount; -} - -VkDeviceSize VmaBlockMetadata_Linear::GetUnusedRangeSizeMax() const -{ - const VkDeviceSize size = GetSize(); - - /* - We don't consider gaps inside allocation vectors with freed allocations because - they are not suitable for reuse in linear allocator. We consider only space that - is available for new allocations. - */ - if(IsEmpty()) - { - return size; - } - - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - - switch(m_2ndVectorMode) - { - case SECOND_VECTOR_EMPTY: - /* - Available space is after end of 1st, as well as before beginning of 1st (which - whould make it a ring buffer). - */ - { - const size_t suballocations1stCount = suballocations1st.size(); - VMA_ASSERT(suballocations1stCount > m_1stNullItemsBeginCount); - const VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount]; - const VmaSuballocation& lastSuballoc = suballocations1st[suballocations1stCount - 1]; - return VMA_MAX( - firstSuballoc.offset, - size - (lastSuballoc.offset + lastSuballoc.size)); - } - break; - - case SECOND_VECTOR_RING_BUFFER: - /* - Available space is only between end of 2nd and beginning of 1st. - */ - { - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - const VmaSuballocation& lastSuballoc2nd = suballocations2nd.back(); - const VmaSuballocation& firstSuballoc1st = suballocations1st[m_1stNullItemsBeginCount]; - return firstSuballoc1st.offset - (lastSuballoc2nd.offset + lastSuballoc2nd.size); - } - break; - - case SECOND_VECTOR_DOUBLE_STACK: - /* - Available space is only between end of 1st and top of 2nd. - */ - { - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - const VmaSuballocation& topSuballoc2nd = suballocations2nd.back(); - const VmaSuballocation& lastSuballoc1st = suballocations1st.back(); - return topSuballoc2nd.offset - (lastSuballoc1st.offset + lastSuballoc1st.size); - } - break; - - default: - VMA_ASSERT(0); - return 0; - } -} - -void VmaBlockMetadata_Linear::CalcAllocationStatInfo(VmaStatInfo& outInfo) const -{ - const VkDeviceSize size = GetSize(); - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - const size_t suballoc1stCount = suballocations1st.size(); - const size_t suballoc2ndCount = suballocations2nd.size(); - - outInfo.blockCount = 1; - outInfo.allocationCount = (uint32_t)GetAllocationCount(); - outInfo.unusedRangeCount = 0; - outInfo.usedBytes = 0; - outInfo.allocationSizeMin = UINT64_MAX; - outInfo.allocationSizeMax = 0; - outInfo.unusedRangeSizeMin = UINT64_MAX; - outInfo.unusedRangeSizeMax = 0; - - VkDeviceSize lastOffset = 0; - - if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; - size_t nextAlloc2ndIndex = 0; - while(lastOffset < freeSpace2ndTo1stEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while(nextAlloc2ndIndex < suballoc2ndCount && - suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE) - { - ++nextAlloc2ndIndex; - } - - // Found non-null allocation. - if(nextAlloc2ndIndex < suballoc2ndCount) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += unusedRangeSize; - outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize); - outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - outInfo.usedBytes += suballoc.size; - outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size); - outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size); - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc2ndIndex; - } - // We are at the end. - else - { - // There is free space from lastOffset to freeSpace2ndTo1stEnd. - if(lastOffset < freeSpace2ndTo1stEnd) - { - const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset; - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += unusedRangeSize; - outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize); - outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize); - } - - // End of loop. - lastOffset = freeSpace2ndTo1stEnd; - } - } - } - - size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; - const VkDeviceSize freeSpace1stTo2ndEnd = - m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; - while(lastOffset < freeSpace1stTo2ndEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while(nextAlloc1stIndex < suballoc1stCount && - suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE) - { - ++nextAlloc1stIndex; - } - - // Found non-null allocation. - if(nextAlloc1stIndex < suballoc1stCount) - { - const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += unusedRangeSize; - outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize); - outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - outInfo.usedBytes += suballoc.size; - outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size); - outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size); - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc1stIndex; - } - // We are at the end. - else - { - // There is free space from lastOffset to freeSpace1stTo2ndEnd. - if(lastOffset < freeSpace1stTo2ndEnd) - { - const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset; - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += unusedRangeSize; - outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize); - outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize); - } - - // End of loop. - lastOffset = freeSpace1stTo2ndEnd; - } - } - - if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; - while(lastOffset < size) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while(nextAlloc2ndIndex != SIZE_MAX && - suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE) - { - --nextAlloc2ndIndex; - } - - // Found non-null allocation. - if(nextAlloc2ndIndex != SIZE_MAX) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += unusedRangeSize; - outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize); - outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - outInfo.usedBytes += suballoc.size; - outInfo.allocationSizeMin = VMA_MIN(outInfo.allocationSizeMin, suballoc.size); - outInfo.allocationSizeMax = VMA_MIN(outInfo.allocationSizeMax, suballoc.size); - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - --nextAlloc2ndIndex; - } - // We are at the end. - else - { - // There is free space from lastOffset to size. - if(lastOffset < size) - { - const VkDeviceSize unusedRangeSize = size - lastOffset; - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += unusedRangeSize; - outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusedRangeSize); - outInfo.unusedRangeSizeMax = VMA_MIN(outInfo.unusedRangeSizeMax, unusedRangeSize); - } - - // End of loop. - lastOffset = size; - } - } - } - - outInfo.unusedBytes = size - outInfo.usedBytes; -} - -void VmaBlockMetadata_Linear::AddPoolStats(VmaPoolStats& inoutStats) const -{ - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - const VkDeviceSize size = GetSize(); - const size_t suballoc1stCount = suballocations1st.size(); - const size_t suballoc2ndCount = suballocations2nd.size(); - - inoutStats.size += size; - - VkDeviceSize lastOffset = 0; - - if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; - size_t nextAlloc2ndIndex = m_1stNullItemsBeginCount; - while(lastOffset < freeSpace2ndTo1stEnd) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while(nextAlloc2ndIndex < suballoc2ndCount && - suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE) - { - ++nextAlloc2ndIndex; - } - - // Found non-null allocation. - if(nextAlloc2ndIndex < suballoc2ndCount) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - inoutStats.unusedSize += unusedRangeSize; - ++inoutStats.unusedRangeCount; - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++inoutStats.allocationCount; - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc2ndIndex; - } - // We are at the end. - else - { - if(lastOffset < freeSpace2ndTo1stEnd) - { - // There is free space from lastOffset to freeSpace2ndTo1stEnd. - const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset; - inoutStats.unusedSize += unusedRangeSize; - ++inoutStats.unusedRangeCount; - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize); - } - - // End of loop. - lastOffset = freeSpace2ndTo1stEnd; - } - } - } - - size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; - const VkDeviceSize freeSpace1stTo2ndEnd = - m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; - while(lastOffset < freeSpace1stTo2ndEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while(nextAlloc1stIndex < suballoc1stCount && - suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE) - { - ++nextAlloc1stIndex; - } - - // Found non-null allocation. - if(nextAlloc1stIndex < suballoc1stCount) - { - const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - inoutStats.unusedSize += unusedRangeSize; - ++inoutStats.unusedRangeCount; - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++inoutStats.allocationCount; - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc1stIndex; - } - // We are at the end. - else - { - if(lastOffset < freeSpace1stTo2ndEnd) - { - // There is free space from lastOffset to freeSpace1stTo2ndEnd. - const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset; - inoutStats.unusedSize += unusedRangeSize; - ++inoutStats.unusedRangeCount; - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize); - } - - // End of loop. - lastOffset = freeSpace1stTo2ndEnd; - } - } - - if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; - while(lastOffset < size) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while(nextAlloc2ndIndex != SIZE_MAX && - suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE) - { - --nextAlloc2ndIndex; - } - - // Found non-null allocation. - if(nextAlloc2ndIndex != SIZE_MAX) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - inoutStats.unusedSize += unusedRangeSize; - ++inoutStats.unusedRangeCount; - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++inoutStats.allocationCount; - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - --nextAlloc2ndIndex; - } - // We are at the end. - else - { - if(lastOffset < size) - { - // There is free space from lastOffset to size. - const VkDeviceSize unusedRangeSize = size - lastOffset; - inoutStats.unusedSize += unusedRangeSize; - ++inoutStats.unusedRangeCount; - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, unusedRangeSize); - } - - // End of loop. - lastOffset = size; - } - } - } -} - -#if VMA_STATS_STRING_ENABLED -void VmaBlockMetadata_Linear::PrintDetailedMap(class VmaJsonWriter& json) const -{ - const VkDeviceSize size = GetSize(); - const SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - const size_t suballoc1stCount = suballocations1st.size(); - const size_t suballoc2ndCount = suballocations2nd.size(); - - // FIRST PASS - - size_t unusedRangeCount = 0; - VkDeviceSize usedBytes = 0; - - VkDeviceSize lastOffset = 0; - - size_t alloc2ndCount = 0; - if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; - size_t nextAlloc2ndIndex = 0; - while(lastOffset < freeSpace2ndTo1stEnd) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while(nextAlloc2ndIndex < suballoc2ndCount && - suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE) - { - ++nextAlloc2ndIndex; - } - - // Found non-null allocation. - if(nextAlloc2ndIndex < suballoc2ndCount) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - ++unusedRangeCount; - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++alloc2ndCount; - usedBytes += suballoc.size; - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc2ndIndex; - } - // We are at the end. - else - { - if(lastOffset < freeSpace2ndTo1stEnd) - { - // There is free space from lastOffset to freeSpace2ndTo1stEnd. - ++unusedRangeCount; - } - - // End of loop. - lastOffset = freeSpace2ndTo1stEnd; - } - } - } - - size_t nextAlloc1stIndex = m_1stNullItemsBeginCount; - size_t alloc1stCount = 0; - const VkDeviceSize freeSpace1stTo2ndEnd = - m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size; - while(lastOffset < freeSpace1stTo2ndEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while(nextAlloc1stIndex < suballoc1stCount && - suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE) - { - ++nextAlloc1stIndex; - } - - // Found non-null allocation. - if(nextAlloc1stIndex < suballoc1stCount) - { - const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - ++unusedRangeCount; - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++alloc1stCount; - usedBytes += suballoc.size; - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc1stIndex; - } - // We are at the end. - else - { - if(lastOffset < size) - { - // There is free space from lastOffset to freeSpace1stTo2ndEnd. - ++unusedRangeCount; - } - - // End of loop. - lastOffset = freeSpace1stTo2ndEnd; - } - } - - if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; - while(lastOffset < size) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while(nextAlloc2ndIndex != SIZE_MAX && - suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE) - { - --nextAlloc2ndIndex; - } - - // Found non-null allocation. - if(nextAlloc2ndIndex != SIZE_MAX) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - ++unusedRangeCount; - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - ++alloc2ndCount; - usedBytes += suballoc.size; - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - --nextAlloc2ndIndex; - } - // We are at the end. - else - { - if(lastOffset < size) - { - // There is free space from lastOffset to size. - ++unusedRangeCount; - } - - // End of loop. - lastOffset = size; - } - } - } - - const VkDeviceSize unusedBytes = size - usedBytes; - PrintDetailedMap_Begin(json, unusedBytes, alloc1stCount + alloc2ndCount, unusedRangeCount); - - // SECOND PASS - lastOffset = 0; - - if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset; - size_t nextAlloc2ndIndex = 0; - while(lastOffset < freeSpace2ndTo1stEnd) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while(nextAlloc2ndIndex < suballoc2ndCount && - suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE) - { - ++nextAlloc2ndIndex; - } - - // Found non-null allocation. - if(nextAlloc2ndIndex < suballoc2ndCount) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation); - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc2ndIndex; - } - // We are at the end. - else - { - if(lastOffset < freeSpace2ndTo1stEnd) - { - // There is free space from lastOffset to freeSpace2ndTo1stEnd. - const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } - - // End of loop. - lastOffset = freeSpace2ndTo1stEnd; - } - } - } - - nextAlloc1stIndex = m_1stNullItemsBeginCount; - while(lastOffset < freeSpace1stTo2ndEnd) - { - // Find next non-null allocation or move nextAllocIndex to the end. - while(nextAlloc1stIndex < suballoc1stCount && - suballocations1st[nextAlloc1stIndex].hAllocation == VK_NULL_HANDLE) - { - ++nextAlloc1stIndex; - } - - // Found non-null allocation. - if(nextAlloc1stIndex < suballoc1stCount) - { - const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation); - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - ++nextAlloc1stIndex; - } - // We are at the end. - else - { - if(lastOffset < freeSpace1stTo2ndEnd) - { - // There is free space from lastOffset to freeSpace1stTo2ndEnd. - const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } - - // End of loop. - lastOffset = freeSpace1stTo2ndEnd; - } - } - - if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - size_t nextAlloc2ndIndex = suballocations2nd.size() - 1; - while(lastOffset < size) - { - // Find next non-null allocation or move nextAlloc2ndIndex to the end. - while(nextAlloc2ndIndex != SIZE_MAX && - suballocations2nd[nextAlloc2ndIndex].hAllocation == VK_NULL_HANDLE) - { - --nextAlloc2ndIndex; - } - - // Found non-null allocation. - if(nextAlloc2ndIndex != SIZE_MAX) - { - const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex]; - - // 1. Process free space before this allocation. - if(lastOffset < suballoc.offset) - { - // There is free space from lastOffset to suballoc.offset. - const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } - - // 2. Process this allocation. - // There is allocation with suballoc.offset, suballoc.size. - PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.hAllocation); - - // 3. Prepare for next iteration. - lastOffset = suballoc.offset + suballoc.size; - --nextAlloc2ndIndex; - } - // We are at the end. - else - { - if(lastOffset < size) - { - // There is free space from lastOffset to size. - const VkDeviceSize unusedRangeSize = size - lastOffset; - PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize); - } - - // End of loop. - lastOffset = size; - } - } - } - - PrintDetailedMap_End(json); -} -#endif // #if VMA_STATS_STRING_ENABLED - -bool VmaBlockMetadata_Linear::CreateAllocationRequest( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) -{ - VMA_ASSERT(allocSize > 0); - VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(pAllocationRequest != VMA_NULL); - VMA_HEAVY_ASSERT(Validate()); - return upperAddress ? - CreateAllocationRequest_UpperAddress( - currentFrameIndex, frameInUseCount, bufferImageGranularity, - allocSize, allocAlignment, allocType, canMakeOtherLost, strategy, pAllocationRequest) : - CreateAllocationRequest_LowerAddress( - currentFrameIndex, frameInUseCount, bufferImageGranularity, - allocSize, allocAlignment, allocType, canMakeOtherLost, strategy, pAllocationRequest); -} - -bool VmaBlockMetadata_Linear::CreateAllocationRequest_UpperAddress( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) -{ - const VkDeviceSize size = GetSize(); - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - - if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - VMA_ASSERT(0 && "Trying to use pool with linear algorithm as double stack, while it is already being used as ring buffer."); - return false; - } - - // Try to allocate before 2nd.back(), or end of block if 2nd.empty(). - if(allocSize > size) - { - return false; - } - VkDeviceSize resultBaseOffset = size - allocSize; - if(!suballocations2nd.empty()) - { - const VmaSuballocation& lastSuballoc = suballocations2nd.back(); - resultBaseOffset = lastSuballoc.offset - allocSize; - if(allocSize > lastSuballoc.offset) - { - return false; - } - } - - // Start from offset equal to end of free space. - VkDeviceSize resultOffset = resultBaseOffset; - - // Apply VMA_DEBUG_MARGIN at the end. - if(VMA_DEBUG_MARGIN > 0) - { - if(resultOffset < VMA_DEBUG_MARGIN) - { - return false; - } - resultOffset -= VMA_DEBUG_MARGIN; - } - - // Apply alignment. - resultOffset = VmaAlignDown(resultOffset, allocAlignment); - - // Check next suballocations from 2nd for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if(bufferImageGranularity > 1 && !suballocations2nd.empty()) - { - bool bufferImageGranularityConflict = false; - for(size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; ) - { - const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex]; - if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(nextSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if(bufferImageGranularityConflict) - { - resultOffset = VmaAlignDown(resultOffset, bufferImageGranularity); - } - } - - // There is enough free space. - const VkDeviceSize endOf1st = !suballocations1st.empty() ? - suballocations1st.back().offset + suballocations1st.back().size : - 0; - if(endOf1st + VMA_DEBUG_MARGIN <= resultOffset) - { - // Check previous suballocations for BufferImageGranularity conflicts. - // If conflict exists, allocation cannot be made here. - if(bufferImageGranularity > 1) - { - for(size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; ) - { - const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex]; - if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(allocType, prevSuballoc.type)) - { - return false; - } - } - else - { - // Already on next page. - break; - } - } - } - - // All tests passed: Success. - pAllocationRequest->offset = resultOffset; - pAllocationRequest->sumFreeSize = resultBaseOffset + allocSize - endOf1st; - pAllocationRequest->sumItemSize = 0; - // pAllocationRequest->item unused. - pAllocationRequest->itemsToMakeLostCount = 0; - pAllocationRequest->type = VmaAllocationRequestType::UpperAddress; - return true; - } - - return false; -} - -bool VmaBlockMetadata_Linear::CreateAllocationRequest_LowerAddress( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) -{ - const VkDeviceSize size = GetSize(); - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - - if(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - // Try to allocate at the end of 1st vector. - - VkDeviceSize resultBaseOffset = 0; - if(!suballocations1st.empty()) - { - const VmaSuballocation& lastSuballoc = suballocations1st.back(); - resultBaseOffset = lastSuballoc.offset + lastSuballoc.size; - } - - // Start from offset equal to beginning of free space. - VkDeviceSize resultOffset = resultBaseOffset; - - // Apply VMA_DEBUG_MARGIN at the beginning. - if(VMA_DEBUG_MARGIN > 0) - { - resultOffset += VMA_DEBUG_MARGIN; - } - - // Apply alignment. - resultOffset = VmaAlignUp(resultOffset, allocAlignment); - - // Check previous suballocations for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if(bufferImageGranularity > 1 && !suballocations1st.empty()) - { - bool bufferImageGranularityConflict = false; - for(size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; ) - { - const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex]; - if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if(bufferImageGranularityConflict) - { - resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity); - } - } - - const VkDeviceSize freeSpaceEnd = m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? - suballocations2nd.back().offset : size; - - // There is enough free space at the end after alignment. - if(resultOffset + allocSize + VMA_DEBUG_MARGIN <= freeSpaceEnd) - { - // Check next suballocations for BufferImageGranularity conflicts. - // If conflict exists, allocation cannot be made here. - if(bufferImageGranularity > 1 && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - for(size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; ) - { - const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex]; - if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) - { - return false; - } - } - else - { - // Already on previous page. - break; - } - } - } - - // All tests passed: Success. - pAllocationRequest->offset = resultOffset; - pAllocationRequest->sumFreeSize = freeSpaceEnd - resultBaseOffset; - pAllocationRequest->sumItemSize = 0; - // pAllocationRequest->item, customData unused. - pAllocationRequest->type = VmaAllocationRequestType::EndOf1st; - pAllocationRequest->itemsToMakeLostCount = 0; - return true; - } - } - - // Wrap-around to end of 2nd vector. Try to allocate there, watching for the - // beginning of 1st vector as the end of free space. - if(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - VMA_ASSERT(!suballocations1st.empty()); - - VkDeviceSize resultBaseOffset = 0; - if(!suballocations2nd.empty()) - { - const VmaSuballocation& lastSuballoc = suballocations2nd.back(); - resultBaseOffset = lastSuballoc.offset + lastSuballoc.size; - } - - // Start from offset equal to beginning of free space. - VkDeviceSize resultOffset = resultBaseOffset; - - // Apply VMA_DEBUG_MARGIN at the beginning. - if(VMA_DEBUG_MARGIN > 0) - { - resultOffset += VMA_DEBUG_MARGIN; - } - - // Apply alignment. - resultOffset = VmaAlignUp(resultOffset, allocAlignment); - - // Check previous suballocations for BufferImageGranularity conflicts. - // Make bigger alignment if necessary. - if(bufferImageGranularity > 1 && !suballocations2nd.empty()) - { - bool bufferImageGranularityConflict = false; - for(size_t prevSuballocIndex = suballocations2nd.size(); prevSuballocIndex--; ) - { - const VmaSuballocation& prevSuballoc = suballocations2nd[prevSuballocIndex]; - if(VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType)) - { - bufferImageGranularityConflict = true; - break; - } - } - else - // Already on previous page. - break; - } - if(bufferImageGranularityConflict) - { - resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity); - } - } - - pAllocationRequest->itemsToMakeLostCount = 0; - pAllocationRequest->sumItemSize = 0; - size_t index1st = m_1stNullItemsBeginCount; - - if(canMakeOtherLost) - { - while(index1st < suballocations1st.size() && - resultOffset + allocSize + VMA_DEBUG_MARGIN > suballocations1st[index1st].offset) - { - // Next colliding allocation at the beginning of 1st vector found. Try to make it lost. - const VmaSuballocation& suballoc = suballocations1st[index1st]; - if(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE) - { - // No problem. - } - else - { - VMA_ASSERT(suballoc.hAllocation != VK_NULL_HANDLE); - if(suballoc.hAllocation->CanBecomeLost() && - suballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex) - { - ++pAllocationRequest->itemsToMakeLostCount; - pAllocationRequest->sumItemSize += suballoc.size; - } - else - { - return false; - } - } - ++index1st; - } - - // Check next suballocations for BufferImageGranularity conflicts. - // If conflict exists, we must mark more allocations lost or fail. - if(bufferImageGranularity > 1) - { - while(index1st < suballocations1st.size()) - { - const VmaSuballocation& suballoc = suballocations1st[index1st]; - if(VmaBlocksOnSamePage(resultOffset, allocSize, suballoc.offset, bufferImageGranularity)) - { - if(suballoc.hAllocation != VK_NULL_HANDLE) - { - // Not checking actual VmaIsBufferImageGranularityConflict(allocType, suballoc.type). - if(suballoc.hAllocation->CanBecomeLost() && - suballoc.hAllocation->GetLastUseFrameIndex() + frameInUseCount < currentFrameIndex) - { - ++pAllocationRequest->itemsToMakeLostCount; - pAllocationRequest->sumItemSize += suballoc.size; - } - else - { - return false; - } - } - } - else - { - // Already on next page. - break; - } - ++index1st; - } - } - - // Special case: There is not enough room at the end for this allocation, even after making all from the 1st lost. - if(index1st == suballocations1st.size() && - resultOffset + allocSize + VMA_DEBUG_MARGIN > size) - { - // TODO: This is a known bug that it's not yet implemented and the allocation is failing. - VMA_DEBUG_LOG("Unsupported special case in custom pool with linear allocation algorithm used as ring buffer with allocations that can be lost."); - } - } - - // There is enough free space at the end after alignment. - if((index1st == suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN <= size) || - (index1st < suballocations1st.size() && resultOffset + allocSize + VMA_DEBUG_MARGIN <= suballocations1st[index1st].offset)) - { - // Check next suballocations for BufferImageGranularity conflicts. - // If conflict exists, allocation cannot be made here. - if(bufferImageGranularity > 1) - { - for(size_t nextSuballocIndex = index1st; - nextSuballocIndex < suballocations1st.size(); - nextSuballocIndex++) - { - const VmaSuballocation& nextSuballoc = suballocations1st[nextSuballocIndex]; - if(VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity)) - { - if(VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type)) - { - return false; - } - } - else - { - // Already on next page. - break; - } - } - } - - // All tests passed: Success. - pAllocationRequest->offset = resultOffset; - pAllocationRequest->sumFreeSize = - (index1st < suballocations1st.size() ? suballocations1st[index1st].offset : size) - - resultBaseOffset - - pAllocationRequest->sumItemSize; - pAllocationRequest->type = VmaAllocationRequestType::EndOf2nd; - // pAllocationRequest->item, customData unused. - return true; - } - } - - return false; -} - -bool VmaBlockMetadata_Linear::MakeRequestedAllocationsLost( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VmaAllocationRequest* pAllocationRequest) -{ - if(pAllocationRequest->itemsToMakeLostCount == 0) - { - return true; - } - - VMA_ASSERT(m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER); - - // We always start from 1st. - SuballocationVectorType* suballocations = &AccessSuballocations1st(); - size_t index = m_1stNullItemsBeginCount; - size_t madeLostCount = 0; - while(madeLostCount < pAllocationRequest->itemsToMakeLostCount) - { - if(index == suballocations->size()) - { - index = 0; - // If we get to the end of 1st, we wrap around to beginning of 2nd of 1st. - if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - suballocations = &AccessSuballocations2nd(); - } - // else: m_2ndVectorMode == SECOND_VECTOR_EMPTY: - // suballocations continues pointing at AccessSuballocations1st(). - VMA_ASSERT(!suballocations->empty()); - } - VmaSuballocation& suballoc = (*suballocations)[index]; - if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - { - VMA_ASSERT(suballoc.hAllocation != VK_NULL_HANDLE); - VMA_ASSERT(suballoc.hAllocation->CanBecomeLost()); - if(suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount)) - { - suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - suballoc.hAllocation = VK_NULL_HANDLE; - m_SumFreeSize += suballoc.size; - if(suballocations == &AccessSuballocations1st()) - { - ++m_1stNullItemsMiddleCount; - } - else - { - ++m_2ndNullItemsCount; - } - ++madeLostCount; - } - else - { - return false; - } - } - ++index; - } - - CleanupAfterFree(); - //VMA_HEAVY_ASSERT(Validate()); // Already called by ClanupAfterFree(). - - return true; -} - -uint32_t VmaBlockMetadata_Linear::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) -{ - uint32_t lostAllocationCount = 0; - - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - for(size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i) - { - VmaSuballocation& suballoc = suballocations1st[i]; - if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE && - suballoc.hAllocation->CanBecomeLost() && - suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount)) - { - suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - suballoc.hAllocation = VK_NULL_HANDLE; - ++m_1stNullItemsMiddleCount; - m_SumFreeSize += suballoc.size; - ++lostAllocationCount; - } - } - - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - for(size_t i = 0, count = suballocations2nd.size(); i < count; ++i) - { - VmaSuballocation& suballoc = suballocations2nd[i]; - if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE && - suballoc.hAllocation->CanBecomeLost() && - suballoc.hAllocation->MakeLost(currentFrameIndex, frameInUseCount)) - { - suballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - suballoc.hAllocation = VK_NULL_HANDLE; - ++m_2ndNullItemsCount; - m_SumFreeSize += suballoc.size; - ++lostAllocationCount; - } - } - - if(lostAllocationCount) - { - CleanupAfterFree(); - } - - return lostAllocationCount; -} - -VkResult VmaBlockMetadata_Linear::CheckCorruption(const void* pBlockData) -{ - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - for(size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i) - { - const VmaSuballocation& suballoc = suballocations1st[i]; - if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - { - if(!VmaValidateMagicValue(pBlockData, suballoc.offset - VMA_DEBUG_MARGIN)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!"); - return VK_ERROR_VALIDATION_FAILED_EXT; - } - if(!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); - return VK_ERROR_VALIDATION_FAILED_EXT; - } - } - } - - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - for(size_t i = 0, count = suballocations2nd.size(); i < count; ++i) - { - const VmaSuballocation& suballoc = suballocations2nd[i]; - if(suballoc.type != VMA_SUBALLOCATION_TYPE_FREE) - { - if(!VmaValidateMagicValue(pBlockData, suballoc.offset - VMA_DEBUG_MARGIN)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE VALIDATED ALLOCATION!"); - return VK_ERROR_VALIDATION_FAILED_EXT; - } - if(!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!"); - return VK_ERROR_VALIDATION_FAILED_EXT; - } - } - } - - return VK_SUCCESS; -} - -void VmaBlockMetadata_Linear::Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - VkDeviceSize allocSize, - VmaAllocation hAllocation) -{ - const VmaSuballocation newSuballoc = { request.offset, allocSize, hAllocation, type }; - - switch(request.type) - { - case VmaAllocationRequestType::UpperAddress: - { - VMA_ASSERT(m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER && - "CRITICAL ERROR: Trying to use linear allocator as double stack while it was already used as ring buffer."); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - suballocations2nd.push_back(newSuballoc); - m_2ndVectorMode = SECOND_VECTOR_DOUBLE_STACK; - } - break; - case VmaAllocationRequestType::EndOf1st: - { - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - - VMA_ASSERT(suballocations1st.empty() || - request.offset >= suballocations1st.back().offset + suballocations1st.back().size); - // Check if it fits before the end of the block. - VMA_ASSERT(request.offset + allocSize <= GetSize()); - - suballocations1st.push_back(newSuballoc); - } - break; - case VmaAllocationRequestType::EndOf2nd: - { - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - // New allocation at the end of 2-part ring buffer, so before first allocation from 1st vector. - VMA_ASSERT(!suballocations1st.empty() && - request.offset + allocSize <= suballocations1st[m_1stNullItemsBeginCount].offset); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - - switch(m_2ndVectorMode) - { - case SECOND_VECTOR_EMPTY: - // First allocation from second part ring buffer. - VMA_ASSERT(suballocations2nd.empty()); - m_2ndVectorMode = SECOND_VECTOR_RING_BUFFER; - break; - case SECOND_VECTOR_RING_BUFFER: - // 2-part ring buffer is already started. - VMA_ASSERT(!suballocations2nd.empty()); - break; - case SECOND_VECTOR_DOUBLE_STACK: - VMA_ASSERT(0 && "CRITICAL ERROR: Trying to use linear allocator as ring buffer while it was already used as double stack."); - break; - default: - VMA_ASSERT(0); - } - - suballocations2nd.push_back(newSuballoc); - } - break; - default: - VMA_ASSERT(0 && "CRITICAL INTERNAL ERROR."); - } - - m_SumFreeSize -= newSuballoc.size; -} - -void VmaBlockMetadata_Linear::Free(const VmaAllocation allocation) -{ - FreeAtOffset(allocation->GetOffset()); -} - -void VmaBlockMetadata_Linear::FreeAtOffset(VkDeviceSize offset) -{ - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - - if(!suballocations1st.empty()) - { - // First allocation: Mark it as next empty at the beginning. - VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount]; - if(firstSuballoc.offset == offset) - { - firstSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE; - firstSuballoc.hAllocation = VK_NULL_HANDLE; - m_SumFreeSize += firstSuballoc.size; - ++m_1stNullItemsBeginCount; - CleanupAfterFree(); - return; - } - } - - // Last allocation in 2-part ring buffer or top of upper stack (same logic). - if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER || - m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK) - { - VmaSuballocation& lastSuballoc = suballocations2nd.back(); - if(lastSuballoc.offset == offset) - { - m_SumFreeSize += lastSuballoc.size; - suballocations2nd.pop_back(); - CleanupAfterFree(); - return; - } - } - // Last allocation in 1st vector. - else if(m_2ndVectorMode == SECOND_VECTOR_EMPTY) - { - VmaSuballocation& lastSuballoc = suballocations1st.back(); - if(lastSuballoc.offset == offset) - { - m_SumFreeSize += lastSuballoc.size; - suballocations1st.pop_back(); - CleanupAfterFree(); - return; - } - } - - // Item from the middle of 1st vector. - { - VmaSuballocation refSuballoc; - refSuballoc.offset = offset; - // Rest of members stays uninitialized intentionally for better performance. - SuballocationVectorType::iterator it = VmaBinaryFindSorted( - suballocations1st.begin() + m_1stNullItemsBeginCount, - suballocations1st.end(), - refSuballoc, - VmaSuballocationOffsetLess()); - if(it != suballocations1st.end()) - { - it->type = VMA_SUBALLOCATION_TYPE_FREE; - it->hAllocation = VK_NULL_HANDLE; - ++m_1stNullItemsMiddleCount; - m_SumFreeSize += it->size; - CleanupAfterFree(); - return; - } - } - - if(m_2ndVectorMode != SECOND_VECTOR_EMPTY) - { - // Item from the middle of 2nd vector. - VmaSuballocation refSuballoc; - refSuballoc.offset = offset; - // Rest of members stays uninitialized intentionally for better performance. - SuballocationVectorType::iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ? - VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) : - VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater()); - if(it != suballocations2nd.end()) - { - it->type = VMA_SUBALLOCATION_TYPE_FREE; - it->hAllocation = VK_NULL_HANDLE; - ++m_2ndNullItemsCount; - m_SumFreeSize += it->size; - CleanupAfterFree(); - return; - } - } - - VMA_ASSERT(0 && "Allocation to free not found in linear allocator!"); -} - -bool VmaBlockMetadata_Linear::ShouldCompact1st() const -{ - const size_t nullItemCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount; - const size_t suballocCount = AccessSuballocations1st().size(); - return suballocCount > 32 && nullItemCount * 2 >= (suballocCount - nullItemCount) * 3; -} - -void VmaBlockMetadata_Linear::CleanupAfterFree() -{ - SuballocationVectorType& suballocations1st = AccessSuballocations1st(); - SuballocationVectorType& suballocations2nd = AccessSuballocations2nd(); - - if(IsEmpty()) - { - suballocations1st.clear(); - suballocations2nd.clear(); - m_1stNullItemsBeginCount = 0; - m_1stNullItemsMiddleCount = 0; - m_2ndNullItemsCount = 0; - m_2ndVectorMode = SECOND_VECTOR_EMPTY; - } - else - { - const size_t suballoc1stCount = suballocations1st.size(); - const size_t nullItem1stCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount; - VMA_ASSERT(nullItem1stCount <= suballoc1stCount); - - // Find more null items at the beginning of 1st vector. - while(m_1stNullItemsBeginCount < suballoc1stCount && - suballocations1st[m_1stNullItemsBeginCount].hAllocation == VK_NULL_HANDLE) - { - ++m_1stNullItemsBeginCount; - --m_1stNullItemsMiddleCount; - } - - // Find more null items at the end of 1st vector. - while(m_1stNullItemsMiddleCount > 0 && - suballocations1st.back().hAllocation == VK_NULL_HANDLE) - { - --m_1stNullItemsMiddleCount; - suballocations1st.pop_back(); - } - - // Find more null items at the end of 2nd vector. - while(m_2ndNullItemsCount > 0 && - suballocations2nd.back().hAllocation == VK_NULL_HANDLE) - { - --m_2ndNullItemsCount; - suballocations2nd.pop_back(); - } - - // Find more null items at the beginning of 2nd vector. - while(m_2ndNullItemsCount > 0 && - suballocations2nd[0].hAllocation == VK_NULL_HANDLE) - { - --m_2ndNullItemsCount; - VmaVectorRemove(suballocations2nd, 0); - } - - if(ShouldCompact1st()) - { - const size_t nonNullItemCount = suballoc1stCount - nullItem1stCount; - size_t srcIndex = m_1stNullItemsBeginCount; - for(size_t dstIndex = 0; dstIndex < nonNullItemCount; ++dstIndex) - { - while(suballocations1st[srcIndex].hAllocation == VK_NULL_HANDLE) - { - ++srcIndex; - } - if(dstIndex != srcIndex) - { - suballocations1st[dstIndex] = suballocations1st[srcIndex]; - } - ++srcIndex; - } - suballocations1st.resize(nonNullItemCount); - m_1stNullItemsBeginCount = 0; - m_1stNullItemsMiddleCount = 0; - } - - // 2nd vector became empty. - if(suballocations2nd.empty()) - { - m_2ndVectorMode = SECOND_VECTOR_EMPTY; - } - - // 1st vector became empty. - if(suballocations1st.size() - m_1stNullItemsBeginCount == 0) - { - suballocations1st.clear(); - m_1stNullItemsBeginCount = 0; - - if(!suballocations2nd.empty() && m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER) - { - // Swap 1st with 2nd. Now 2nd is empty. - m_2ndVectorMode = SECOND_VECTOR_EMPTY; - m_1stNullItemsMiddleCount = m_2ndNullItemsCount; - while(m_1stNullItemsBeginCount < suballocations2nd.size() && - suballocations2nd[m_1stNullItemsBeginCount].hAllocation == VK_NULL_HANDLE) - { - ++m_1stNullItemsBeginCount; - --m_1stNullItemsMiddleCount; - } - m_2ndNullItemsCount = 0; - m_1stVectorIndex ^= 1; - } - } - } - - VMA_HEAVY_ASSERT(Validate()); -} - - -//////////////////////////////////////////////////////////////////////////////// -// class VmaBlockMetadata_Buddy - -VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(VmaAllocator hAllocator) : - VmaBlockMetadata(hAllocator), - m_Root(VMA_NULL), - m_AllocationCount(0), - m_FreeCount(1), - m_SumFreeSize(0) -{ - memset(m_FreeList, 0, sizeof(m_FreeList)); -} - -VmaBlockMetadata_Buddy::~VmaBlockMetadata_Buddy() -{ - DeleteNode(m_Root); -} - -void VmaBlockMetadata_Buddy::Init(VkDeviceSize size) -{ - VmaBlockMetadata::Init(size); - - m_UsableSize = VmaPrevPow2(size); - m_SumFreeSize = m_UsableSize; - - // Calculate m_LevelCount. - m_LevelCount = 1; - while(m_LevelCount < MAX_LEVELS && - LevelToNodeSize(m_LevelCount) >= MIN_NODE_SIZE) - { - ++m_LevelCount; - } - - Node* rootNode = vma_new(GetAllocationCallbacks(), Node)(); - rootNode->offset = 0; - rootNode->type = Node::TYPE_FREE; - rootNode->parent = VMA_NULL; - rootNode->buddy = VMA_NULL; - - m_Root = rootNode; - AddToFreeListFront(0, rootNode); -} - -bool VmaBlockMetadata_Buddy::Validate() const -{ - // Validate tree. - ValidationContext ctx; - if(!ValidateNode(ctx, VMA_NULL, m_Root, 0, LevelToNodeSize(0))) - { - VMA_VALIDATE(false && "ValidateNode failed."); - } - VMA_VALIDATE(m_AllocationCount == ctx.calculatedAllocationCount); - VMA_VALIDATE(m_SumFreeSize == ctx.calculatedSumFreeSize); - - // Validate free node lists. - for(uint32_t level = 0; level < m_LevelCount; ++level) - { - VMA_VALIDATE(m_FreeList[level].front == VMA_NULL || - m_FreeList[level].front->free.prev == VMA_NULL); - - for(Node* node = m_FreeList[level].front; - node != VMA_NULL; - node = node->free.next) - { - VMA_VALIDATE(node->type == Node::TYPE_FREE); - - if(node->free.next == VMA_NULL) - { - VMA_VALIDATE(m_FreeList[level].back == node); - } - else - { - VMA_VALIDATE(node->free.next->free.prev == node); - } - } - } - - // Validate that free lists ar higher levels are empty. - for(uint32_t level = m_LevelCount; level < MAX_LEVELS; ++level) - { - VMA_VALIDATE(m_FreeList[level].front == VMA_NULL && m_FreeList[level].back == VMA_NULL); - } - - return true; -} - -VkDeviceSize VmaBlockMetadata_Buddy::GetUnusedRangeSizeMax() const -{ - for(uint32_t level = 0; level < m_LevelCount; ++level) - { - if(m_FreeList[level].front != VMA_NULL) - { - return LevelToNodeSize(level); - } - } - return 0; -} - -void VmaBlockMetadata_Buddy::CalcAllocationStatInfo(VmaStatInfo& outInfo) const -{ - const VkDeviceSize unusableSize = GetUnusableSize(); - - outInfo.blockCount = 1; - - outInfo.allocationCount = outInfo.unusedRangeCount = 0; - outInfo.usedBytes = outInfo.unusedBytes = 0; - - outInfo.allocationSizeMax = outInfo.unusedRangeSizeMax = 0; - outInfo.allocationSizeMin = outInfo.unusedRangeSizeMin = UINT64_MAX; - outInfo.allocationSizeAvg = outInfo.unusedRangeSizeAvg = 0; // Unused. - - CalcAllocationStatInfoNode(outInfo, m_Root, LevelToNodeSize(0)); - - if(unusableSize > 0) - { - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += unusableSize; - outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, unusableSize); - outInfo.unusedRangeSizeMin = VMA_MIN(outInfo.unusedRangeSizeMin, unusableSize); - } -} - -void VmaBlockMetadata_Buddy::AddPoolStats(VmaPoolStats& inoutStats) const -{ - const VkDeviceSize unusableSize = GetUnusableSize(); - - inoutStats.size += GetSize(); - inoutStats.unusedSize += m_SumFreeSize + unusableSize; - inoutStats.allocationCount += m_AllocationCount; - inoutStats.unusedRangeCount += m_FreeCount; - inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, GetUnusedRangeSizeMax()); - - if(unusableSize > 0) - { - ++inoutStats.unusedRangeCount; - // Not updating inoutStats.unusedRangeSizeMax with unusableSize because this space is not available for allocations. - } -} - -#if VMA_STATS_STRING_ENABLED - -void VmaBlockMetadata_Buddy::PrintDetailedMap(class VmaJsonWriter& json) const -{ - // TODO optimize - VmaStatInfo stat; - CalcAllocationStatInfo(stat); - - PrintDetailedMap_Begin( - json, - stat.unusedBytes, - stat.allocationCount, - stat.unusedRangeCount); - - PrintDetailedMapNode(json, m_Root, LevelToNodeSize(0)); - - const VkDeviceSize unusableSize = GetUnusableSize(); - if(unusableSize > 0) - { - PrintDetailedMap_UnusedRange(json, - m_UsableSize, // offset - unusableSize); // size - } - - PrintDetailedMap_End(json); -} - -#endif // #if VMA_STATS_STRING_ENABLED - -bool VmaBlockMetadata_Buddy::CreateAllocationRequest( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, - bool canMakeOtherLost, - uint32_t strategy, - VmaAllocationRequest* pAllocationRequest) -{ - VMA_ASSERT(!upperAddress && "VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm."); - - // Simple way to respect bufferImageGranularity. May be optimized some day. - // Whenever it might be an OPTIMAL image... - if(allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN || - allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN || - allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL) - { - allocAlignment = VMA_MAX(allocAlignment, bufferImageGranularity); - allocSize = VMA_MAX(allocSize, bufferImageGranularity); - } - - if(allocSize > m_UsableSize) - { - return false; - } - - const uint32_t targetLevel = AllocSizeToLevel(allocSize); - for(uint32_t level = targetLevel + 1; level--; ) - { - for(Node* freeNode = m_FreeList[level].front; - freeNode != VMA_NULL; - freeNode = freeNode->free.next) - { - if(freeNode->offset % allocAlignment == 0) - { - pAllocationRequest->type = VmaAllocationRequestType::Normal; - pAllocationRequest->offset = freeNode->offset; - pAllocationRequest->sumFreeSize = LevelToNodeSize(level); - pAllocationRequest->sumItemSize = 0; - pAllocationRequest->itemsToMakeLostCount = 0; - pAllocationRequest->customData = (void*)(uintptr_t)level; - return true; - } - } - } - - return false; -} - -bool VmaBlockMetadata_Buddy::MakeRequestedAllocationsLost( - uint32_t currentFrameIndex, - uint32_t frameInUseCount, - VmaAllocationRequest* pAllocationRequest) -{ - /* - Lost allocations are not supported in buddy allocator at the moment. - Support might be added in the future. - */ - return pAllocationRequest->itemsToMakeLostCount == 0; -} - -uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) -{ - /* - Lost allocations are not supported in buddy allocator at the moment. - Support might be added in the future. - */ - return 0; -} - -void VmaBlockMetadata_Buddy::Alloc( - const VmaAllocationRequest& request, - VmaSuballocationType type, - VkDeviceSize allocSize, - VmaAllocation hAllocation) -{ - VMA_ASSERT(request.type == VmaAllocationRequestType::Normal); - - const uint32_t targetLevel = AllocSizeToLevel(allocSize); - uint32_t currLevel = (uint32_t)(uintptr_t)request.customData; - - Node* currNode = m_FreeList[currLevel].front; - VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE); - while(currNode->offset != request.offset) - { - currNode = currNode->free.next; - VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE); - } - - // Go down, splitting free nodes. - while(currLevel < targetLevel) - { - // currNode is already first free node at currLevel. - // Remove it from list of free nodes at this currLevel. - RemoveFromFreeList(currLevel, currNode); - - const uint32_t childrenLevel = currLevel + 1; - - // Create two free sub-nodes. - Node* leftChild = vma_new(GetAllocationCallbacks(), Node)(); - Node* rightChild = vma_new(GetAllocationCallbacks(), Node)(); - - leftChild->offset = currNode->offset; - leftChild->type = Node::TYPE_FREE; - leftChild->parent = currNode; - leftChild->buddy = rightChild; - - rightChild->offset = currNode->offset + LevelToNodeSize(childrenLevel); - rightChild->type = Node::TYPE_FREE; - rightChild->parent = currNode; - rightChild->buddy = leftChild; - - // Convert current currNode to split type. - currNode->type = Node::TYPE_SPLIT; - currNode->split.leftChild = leftChild; - - // Add child nodes to free list. Order is important! - AddToFreeListFront(childrenLevel, rightChild); - AddToFreeListFront(childrenLevel, leftChild); - - ++m_FreeCount; - //m_SumFreeSize -= LevelToNodeSize(currLevel) % 2; // Useful only when level node sizes can be non power of 2. - ++currLevel; - currNode = m_FreeList[currLevel].front; - - /* - We can be sure that currNode, as left child of node previously split, - also fullfills the alignment requirement. - */ - } - - // Remove from free list. - VMA_ASSERT(currLevel == targetLevel && - currNode != VMA_NULL && - currNode->type == Node::TYPE_FREE); - RemoveFromFreeList(currLevel, currNode); - - // Convert to allocation node. - currNode->type = Node::TYPE_ALLOCATION; - currNode->allocation.alloc = hAllocation; - - ++m_AllocationCount; - --m_FreeCount; - m_SumFreeSize -= allocSize; -} - -void VmaBlockMetadata_Buddy::DeleteNode(Node* node) -{ - if(node->type == Node::TYPE_SPLIT) - { - DeleteNode(node->split.leftChild->buddy); - DeleteNode(node->split.leftChild); - } - - vma_delete(GetAllocationCallbacks(), node); -} - -bool VmaBlockMetadata_Buddy::ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const -{ - VMA_VALIDATE(level < m_LevelCount); - VMA_VALIDATE(curr->parent == parent); - VMA_VALIDATE((curr->buddy == VMA_NULL) == (parent == VMA_NULL)); - VMA_VALIDATE(curr->buddy == VMA_NULL || curr->buddy->buddy == curr); - switch(curr->type) - { - case Node::TYPE_FREE: - // curr->free.prev, next are validated separately. - ctx.calculatedSumFreeSize += levelNodeSize; - ++ctx.calculatedFreeCount; - break; - case Node::TYPE_ALLOCATION: - ++ctx.calculatedAllocationCount; - ctx.calculatedSumFreeSize += levelNodeSize - curr->allocation.alloc->GetSize(); - VMA_VALIDATE(curr->allocation.alloc != VK_NULL_HANDLE); - break; - case Node::TYPE_SPLIT: - { - const uint32_t childrenLevel = level + 1; - const VkDeviceSize childrenLevelNodeSize = levelNodeSize / 2; - const Node* const leftChild = curr->split.leftChild; - VMA_VALIDATE(leftChild != VMA_NULL); - VMA_VALIDATE(leftChild->offset == curr->offset); - if(!ValidateNode(ctx, curr, leftChild, childrenLevel, childrenLevelNodeSize)) - { - VMA_VALIDATE(false && "ValidateNode for left child failed."); - } - const Node* const rightChild = leftChild->buddy; - VMA_VALIDATE(rightChild->offset == curr->offset + childrenLevelNodeSize); - if(!ValidateNode(ctx, curr, rightChild, childrenLevel, childrenLevelNodeSize)) - { - VMA_VALIDATE(false && "ValidateNode for right child failed."); - } - } - break; - default: - return false; - } - - return true; -} - -uint32_t VmaBlockMetadata_Buddy::AllocSizeToLevel(VkDeviceSize allocSize) const -{ - // I know this could be optimized somehow e.g. by using std::log2p1 from C++20. - uint32_t level = 0; - VkDeviceSize currLevelNodeSize = m_UsableSize; - VkDeviceSize nextLevelNodeSize = currLevelNodeSize >> 1; - while(allocSize <= nextLevelNodeSize && level + 1 < m_LevelCount) - { - ++level; - currLevelNodeSize = nextLevelNodeSize; - nextLevelNodeSize = currLevelNodeSize >> 1; - } - return level; -} - -void VmaBlockMetadata_Buddy::FreeAtOffset(VmaAllocation alloc, VkDeviceSize offset) -{ - // Find node and level. - Node* node = m_Root; - VkDeviceSize nodeOffset = 0; - uint32_t level = 0; - VkDeviceSize levelNodeSize = LevelToNodeSize(0); - while(node->type == Node::TYPE_SPLIT) - { - const VkDeviceSize nextLevelSize = levelNodeSize >> 1; - if(offset < nodeOffset + nextLevelSize) - { - node = node->split.leftChild; - } - else - { - node = node->split.leftChild->buddy; - nodeOffset += nextLevelSize; - } - ++level; - levelNodeSize = nextLevelSize; - } - - VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION); - VMA_ASSERT(alloc == VK_NULL_HANDLE || node->allocation.alloc == alloc); - - ++m_FreeCount; - --m_AllocationCount; - m_SumFreeSize += alloc->GetSize(); - - node->type = Node::TYPE_FREE; - - // Join free nodes if possible. - while(level > 0 && node->buddy->type == Node::TYPE_FREE) - { - RemoveFromFreeList(level, node->buddy); - Node* const parent = node->parent; - - vma_delete(GetAllocationCallbacks(), node->buddy); - vma_delete(GetAllocationCallbacks(), node); - parent->type = Node::TYPE_FREE; - - node = parent; - --level; - //m_SumFreeSize += LevelToNodeSize(level) % 2; // Useful only when level node sizes can be non power of 2. - --m_FreeCount; - } - - AddToFreeListFront(level, node); -} - -void VmaBlockMetadata_Buddy::CalcAllocationStatInfoNode(VmaStatInfo& outInfo, const Node* node, VkDeviceSize levelNodeSize) const -{ - switch(node->type) - { - case Node::TYPE_FREE: - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += levelNodeSize; - outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, levelNodeSize); - outInfo.unusedRangeSizeMin = VMA_MAX(outInfo.unusedRangeSizeMin, levelNodeSize); - break; - case Node::TYPE_ALLOCATION: - { - const VkDeviceSize allocSize = node->allocation.alloc->GetSize(); - ++outInfo.allocationCount; - outInfo.usedBytes += allocSize; - outInfo.allocationSizeMax = VMA_MAX(outInfo.allocationSizeMax, allocSize); - outInfo.allocationSizeMin = VMA_MAX(outInfo.allocationSizeMin, allocSize); - - const VkDeviceSize unusedRangeSize = levelNodeSize - allocSize; - if(unusedRangeSize > 0) - { - ++outInfo.unusedRangeCount; - outInfo.unusedBytes += unusedRangeSize; - outInfo.unusedRangeSizeMax = VMA_MAX(outInfo.unusedRangeSizeMax, unusedRangeSize); - outInfo.unusedRangeSizeMin = VMA_MAX(outInfo.unusedRangeSizeMin, unusedRangeSize); - } - } - break; - case Node::TYPE_SPLIT: - { - const VkDeviceSize childrenNodeSize = levelNodeSize / 2; - const Node* const leftChild = node->split.leftChild; - CalcAllocationStatInfoNode(outInfo, leftChild, childrenNodeSize); - const Node* const rightChild = leftChild->buddy; - CalcAllocationStatInfoNode(outInfo, rightChild, childrenNodeSize); - } - break; - default: - VMA_ASSERT(0); - } -} - -void VmaBlockMetadata_Buddy::AddToFreeListFront(uint32_t level, Node* node) -{ - VMA_ASSERT(node->type == Node::TYPE_FREE); - - // List is empty. - Node* const frontNode = m_FreeList[level].front; - if(frontNode == VMA_NULL) - { - VMA_ASSERT(m_FreeList[level].back == VMA_NULL); - node->free.prev = node->free.next = VMA_NULL; - m_FreeList[level].front = m_FreeList[level].back = node; - } - else - { - VMA_ASSERT(frontNode->free.prev == VMA_NULL); - node->free.prev = VMA_NULL; - node->free.next = frontNode; - frontNode->free.prev = node; - m_FreeList[level].front = node; - } -} - -void VmaBlockMetadata_Buddy::RemoveFromFreeList(uint32_t level, Node* node) -{ - VMA_ASSERT(m_FreeList[level].front != VMA_NULL); - - // It is at the front. - if(node->free.prev == VMA_NULL) - { - VMA_ASSERT(m_FreeList[level].front == node); - m_FreeList[level].front = node->free.next; - } - else - { - Node* const prevFreeNode = node->free.prev; - VMA_ASSERT(prevFreeNode->free.next == node); - prevFreeNode->free.next = node->free.next; - } - - // It is at the back. - if(node->free.next == VMA_NULL) - { - VMA_ASSERT(m_FreeList[level].back == node); - m_FreeList[level].back = node->free.prev; - } - else - { - Node* const nextFreeNode = node->free.next; - VMA_ASSERT(nextFreeNode->free.prev == node); - nextFreeNode->free.prev = node->free.prev; - } -} - -#if VMA_STATS_STRING_ENABLED -void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const -{ - switch(node->type) - { - case Node::TYPE_FREE: - PrintDetailedMap_UnusedRange(json, node->offset, levelNodeSize); - break; - case Node::TYPE_ALLOCATION: - { - PrintDetailedMap_Allocation(json, node->offset, node->allocation.alloc); - const VkDeviceSize allocSize = node->allocation.alloc->GetSize(); - if(allocSize < levelNodeSize) - { - PrintDetailedMap_UnusedRange(json, node->offset + allocSize, levelNodeSize - allocSize); - } - } - break; - case Node::TYPE_SPLIT: - { - const VkDeviceSize childrenNodeSize = levelNodeSize / 2; - const Node* const leftChild = node->split.leftChild; - PrintDetailedMapNode(json, leftChild, childrenNodeSize); - const Node* const rightChild = leftChild->buddy; - PrintDetailedMapNode(json, rightChild, childrenNodeSize); - } - break; - default: - VMA_ASSERT(0); - } -} -#endif // #if VMA_STATS_STRING_ENABLED - - -//////////////////////////////////////////////////////////////////////////////// -// class VmaDeviceMemoryBlock - -VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator) : - m_pMetadata(VMA_NULL), - m_MemoryTypeIndex(UINT32_MAX), - m_Id(0), - m_hMemory(VK_NULL_HANDLE), - m_MapCount(0), - m_pMappedData(VMA_NULL) -{ -} - -void VmaDeviceMemoryBlock::Init( - VmaAllocator hAllocator, - VmaPool hParentPool, - uint32_t newMemoryTypeIndex, - VkDeviceMemory newMemory, - VkDeviceSize newSize, - uint32_t id, - uint32_t algorithm) -{ - VMA_ASSERT(m_hMemory == VK_NULL_HANDLE); - - m_hParentPool = hParentPool; - m_MemoryTypeIndex = newMemoryTypeIndex; - m_Id = id; - m_hMemory = newMemory; - - switch(algorithm) - { - case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT: - m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator); - break; - case VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT: - m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Buddy)(hAllocator); - break; - default: - VMA_ASSERT(0); - // Fall-through. - case 0: - m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Generic)(hAllocator); - } - m_pMetadata->Init(newSize); -} - -void VmaDeviceMemoryBlock::Destroy(VmaAllocator allocator) -{ - // This is the most important assert in the entire library. - // Hitting it means you have some memory leak - unreleased VmaAllocation objects. - VMA_ASSERT(m_pMetadata->IsEmpty() && "Some allocations were not freed before destruction of this memory block!"); - - VMA_ASSERT(m_hMemory != VK_NULL_HANDLE); - allocator->FreeVulkanMemory(m_MemoryTypeIndex, m_pMetadata->GetSize(), m_hMemory); - m_hMemory = VK_NULL_HANDLE; - - vma_delete(allocator, m_pMetadata); - m_pMetadata = VMA_NULL; -} - -bool VmaDeviceMemoryBlock::Validate() const -{ - VMA_VALIDATE((m_hMemory != VK_NULL_HANDLE) && - (m_pMetadata->GetSize() != 0)); - - return m_pMetadata->Validate(); -} - -VkResult VmaDeviceMemoryBlock::CheckCorruption(VmaAllocator hAllocator) -{ - void* pData = nullptr; - VkResult res = Map(hAllocator, 1, &pData); - if(res != VK_SUCCESS) - { - return res; - } - - res = m_pMetadata->CheckCorruption(pData); - - Unmap(hAllocator, 1); - - return res; -} - -VkResult VmaDeviceMemoryBlock::Map(VmaAllocator hAllocator, uint32_t count, void** ppData) -{ - if(count == 0) - { - return VK_SUCCESS; - } - - VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex); - if(m_MapCount != 0) - { - m_MapCount += count; - VMA_ASSERT(m_pMappedData != VMA_NULL); - if(ppData != VMA_NULL) - { - *ppData = m_pMappedData; - } - return VK_SUCCESS; - } - else - { - VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)( - hAllocator->m_hDevice, - m_hMemory, - 0, // offset - VK_WHOLE_SIZE, - 0, // flags - &m_pMappedData); - if(result == VK_SUCCESS) - { - if(ppData != VMA_NULL) - { - *ppData = m_pMappedData; - } - m_MapCount = count; - } - return result; - } -} - -void VmaDeviceMemoryBlock::Unmap(VmaAllocator hAllocator, uint32_t count) -{ - if(count == 0) - { - return; - } - - VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex); - if(m_MapCount >= count) - { - m_MapCount -= count; - if(m_MapCount == 0) - { - m_pMappedData = VMA_NULL; - (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory); - } - } - else - { - VMA_ASSERT(0 && "VkDeviceMemory block is being unmapped while it was not previously mapped."); - } -} - -VkResult VmaDeviceMemoryBlock::WriteMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize) -{ - VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION); - VMA_ASSERT(allocOffset >= VMA_DEBUG_MARGIN); - - void* pData; - VkResult res = Map(hAllocator, 1, &pData); - if(res != VK_SUCCESS) - { - return res; - } - - VmaWriteMagicValue(pData, allocOffset - VMA_DEBUG_MARGIN); - VmaWriteMagicValue(pData, allocOffset + allocSize); - - Unmap(hAllocator, 1); - - return VK_SUCCESS; -} - -VkResult VmaDeviceMemoryBlock::ValidateMagicValueAroundAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize) -{ - VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION); - VMA_ASSERT(allocOffset >= VMA_DEBUG_MARGIN); - - void* pData; - VkResult res = Map(hAllocator, 1, &pData); - if(res != VK_SUCCESS) - { - return res; - } - - if(!VmaValidateMagicValue(pData, allocOffset - VMA_DEBUG_MARGIN)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED BEFORE FREED ALLOCATION!"); - } - else if(!VmaValidateMagicValue(pData, allocOffset + allocSize)) - { - VMA_ASSERT(0 && "MEMORY CORRUPTION DETECTED AFTER FREED ALLOCATION!"); - } - - Unmap(hAllocator, 1); - - return VK_SUCCESS; -} - -VkResult VmaDeviceMemoryBlock::BindBufferMemory( - const VmaAllocator hAllocator, - const VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkBuffer hBuffer, - const void* pNext) -{ - VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK && - hAllocation->GetBlock() == this); - VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() && - "Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?"); - const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset; - // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads. - VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex); - return hAllocator->BindVulkanBuffer(m_hMemory, memoryOffset, hBuffer, pNext); -} - -VkResult VmaDeviceMemoryBlock::BindImageMemory( - const VmaAllocator hAllocator, - const VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkImage hImage, - const void* pNext) -{ - VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK && - hAllocation->GetBlock() == this); - VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() && - "Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?"); - const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset; - // This lock is important so that we don't call vkBind... and/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads. - VmaMutexLock lock(m_Mutex, hAllocator->m_UseMutex); - return hAllocator->BindVulkanImage(m_hMemory, memoryOffset, hImage, pNext); -} - -static void InitStatInfo(VmaStatInfo& outInfo) -{ - memset(&outInfo, 0, sizeof(outInfo)); - outInfo.allocationSizeMin = UINT64_MAX; - outInfo.unusedRangeSizeMin = UINT64_MAX; -} - -// Adds statistics srcInfo into inoutInfo, like: inoutInfo += srcInfo. -static void VmaAddStatInfo(VmaStatInfo& inoutInfo, const VmaStatInfo& srcInfo) -{ - inoutInfo.blockCount += srcInfo.blockCount; - inoutInfo.allocationCount += srcInfo.allocationCount; - inoutInfo.unusedRangeCount += srcInfo.unusedRangeCount; - inoutInfo.usedBytes += srcInfo.usedBytes; - inoutInfo.unusedBytes += srcInfo.unusedBytes; - inoutInfo.allocationSizeMin = VMA_MIN(inoutInfo.allocationSizeMin, srcInfo.allocationSizeMin); - inoutInfo.allocationSizeMax = VMA_MAX(inoutInfo.allocationSizeMax, srcInfo.allocationSizeMax); - inoutInfo.unusedRangeSizeMin = VMA_MIN(inoutInfo.unusedRangeSizeMin, srcInfo.unusedRangeSizeMin); - inoutInfo.unusedRangeSizeMax = VMA_MAX(inoutInfo.unusedRangeSizeMax, srcInfo.unusedRangeSizeMax); -} - -static void VmaPostprocessCalcStatInfo(VmaStatInfo& inoutInfo) -{ - inoutInfo.allocationSizeAvg = (inoutInfo.allocationCount > 0) ? - VmaRoundDiv(inoutInfo.usedBytes, inoutInfo.allocationCount) : 0; - inoutInfo.unusedRangeSizeAvg = (inoutInfo.unusedRangeCount > 0) ? - VmaRoundDiv(inoutInfo.unusedBytes, inoutInfo.unusedRangeCount) : 0; -} - -VmaPool_T::VmaPool_T( - VmaAllocator hAllocator, - const VmaPoolCreateInfo& createInfo, - VkDeviceSize preferredBlockSize) : - m_BlockVector( - hAllocator, - this, // hParentPool - createInfo.memoryTypeIndex, - createInfo.blockSize != 0 ? createInfo.blockSize : preferredBlockSize, - createInfo.minBlockCount, - createInfo.maxBlockCount, - (createInfo.flags & VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(), - createInfo.frameInUseCount, - createInfo.blockSize != 0, // explicitBlockSize - createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK), // algorithm - m_Id(0), - m_Name(VMA_NULL) -{ -} - -VmaPool_T::~VmaPool_T() -{ -} - -void VmaPool_T::SetName(const char* pName) -{ - const VkAllocationCallbacks* allocs = m_BlockVector.GetAllocator()->GetAllocationCallbacks(); - VmaFreeString(allocs, m_Name); - - if(pName != VMA_NULL) - { - m_Name = VmaCreateStringCopy(allocs, pName); - } - else - { - m_Name = VMA_NULL; - } -} - -#if VMA_STATS_STRING_ENABLED - -#endif // #if VMA_STATS_STRING_ENABLED - -VmaBlockVector::VmaBlockVector( - VmaAllocator hAllocator, - VmaPool hParentPool, - uint32_t memoryTypeIndex, - VkDeviceSize preferredBlockSize, - size_t minBlockCount, - size_t maxBlockCount, - VkDeviceSize bufferImageGranularity, - uint32_t frameInUseCount, - bool explicitBlockSize, - uint32_t algorithm) : - m_hAllocator(hAllocator), - m_hParentPool(hParentPool), - m_MemoryTypeIndex(memoryTypeIndex), - m_PreferredBlockSize(preferredBlockSize), - m_MinBlockCount(minBlockCount), - m_MaxBlockCount(maxBlockCount), - m_BufferImageGranularity(bufferImageGranularity), - m_FrameInUseCount(frameInUseCount), - m_ExplicitBlockSize(explicitBlockSize), - m_Algorithm(algorithm), - m_HasEmptyBlock(false), - m_Blocks(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), - m_NextBlockId(0) -{ -} - -VmaBlockVector::~VmaBlockVector() -{ - for(size_t i = m_Blocks.size(); i--; ) - { - m_Blocks[i]->Destroy(m_hAllocator); - vma_delete(m_hAllocator, m_Blocks[i]); - } -} - -VkResult VmaBlockVector::CreateMinBlocks() -{ - for(size_t i = 0; i < m_MinBlockCount; ++i) - { - VkResult res = CreateBlock(m_PreferredBlockSize, VMA_NULL); - if(res != VK_SUCCESS) - { - return res; - } - } - return VK_SUCCESS; -} - -void VmaBlockVector::GetPoolStats(VmaPoolStats* pStats) -{ - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - - const size_t blockCount = m_Blocks.size(); - - pStats->size = 0; - pStats->unusedSize = 0; - pStats->allocationCount = 0; - pStats->unusedRangeCount = 0; - pStats->unusedRangeSizeMax = 0; - pStats->blockCount = blockCount; - - for(uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) - { - const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pBlock); - VMA_HEAVY_ASSERT(pBlock->Validate()); - pBlock->m_pMetadata->AddPoolStats(*pStats); - } -} - -bool VmaBlockVector::IsEmpty() -{ - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - return m_Blocks.empty(); -} - -bool VmaBlockVector::IsCorruptionDetectionEnabled() const -{ - const uint32_t requiredMemFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; - return (VMA_DEBUG_DETECT_CORRUPTION != 0) && - (VMA_DEBUG_MARGIN > 0) && - (m_Algorithm == 0 || m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) && - (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & requiredMemFlags) == requiredMemFlags; -} - -static const uint32_t VMA_ALLOCATION_TRY_COUNT = 32; - -VkResult VmaBlockVector::Allocate( - uint32_t currentFrameIndex, - VkDeviceSize size, - VkDeviceSize alignment, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations) -{ - size_t allocIndex; - VkResult res = VK_SUCCESS; - - if(IsCorruptionDetectionEnabled()) - { - size = VmaAlignUp(size, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE)); - alignment = VmaAlignUp(alignment, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE)); - } - - { - VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); - for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex) - { - res = AllocatePage( - currentFrameIndex, - size, - alignment, - createInfo, - suballocType, - pAllocations + allocIndex); - if(res != VK_SUCCESS) - { - break; - } - } - } - - if(res != VK_SUCCESS) - { - // Free all already created allocations. - while(allocIndex--) - { - Free(pAllocations[allocIndex]); - } - memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); - } - - return res; -} - -VkResult VmaBlockVector::AllocatePage( - uint32_t currentFrameIndex, - VkDeviceSize size, - VkDeviceSize alignment, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - VmaAllocation* pAllocation) -{ - const bool isUpperAddress = (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0; - bool canMakeOtherLost = (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT) != 0; - const bool mapped = (createInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0; - const bool isUserDataString = (createInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0; - - const bool withinBudget = (createInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0; - VkDeviceSize freeMemory; - { - const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex); - VmaBudget heapBudget = {}; - m_hAllocator->GetBudget(&heapBudget, heapIndex, 1); - freeMemory = (heapBudget.usage < heapBudget.budget) ? (heapBudget.budget - heapBudget.usage) : 0; - } - - const bool canFallbackToDedicated = !IsCustomPool(); - const bool canCreateNewBlock = - ((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0) && - (m_Blocks.size() < m_MaxBlockCount) && - (freeMemory >= size || !canFallbackToDedicated); - uint32_t strategy = createInfo.flags & VMA_ALLOCATION_CREATE_STRATEGY_MASK; - - // If linearAlgorithm is used, canMakeOtherLost is available only when used as ring buffer. - // Which in turn is available only when maxBlockCount = 1. - if(m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT && m_MaxBlockCount > 1) - { - canMakeOtherLost = false; - } - - // Upper address can only be used with linear allocator and within single memory block. - if(isUpperAddress && - (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT || m_MaxBlockCount > 1)) - { - return VK_ERROR_FEATURE_NOT_PRESENT; - } - - // Validate strategy. - switch(strategy) - { - case 0: - strategy = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT; - break; - case VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT: - case VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT: - case VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT: - break; - default: - return VK_ERROR_FEATURE_NOT_PRESENT; - } - - // Early reject: requested allocation size is larger that maximum block size for this block vector. - if(size + 2 * VMA_DEBUG_MARGIN > m_PreferredBlockSize) - { - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - - /* - Under certain condition, this whole section can be skipped for optimization, so - we move on directly to trying to allocate with canMakeOtherLost. That's the case - e.g. for custom pools with linear algorithm. - */ - if(!canMakeOtherLost || canCreateNewBlock) - { - // 1. Search existing allocations. Try to allocate without making other allocations lost. - VmaAllocationCreateFlags allocFlagsCopy = createInfo.flags; - allocFlagsCopy &= ~VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT; - - if(m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) - { - // Use only last block. - if(!m_Blocks.empty()) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks.back(); - VMA_ASSERT(pCurrBlock); - VkResult res = AllocateFromBlock( - pCurrBlock, - currentFrameIndex, - size, - alignment, - allocFlagsCopy, - createInfo.pUserData, - suballocType, - strategy, - pAllocation); - if(res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Returned from last block #%u", pCurrBlock->GetId()); - return VK_SUCCESS; - } - } - } - else - { - if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT) - { - // Forward order in m_Blocks - prefer blocks with smallest amount of free space. - for(size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex ) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pCurrBlock); - VkResult res = AllocateFromBlock( - pCurrBlock, - currentFrameIndex, - size, - alignment, - allocFlagsCopy, - createInfo.pUserData, - suballocType, - strategy, - pAllocation); - if(res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Returned from existing block #%u", pCurrBlock->GetId()); - return VK_SUCCESS; - } - } - } - else // WORST_FIT, FIRST_FIT - { - // Backward order in m_Blocks - prefer blocks with largest amount of free space. - for(size_t blockIndex = m_Blocks.size(); blockIndex--; ) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pCurrBlock); - VkResult res = AllocateFromBlock( - pCurrBlock, - currentFrameIndex, - size, - alignment, - allocFlagsCopy, - createInfo.pUserData, - suballocType, - strategy, - pAllocation); - if(res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Returned from existing block #%u", pCurrBlock->GetId()); - return VK_SUCCESS; - } - } - } - } - - // 2. Try to create new block. - if(canCreateNewBlock) - { - // Calculate optimal size for new block. - VkDeviceSize newBlockSize = m_PreferredBlockSize; - uint32_t newBlockSizeShift = 0; - const uint32_t NEW_BLOCK_SIZE_SHIFT_MAX = 3; - - if(!m_ExplicitBlockSize) - { - // Allocate 1/8, 1/4, 1/2 as first blocks. - const VkDeviceSize maxExistingBlockSize = CalcMaxBlockSize(); - for(uint32_t i = 0; i < NEW_BLOCK_SIZE_SHIFT_MAX; ++i) - { - const VkDeviceSize smallerNewBlockSize = newBlockSize / 2; - if(smallerNewBlockSize > maxExistingBlockSize && smallerNewBlockSize >= size * 2) - { - newBlockSize = smallerNewBlockSize; - ++newBlockSizeShift; - } - else - { - break; - } - } - } - - size_t newBlockIndex = 0; - VkResult res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ? - CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY; - // Allocation of this size failed? Try 1/2, 1/4, 1/8 of m_PreferredBlockSize. - if(!m_ExplicitBlockSize) - { - while(res < 0 && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX) - { - const VkDeviceSize smallerNewBlockSize = newBlockSize / 2; - if(smallerNewBlockSize >= size) - { - newBlockSize = smallerNewBlockSize; - ++newBlockSizeShift; - res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ? - CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - else - { - break; - } - } - } - - if(res == VK_SUCCESS) - { - VmaDeviceMemoryBlock* const pBlock = m_Blocks[newBlockIndex]; - VMA_ASSERT(pBlock->m_pMetadata->GetSize() >= size); - - res = AllocateFromBlock( - pBlock, - currentFrameIndex, - size, - alignment, - allocFlagsCopy, - createInfo.pUserData, - suballocType, - strategy, - pAllocation); - if(res == VK_SUCCESS) - { - VMA_DEBUG_LOG(" Created new block #%u Size=%llu", pBlock->GetId(), newBlockSize); - return VK_SUCCESS; - } - else - { - // Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment. - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - } - } - } - - // 3. Try to allocate from existing blocks with making other allocations lost. - if(canMakeOtherLost) - { - uint32_t tryIndex = 0; - for(; tryIndex < VMA_ALLOCATION_TRY_COUNT; ++tryIndex) - { - VmaDeviceMemoryBlock* pBestRequestBlock = VMA_NULL; - VmaAllocationRequest bestRequest = {}; - VkDeviceSize bestRequestCost = VK_WHOLE_SIZE; - - // 1. Search existing allocations. - if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT) - { - // Forward order in m_Blocks - prefer blocks with smallest amount of free space. - for(size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex ) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pCurrBlock); - VmaAllocationRequest currRequest = {}; - if(pCurrBlock->m_pMetadata->CreateAllocationRequest( - currentFrameIndex, - m_FrameInUseCount, - m_BufferImageGranularity, - size, - alignment, - (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0, - suballocType, - canMakeOtherLost, - strategy, - &currRequest)) - { - const VkDeviceSize currRequestCost = currRequest.CalcCost(); - if(pBestRequestBlock == VMA_NULL || - currRequestCost < bestRequestCost) - { - pBestRequestBlock = pCurrBlock; - bestRequest = currRequest; - bestRequestCost = currRequestCost; - - if(bestRequestCost == 0) - { - break; - } - } - } - } - } - else // WORST_FIT, FIRST_FIT - { - // Backward order in m_Blocks - prefer blocks with largest amount of free space. - for(size_t blockIndex = m_Blocks.size(); blockIndex--; ) - { - VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pCurrBlock); - VmaAllocationRequest currRequest = {}; - if(pCurrBlock->m_pMetadata->CreateAllocationRequest( - currentFrameIndex, - m_FrameInUseCount, - m_BufferImageGranularity, - size, - alignment, - (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0, - suballocType, - canMakeOtherLost, - strategy, - &currRequest)) - { - const VkDeviceSize currRequestCost = currRequest.CalcCost(); - if(pBestRequestBlock == VMA_NULL || - currRequestCost < bestRequestCost || - strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT) - { - pBestRequestBlock = pCurrBlock; - bestRequest = currRequest; - bestRequestCost = currRequestCost; - - if(bestRequestCost == 0 || - strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT) - { - break; - } - } - } - } - } - - if(pBestRequestBlock != VMA_NULL) - { - if(mapped) - { - VkResult res = pBestRequestBlock->Map(m_hAllocator, 1, VMA_NULL); - if(res != VK_SUCCESS) - { - return res; - } - } - - if(pBestRequestBlock->m_pMetadata->MakeRequestedAllocationsLost( - currentFrameIndex, - m_FrameInUseCount, - &bestRequest)) - { - // Allocate from this pBlock. - *pAllocation = m_hAllocator->m_AllocationObjectAllocator.Allocate(); - (*pAllocation)->Ctor(currentFrameIndex, isUserDataString); - pBestRequestBlock->m_pMetadata->Alloc(bestRequest, suballocType, size, *pAllocation); - UpdateHasEmptyBlock(); - (*pAllocation)->InitBlockAllocation( - pBestRequestBlock, - bestRequest.offset, - alignment, - size, - m_MemoryTypeIndex, - suballocType, - mapped, - (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0); - VMA_HEAVY_ASSERT(pBestRequestBlock->Validate()); - VMA_DEBUG_LOG(" Returned from existing block"); - (*pAllocation)->SetUserData(m_hAllocator, createInfo.pUserData); - m_hAllocator->m_Budget.AddAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), size); - if(VMA_DEBUG_INITIALIZE_ALLOCATIONS) - { - m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED); - } - if(IsCorruptionDetectionEnabled()) - { - VkResult res = pBestRequestBlock->WriteMagicValueAroundAllocation(m_hAllocator, bestRequest.offset, size); - VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value."); - } - return VK_SUCCESS; - } - // else: Some allocations must have been touched while we are here. Next try. - } - else - { - // Could not find place in any of the blocks - break outer loop. - break; - } - } - /* Maximum number of tries exceeded - a very unlike event when many other - threads are simultaneously touching allocations making it impossible to make - lost at the same time as we try to allocate. */ - if(tryIndex == VMA_ALLOCATION_TRY_COUNT) - { - return VK_ERROR_TOO_MANY_OBJECTS; - } - } - - return VK_ERROR_OUT_OF_DEVICE_MEMORY; -} - -void VmaBlockVector::Free( - const VmaAllocation hAllocation) -{ - VmaDeviceMemoryBlock* pBlockToDelete = VMA_NULL; - - bool budgetExceeded = false; - { - const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex); - VmaBudget heapBudget = {}; - m_hAllocator->GetBudget(&heapBudget, heapIndex, 1); - budgetExceeded = heapBudget.usage >= heapBudget.budget; - } - - // Scope for lock. - { - VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); - - VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock(); - - if(IsCorruptionDetectionEnabled()) - { - VkResult res = pBlock->ValidateMagicValueAroundAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize()); - VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to validate magic value."); - } - - if(hAllocation->IsPersistentMap()) - { - pBlock->Unmap(m_hAllocator, 1); - } - - pBlock->m_pMetadata->Free(hAllocation); - VMA_HEAVY_ASSERT(pBlock->Validate()); - - VMA_DEBUG_LOG(" Freed from MemoryTypeIndex=%u", m_MemoryTypeIndex); - - const bool canDeleteBlock = m_Blocks.size() > m_MinBlockCount; - // pBlock became empty after this deallocation. - if(pBlock->m_pMetadata->IsEmpty()) - { - // Already has empty block. We don't want to have two, so delete this one. - if((m_HasEmptyBlock || budgetExceeded) && canDeleteBlock) - { - pBlockToDelete = pBlock; - Remove(pBlock); - } - // else: We now have an empty block - leave it. - } - // pBlock didn't become empty, but we have another empty block - find and free that one. - // (This is optional, heuristics.) - else if(m_HasEmptyBlock && canDeleteBlock) - { - VmaDeviceMemoryBlock* pLastBlock = m_Blocks.back(); - if(pLastBlock->m_pMetadata->IsEmpty()) - { - pBlockToDelete = pLastBlock; - m_Blocks.pop_back(); - } - } - - UpdateHasEmptyBlock(); - IncrementallySortBlocks(); - } - - // Destruction of a free block. Deferred until this point, outside of mutex - // lock, for performance reason. - if(pBlockToDelete != VMA_NULL) - { - VMA_DEBUG_LOG(" Deleted empty block"); - pBlockToDelete->Destroy(m_hAllocator); - vma_delete(m_hAllocator, pBlockToDelete); - } -} - -VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const -{ - VkDeviceSize result = 0; - for(size_t i = m_Blocks.size(); i--; ) - { - result = VMA_MAX(result, m_Blocks[i]->m_pMetadata->GetSize()); - if(result >= m_PreferredBlockSize) - { - break; - } - } - return result; -} - -void VmaBlockVector::Remove(VmaDeviceMemoryBlock* pBlock) -{ - for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) - { - if(m_Blocks[blockIndex] == pBlock) - { - VmaVectorRemove(m_Blocks, blockIndex); - return; - } - } - VMA_ASSERT(0); -} - -void VmaBlockVector::IncrementallySortBlocks() -{ - if(m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) - { - // Bubble sort only until first swap. - for(size_t i = 1; i < m_Blocks.size(); ++i) - { - if(m_Blocks[i - 1]->m_pMetadata->GetSumFreeSize() > m_Blocks[i]->m_pMetadata->GetSumFreeSize()) - { - VMA_SWAP(m_Blocks[i - 1], m_Blocks[i]); - return; - } - } - } -} - -VkResult VmaBlockVector::AllocateFromBlock( - VmaDeviceMemoryBlock* pBlock, - uint32_t currentFrameIndex, - VkDeviceSize size, - VkDeviceSize alignment, - VmaAllocationCreateFlags allocFlags, - void* pUserData, - VmaSuballocationType suballocType, - uint32_t strategy, - VmaAllocation* pAllocation) -{ - VMA_ASSERT((allocFlags & VMA_ALLOCATION_CREATE_CAN_MAKE_OTHER_LOST_BIT) == 0); - const bool isUpperAddress = (allocFlags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0; - const bool mapped = (allocFlags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0; - const bool isUserDataString = (allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0; - - VmaAllocationRequest currRequest = {}; - if(pBlock->m_pMetadata->CreateAllocationRequest( - currentFrameIndex, - m_FrameInUseCount, - m_BufferImageGranularity, - size, - alignment, - isUpperAddress, - suballocType, - false, // canMakeOtherLost - strategy, - &currRequest)) - { - // Allocate from pCurrBlock. - VMA_ASSERT(currRequest.itemsToMakeLostCount == 0); - - if(mapped) - { - VkResult res = pBlock->Map(m_hAllocator, 1, VMA_NULL); - if(res != VK_SUCCESS) - { - return res; - } - } - - *pAllocation = m_hAllocator->m_AllocationObjectAllocator.Allocate(); - (*pAllocation)->Ctor(currentFrameIndex, isUserDataString); - pBlock->m_pMetadata->Alloc(currRequest, suballocType, size, *pAllocation); - UpdateHasEmptyBlock(); - (*pAllocation)->InitBlockAllocation( - pBlock, - currRequest.offset, - alignment, - size, - m_MemoryTypeIndex, - suballocType, - mapped, - (allocFlags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0); - VMA_HEAVY_ASSERT(pBlock->Validate()); - (*pAllocation)->SetUserData(m_hAllocator, pUserData); - m_hAllocator->m_Budget.AddAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), size); - if(VMA_DEBUG_INITIALIZE_ALLOCATIONS) - { - m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED); - } - if(IsCorruptionDetectionEnabled()) - { - VkResult res = pBlock->WriteMagicValueAroundAllocation(m_hAllocator, currRequest.offset, size); - VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value."); - } - return VK_SUCCESS; - } - return VK_ERROR_OUT_OF_DEVICE_MEMORY; -} - -VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex) -{ - VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; - allocInfo.memoryTypeIndex = m_MemoryTypeIndex; - allocInfo.allocationSize = blockSize; - VkDeviceMemory mem = VK_NULL_HANDLE; - VkResult res = m_hAllocator->AllocateVulkanMemory(&allocInfo, &mem); - if(res < 0) - { - return res; - } - - // New VkDeviceMemory successfully created. - - // Create new Allocation for it. - VmaDeviceMemoryBlock* const pBlock = vma_new(m_hAllocator, VmaDeviceMemoryBlock)(m_hAllocator); - pBlock->Init( - m_hAllocator, - m_hParentPool, - m_MemoryTypeIndex, - mem, - allocInfo.allocationSize, - m_NextBlockId++, - m_Algorithm); - - m_Blocks.push_back(pBlock); - if(pNewBlockIndex != VMA_NULL) - { - *pNewBlockIndex = m_Blocks.size() - 1; - } - - return VK_SUCCESS; -} - -void VmaBlockVector::ApplyDefragmentationMovesCpu( - class VmaBlockVectorDefragmentationContext* pDefragCtx, - const VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves) -{ - const size_t blockCount = m_Blocks.size(); - const bool isNonCoherent = m_hAllocator->IsMemoryTypeNonCoherent(m_MemoryTypeIndex); - - enum BLOCK_FLAG - { - BLOCK_FLAG_USED = 0x00000001, - BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION = 0x00000002, - }; - - struct BlockInfo - { - uint32_t flags; - void* pMappedData; - }; - VmaVector< BlockInfo, VmaStlAllocator > - blockInfo(blockCount, BlockInfo(), VmaStlAllocator(m_hAllocator->GetAllocationCallbacks())); - memset(blockInfo.data(), 0, blockCount * sizeof(BlockInfo)); - - // Go over all moves. Mark blocks that are used with BLOCK_FLAG_USED. - const size_t moveCount = moves.size(); - for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex) - { - const VmaDefragmentationMove& move = moves[moveIndex]; - blockInfo[move.srcBlockIndex].flags |= BLOCK_FLAG_USED; - blockInfo[move.dstBlockIndex].flags |= BLOCK_FLAG_USED; - } - - VMA_ASSERT(pDefragCtx->res == VK_SUCCESS); - - // Go over all blocks. Get mapped pointer or map if necessary. - for(size_t blockIndex = 0; pDefragCtx->res == VK_SUCCESS && blockIndex < blockCount; ++blockIndex) - { - BlockInfo& currBlockInfo = blockInfo[blockIndex]; - VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex]; - if((currBlockInfo.flags & BLOCK_FLAG_USED) != 0) - { - currBlockInfo.pMappedData = pBlock->GetMappedData(); - // It is not originally mapped - map it. - if(currBlockInfo.pMappedData == VMA_NULL) - { - pDefragCtx->res = pBlock->Map(m_hAllocator, 1, &currBlockInfo.pMappedData); - if(pDefragCtx->res == VK_SUCCESS) - { - currBlockInfo.flags |= BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION; - } - } - } - } - - // Go over all moves. Do actual data transfer. - if(pDefragCtx->res == VK_SUCCESS) - { - const VkDeviceSize nonCoherentAtomSize = m_hAllocator->m_PhysicalDeviceProperties.limits.nonCoherentAtomSize; - VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE }; - - for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex) - { - const VmaDefragmentationMove& move = moves[moveIndex]; - - const BlockInfo& srcBlockInfo = blockInfo[move.srcBlockIndex]; - const BlockInfo& dstBlockInfo = blockInfo[move.dstBlockIndex]; - - VMA_ASSERT(srcBlockInfo.pMappedData && dstBlockInfo.pMappedData); - - // Invalidate source. - if(isNonCoherent) - { - VmaDeviceMemoryBlock* const pSrcBlock = m_Blocks[move.srcBlockIndex]; - memRange.memory = pSrcBlock->GetDeviceMemory(); - memRange.offset = VmaAlignDown(move.srcOffset, nonCoherentAtomSize); - memRange.size = VMA_MIN( - VmaAlignUp(move.size + (move.srcOffset - memRange.offset), nonCoherentAtomSize), - pSrcBlock->m_pMetadata->GetSize() - memRange.offset); - (*m_hAllocator->GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hAllocator->m_hDevice, 1, &memRange); - } - - // THE PLACE WHERE ACTUAL DATA COPY HAPPENS. - memmove( - reinterpret_cast(dstBlockInfo.pMappedData) + move.dstOffset, - reinterpret_cast(srcBlockInfo.pMappedData) + move.srcOffset, - static_cast(move.size)); - - if(IsCorruptionDetectionEnabled()) - { - VmaWriteMagicValue(dstBlockInfo.pMappedData, move.dstOffset - VMA_DEBUG_MARGIN); - VmaWriteMagicValue(dstBlockInfo.pMappedData, move.dstOffset + move.size); - } - - // Flush destination. - if(isNonCoherent) - { - VmaDeviceMemoryBlock* const pDstBlock = m_Blocks[move.dstBlockIndex]; - memRange.memory = pDstBlock->GetDeviceMemory(); - memRange.offset = VmaAlignDown(move.dstOffset, nonCoherentAtomSize); - memRange.size = VMA_MIN( - VmaAlignUp(move.size + (move.dstOffset - memRange.offset), nonCoherentAtomSize), - pDstBlock->m_pMetadata->GetSize() - memRange.offset); - (*m_hAllocator->GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hAllocator->m_hDevice, 1, &memRange); - } - } - } - - // Go over all blocks in reverse order. Unmap those that were mapped just for defragmentation. - // Regardless of pCtx->res == VK_SUCCESS. - for(size_t blockIndex = blockCount; blockIndex--; ) - { - const BlockInfo& currBlockInfo = blockInfo[blockIndex]; - if((currBlockInfo.flags & BLOCK_FLAG_MAPPED_FOR_DEFRAGMENTATION) != 0) - { - VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex]; - pBlock->Unmap(m_hAllocator, 1); - } - } -} - -void VmaBlockVector::ApplyDefragmentationMovesGpu( - class VmaBlockVectorDefragmentationContext* pDefragCtx, - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkCommandBuffer commandBuffer) -{ - const size_t blockCount = m_Blocks.size(); - - pDefragCtx->blockContexts.resize(blockCount); - memset(pDefragCtx->blockContexts.data(), 0, blockCount * sizeof(VmaBlockDefragmentationContext)); - - // Go over all moves. Mark blocks that are used with BLOCK_FLAG_USED. - const size_t moveCount = moves.size(); - for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex) - { - const VmaDefragmentationMove& move = moves[moveIndex]; - - //if(move.type == VMA_ALLOCATION_TYPE_UNKNOWN) - { - // Old school move still require us to map the whole block - pDefragCtx->blockContexts[move.srcBlockIndex].flags |= VmaBlockDefragmentationContext::BLOCK_FLAG_USED; - pDefragCtx->blockContexts[move.dstBlockIndex].flags |= VmaBlockDefragmentationContext::BLOCK_FLAG_USED; - } - } - - VMA_ASSERT(pDefragCtx->res == VK_SUCCESS); - - // Go over all blocks. Create and bind buffer for whole block if necessary. - { - VkBufferCreateInfo bufCreateInfo; - VmaFillGpuDefragmentationBufferCreateInfo(bufCreateInfo); - - for(size_t blockIndex = 0; pDefragCtx->res == VK_SUCCESS && blockIndex < blockCount; ++blockIndex) - { - VmaBlockDefragmentationContext& currBlockCtx = pDefragCtx->blockContexts[blockIndex]; - VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex]; - if((currBlockCtx.flags & VmaBlockDefragmentationContext::BLOCK_FLAG_USED) != 0) - { - bufCreateInfo.size = pBlock->m_pMetadata->GetSize(); - pDefragCtx->res = (*m_hAllocator->GetVulkanFunctions().vkCreateBuffer)( - m_hAllocator->m_hDevice, &bufCreateInfo, m_hAllocator->GetAllocationCallbacks(), &currBlockCtx.hBuffer); - if(pDefragCtx->res == VK_SUCCESS) - { - pDefragCtx->res = (*m_hAllocator->GetVulkanFunctions().vkBindBufferMemory)( - m_hAllocator->m_hDevice, currBlockCtx.hBuffer, pBlock->GetDeviceMemory(), 0); - } - } - } - } - - // Go over all moves. Post data transfer commands to command buffer. - if(pDefragCtx->res == VK_SUCCESS) - { - for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex) - { - const VmaDefragmentationMove& move = moves[moveIndex]; - - const VmaBlockDefragmentationContext& srcBlockCtx = pDefragCtx->blockContexts[move.srcBlockIndex]; - const VmaBlockDefragmentationContext& dstBlockCtx = pDefragCtx->blockContexts[move.dstBlockIndex]; - - VMA_ASSERT(srcBlockCtx.hBuffer && dstBlockCtx.hBuffer); - - VkBufferCopy region = { - move.srcOffset, - move.dstOffset, - move.size }; - (*m_hAllocator->GetVulkanFunctions().vkCmdCopyBuffer)( - commandBuffer, srcBlockCtx.hBuffer, dstBlockCtx.hBuffer, 1, ®ion); - } - } - - // Save buffers to defrag context for later destruction. - if(pDefragCtx->res == VK_SUCCESS && moveCount > 0) - { - pDefragCtx->res = VK_NOT_READY; - } -} - -void VmaBlockVector::FreeEmptyBlocks(VmaDefragmentationStats* pDefragmentationStats) -{ - for(size_t blockIndex = m_Blocks.size(); blockIndex--; ) - { - VmaDeviceMemoryBlock* pBlock = m_Blocks[blockIndex]; - if(pBlock->m_pMetadata->IsEmpty()) - { - if(m_Blocks.size() > m_MinBlockCount) - { - if(pDefragmentationStats != VMA_NULL) - { - ++pDefragmentationStats->deviceMemoryBlocksFreed; - pDefragmentationStats->bytesFreed += pBlock->m_pMetadata->GetSize(); - } - - VmaVectorRemove(m_Blocks, blockIndex); - pBlock->Destroy(m_hAllocator); - vma_delete(m_hAllocator, pBlock); - } - else - { - break; - } - } - } - UpdateHasEmptyBlock(); -} - -void VmaBlockVector::UpdateHasEmptyBlock() -{ - m_HasEmptyBlock = false; - for(size_t index = 0, count = m_Blocks.size(); index < count; ++index) - { - VmaDeviceMemoryBlock* const pBlock = m_Blocks[index]; - if(pBlock->m_pMetadata->IsEmpty()) - { - m_HasEmptyBlock = true; - break; - } - } -} - -#if VMA_STATS_STRING_ENABLED - -void VmaBlockVector::PrintDetailedMap(class VmaJsonWriter& json) -{ - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - - json.BeginObject(); - - if(IsCustomPool()) - { - const char* poolName = m_hParentPool->GetName(); - if(poolName != VMA_NULL && poolName[0] != '\0') - { - json.WriteString("Name"); - json.WriteString(poolName); - } - - json.WriteString("MemoryTypeIndex"); - json.WriteNumber(m_MemoryTypeIndex); - - json.WriteString("BlockSize"); - json.WriteNumber(m_PreferredBlockSize); - - json.WriteString("BlockCount"); - json.BeginObject(true); - if(m_MinBlockCount > 0) - { - json.WriteString("Min"); - json.WriteNumber((uint64_t)m_MinBlockCount); - } - if(m_MaxBlockCount < SIZE_MAX) - { - json.WriteString("Max"); - json.WriteNumber((uint64_t)m_MaxBlockCount); - } - json.WriteString("Cur"); - json.WriteNumber((uint64_t)m_Blocks.size()); - json.EndObject(); - - if(m_FrameInUseCount > 0) - { - json.WriteString("FrameInUseCount"); - json.WriteNumber(m_FrameInUseCount); - } - - if(m_Algorithm != 0) - { - json.WriteString("Algorithm"); - json.WriteString(VmaAlgorithmToStr(m_Algorithm)); - } - } - else - { - json.WriteString("PreferredBlockSize"); - json.WriteNumber(m_PreferredBlockSize); - } - - json.WriteString("Blocks"); - json.BeginObject(); - for(size_t i = 0; i < m_Blocks.size(); ++i) - { - json.BeginString(); - json.ContinueString(m_Blocks[i]->GetId()); - json.EndString(); - - m_Blocks[i]->m_pMetadata->PrintDetailedMap(json); - } - json.EndObject(); - - json.EndObject(); -} - -#endif // #if VMA_STATS_STRING_ENABLED - -void VmaBlockVector::Defragment( - class VmaBlockVectorDefragmentationContext* pCtx, - VmaDefragmentationStats* pStats, VmaDefragmentationFlags flags, - VkDeviceSize& maxCpuBytesToMove, uint32_t& maxCpuAllocationsToMove, - VkDeviceSize& maxGpuBytesToMove, uint32_t& maxGpuAllocationsToMove, - VkCommandBuffer commandBuffer) -{ - pCtx->res = VK_SUCCESS; - - const VkMemoryPropertyFlags memPropFlags = - m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags; - const bool isHostVisible = (memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0; - - const bool canDefragmentOnCpu = maxCpuBytesToMove > 0 && maxCpuAllocationsToMove > 0 && - isHostVisible; - const bool canDefragmentOnGpu = maxGpuBytesToMove > 0 && maxGpuAllocationsToMove > 0 && - !IsCorruptionDetectionEnabled() && - ((1u << m_MemoryTypeIndex) & m_hAllocator->GetGpuDefragmentationMemoryTypeBits()) != 0; - - // There are options to defragment this memory type. - if(canDefragmentOnCpu || canDefragmentOnGpu) - { - bool defragmentOnGpu; - // There is only one option to defragment this memory type. - if(canDefragmentOnGpu != canDefragmentOnCpu) - { - defragmentOnGpu = canDefragmentOnGpu; - } - // Both options are available: Heuristics to choose the best one. - else - { - defragmentOnGpu = (memPropFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) != 0 || - m_hAllocator->IsIntegratedGpu(); - } - - bool overlappingMoveSupported = !defragmentOnGpu; - - if(m_hAllocator->m_UseMutex) - { - if(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL) - { - if(!m_Mutex.TryLockWrite()) - { - pCtx->res = VK_ERROR_INITIALIZATION_FAILED; - return; - } - } - else - { - m_Mutex.LockWrite(); - pCtx->mutexLocked = true; - } - } - - pCtx->Begin(overlappingMoveSupported, flags); - - // Defragment. - - const VkDeviceSize maxBytesToMove = defragmentOnGpu ? maxGpuBytesToMove : maxCpuBytesToMove; - const uint32_t maxAllocationsToMove = defragmentOnGpu ? maxGpuAllocationsToMove : maxCpuAllocationsToMove; - pCtx->res = pCtx->GetAlgorithm()->Defragment(pCtx->defragmentationMoves, maxBytesToMove, maxAllocationsToMove, flags); - - // Accumulate statistics. - if(pStats != VMA_NULL) - { - const VkDeviceSize bytesMoved = pCtx->GetAlgorithm()->GetBytesMoved(); - const uint32_t allocationsMoved = pCtx->GetAlgorithm()->GetAllocationsMoved(); - pStats->bytesMoved += bytesMoved; - pStats->allocationsMoved += allocationsMoved; - VMA_ASSERT(bytesMoved <= maxBytesToMove); - VMA_ASSERT(allocationsMoved <= maxAllocationsToMove); - if(defragmentOnGpu) - { - maxGpuBytesToMove -= bytesMoved; - maxGpuAllocationsToMove -= allocationsMoved; - } - else - { - maxCpuBytesToMove -= bytesMoved; - maxCpuAllocationsToMove -= allocationsMoved; - } - } - - if(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL) - { - if(m_hAllocator->m_UseMutex) - m_Mutex.UnlockWrite(); - - if(pCtx->res >= VK_SUCCESS && !pCtx->defragmentationMoves.empty()) - pCtx->res = VK_NOT_READY; - - return; - } - - if(pCtx->res >= VK_SUCCESS) - { - if(defragmentOnGpu) - { - ApplyDefragmentationMovesGpu(pCtx, pCtx->defragmentationMoves, commandBuffer); - } - else - { - ApplyDefragmentationMovesCpu(pCtx, pCtx->defragmentationMoves); - } - } - } -} - -void VmaBlockVector::DefragmentationEnd( - class VmaBlockVectorDefragmentationContext* pCtx, - VmaDefragmentationStats* pStats) -{ - // Destroy buffers. - for(size_t blockIndex = pCtx->blockContexts.size(); blockIndex--; ) - { - VmaBlockDefragmentationContext& blockCtx = pCtx->blockContexts[blockIndex]; - if(blockCtx.hBuffer) - { - (*m_hAllocator->GetVulkanFunctions().vkDestroyBuffer)( - m_hAllocator->m_hDevice, blockCtx.hBuffer, m_hAllocator->GetAllocationCallbacks()); - } - } - - if(pCtx->res >= VK_SUCCESS) - { - FreeEmptyBlocks(pStats); - } - - if(pCtx->mutexLocked) - { - VMA_ASSERT(m_hAllocator->m_UseMutex); - m_Mutex.UnlockWrite(); - } -} - -uint32_t VmaBlockVector::ProcessDefragmentations( - class VmaBlockVectorDefragmentationContext *pCtx, - VmaDefragmentationPassMoveInfo* pMove, uint32_t maxMoves) -{ - VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); - - const uint32_t moveCount = std::min(uint32_t(pCtx->defragmentationMoves.size()) - pCtx->defragmentationMovesProcessed, maxMoves); - - for(uint32_t i = pCtx->defragmentationMovesProcessed; i < moveCount; ++ i) - { - VmaDefragmentationMove& move = pCtx->defragmentationMoves[i]; - - pMove->allocation = move.hAllocation; - pMove->memory = move.pDstBlock->GetDeviceMemory(); - pMove->offset = move.dstOffset; - - ++ pMove; - } - - pCtx->defragmentationMovesProcessed += moveCount; - - return moveCount; -} - -void VmaBlockVector::CommitDefragmentations( - class VmaBlockVectorDefragmentationContext *pCtx, - VmaDefragmentationStats* pStats) -{ - VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); - - for(uint32_t i = pCtx->defragmentationMovesCommitted; i < pCtx->defragmentationMovesProcessed; ++ i) - { - const VmaDefragmentationMove &move = pCtx->defragmentationMoves[i]; - - move.pSrcBlock->m_pMetadata->FreeAtOffset(move.srcOffset); - move.hAllocation->ChangeBlockAllocation(m_hAllocator, move.pDstBlock, move.dstOffset); - } - - pCtx->defragmentationMovesCommitted = pCtx->defragmentationMovesProcessed; - FreeEmptyBlocks(pStats); -} - -size_t VmaBlockVector::CalcAllocationCount() const -{ - size_t result = 0; - for(size_t i = 0; i < m_Blocks.size(); ++i) - { - result += m_Blocks[i]->m_pMetadata->GetAllocationCount(); - } - return result; -} - -bool VmaBlockVector::IsBufferImageGranularityConflictPossible() const -{ - if(m_BufferImageGranularity == 1) - { - return false; - } - VmaSuballocationType lastSuballocType = VMA_SUBALLOCATION_TYPE_FREE; - for(size_t i = 0, count = m_Blocks.size(); i < count; ++i) - { - VmaDeviceMemoryBlock* const pBlock = m_Blocks[i]; - VMA_ASSERT(m_Algorithm == 0); - VmaBlockMetadata_Generic* const pMetadata = (VmaBlockMetadata_Generic*)pBlock->m_pMetadata; - if(pMetadata->IsBufferImageGranularityConflictPossible(m_BufferImageGranularity, lastSuballocType)) - { - return true; - } - } - return false; -} - -void VmaBlockVector::MakePoolAllocationsLost( - uint32_t currentFrameIndex, - size_t* pLostAllocationCount) -{ - VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex); - size_t lostAllocationCount = 0; - for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) - { - VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pBlock); - lostAllocationCount += pBlock->m_pMetadata->MakeAllocationsLost(currentFrameIndex, m_FrameInUseCount); - } - if(pLostAllocationCount != VMA_NULL) - { - *pLostAllocationCount = lostAllocationCount; - } -} - -VkResult VmaBlockVector::CheckCorruption() -{ - if(!IsCorruptionDetectionEnabled()) - { - return VK_ERROR_FEATURE_NOT_PRESENT; - } - - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) - { - VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pBlock); - VkResult res = pBlock->CheckCorruption(m_hAllocator); - if(res != VK_SUCCESS) - { - return res; - } - } - return VK_SUCCESS; -} - -void VmaBlockVector::AddStats(VmaStats* pStats) -{ - const uint32_t memTypeIndex = m_MemoryTypeIndex; - const uint32_t memHeapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(memTypeIndex); - - VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex); - - for(uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex) - { - const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex]; - VMA_ASSERT(pBlock); - VMA_HEAVY_ASSERT(pBlock->Validate()); - VmaStatInfo allocationStatInfo; - pBlock->m_pMetadata->CalcAllocationStatInfo(allocationStatInfo); - VmaAddStatInfo(pStats->total, allocationStatInfo); - VmaAddStatInfo(pStats->memoryType[memTypeIndex], allocationStatInfo); - VmaAddStatInfo(pStats->memoryHeap[memHeapIndex], allocationStatInfo); - } -} - -//////////////////////////////////////////////////////////////////////////////// -// VmaDefragmentationAlgorithm_Generic members definition - -VmaDefragmentationAlgorithm_Generic::VmaDefragmentationAlgorithm_Generic( - VmaAllocator hAllocator, - VmaBlockVector* pBlockVector, - uint32_t currentFrameIndex, - bool overlappingMoveSupported) : - VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex), - m_AllocationCount(0), - m_AllAllocations(false), - m_BytesMoved(0), - m_AllocationsMoved(0), - m_Blocks(VmaStlAllocator(hAllocator->GetAllocationCallbacks())) -{ - // Create block info for each block. - const size_t blockCount = m_pBlockVector->m_Blocks.size(); - for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) - { - BlockInfo* pBlockInfo = vma_new(m_hAllocator, BlockInfo)(m_hAllocator->GetAllocationCallbacks()); - pBlockInfo->m_OriginalBlockIndex = blockIndex; - pBlockInfo->m_pBlock = m_pBlockVector->m_Blocks[blockIndex]; - m_Blocks.push_back(pBlockInfo); - } - - // Sort them by m_pBlock pointer value. - VMA_SORT(m_Blocks.begin(), m_Blocks.end(), BlockPointerLess()); -} - -VmaDefragmentationAlgorithm_Generic::~VmaDefragmentationAlgorithm_Generic() -{ - for(size_t i = m_Blocks.size(); i--; ) - { - vma_delete(m_hAllocator, m_Blocks[i]); - } -} - -void VmaDefragmentationAlgorithm_Generic::AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) -{ - // Now as we are inside VmaBlockVector::m_Mutex, we can make final check if this allocation was not lost. - if(hAlloc->GetLastUseFrameIndex() != VMA_FRAME_INDEX_LOST) - { - VmaDeviceMemoryBlock* pBlock = hAlloc->GetBlock(); - BlockInfoVector::iterator it = VmaBinaryFindFirstNotLess(m_Blocks.begin(), m_Blocks.end(), pBlock, BlockPointerLess()); - if(it != m_Blocks.end() && (*it)->m_pBlock == pBlock) - { - AllocationInfo allocInfo = AllocationInfo(hAlloc, pChanged); - (*it)->m_Allocations.push_back(allocInfo); - } - else - { - VMA_ASSERT(0); - } - - ++m_AllocationCount; - } -} - -VkResult VmaDefragmentationAlgorithm_Generic::DefragmentRound( - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkDeviceSize maxBytesToMove, - uint32_t maxAllocationsToMove, - bool freeOldAllocations) -{ - if(m_Blocks.empty()) - { - return VK_SUCCESS; - } - - // This is a choice based on research. - // Option 1: - uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT; - // Option 2: - //uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT; - // Option 3: - //uint32_t strategy = VMA_ALLOCATION_CREATE_STRATEGY_MIN_FRAGMENTATION_BIT; - - size_t srcBlockMinIndex = 0; - // When FAST_ALGORITHM, move allocations from only last out of blocks that contain non-movable allocations. - /* - if(m_AlgorithmFlags & VMA_DEFRAGMENTATION_FAST_ALGORITHM_BIT) - { - const size_t blocksWithNonMovableCount = CalcBlocksWithNonMovableCount(); - if(blocksWithNonMovableCount > 0) - { - srcBlockMinIndex = blocksWithNonMovableCount - 1; - } - } - */ - - size_t srcBlockIndex = m_Blocks.size() - 1; - size_t srcAllocIndex = SIZE_MAX; - for(;;) - { - // 1. Find next allocation to move. - // 1.1. Start from last to first m_Blocks - they are sorted from most "destination" to most "source". - // 1.2. Then start from last to first m_Allocations. - while(srcAllocIndex >= m_Blocks[srcBlockIndex]->m_Allocations.size()) - { - if(m_Blocks[srcBlockIndex]->m_Allocations.empty()) - { - // Finished: no more allocations to process. - if(srcBlockIndex == srcBlockMinIndex) - { - return VK_SUCCESS; - } - else - { - --srcBlockIndex; - srcAllocIndex = SIZE_MAX; - } - } - else - { - srcAllocIndex = m_Blocks[srcBlockIndex]->m_Allocations.size() - 1; - } - } - - BlockInfo* pSrcBlockInfo = m_Blocks[srcBlockIndex]; - AllocationInfo& allocInfo = pSrcBlockInfo->m_Allocations[srcAllocIndex]; - - const VkDeviceSize size = allocInfo.m_hAllocation->GetSize(); - const VkDeviceSize srcOffset = allocInfo.m_hAllocation->GetOffset(); - const VkDeviceSize alignment = allocInfo.m_hAllocation->GetAlignment(); - const VmaSuballocationType suballocType = allocInfo.m_hAllocation->GetSuballocationType(); - - // 2. Try to find new place for this allocation in preceding or current block. - for(size_t dstBlockIndex = 0; dstBlockIndex <= srcBlockIndex; ++dstBlockIndex) - { - BlockInfo* pDstBlockInfo = m_Blocks[dstBlockIndex]; - VmaAllocationRequest dstAllocRequest; - if(pDstBlockInfo->m_pBlock->m_pMetadata->CreateAllocationRequest( - m_CurrentFrameIndex, - m_pBlockVector->GetFrameInUseCount(), - m_pBlockVector->GetBufferImageGranularity(), - size, - alignment, - false, // upperAddress - suballocType, - false, // canMakeOtherLost - strategy, - &dstAllocRequest) && - MoveMakesSense( - dstBlockIndex, dstAllocRequest.offset, srcBlockIndex, srcOffset)) - { - VMA_ASSERT(dstAllocRequest.itemsToMakeLostCount == 0); - - // Reached limit on number of allocations or bytes to move. - if((m_AllocationsMoved + 1 > maxAllocationsToMove) || - (m_BytesMoved + size > maxBytesToMove)) - { - return VK_SUCCESS; - } - - VmaDefragmentationMove move = {}; - move.srcBlockIndex = pSrcBlockInfo->m_OriginalBlockIndex; - move.dstBlockIndex = pDstBlockInfo->m_OriginalBlockIndex; - move.srcOffset = srcOffset; - move.dstOffset = dstAllocRequest.offset; - move.size = size; - move.hAllocation = allocInfo.m_hAllocation; - move.pSrcBlock = pSrcBlockInfo->m_pBlock; - move.pDstBlock = pDstBlockInfo->m_pBlock; - - moves.push_back(move); - - pDstBlockInfo->m_pBlock->m_pMetadata->Alloc( - dstAllocRequest, - suballocType, - size, - allocInfo.m_hAllocation); - - if(freeOldAllocations) - { - pSrcBlockInfo->m_pBlock->m_pMetadata->FreeAtOffset(srcOffset); - allocInfo.m_hAllocation->ChangeBlockAllocation(m_hAllocator, pDstBlockInfo->m_pBlock, dstAllocRequest.offset); - } - - if(allocInfo.m_pChanged != VMA_NULL) - { - *allocInfo.m_pChanged = VK_TRUE; - } - - ++m_AllocationsMoved; - m_BytesMoved += size; - - VmaVectorRemove(pSrcBlockInfo->m_Allocations, srcAllocIndex); - - break; - } - } - - // If not processed, this allocInfo remains in pBlockInfo->m_Allocations for next round. - - if(srcAllocIndex > 0) - { - --srcAllocIndex; - } - else - { - if(srcBlockIndex > 0) - { - --srcBlockIndex; - srcAllocIndex = SIZE_MAX; - } - else - { - return VK_SUCCESS; - } - } - } -} - -size_t VmaDefragmentationAlgorithm_Generic::CalcBlocksWithNonMovableCount() const -{ - size_t result = 0; - for(size_t i = 0; i < m_Blocks.size(); ++i) - { - if(m_Blocks[i]->m_HasNonMovableAllocations) - { - ++result; - } - } - return result; -} - -VkResult VmaDefragmentationAlgorithm_Generic::Defragment( - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkDeviceSize maxBytesToMove, - uint32_t maxAllocationsToMove, - VmaDefragmentationFlags flags) -{ - if(!m_AllAllocations && m_AllocationCount == 0) - { - return VK_SUCCESS; - } - - const size_t blockCount = m_Blocks.size(); - for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) - { - BlockInfo* pBlockInfo = m_Blocks[blockIndex]; - - if(m_AllAllocations) - { - VmaBlockMetadata_Generic* pMetadata = (VmaBlockMetadata_Generic*)pBlockInfo->m_pBlock->m_pMetadata; - for(VmaSuballocationList::const_iterator it = pMetadata->m_Suballocations.begin(); - it != pMetadata->m_Suballocations.end(); - ++it) - { - if(it->type != VMA_SUBALLOCATION_TYPE_FREE) - { - AllocationInfo allocInfo = AllocationInfo(it->hAllocation, VMA_NULL); - pBlockInfo->m_Allocations.push_back(allocInfo); - } - } - } - - pBlockInfo->CalcHasNonMovableAllocations(); - - // This is a choice based on research. - // Option 1: - pBlockInfo->SortAllocationsByOffsetDescending(); - // Option 2: - //pBlockInfo->SortAllocationsBySizeDescending(); - } - - // Sort m_Blocks this time by the main criterium, from most "destination" to most "source" blocks. - VMA_SORT(m_Blocks.begin(), m_Blocks.end(), BlockInfoCompareMoveDestination()); - - // This is a choice based on research. - const uint32_t roundCount = 2; - - // Execute defragmentation rounds (the main part). - VkResult result = VK_SUCCESS; - for(uint32_t round = 0; (round < roundCount) && (result == VK_SUCCESS); ++round) - { - result = DefragmentRound(moves, maxBytesToMove, maxAllocationsToMove, !(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL)); - } - - return result; -} - -bool VmaDefragmentationAlgorithm_Generic::MoveMakesSense( - size_t dstBlockIndex, VkDeviceSize dstOffset, - size_t srcBlockIndex, VkDeviceSize srcOffset) -{ - if(dstBlockIndex < srcBlockIndex) - { - return true; - } - if(dstBlockIndex > srcBlockIndex) - { - return false; - } - if(dstOffset < srcOffset) - { - return true; - } - return false; -} - -//////////////////////////////////////////////////////////////////////////////// -// VmaDefragmentationAlgorithm_Fast - -VmaDefragmentationAlgorithm_Fast::VmaDefragmentationAlgorithm_Fast( - VmaAllocator hAllocator, - VmaBlockVector* pBlockVector, - uint32_t currentFrameIndex, - bool overlappingMoveSupported) : - VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex), - m_OverlappingMoveSupported(overlappingMoveSupported), - m_AllocationCount(0), - m_AllAllocations(false), - m_BytesMoved(0), - m_AllocationsMoved(0), - m_BlockInfos(VmaStlAllocator(hAllocator->GetAllocationCallbacks())) -{ - VMA_ASSERT(VMA_DEBUG_MARGIN == 0); - -} - -VmaDefragmentationAlgorithm_Fast::~VmaDefragmentationAlgorithm_Fast() -{ -} - -VkResult VmaDefragmentationAlgorithm_Fast::Defragment( - VmaVector< VmaDefragmentationMove, VmaStlAllocator >& moves, - VkDeviceSize maxBytesToMove, - uint32_t maxAllocationsToMove, - VmaDefragmentationFlags flags) -{ - VMA_ASSERT(m_AllAllocations || m_pBlockVector->CalcAllocationCount() == m_AllocationCount); - - const size_t blockCount = m_pBlockVector->GetBlockCount(); - if(blockCount == 0 || maxBytesToMove == 0 || maxAllocationsToMove == 0) - { - return VK_SUCCESS; - } - - PreprocessMetadata(); - - // Sort blocks in order from most destination. - - m_BlockInfos.resize(blockCount); - for(size_t i = 0; i < blockCount; ++i) - { - m_BlockInfos[i].origBlockIndex = i; - } - - VMA_SORT(m_BlockInfos.begin(), m_BlockInfos.end(), [this](const BlockInfo& lhs, const BlockInfo& rhs) -> bool { - return m_pBlockVector->GetBlock(lhs.origBlockIndex)->m_pMetadata->GetSumFreeSize() < - m_pBlockVector->GetBlock(rhs.origBlockIndex)->m_pMetadata->GetSumFreeSize(); - }); - - // THE MAIN ALGORITHM - - FreeSpaceDatabase freeSpaceDb; - - size_t dstBlockInfoIndex = 0; - size_t dstOrigBlockIndex = m_BlockInfos[dstBlockInfoIndex].origBlockIndex; - VmaDeviceMemoryBlock* pDstBlock = m_pBlockVector->GetBlock(dstOrigBlockIndex); - VmaBlockMetadata_Generic* pDstMetadata = (VmaBlockMetadata_Generic*)pDstBlock->m_pMetadata; - VkDeviceSize dstBlockSize = pDstMetadata->GetSize(); - VkDeviceSize dstOffset = 0; - - bool end = false; - for(size_t srcBlockInfoIndex = 0; !end && srcBlockInfoIndex < blockCount; ++srcBlockInfoIndex) - { - const size_t srcOrigBlockIndex = m_BlockInfos[srcBlockInfoIndex].origBlockIndex; - VmaDeviceMemoryBlock* const pSrcBlock = m_pBlockVector->GetBlock(srcOrigBlockIndex); - VmaBlockMetadata_Generic* const pSrcMetadata = (VmaBlockMetadata_Generic*)pSrcBlock->m_pMetadata; - for(VmaSuballocationList::iterator srcSuballocIt = pSrcMetadata->m_Suballocations.begin(); - !end && srcSuballocIt != pSrcMetadata->m_Suballocations.end(); ) - { - VmaAllocation_T* const pAlloc = srcSuballocIt->hAllocation; - const VkDeviceSize srcAllocAlignment = pAlloc->GetAlignment(); - const VkDeviceSize srcAllocSize = srcSuballocIt->size; - if(m_AllocationsMoved == maxAllocationsToMove || - m_BytesMoved + srcAllocSize > maxBytesToMove) - { - end = true; - break; - } - const VkDeviceSize srcAllocOffset = srcSuballocIt->offset; - - VmaDefragmentationMove move = {}; - // Try to place it in one of free spaces from the database. - size_t freeSpaceInfoIndex; - VkDeviceSize dstAllocOffset; - if(freeSpaceDb.Fetch(srcAllocAlignment, srcAllocSize, - freeSpaceInfoIndex, dstAllocOffset)) - { - size_t freeSpaceOrigBlockIndex = m_BlockInfos[freeSpaceInfoIndex].origBlockIndex; - VmaDeviceMemoryBlock* pFreeSpaceBlock = m_pBlockVector->GetBlock(freeSpaceOrigBlockIndex); - VmaBlockMetadata_Generic* pFreeSpaceMetadata = (VmaBlockMetadata_Generic*)pFreeSpaceBlock->m_pMetadata; - - // Same block - if(freeSpaceInfoIndex == srcBlockInfoIndex) - { - VMA_ASSERT(dstAllocOffset <= srcAllocOffset); - - // MOVE OPTION 1: Move the allocation inside the same block by decreasing offset. - - VmaSuballocation suballoc = *srcSuballocIt; - suballoc.offset = dstAllocOffset; - suballoc.hAllocation->ChangeOffset(dstAllocOffset); - m_BytesMoved += srcAllocSize; - ++m_AllocationsMoved; - - VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt; - ++nextSuballocIt; - pSrcMetadata->m_Suballocations.erase(srcSuballocIt); - srcSuballocIt = nextSuballocIt; - - InsertSuballoc(pFreeSpaceMetadata, suballoc); - - move.srcBlockIndex = srcOrigBlockIndex; - move.dstBlockIndex = freeSpaceOrigBlockIndex; - move.srcOffset = srcAllocOffset; - move.dstOffset = dstAllocOffset; - move.size = srcAllocSize; - - moves.push_back(move); - } - // Different block - else - { - // MOVE OPTION 2: Move the allocation to a different block. - - VMA_ASSERT(freeSpaceInfoIndex < srcBlockInfoIndex); - - VmaSuballocation suballoc = *srcSuballocIt; - suballoc.offset = dstAllocOffset; - suballoc.hAllocation->ChangeBlockAllocation(m_hAllocator, pFreeSpaceBlock, dstAllocOffset); - m_BytesMoved += srcAllocSize; - ++m_AllocationsMoved; - - VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt; - ++nextSuballocIt; - pSrcMetadata->m_Suballocations.erase(srcSuballocIt); - srcSuballocIt = nextSuballocIt; - - InsertSuballoc(pFreeSpaceMetadata, suballoc); - - move.srcBlockIndex = srcOrigBlockIndex; - move.dstBlockIndex = freeSpaceOrigBlockIndex; - move.srcOffset = srcAllocOffset; - move.dstOffset = dstAllocOffset; - move.size = srcAllocSize; - - moves.push_back(move); - } - } - else - { - dstAllocOffset = VmaAlignUp(dstOffset, srcAllocAlignment); - - // If the allocation doesn't fit before the end of dstBlock, forward to next block. - while(dstBlockInfoIndex < srcBlockInfoIndex && - dstAllocOffset + srcAllocSize > dstBlockSize) - { - // But before that, register remaining free space at the end of dst block. - freeSpaceDb.Register(dstBlockInfoIndex, dstOffset, dstBlockSize - dstOffset); - - ++dstBlockInfoIndex; - dstOrigBlockIndex = m_BlockInfos[dstBlockInfoIndex].origBlockIndex; - pDstBlock = m_pBlockVector->GetBlock(dstOrigBlockIndex); - pDstMetadata = (VmaBlockMetadata_Generic*)pDstBlock->m_pMetadata; - dstBlockSize = pDstMetadata->GetSize(); - dstOffset = 0; - dstAllocOffset = 0; - } - - // Same block - if(dstBlockInfoIndex == srcBlockInfoIndex) - { - VMA_ASSERT(dstAllocOffset <= srcAllocOffset); - - const bool overlap = dstAllocOffset + srcAllocSize > srcAllocOffset; - - bool skipOver = overlap; - if(overlap && m_OverlappingMoveSupported && dstAllocOffset < srcAllocOffset) - { - // If destination and source place overlap, skip if it would move it - // by only < 1/64 of its size. - skipOver = (srcAllocOffset - dstAllocOffset) * 64 < srcAllocSize; - } - - if(skipOver) - { - freeSpaceDb.Register(dstBlockInfoIndex, dstOffset, srcAllocOffset - dstOffset); - - dstOffset = srcAllocOffset + srcAllocSize; - ++srcSuballocIt; - } - // MOVE OPTION 1: Move the allocation inside the same block by decreasing offset. - else - { - srcSuballocIt->offset = dstAllocOffset; - srcSuballocIt->hAllocation->ChangeOffset(dstAllocOffset); - dstOffset = dstAllocOffset + srcAllocSize; - m_BytesMoved += srcAllocSize; - ++m_AllocationsMoved; - ++srcSuballocIt; - - move.srcBlockIndex = srcOrigBlockIndex; - move.dstBlockIndex = dstOrigBlockIndex; - move.srcOffset = srcAllocOffset; - move.dstOffset = dstAllocOffset; - move.size = srcAllocSize; - - moves.push_back(move); - } - } - // Different block - else - { - // MOVE OPTION 2: Move the allocation to a different block. - - VMA_ASSERT(dstBlockInfoIndex < srcBlockInfoIndex); - VMA_ASSERT(dstAllocOffset + srcAllocSize <= dstBlockSize); - - VmaSuballocation suballoc = *srcSuballocIt; - suballoc.offset = dstAllocOffset; - suballoc.hAllocation->ChangeBlockAllocation(m_hAllocator, pDstBlock, dstAllocOffset); - dstOffset = dstAllocOffset + srcAllocSize; - m_BytesMoved += srcAllocSize; - ++m_AllocationsMoved; - - VmaSuballocationList::iterator nextSuballocIt = srcSuballocIt; - ++nextSuballocIt; - pSrcMetadata->m_Suballocations.erase(srcSuballocIt); - srcSuballocIt = nextSuballocIt; - - pDstMetadata->m_Suballocations.push_back(suballoc); - - move.srcBlockIndex = srcOrigBlockIndex; - move.dstBlockIndex = dstOrigBlockIndex; - move.srcOffset = srcAllocOffset; - move.dstOffset = dstAllocOffset; - move.size = srcAllocSize; - - moves.push_back(move); - } - } - } - } - - m_BlockInfos.clear(); - - PostprocessMetadata(); - - return VK_SUCCESS; -} - -void VmaDefragmentationAlgorithm_Fast::PreprocessMetadata() -{ - const size_t blockCount = m_pBlockVector->GetBlockCount(); - for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) - { - VmaBlockMetadata_Generic* const pMetadata = - (VmaBlockMetadata_Generic*)m_pBlockVector->GetBlock(blockIndex)->m_pMetadata; - pMetadata->m_FreeCount = 0; - pMetadata->m_SumFreeSize = pMetadata->GetSize(); - pMetadata->m_FreeSuballocationsBySize.clear(); - for(VmaSuballocationList::iterator it = pMetadata->m_Suballocations.begin(); - it != pMetadata->m_Suballocations.end(); ) - { - if(it->type == VMA_SUBALLOCATION_TYPE_FREE) - { - VmaSuballocationList::iterator nextIt = it; - ++nextIt; - pMetadata->m_Suballocations.erase(it); - it = nextIt; - } - else - { - ++it; - } - } - } -} - -void VmaDefragmentationAlgorithm_Fast::PostprocessMetadata() -{ - const size_t blockCount = m_pBlockVector->GetBlockCount(); - for(size_t blockIndex = 0; blockIndex < blockCount; ++blockIndex) - { - VmaBlockMetadata_Generic* const pMetadata = - (VmaBlockMetadata_Generic*)m_pBlockVector->GetBlock(blockIndex)->m_pMetadata; - const VkDeviceSize blockSize = pMetadata->GetSize(); - - // No allocations in this block - entire area is free. - if(pMetadata->m_Suballocations.empty()) - { - pMetadata->m_FreeCount = 1; - //pMetadata->m_SumFreeSize is already set to blockSize. - VmaSuballocation suballoc = { - 0, // offset - blockSize, // size - VMA_NULL, // hAllocation - VMA_SUBALLOCATION_TYPE_FREE }; - pMetadata->m_Suballocations.push_back(suballoc); - pMetadata->RegisterFreeSuballocation(pMetadata->m_Suballocations.begin()); - } - // There are some allocations in this block. - else - { - VkDeviceSize offset = 0; - VmaSuballocationList::iterator it; - for(it = pMetadata->m_Suballocations.begin(); - it != pMetadata->m_Suballocations.end(); - ++it) - { - VMA_ASSERT(it->type != VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(it->offset >= offset); - - // Need to insert preceding free space. - if(it->offset > offset) - { - ++pMetadata->m_FreeCount; - const VkDeviceSize freeSize = it->offset - offset; - VmaSuballocation suballoc = { - offset, // offset - freeSize, // size - VMA_NULL, // hAllocation - VMA_SUBALLOCATION_TYPE_FREE }; - VmaSuballocationList::iterator precedingFreeIt = pMetadata->m_Suballocations.insert(it, suballoc); - if(freeSize >= VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER) - { - pMetadata->m_FreeSuballocationsBySize.push_back(precedingFreeIt); - } - } - - pMetadata->m_SumFreeSize -= it->size; - offset = it->offset + it->size; - } - - // Need to insert trailing free space. - if(offset < blockSize) - { - ++pMetadata->m_FreeCount; - const VkDeviceSize freeSize = blockSize - offset; - VmaSuballocation suballoc = { - offset, // offset - freeSize, // size - VMA_NULL, // hAllocation - VMA_SUBALLOCATION_TYPE_FREE }; - VMA_ASSERT(it == pMetadata->m_Suballocations.end()); - VmaSuballocationList::iterator trailingFreeIt = pMetadata->m_Suballocations.insert(it, suballoc); - if(freeSize > VMA_MIN_FREE_SUBALLOCATION_SIZE_TO_REGISTER) - { - pMetadata->m_FreeSuballocationsBySize.push_back(trailingFreeIt); - } - } - - VMA_SORT( - pMetadata->m_FreeSuballocationsBySize.begin(), - pMetadata->m_FreeSuballocationsBySize.end(), - VmaSuballocationItemSizeLess()); - } - - VMA_HEAVY_ASSERT(pMetadata->Validate()); - } -} - -void VmaDefragmentationAlgorithm_Fast::InsertSuballoc(VmaBlockMetadata_Generic* pMetadata, const VmaSuballocation& suballoc) -{ - // TODO: Optimize somehow. Remember iterator instead of searching for it linearly. - VmaSuballocationList::iterator it = pMetadata->m_Suballocations.begin(); - while(it != pMetadata->m_Suballocations.end()) - { - if(it->offset < suballoc.offset) - { - ++it; - } - } - pMetadata->m_Suballocations.insert(it, suballoc); -} - -//////////////////////////////////////////////////////////////////////////////// -// VmaBlockVectorDefragmentationContext - -VmaBlockVectorDefragmentationContext::VmaBlockVectorDefragmentationContext( - VmaAllocator hAllocator, - VmaPool hCustomPool, - VmaBlockVector* pBlockVector, - uint32_t currFrameIndex) : - res(VK_SUCCESS), - mutexLocked(false), - blockContexts(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), - defragmentationMoves(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), - defragmentationMovesProcessed(0), - defragmentationMovesCommitted(0), - hasDefragmentationPlan(0), - m_hAllocator(hAllocator), - m_hCustomPool(hCustomPool), - m_pBlockVector(pBlockVector), - m_CurrFrameIndex(currFrameIndex), - m_pAlgorithm(VMA_NULL), - m_Allocations(VmaStlAllocator(hAllocator->GetAllocationCallbacks())), - m_AllAllocations(false) -{ -} - -VmaBlockVectorDefragmentationContext::~VmaBlockVectorDefragmentationContext() -{ - vma_delete(m_hAllocator, m_pAlgorithm); -} - -void VmaBlockVectorDefragmentationContext::AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) -{ - AllocInfo info = { hAlloc, pChanged }; - m_Allocations.push_back(info); -} - -void VmaBlockVectorDefragmentationContext::Begin(bool overlappingMoveSupported, VmaDefragmentationFlags flags) -{ - const bool allAllocations = m_AllAllocations || - m_Allocations.size() == m_pBlockVector->CalcAllocationCount(); - - /******************************** - HERE IS THE CHOICE OF DEFRAGMENTATION ALGORITHM. - ********************************/ - - /* - Fast algorithm is supported only when certain criteria are met: - - VMA_DEBUG_MARGIN is 0. - - All allocations in this block vector are moveable. - - There is no possibility of image/buffer granularity conflict. - - The defragmentation is not incremental - */ - if(VMA_DEBUG_MARGIN == 0 && - allAllocations && - !m_pBlockVector->IsBufferImageGranularityConflictPossible() && - !(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL)) - { - m_pAlgorithm = vma_new(m_hAllocator, VmaDefragmentationAlgorithm_Fast)( - m_hAllocator, m_pBlockVector, m_CurrFrameIndex, overlappingMoveSupported); - } - else - { - m_pAlgorithm = vma_new(m_hAllocator, VmaDefragmentationAlgorithm_Generic)( - m_hAllocator, m_pBlockVector, m_CurrFrameIndex, overlappingMoveSupported); - } - - if(allAllocations) - { - m_pAlgorithm->AddAll(); - } - else - { - for(size_t i = 0, count = m_Allocations.size(); i < count; ++i) - { - m_pAlgorithm->AddAllocation(m_Allocations[i].hAlloc, m_Allocations[i].pChanged); - } - } -} - -//////////////////////////////////////////////////////////////////////////////// -// VmaDefragmentationContext - -VmaDefragmentationContext_T::VmaDefragmentationContext_T( - VmaAllocator hAllocator, - uint32_t currFrameIndex, - uint32_t flags, - VmaDefragmentationStats* pStats) : - m_hAllocator(hAllocator), - m_CurrFrameIndex(currFrameIndex), - m_Flags(flags), - m_pStats(pStats), - m_CustomPoolContexts(VmaStlAllocator(hAllocator->GetAllocationCallbacks())) -{ - memset(m_DefaultPoolContexts, 0, sizeof(m_DefaultPoolContexts)); -} - -VmaDefragmentationContext_T::~VmaDefragmentationContext_T() -{ - for(size_t i = m_CustomPoolContexts.size(); i--; ) - { - VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_CustomPoolContexts[i]; - pBlockVectorCtx->GetBlockVector()->DefragmentationEnd(pBlockVectorCtx, m_pStats); - vma_delete(m_hAllocator, pBlockVectorCtx); - } - for(size_t i = m_hAllocator->m_MemProps.memoryTypeCount; i--; ) - { - VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_DefaultPoolContexts[i]; - if(pBlockVectorCtx) - { - pBlockVectorCtx->GetBlockVector()->DefragmentationEnd(pBlockVectorCtx, m_pStats); - vma_delete(m_hAllocator, pBlockVectorCtx); - } - } -} - -void VmaDefragmentationContext_T::AddPools(uint32_t poolCount, VmaPool* pPools) -{ - for(uint32_t poolIndex = 0; poolIndex < poolCount; ++poolIndex) - { - VmaPool pool = pPools[poolIndex]; - VMA_ASSERT(pool); - // Pools with algorithm other than default are not defragmented. - if(pool->m_BlockVector.GetAlgorithm() == 0) - { - VmaBlockVectorDefragmentationContext* pBlockVectorDefragCtx = VMA_NULL; - - for(size_t i = m_CustomPoolContexts.size(); i--; ) - { - if(m_CustomPoolContexts[i]->GetCustomPool() == pool) - { - pBlockVectorDefragCtx = m_CustomPoolContexts[i]; - break; - } - } - - if(!pBlockVectorDefragCtx) - { - pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)( - m_hAllocator, - pool, - &pool->m_BlockVector, - m_CurrFrameIndex); - m_CustomPoolContexts.push_back(pBlockVectorDefragCtx); - } - - pBlockVectorDefragCtx->AddAll(); - } - } -} - -void VmaDefragmentationContext_T::AddAllocations( - uint32_t allocationCount, - VmaAllocation* pAllocations, - VkBool32* pAllocationsChanged) -{ - // Dispatch pAllocations among defragmentators. Create them when necessary. - for(uint32_t allocIndex = 0; allocIndex < allocationCount; ++allocIndex) - { - const VmaAllocation hAlloc = pAllocations[allocIndex]; - VMA_ASSERT(hAlloc); - // DedicatedAlloc cannot be defragmented. - if((hAlloc->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK) && - // Lost allocation cannot be defragmented. - (hAlloc->GetLastUseFrameIndex() != VMA_FRAME_INDEX_LOST)) - { - VmaBlockVectorDefragmentationContext* pBlockVectorDefragCtx = VMA_NULL; - - const VmaPool hAllocPool = hAlloc->GetBlock()->GetParentPool(); - // This allocation belongs to custom pool. - if(hAllocPool != VK_NULL_HANDLE) - { - // Pools with algorithm other than default are not defragmented. - if(hAllocPool->m_BlockVector.GetAlgorithm() == 0) - { - for(size_t i = m_CustomPoolContexts.size(); i--; ) - { - if(m_CustomPoolContexts[i]->GetCustomPool() == hAllocPool) - { - pBlockVectorDefragCtx = m_CustomPoolContexts[i]; - break; - } - } - if(!pBlockVectorDefragCtx) - { - pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)( - m_hAllocator, - hAllocPool, - &hAllocPool->m_BlockVector, - m_CurrFrameIndex); - m_CustomPoolContexts.push_back(pBlockVectorDefragCtx); - } - } - } - // This allocation belongs to default pool. - else - { - const uint32_t memTypeIndex = hAlloc->GetMemoryTypeIndex(); - pBlockVectorDefragCtx = m_DefaultPoolContexts[memTypeIndex]; - if(!pBlockVectorDefragCtx) - { - pBlockVectorDefragCtx = vma_new(m_hAllocator, VmaBlockVectorDefragmentationContext)( - m_hAllocator, - VMA_NULL, // hCustomPool - m_hAllocator->m_pBlockVectors[memTypeIndex], - m_CurrFrameIndex); - m_DefaultPoolContexts[memTypeIndex] = pBlockVectorDefragCtx; - } - } - - if(pBlockVectorDefragCtx) - { - VkBool32* const pChanged = (pAllocationsChanged != VMA_NULL) ? - &pAllocationsChanged[allocIndex] : VMA_NULL; - pBlockVectorDefragCtx->AddAllocation(hAlloc, pChanged); - } - } - } -} - -VkResult VmaDefragmentationContext_T::Defragment( - VkDeviceSize maxCpuBytesToMove, uint32_t maxCpuAllocationsToMove, - VkDeviceSize maxGpuBytesToMove, uint32_t maxGpuAllocationsToMove, - VkCommandBuffer commandBuffer, VmaDefragmentationStats* pStats, VmaDefragmentationFlags flags) -{ - if(pStats) - { - memset(pStats, 0, sizeof(VmaDefragmentationStats)); - } - - if(flags & VMA_DEFRAGMENTATION_FLAG_INCREMENTAL) - { - // For incremental defragmetnations, we just earmark how much we can move - // The real meat is in the defragmentation steps - m_MaxCpuBytesToMove = maxCpuBytesToMove; - m_MaxCpuAllocationsToMove = maxCpuAllocationsToMove; - - m_MaxGpuBytesToMove = maxGpuBytesToMove; - m_MaxGpuAllocationsToMove = maxGpuAllocationsToMove; - - if(m_MaxCpuBytesToMove == 0 && m_MaxCpuAllocationsToMove == 0 && - m_MaxGpuBytesToMove == 0 && m_MaxGpuAllocationsToMove == 0) - return VK_SUCCESS; - - return VK_NOT_READY; - } - - if(commandBuffer == VK_NULL_HANDLE) - { - maxGpuBytesToMove = 0; - maxGpuAllocationsToMove = 0; - } - - VkResult res = VK_SUCCESS; - - // Process default pools. - for(uint32_t memTypeIndex = 0; - memTypeIndex < m_hAllocator->GetMemoryTypeCount() && res >= VK_SUCCESS; - ++memTypeIndex) - { - VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_DefaultPoolContexts[memTypeIndex]; - if(pBlockVectorCtx) - { - VMA_ASSERT(pBlockVectorCtx->GetBlockVector()); - pBlockVectorCtx->GetBlockVector()->Defragment( - pBlockVectorCtx, - pStats, flags, - maxCpuBytesToMove, maxCpuAllocationsToMove, - maxGpuBytesToMove, maxGpuAllocationsToMove, - commandBuffer); - if(pBlockVectorCtx->res != VK_SUCCESS) - { - res = pBlockVectorCtx->res; - } - } - } - - // Process custom pools. - for(size_t customCtxIndex = 0, customCtxCount = m_CustomPoolContexts.size(); - customCtxIndex < customCtxCount && res >= VK_SUCCESS; - ++customCtxIndex) - { - VmaBlockVectorDefragmentationContext* pBlockVectorCtx = m_CustomPoolContexts[customCtxIndex]; - VMA_ASSERT(pBlockVectorCtx && pBlockVectorCtx->GetBlockVector()); - pBlockVectorCtx->GetBlockVector()->Defragment( - pBlockVectorCtx, - pStats, flags, - maxCpuBytesToMove, maxCpuAllocationsToMove, - maxGpuBytesToMove, maxGpuAllocationsToMove, - commandBuffer); - if(pBlockVectorCtx->res != VK_SUCCESS) - { - res = pBlockVectorCtx->res; - } - } - - return res; -} - -VkResult VmaDefragmentationContext_T::DefragmentPassBegin(VmaDefragmentationPassInfo* pInfo) -{ - VmaDefragmentationPassMoveInfo* pCurrentMove = pInfo->pMoves; - uint32_t movesLeft = pInfo->moveCount; - - // Process default pools. - for(uint32_t memTypeIndex = 0; - memTypeIndex < m_hAllocator->GetMemoryTypeCount(); - ++memTypeIndex) - { - VmaBlockVectorDefragmentationContext *pBlockVectorCtx = m_DefaultPoolContexts[memTypeIndex]; - if(pBlockVectorCtx) - { - VMA_ASSERT(pBlockVectorCtx->GetBlockVector()); - - if(!pBlockVectorCtx->hasDefragmentationPlan) - { - pBlockVectorCtx->GetBlockVector()->Defragment( - pBlockVectorCtx, - m_pStats, m_Flags, - m_MaxCpuBytesToMove, m_MaxCpuAllocationsToMove, - m_MaxGpuBytesToMove, m_MaxGpuAllocationsToMove, - VK_NULL_HANDLE); - - if(pBlockVectorCtx->res < VK_SUCCESS) - continue; - - pBlockVectorCtx->hasDefragmentationPlan = true; - } - - const uint32_t processed = pBlockVectorCtx->GetBlockVector()->ProcessDefragmentations( - pBlockVectorCtx, - pCurrentMove, movesLeft); - - movesLeft -= processed; - pCurrentMove += processed; - } - } - - // Process custom pools. - for(size_t customCtxIndex = 0, customCtxCount = m_CustomPoolContexts.size(); - customCtxIndex < customCtxCount; - ++customCtxIndex) - { - VmaBlockVectorDefragmentationContext *pBlockVectorCtx = m_CustomPoolContexts[customCtxIndex]; - VMA_ASSERT(pBlockVectorCtx && pBlockVectorCtx->GetBlockVector()); - - if(!pBlockVectorCtx->hasDefragmentationPlan) - { - pBlockVectorCtx->GetBlockVector()->Defragment( - pBlockVectorCtx, - m_pStats, m_Flags, - m_MaxCpuBytesToMove, m_MaxCpuAllocationsToMove, - m_MaxGpuBytesToMove, m_MaxGpuAllocationsToMove, - VK_NULL_HANDLE); - - if(pBlockVectorCtx->res < VK_SUCCESS) - continue; - - pBlockVectorCtx->hasDefragmentationPlan = true; - } - - const uint32_t processed = pBlockVectorCtx->GetBlockVector()->ProcessDefragmentations( - pBlockVectorCtx, - pCurrentMove, movesLeft); - - movesLeft -= processed; - pCurrentMove += processed; - } - - pInfo->moveCount = pInfo->moveCount - movesLeft; - - return VK_SUCCESS; -} -VkResult VmaDefragmentationContext_T::DefragmentPassEnd() -{ - VkResult res = VK_SUCCESS; - - // Process default pools. - for(uint32_t memTypeIndex = 0; - memTypeIndex < m_hAllocator->GetMemoryTypeCount(); - ++memTypeIndex) - { - VmaBlockVectorDefragmentationContext *pBlockVectorCtx = m_DefaultPoolContexts[memTypeIndex]; - if(pBlockVectorCtx) - { - VMA_ASSERT(pBlockVectorCtx->GetBlockVector()); - - if(!pBlockVectorCtx->hasDefragmentationPlan) - { - res = VK_NOT_READY; - continue; - } - - pBlockVectorCtx->GetBlockVector()->CommitDefragmentations( - pBlockVectorCtx, m_pStats); - - if(pBlockVectorCtx->defragmentationMoves.size() != pBlockVectorCtx->defragmentationMovesCommitted) - res = VK_NOT_READY; - } - } - - // Process custom pools. - for(size_t customCtxIndex = 0, customCtxCount = m_CustomPoolContexts.size(); - customCtxIndex < customCtxCount; - ++customCtxIndex) - { - VmaBlockVectorDefragmentationContext *pBlockVectorCtx = m_CustomPoolContexts[customCtxIndex]; - VMA_ASSERT(pBlockVectorCtx && pBlockVectorCtx->GetBlockVector()); - - if(!pBlockVectorCtx->hasDefragmentationPlan) - { - res = VK_NOT_READY; - continue; - } - - pBlockVectorCtx->GetBlockVector()->CommitDefragmentations( - pBlockVectorCtx, m_pStats); - - if(pBlockVectorCtx->defragmentationMoves.size() != pBlockVectorCtx->defragmentationMovesCommitted) - res = VK_NOT_READY; - } - - return res; -} - -//////////////////////////////////////////////////////////////////////////////// -// VmaRecorder - -#if VMA_RECORDING_ENABLED - -VmaRecorder::VmaRecorder() : - m_UseMutex(true), - m_Flags(0), - m_File(VMA_NULL), - m_Freq(INT64_MAX), - m_StartCounter(INT64_MAX) -{ -} - -VkResult VmaRecorder::Init(const VmaRecordSettings& settings, bool useMutex) -{ - m_UseMutex = useMutex; - m_Flags = settings.flags; - - QueryPerformanceFrequency((LARGE_INTEGER*)&m_Freq); - QueryPerformanceCounter((LARGE_INTEGER*)&m_StartCounter); - - // Open file for writing. - errno_t err = fopen_s(&m_File, settings.pFilePath, "wb"); - if(err != 0) - { - return VK_ERROR_INITIALIZATION_FAILED; - } - - // Write header. - fprintf(m_File, "%s\n", "Vulkan Memory Allocator,Calls recording"); - fprintf(m_File, "%s\n", "1,8"); - - return VK_SUCCESS; -} - -VmaRecorder::~VmaRecorder() -{ - if(m_File != VMA_NULL) - { - fclose(m_File); - } -} - -void VmaRecorder::RecordCreateAllocator(uint32_t frameIndex) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaCreateAllocator\n", callParams.threadId, callParams.time, frameIndex); - Flush(); -} - -void VmaRecorder::RecordDestroyAllocator(uint32_t frameIndex) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaDestroyAllocator\n", callParams.threadId, callParams.time, frameIndex); - Flush(); -} - -void VmaRecorder::RecordCreatePool(uint32_t frameIndex, const VmaPoolCreateInfo& createInfo, VmaPool pool) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaCreatePool,%u,%u,%llu,%llu,%llu,%u,%p\n", callParams.threadId, callParams.time, frameIndex, - createInfo.memoryTypeIndex, - createInfo.flags, - createInfo.blockSize, - (uint64_t)createInfo.minBlockCount, - (uint64_t)createInfo.maxBlockCount, - createInfo.frameInUseCount, - pool); - Flush(); -} - -void VmaRecorder::RecordDestroyPool(uint32_t frameIndex, VmaPool pool) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaDestroyPool,%p\n", callParams.threadId, callParams.time, frameIndex, - pool); - Flush(); -} - -void VmaRecorder::RecordAllocateMemory(uint32_t frameIndex, - const VkMemoryRequirements& vkMemReq, - const VmaAllocationCreateInfo& createInfo, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - UserDataString userDataStr(createInfo.flags, createInfo.pUserData); - fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemory,%llu,%llu,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex, - vkMemReq.size, - vkMemReq.alignment, - vkMemReq.memoryTypeBits, - createInfo.flags, - createInfo.usage, - createInfo.requiredFlags, - createInfo.preferredFlags, - createInfo.memoryTypeBits, - createInfo.pool, - allocation, - userDataStr.GetString()); - Flush(); -} - -void VmaRecorder::RecordAllocateMemoryPages(uint32_t frameIndex, - const VkMemoryRequirements& vkMemReq, - const VmaAllocationCreateInfo& createInfo, - uint64_t allocationCount, - const VmaAllocation* pAllocations) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - UserDataString userDataStr(createInfo.flags, createInfo.pUserData); - fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryPages,%llu,%llu,%u,%u,%u,%u,%u,%u,%p,", callParams.threadId, callParams.time, frameIndex, - vkMemReq.size, - vkMemReq.alignment, - vkMemReq.memoryTypeBits, - createInfo.flags, - createInfo.usage, - createInfo.requiredFlags, - createInfo.preferredFlags, - createInfo.memoryTypeBits, - createInfo.pool); - PrintPointerList(allocationCount, pAllocations); - fprintf(m_File, ",%s\n", userDataStr.GetString()); - Flush(); -} - -void VmaRecorder::RecordAllocateMemoryForBuffer(uint32_t frameIndex, - const VkMemoryRequirements& vkMemReq, - bool requiresDedicatedAllocation, - bool prefersDedicatedAllocation, - const VmaAllocationCreateInfo& createInfo, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - UserDataString userDataStr(createInfo.flags, createInfo.pUserData); - fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryForBuffer,%llu,%llu,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex, - vkMemReq.size, - vkMemReq.alignment, - vkMemReq.memoryTypeBits, - requiresDedicatedAllocation ? 1 : 0, - prefersDedicatedAllocation ? 1 : 0, - createInfo.flags, - createInfo.usage, - createInfo.requiredFlags, - createInfo.preferredFlags, - createInfo.memoryTypeBits, - createInfo.pool, - allocation, - userDataStr.GetString()); - Flush(); -} - -void VmaRecorder::RecordAllocateMemoryForImage(uint32_t frameIndex, - const VkMemoryRequirements& vkMemReq, - bool requiresDedicatedAllocation, - bool prefersDedicatedAllocation, - const VmaAllocationCreateInfo& createInfo, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - UserDataString userDataStr(createInfo.flags, createInfo.pUserData); - fprintf(m_File, "%u,%.3f,%u,vmaAllocateMemoryForImage,%llu,%llu,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex, - vkMemReq.size, - vkMemReq.alignment, - vkMemReq.memoryTypeBits, - requiresDedicatedAllocation ? 1 : 0, - prefersDedicatedAllocation ? 1 : 0, - createInfo.flags, - createInfo.usage, - createInfo.requiredFlags, - createInfo.preferredFlags, - createInfo.memoryTypeBits, - createInfo.pool, - allocation, - userDataStr.GetString()); - Flush(); -} - -void VmaRecorder::RecordFreeMemory(uint32_t frameIndex, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaFreeMemory,%p\n", callParams.threadId, callParams.time, frameIndex, - allocation); - Flush(); -} - -void VmaRecorder::RecordFreeMemoryPages(uint32_t frameIndex, - uint64_t allocationCount, - const VmaAllocation* pAllocations) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaFreeMemoryPages,", callParams.threadId, callParams.time, frameIndex); - PrintPointerList(allocationCount, pAllocations); - fprintf(m_File, "\n"); - Flush(); -} - -void VmaRecorder::RecordSetAllocationUserData(uint32_t frameIndex, - VmaAllocation allocation, - const void* pUserData) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - UserDataString userDataStr( - allocation->IsUserDataString() ? VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT : 0, - pUserData); - fprintf(m_File, "%u,%.3f,%u,vmaSetAllocationUserData,%p,%s\n", callParams.threadId, callParams.time, frameIndex, - allocation, - userDataStr.GetString()); - Flush(); -} - -void VmaRecorder::RecordCreateLostAllocation(uint32_t frameIndex, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaCreateLostAllocation,%p\n", callParams.threadId, callParams.time, frameIndex, - allocation); - Flush(); -} - -void VmaRecorder::RecordMapMemory(uint32_t frameIndex, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaMapMemory,%p\n", callParams.threadId, callParams.time, frameIndex, - allocation); - Flush(); -} - -void VmaRecorder::RecordUnmapMemory(uint32_t frameIndex, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaUnmapMemory,%p\n", callParams.threadId, callParams.time, frameIndex, - allocation); - Flush(); -} - -void VmaRecorder::RecordFlushAllocation(uint32_t frameIndex, - VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaFlushAllocation,%p,%llu,%llu\n", callParams.threadId, callParams.time, frameIndex, - allocation, - offset, - size); - Flush(); -} - -void VmaRecorder::RecordInvalidateAllocation(uint32_t frameIndex, - VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaInvalidateAllocation,%p,%llu,%llu\n", callParams.threadId, callParams.time, frameIndex, - allocation, - offset, - size); - Flush(); -} - -void VmaRecorder::RecordCreateBuffer(uint32_t frameIndex, - const VkBufferCreateInfo& bufCreateInfo, - const VmaAllocationCreateInfo& allocCreateInfo, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - UserDataString userDataStr(allocCreateInfo.flags, allocCreateInfo.pUserData); - fprintf(m_File, "%u,%.3f,%u,vmaCreateBuffer,%u,%llu,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex, - bufCreateInfo.flags, - bufCreateInfo.size, - bufCreateInfo.usage, - bufCreateInfo.sharingMode, - allocCreateInfo.flags, - allocCreateInfo.usage, - allocCreateInfo.requiredFlags, - allocCreateInfo.preferredFlags, - allocCreateInfo.memoryTypeBits, - allocCreateInfo.pool, - allocation, - userDataStr.GetString()); - Flush(); -} - -void VmaRecorder::RecordCreateImage(uint32_t frameIndex, - const VkImageCreateInfo& imageCreateInfo, - const VmaAllocationCreateInfo& allocCreateInfo, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - UserDataString userDataStr(allocCreateInfo.flags, allocCreateInfo.pUserData); - fprintf(m_File, "%u,%.3f,%u,vmaCreateImage,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%p,%p,%s\n", callParams.threadId, callParams.time, frameIndex, - imageCreateInfo.flags, - imageCreateInfo.imageType, - imageCreateInfo.format, - imageCreateInfo.extent.width, - imageCreateInfo.extent.height, - imageCreateInfo.extent.depth, - imageCreateInfo.mipLevels, - imageCreateInfo.arrayLayers, - imageCreateInfo.samples, - imageCreateInfo.tiling, - imageCreateInfo.usage, - imageCreateInfo.sharingMode, - imageCreateInfo.initialLayout, - allocCreateInfo.flags, - allocCreateInfo.usage, - allocCreateInfo.requiredFlags, - allocCreateInfo.preferredFlags, - allocCreateInfo.memoryTypeBits, - allocCreateInfo.pool, - allocation, - userDataStr.GetString()); - Flush(); -} - -void VmaRecorder::RecordDestroyBuffer(uint32_t frameIndex, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaDestroyBuffer,%p\n", callParams.threadId, callParams.time, frameIndex, - allocation); - Flush(); -} - -void VmaRecorder::RecordDestroyImage(uint32_t frameIndex, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaDestroyImage,%p\n", callParams.threadId, callParams.time, frameIndex, - allocation); - Flush(); -} - -void VmaRecorder::RecordTouchAllocation(uint32_t frameIndex, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaTouchAllocation,%p\n", callParams.threadId, callParams.time, frameIndex, - allocation); - Flush(); -} - -void VmaRecorder::RecordGetAllocationInfo(uint32_t frameIndex, - VmaAllocation allocation) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaGetAllocationInfo,%p\n", callParams.threadId, callParams.time, frameIndex, - allocation); - Flush(); -} - -void VmaRecorder::RecordMakePoolAllocationsLost(uint32_t frameIndex, - VmaPool pool) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaMakePoolAllocationsLost,%p\n", callParams.threadId, callParams.time, frameIndex, - pool); - Flush(); -} - -void VmaRecorder::RecordDefragmentationBegin(uint32_t frameIndex, - const VmaDefragmentationInfo2& info, - VmaDefragmentationContext ctx) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaDefragmentationBegin,%u,", callParams.threadId, callParams.time, frameIndex, - info.flags); - PrintPointerList(info.allocationCount, info.pAllocations); - fprintf(m_File, ","); - PrintPointerList(info.poolCount, info.pPools); - fprintf(m_File, ",%llu,%u,%llu,%u,%p,%p\n", - info.maxCpuBytesToMove, - info.maxCpuAllocationsToMove, - info.maxGpuBytesToMove, - info.maxGpuAllocationsToMove, - info.commandBuffer, - ctx); - Flush(); -} - -void VmaRecorder::RecordDefragmentationEnd(uint32_t frameIndex, - VmaDefragmentationContext ctx) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaDefragmentationEnd,%p\n", callParams.threadId, callParams.time, frameIndex, - ctx); - Flush(); -} - -void VmaRecorder::RecordSetPoolName(uint32_t frameIndex, - VmaPool pool, - const char* name) -{ - CallParams callParams; - GetBasicParams(callParams); - - VmaMutexLock lock(m_FileMutex, m_UseMutex); - fprintf(m_File, "%u,%.3f,%u,vmaSetPoolName,%p,%s\n", callParams.threadId, callParams.time, frameIndex, - pool, name != VMA_NULL ? name : ""); - Flush(); -} - -VmaRecorder::UserDataString::UserDataString(VmaAllocationCreateFlags allocFlags, const void* pUserData) -{ - if(pUserData != VMA_NULL) - { - if((allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0) - { - m_Str = (const char*)pUserData; - } - else - { - sprintf_s(m_PtrStr, "%p", pUserData); - m_Str = m_PtrStr; - } - } - else - { - m_Str = ""; - } -} - -void VmaRecorder::WriteConfiguration( - const VkPhysicalDeviceProperties& devProps, - const VkPhysicalDeviceMemoryProperties& memProps, - uint32_t vulkanApiVersion, - bool dedicatedAllocationExtensionEnabled, - bool bindMemory2ExtensionEnabled, - bool memoryBudgetExtensionEnabled) -{ - fprintf(m_File, "Config,Begin\n"); - - fprintf(m_File, "VulkanApiVersion,%u,%u\n", VK_VERSION_MAJOR(vulkanApiVersion), VK_VERSION_MINOR(vulkanApiVersion)); - - fprintf(m_File, "PhysicalDevice,apiVersion,%u\n", devProps.apiVersion); - fprintf(m_File, "PhysicalDevice,driverVersion,%u\n", devProps.driverVersion); - fprintf(m_File, "PhysicalDevice,vendorID,%u\n", devProps.vendorID); - fprintf(m_File, "PhysicalDevice,deviceID,%u\n", devProps.deviceID); - fprintf(m_File, "PhysicalDevice,deviceType,%u\n", devProps.deviceType); - fprintf(m_File, "PhysicalDevice,deviceName,%s\n", devProps.deviceName); - - fprintf(m_File, "PhysicalDeviceLimits,maxMemoryAllocationCount,%u\n", devProps.limits.maxMemoryAllocationCount); - fprintf(m_File, "PhysicalDeviceLimits,bufferImageGranularity,%llu\n", devProps.limits.bufferImageGranularity); - fprintf(m_File, "PhysicalDeviceLimits,nonCoherentAtomSize,%llu\n", devProps.limits.nonCoherentAtomSize); - - fprintf(m_File, "PhysicalDeviceMemory,HeapCount,%u\n", memProps.memoryHeapCount); - for(uint32_t i = 0; i < memProps.memoryHeapCount; ++i) - { - fprintf(m_File, "PhysicalDeviceMemory,Heap,%u,size,%llu\n", i, memProps.memoryHeaps[i].size); - fprintf(m_File, "PhysicalDeviceMemory,Heap,%u,flags,%u\n", i, memProps.memoryHeaps[i].flags); - } - fprintf(m_File, "PhysicalDeviceMemory,TypeCount,%u\n", memProps.memoryTypeCount); - for(uint32_t i = 0; i < memProps.memoryTypeCount; ++i) - { - fprintf(m_File, "PhysicalDeviceMemory,Type,%u,heapIndex,%u\n", i, memProps.memoryTypes[i].heapIndex); - fprintf(m_File, "PhysicalDeviceMemory,Type,%u,propertyFlags,%u\n", i, memProps.memoryTypes[i].propertyFlags); - } - - fprintf(m_File, "Extension,VK_KHR_dedicated_allocation,%u\n", dedicatedAllocationExtensionEnabled ? 1 : 0); - fprintf(m_File, "Extension,VK_KHR_bind_memory2,%u\n", bindMemory2ExtensionEnabled ? 1 : 0); - fprintf(m_File, "Extension,VK_EXT_memory_budget,%u\n", memoryBudgetExtensionEnabled ? 1 : 0); - - fprintf(m_File, "Macro,VMA_DEBUG_ALWAYS_DEDICATED_MEMORY,%u\n", VMA_DEBUG_ALWAYS_DEDICATED_MEMORY ? 1 : 0); - fprintf(m_File, "Macro,VMA_DEBUG_ALIGNMENT,%llu\n", (VkDeviceSize)VMA_DEBUG_ALIGNMENT); - fprintf(m_File, "Macro,VMA_DEBUG_MARGIN,%llu\n", (VkDeviceSize)VMA_DEBUG_MARGIN); - fprintf(m_File, "Macro,VMA_DEBUG_INITIALIZE_ALLOCATIONS,%u\n", VMA_DEBUG_INITIALIZE_ALLOCATIONS ? 1 : 0); - fprintf(m_File, "Macro,VMA_DEBUG_DETECT_CORRUPTION,%u\n", VMA_DEBUG_DETECT_CORRUPTION ? 1 : 0); - fprintf(m_File, "Macro,VMA_DEBUG_GLOBAL_MUTEX,%u\n", VMA_DEBUG_GLOBAL_MUTEX ? 1 : 0); - fprintf(m_File, "Macro,VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY,%llu\n", (VkDeviceSize)VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY); - fprintf(m_File, "Macro,VMA_SMALL_HEAP_MAX_SIZE,%llu\n", (VkDeviceSize)VMA_SMALL_HEAP_MAX_SIZE); - fprintf(m_File, "Macro,VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE,%llu\n", (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE); - - fprintf(m_File, "Config,End\n"); -} - -void VmaRecorder::GetBasicParams(CallParams& outParams) -{ - outParams.threadId = GetCurrentThreadId(); - - LARGE_INTEGER counter; - QueryPerformanceCounter(&counter); - outParams.time = (double)(counter.QuadPart - m_StartCounter) / (double)m_Freq; -} - -void VmaRecorder::PrintPointerList(uint64_t count, const VmaAllocation* pItems) -{ - if(count) - { - fprintf(m_File, "%p", pItems[0]); - for(uint64_t i = 1; i < count; ++i) - { - fprintf(m_File, " %p", pItems[i]); - } - } -} - -void VmaRecorder::Flush() -{ - if((m_Flags & VMA_RECORD_FLUSH_AFTER_CALL_BIT) != 0) - { - fflush(m_File); - } -} - -#endif // #if VMA_RECORDING_ENABLED - -//////////////////////////////////////////////////////////////////////////////// -// VmaAllocationObjectAllocator - -VmaAllocationObjectAllocator::VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks) : - m_Allocator(pAllocationCallbacks, 1024) -{ -} - -VmaAllocation VmaAllocationObjectAllocator::Allocate() -{ - VmaMutexLock mutexLock(m_Mutex); - return m_Allocator.Alloc(); -} - -void VmaAllocationObjectAllocator::Free(VmaAllocation hAlloc) -{ - VmaMutexLock mutexLock(m_Mutex); - m_Allocator.Free(hAlloc); -} - -//////////////////////////////////////////////////////////////////////////////// -// VmaAllocator_T - -VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) : - m_UseMutex((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT) == 0), - m_VulkanApiVersion(pCreateInfo->vulkanApiVersion != 0 ? pCreateInfo->vulkanApiVersion : VK_API_VERSION_1_0), - m_UseKhrDedicatedAllocation((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0), - m_UseKhrBindMemory2((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0), - m_UseExtMemoryBudget((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0), - m_hDevice(pCreateInfo->device), - m_hInstance(pCreateInfo->instance), - m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL), - m_AllocationCallbacks(pCreateInfo->pAllocationCallbacks ? - *pCreateInfo->pAllocationCallbacks : VmaEmptyAllocationCallbacks), - m_AllocationObjectAllocator(&m_AllocationCallbacks), - m_HeapSizeLimitMask(0), - m_PreferredLargeHeapBlockSize(0), - m_PhysicalDevice(pCreateInfo->physicalDevice), - m_CurrentFrameIndex(0), - m_GpuDefragmentationMemoryTypeBits(UINT32_MAX), - m_Pools(VmaStlAllocator(GetAllocationCallbacks())), - m_NextPoolId(0) -#if VMA_RECORDING_ENABLED - ,m_pRecorder(VMA_NULL) -#endif -{ - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - m_UseKhrDedicatedAllocation = false; - m_UseKhrBindMemory2 = false; - } - - if(VMA_DEBUG_DETECT_CORRUPTION) - { - // Needs to be multiply of uint32_t size because we are going to write VMA_CORRUPTION_DETECTION_MAGIC_VALUE to it. - VMA_ASSERT(VMA_DEBUG_MARGIN % sizeof(uint32_t) == 0); - } - - VMA_ASSERT(pCreateInfo->physicalDevice && pCreateInfo->device); - - if(m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0)) - { -#if !(VMA_DEDICATED_ALLOCATION) - if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0) - { - VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT set but required extensions are disabled by preprocessor macros."); - } -#endif -#if !(VMA_BIND_MEMORY2) - if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0) - { - VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT set but required extension is disabled by preprocessor macros."); - } -#endif - } -#if !(VMA_MEMORY_BUDGET) - if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0) - { - VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT set but required extension is disabled by preprocessor macros."); - } -#endif -#if VMA_VULKAN_VERSION < 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros."); - } -#endif - - memset(&m_DeviceMemoryCallbacks, 0 ,sizeof(m_DeviceMemoryCallbacks)); - memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties)); - memset(&m_MemProps, 0, sizeof(m_MemProps)); - - memset(&m_pBlockVectors, 0, sizeof(m_pBlockVectors)); - memset(&m_pDedicatedAllocations, 0, sizeof(m_pDedicatedAllocations)); - memset(&m_VulkanFunctions, 0, sizeof(m_VulkanFunctions)); - - if(pCreateInfo->pDeviceMemoryCallbacks != VMA_NULL) - { - m_DeviceMemoryCallbacks.pfnAllocate = pCreateInfo->pDeviceMemoryCallbacks->pfnAllocate; - m_DeviceMemoryCallbacks.pfnFree = pCreateInfo->pDeviceMemoryCallbacks->pfnFree; - } - - ImportVulkanFunctions(pCreateInfo->pVulkanFunctions); - - (*m_VulkanFunctions.vkGetPhysicalDeviceProperties)(m_PhysicalDevice, &m_PhysicalDeviceProperties); - (*m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties)(m_PhysicalDevice, &m_MemProps); - - VMA_ASSERT(VmaIsPow2(VMA_DEBUG_ALIGNMENT)); - VMA_ASSERT(VmaIsPow2(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY)); - VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.bufferImageGranularity)); - VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.nonCoherentAtomSize)); - - m_PreferredLargeHeapBlockSize = (pCreateInfo->preferredLargeHeapBlockSize != 0) ? - pCreateInfo->preferredLargeHeapBlockSize : static_cast(VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE); - - if(pCreateInfo->pHeapSizeLimit != VMA_NULL) - { - for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex) - { - const VkDeviceSize limit = pCreateInfo->pHeapSizeLimit[heapIndex]; - if(limit != VK_WHOLE_SIZE) - { - m_HeapSizeLimitMask |= 1u << heapIndex; - if(limit < m_MemProps.memoryHeaps[heapIndex].size) - { - m_MemProps.memoryHeaps[heapIndex].size = limit; - } - } - } - } - - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(memTypeIndex); - - m_pBlockVectors[memTypeIndex] = vma_new(this, VmaBlockVector)( - this, - VK_NULL_HANDLE, // hParentPool - memTypeIndex, - preferredBlockSize, - 0, - SIZE_MAX, - GetBufferImageGranularity(), - pCreateInfo->frameInUseCount, - false, // explicitBlockSize - false); // linearAlgorithm - // No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here, - // becase minBlockCount is 0. - m_pDedicatedAllocations[memTypeIndex] = vma_new(this, AllocationVectorType)(VmaStlAllocator(GetAllocationCallbacks())); - - } -} - -VkResult VmaAllocator_T::Init(const VmaAllocatorCreateInfo* pCreateInfo) -{ - VkResult res = VK_SUCCESS; - - if(pCreateInfo->pRecordSettings != VMA_NULL && - !VmaStrIsEmpty(pCreateInfo->pRecordSettings->pFilePath)) - { -#if VMA_RECORDING_ENABLED - m_pRecorder = vma_new(this, VmaRecorder)(); - res = m_pRecorder->Init(*pCreateInfo->pRecordSettings, m_UseMutex); - if(res != VK_SUCCESS) - { - return res; - } - m_pRecorder->WriteConfiguration( - m_PhysicalDeviceProperties, - m_MemProps, - m_VulkanApiVersion, - m_UseKhrDedicatedAllocation, - m_UseKhrBindMemory2, - m_UseExtMemoryBudget); - m_pRecorder->RecordCreateAllocator(GetCurrentFrameIndex()); -#else - VMA_ASSERT(0 && "VmaAllocatorCreateInfo::pRecordSettings used, but not supported due to VMA_RECORDING_ENABLED not defined to 1."); - return VK_ERROR_FEATURE_NOT_PRESENT; -#endif - } - -#if VMA_MEMORY_BUDGET - if(m_UseExtMemoryBudget) - { - UpdateVulkanBudget(); - } -#endif // #if VMA_MEMORY_BUDGET - - return res; -} - -VmaAllocator_T::~VmaAllocator_T() -{ -#if VMA_RECORDING_ENABLED - if(m_pRecorder != VMA_NULL) - { - m_pRecorder->RecordDestroyAllocator(GetCurrentFrameIndex()); - vma_delete(this, m_pRecorder); - } -#endif - - VMA_ASSERT(m_Pools.empty()); - - for(size_t i = GetMemoryTypeCount(); i--; ) - { - if(m_pDedicatedAllocations[i] != VMA_NULL && !m_pDedicatedAllocations[i]->empty()) - { - VMA_ASSERT(0 && "Unfreed dedicated allocations found."); - } - - vma_delete(this, m_pDedicatedAllocations[i]); - vma_delete(this, m_pBlockVectors[i]); - } -} - -void VmaAllocator_T::ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions) -{ -#if VMA_STATIC_VULKAN_FUNCTIONS == 1 - m_VulkanFunctions.vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)vkGetPhysicalDeviceProperties; - m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)vkGetPhysicalDeviceMemoryProperties; - m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory; - m_VulkanFunctions.vkFreeMemory = (PFN_vkFreeMemory)vkFreeMemory; - m_VulkanFunctions.vkMapMemory = (PFN_vkMapMemory)vkMapMemory; - m_VulkanFunctions.vkUnmapMemory = (PFN_vkUnmapMemory)vkUnmapMemory; - m_VulkanFunctions.vkFlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges)vkFlushMappedMemoryRanges; - m_VulkanFunctions.vkInvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges)vkInvalidateMappedMemoryRanges; - m_VulkanFunctions.vkBindBufferMemory = (PFN_vkBindBufferMemory)vkBindBufferMemory; - m_VulkanFunctions.vkBindImageMemory = (PFN_vkBindImageMemory)vkBindImageMemory; - m_VulkanFunctions.vkGetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements)vkGetBufferMemoryRequirements; - m_VulkanFunctions.vkGetImageMemoryRequirements = (PFN_vkGetImageMemoryRequirements)vkGetImageMemoryRequirements; - m_VulkanFunctions.vkCreateBuffer = (PFN_vkCreateBuffer)vkCreateBuffer; - m_VulkanFunctions.vkDestroyBuffer = (PFN_vkDestroyBuffer)vkDestroyBuffer; - m_VulkanFunctions.vkCreateImage = (PFN_vkCreateImage)vkCreateImage; - m_VulkanFunctions.vkDestroyImage = (PFN_vkDestroyImage)vkDestroyImage; - m_VulkanFunctions.vkCmdCopyBuffer = (PFN_vkCmdCopyBuffer)vkCmdCopyBuffer; -#if VMA_VULKAN_VERSION >= 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VMA_ASSERT(m_hInstance != VK_NULL_HANDLE); - m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR = - (PFN_vkGetBufferMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetBufferMemoryRequirements2"); - m_VulkanFunctions.vkGetImageMemoryRequirements2KHR = - (PFN_vkGetImageMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetImageMemoryRequirements2"); - m_VulkanFunctions.vkBindBufferMemory2KHR = - (PFN_vkBindBufferMemory2KHR)vkGetDeviceProcAddr(m_hDevice, "vkBindBufferMemory2"); - m_VulkanFunctions.vkBindImageMemory2KHR = - (PFN_vkBindImageMemory2KHR)vkGetDeviceProcAddr(m_hDevice, "vkBindImageMemory2"); - m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR = - (PFN_vkGetPhysicalDeviceMemoryProperties2KHR)vkGetInstanceProcAddr(m_hInstance, "vkGetPhysicalDeviceMemoryProperties2"); - } -#endif -#if VMA_DEDICATED_ALLOCATION - if(m_UseKhrDedicatedAllocation) - { - m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR = - (PFN_vkGetBufferMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetBufferMemoryRequirements2KHR"); - m_VulkanFunctions.vkGetImageMemoryRequirements2KHR = - (PFN_vkGetImageMemoryRequirements2KHR)vkGetDeviceProcAddr(m_hDevice, "vkGetImageMemoryRequirements2KHR"); - } -#endif -#if VMA_BIND_MEMORY2 - if(m_UseKhrBindMemory2) - { - m_VulkanFunctions.vkBindBufferMemory2KHR = - (PFN_vkBindBufferMemory2KHR)vkGetDeviceProcAddr(m_hDevice, "vkBindBufferMemory2KHR"); - m_VulkanFunctions.vkBindImageMemory2KHR = - (PFN_vkBindImageMemory2KHR)vkGetDeviceProcAddr(m_hDevice, "vkBindImageMemory2KHR"); - } -#endif // #if VMA_BIND_MEMORY2 -#if VMA_MEMORY_BUDGET - if(m_UseExtMemoryBudget && m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0)) - { - VMA_ASSERT(m_hInstance != VK_NULL_HANDLE); - m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR = - (PFN_vkGetPhysicalDeviceMemoryProperties2KHR)vkGetInstanceProcAddr(m_hInstance, "vkGetPhysicalDeviceMemoryProperties2KHR"); - } -#endif // #if VMA_MEMORY_BUDGET -#endif // #if VMA_STATIC_VULKAN_FUNCTIONS == 1 - -#define VMA_COPY_IF_NOT_NULL(funcName) \ - if(pVulkanFunctions->funcName != VMA_NULL) m_VulkanFunctions.funcName = pVulkanFunctions->funcName; - - if(pVulkanFunctions != VMA_NULL) - { - VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceProperties); - VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties); - VMA_COPY_IF_NOT_NULL(vkAllocateMemory); - VMA_COPY_IF_NOT_NULL(vkFreeMemory); - VMA_COPY_IF_NOT_NULL(vkMapMemory); - VMA_COPY_IF_NOT_NULL(vkUnmapMemory); - VMA_COPY_IF_NOT_NULL(vkFlushMappedMemoryRanges); - VMA_COPY_IF_NOT_NULL(vkInvalidateMappedMemoryRanges); - VMA_COPY_IF_NOT_NULL(vkBindBufferMemory); - VMA_COPY_IF_NOT_NULL(vkBindImageMemory); - VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements); - VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements); - VMA_COPY_IF_NOT_NULL(vkCreateBuffer); - VMA_COPY_IF_NOT_NULL(vkDestroyBuffer); - VMA_COPY_IF_NOT_NULL(vkCreateImage); - VMA_COPY_IF_NOT_NULL(vkDestroyImage); - VMA_COPY_IF_NOT_NULL(vkCmdCopyBuffer); -#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements2KHR); - VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements2KHR); -#endif -#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000 - VMA_COPY_IF_NOT_NULL(vkBindBufferMemory2KHR); - VMA_COPY_IF_NOT_NULL(vkBindImageMemory2KHR); -#endif -#if VMA_MEMORY_BUDGET - VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties2KHR); -#endif - } - -#undef VMA_COPY_IF_NOT_NULL - - // If these asserts are hit, you must either #define VMA_STATIC_VULKAN_FUNCTIONS 1 - // or pass valid pointers as VmaAllocatorCreateInfo::pVulkanFunctions. - VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkAllocateMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkFreeMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkMapMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkUnmapMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkFlushMappedMemoryRanges != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkInvalidateMappedMemoryRanges != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkCreateBuffer != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkDestroyBuffer != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkCreateImage != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkDestroyImage != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkCmdCopyBuffer != VMA_NULL); -#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrDedicatedAllocation) - { - VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements2KHR != VMA_NULL); - } -#endif -#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000 - if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrBindMemory2) - { - VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL); - VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL); - } -#endif -#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000 - if(m_UseExtMemoryBudget || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR != VMA_NULL); - } -#endif -} - -VkDeviceSize VmaAllocator_T::CalcPreferredBlockSize(uint32_t memTypeIndex) -{ - const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex); - const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size; - const bool isSmallHeap = heapSize <= VMA_SMALL_HEAP_MAX_SIZE; - return VmaAlignUp(isSmallHeap ? (heapSize / 8) : m_PreferredLargeHeapBlockSize, (VkDeviceSize)32); -} - -VkResult VmaAllocator_T::AllocateMemoryOfType( - VkDeviceSize size, - VkDeviceSize alignment, - bool dedicatedAllocation, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - const VmaAllocationCreateInfo& createInfo, - uint32_t memTypeIndex, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations) -{ - VMA_ASSERT(pAllocations != VMA_NULL); - VMA_DEBUG_LOG(" AllocateMemory: MemoryTypeIndex=%u, AllocationCount=%zu, Size=%llu", memTypeIndex, allocationCount, size); - - VmaAllocationCreateInfo finalCreateInfo = createInfo; - - // If memory type is not HOST_VISIBLE, disable MAPPED. - if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 && - (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) - { - finalCreateInfo.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT; - } - // If memory is lazily allocated, it should be always dedicated. - if(finalCreateInfo.usage == VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED) - { - finalCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT; - } - - VmaBlockVector* const blockVector = m_pBlockVectors[memTypeIndex]; - VMA_ASSERT(blockVector); - - const VkDeviceSize preferredBlockSize = blockVector->GetPreferredBlockSize(); - bool preferDedicatedMemory = - VMA_DEBUG_ALWAYS_DEDICATED_MEMORY || - dedicatedAllocation || - // Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size. - size > preferredBlockSize / 2; - - if(preferDedicatedMemory && - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 && - finalCreateInfo.pool == VK_NULL_HANDLE) - { - finalCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT; - } - - if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0) - { - if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0) - { - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - else - { - return AllocateDedicatedMemory( - size, - suballocType, - memTypeIndex, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0, - finalCreateInfo.pUserData, - dedicatedBuffer, - dedicatedImage, - allocationCount, - pAllocations); - } - } - else - { - VkResult res = blockVector->Allocate( - m_CurrentFrameIndex.load(), - size, - alignment, - finalCreateInfo, - suballocType, - allocationCount, - pAllocations); - if(res == VK_SUCCESS) - { - return res; - } - - // 5. Try dedicated memory. - if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0) - { - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - else - { - res = AllocateDedicatedMemory( - size, - suballocType, - memTypeIndex, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0, - (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0, - finalCreateInfo.pUserData, - dedicatedBuffer, - dedicatedImage, - allocationCount, - pAllocations); - if(res == VK_SUCCESS) - { - // Succeeded: AllocateDedicatedMemory function already filld pMemory, nothing more to do here. - VMA_DEBUG_LOG(" Allocated as DedicatedMemory"); - return VK_SUCCESS; - } - else - { - // Everything failed: Return error code. - VMA_DEBUG_LOG(" vkAllocateMemory FAILED"); - return res; - } - } - } -} - -VkResult VmaAllocator_T::AllocateDedicatedMemory( - VkDeviceSize size, - VmaSuballocationType suballocType, - uint32_t memTypeIndex, - bool withinBudget, - bool map, - bool isUserDataString, - void* pUserData, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - size_t allocationCount, - VmaAllocation* pAllocations) -{ - VMA_ASSERT(allocationCount > 0 && pAllocations); - - if(withinBudget) - { - const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex); - VmaBudget heapBudget = {}; - GetBudget(&heapBudget, heapIndex, 1); - if(heapBudget.usage + size * allocationCount > heapBudget.budget) - { - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - } - - VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; - allocInfo.memoryTypeIndex = memTypeIndex; - allocInfo.allocationSize = size; - -#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR }; - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - if(dedicatedBuffer != VK_NULL_HANDLE) - { - VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE); - dedicatedAllocInfo.buffer = dedicatedBuffer; - allocInfo.pNext = &dedicatedAllocInfo; - } - else if(dedicatedImage != VK_NULL_HANDLE) - { - dedicatedAllocInfo.image = dedicatedImage; - allocInfo.pNext = &dedicatedAllocInfo; - } - } -#endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - - size_t allocIndex; - VkResult res = VK_SUCCESS; - for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex) - { - res = AllocateDedicatedMemoryPage( - size, - suballocType, - memTypeIndex, - allocInfo, - map, - isUserDataString, - pUserData, - pAllocations + allocIndex); - if(res != VK_SUCCESS) - { - break; - } - } - - if(res == VK_SUCCESS) - { - // Register them in m_pDedicatedAllocations. - { - VmaMutexLockWrite lock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex); - AllocationVectorType* pDedicatedAllocations = m_pDedicatedAllocations[memTypeIndex]; - VMA_ASSERT(pDedicatedAllocations); - for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex) - { - VmaVectorInsertSorted(*pDedicatedAllocations, pAllocations[allocIndex]); - } - } - - VMA_DEBUG_LOG(" Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%u", allocationCount, memTypeIndex); - } - else - { - // Free all already created allocations. - while(allocIndex--) - { - VmaAllocation currAlloc = pAllocations[allocIndex]; - VkDeviceMemory hMemory = currAlloc->GetMemory(); - - /* - There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory - before vkFreeMemory. - - if(currAlloc->GetMappedData() != VMA_NULL) - { - (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory); - } - */ - - FreeVulkanMemory(memTypeIndex, currAlloc->GetSize(), hMemory); - m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), currAlloc->GetSize()); - currAlloc->SetUserData(this, VMA_NULL); - currAlloc->Dtor(); - m_AllocationObjectAllocator.Free(currAlloc); - } - - memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); - } - - return res; -} - -VkResult VmaAllocator_T::AllocateDedicatedMemoryPage( - VkDeviceSize size, - VmaSuballocationType suballocType, - uint32_t memTypeIndex, - const VkMemoryAllocateInfo& allocInfo, - bool map, - bool isUserDataString, - void* pUserData, - VmaAllocation* pAllocation) -{ - VkDeviceMemory hMemory = VK_NULL_HANDLE; - VkResult res = AllocateVulkanMemory(&allocInfo, &hMemory); - if(res < 0) - { - VMA_DEBUG_LOG(" vkAllocateMemory FAILED"); - return res; - } - - void* pMappedData = VMA_NULL; - if(map) - { - res = (*m_VulkanFunctions.vkMapMemory)( - m_hDevice, - hMemory, - 0, - VK_WHOLE_SIZE, - 0, - &pMappedData); - if(res < 0) - { - VMA_DEBUG_LOG(" vkMapMemory FAILED"); - FreeVulkanMemory(memTypeIndex, size, hMemory); - return res; - } - } - - *pAllocation = m_AllocationObjectAllocator.Allocate(); - (*pAllocation)->Ctor(m_CurrentFrameIndex.load(), isUserDataString); - (*pAllocation)->InitDedicatedAllocation(memTypeIndex, hMemory, suballocType, pMappedData, size); - (*pAllocation)->SetUserData(this, pUserData); - m_Budget.AddAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), size); - if(VMA_DEBUG_INITIALIZE_ALLOCATIONS) - { - FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED); - } - - return VK_SUCCESS; -} - -void VmaAllocator_T::GetBufferMemoryRequirements( - VkBuffer hBuffer, - VkMemoryRequirements& memReq, - bool& requiresDedicatedAllocation, - bool& prefersDedicatedAllocation) const -{ -#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VkBufferMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR }; - memReqInfo.buffer = hBuffer; - - VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR }; - - VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR }; - memReq2.pNext = &memDedicatedReq; - - (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2); - - memReq = memReq2.memoryRequirements; - requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE); - prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); - } - else -#endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - { - (*m_VulkanFunctions.vkGetBufferMemoryRequirements)(m_hDevice, hBuffer, &memReq); - requiresDedicatedAllocation = false; - prefersDedicatedAllocation = false; - } -} - -void VmaAllocator_T::GetImageMemoryRequirements( - VkImage hImage, - VkMemoryRequirements& memReq, - bool& requiresDedicatedAllocation, - bool& prefersDedicatedAllocation) const -{ -#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - VkImageMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR }; - memReqInfo.image = hImage; - - VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR }; - - VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR }; - memReq2.pNext = &memDedicatedReq; - - (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2); - - memReq = memReq2.memoryRequirements; - requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE); - prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE); - } - else -#endif // #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - { - (*m_VulkanFunctions.vkGetImageMemoryRequirements)(m_hDevice, hImage, &memReq); - requiresDedicatedAllocation = false; - prefersDedicatedAllocation = false; - } -} - -VkResult VmaAllocator_T::AllocateMemory( - const VkMemoryRequirements& vkMemReq, - bool requiresDedicatedAllocation, - bool prefersDedicatedAllocation, - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, - const VmaAllocationCreateInfo& createInfo, - VmaSuballocationType suballocType, - size_t allocationCount, - VmaAllocation* pAllocations) -{ - memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount); - - VMA_ASSERT(VmaIsPow2(vkMemReq.alignment)); - - if(vkMemReq.size == 0) - { - return VK_ERROR_VALIDATION_FAILED_EXT; - } - if((createInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 && - (createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0) - { - VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT together with VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT makes no sense."); - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - if((createInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 && - (createInfo.flags & VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT) != 0) - { - VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_MAPPED_BIT together with VMA_ALLOCATION_CREATE_CAN_BECOME_LOST_BIT is invalid."); - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - if(requiresDedicatedAllocation) - { - if((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0) - { - VMA_ASSERT(0 && "VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT specified while dedicated allocation is required."); - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - if(createInfo.pool != VK_NULL_HANDLE) - { - VMA_ASSERT(0 && "Pool specified while dedicated allocation is required."); - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - } - if((createInfo.pool != VK_NULL_HANDLE) && - ((createInfo.flags & (VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT)) != 0)) - { - VMA_ASSERT(0 && "Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT when pool != null is invalid."); - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - - if(createInfo.pool != VK_NULL_HANDLE) - { - const VkDeviceSize alignmentForPool = VMA_MAX( - vkMemReq.alignment, - GetMemoryTypeMinAlignment(createInfo.pool->m_BlockVector.GetMemoryTypeIndex())); - - VmaAllocationCreateInfo createInfoForPool = createInfo; - // If memory type is not HOST_VISIBLE, disable MAPPED. - if((createInfoForPool.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 && - (m_MemProps.memoryTypes[createInfo.pool->m_BlockVector.GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) - { - createInfoForPool.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT; - } - - return createInfo.pool->m_BlockVector.Allocate( - m_CurrentFrameIndex.load(), - vkMemReq.size, - alignmentForPool, - createInfoForPool, - suballocType, - allocationCount, - pAllocations); - } - else - { - // Bit mask of memory Vulkan types acceptable for this allocation. - uint32_t memoryTypeBits = vkMemReq.memoryTypeBits; - uint32_t memTypeIndex = UINT32_MAX; - VkResult res = vmaFindMemoryTypeIndex(this, memoryTypeBits, &createInfo, &memTypeIndex); - if(res == VK_SUCCESS) - { - VkDeviceSize alignmentForMemType = VMA_MAX( - vkMemReq.alignment, - GetMemoryTypeMinAlignment(memTypeIndex)); - - res = AllocateMemoryOfType( - vkMemReq.size, - alignmentForMemType, - requiresDedicatedAllocation || prefersDedicatedAllocation, - dedicatedBuffer, - dedicatedImage, - createInfo, - memTypeIndex, - suballocType, - allocationCount, - pAllocations); - // Succeeded on first try. - if(res == VK_SUCCESS) - { - return res; - } - // Allocation from this memory type failed. Try other compatible memory types. - else - { - for(;;) - { - // Remove old memTypeIndex from list of possibilities. - memoryTypeBits &= ~(1u << memTypeIndex); - // Find alternative memTypeIndex. - res = vmaFindMemoryTypeIndex(this, memoryTypeBits, &createInfo, &memTypeIndex); - if(res == VK_SUCCESS) - { - alignmentForMemType = VMA_MAX( - vkMemReq.alignment, - GetMemoryTypeMinAlignment(memTypeIndex)); - - res = AllocateMemoryOfType( - vkMemReq.size, - alignmentForMemType, - requiresDedicatedAllocation || prefersDedicatedAllocation, - dedicatedBuffer, - dedicatedImage, - createInfo, - memTypeIndex, - suballocType, - allocationCount, - pAllocations); - // Allocation from this alternative memory type succeeded. - if(res == VK_SUCCESS) - { - return res; - } - // else: Allocation from this memory type failed. Try next one - next loop iteration. - } - // No other matching memory type index could be found. - else - { - // Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once. - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - } - } - } - // Can't find any single memory type maching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT. - else - return res; - } -} - -void VmaAllocator_T::FreeMemory( - size_t allocationCount, - const VmaAllocation* pAllocations) -{ - VMA_ASSERT(pAllocations); - - for(size_t allocIndex = allocationCount; allocIndex--; ) - { - VmaAllocation allocation = pAllocations[allocIndex]; - - if(allocation != VK_NULL_HANDLE) - { - if(TouchAllocation(allocation)) - { - if(VMA_DEBUG_INITIALIZE_ALLOCATIONS) - { - FillAllocation(allocation, VMA_ALLOCATION_FILL_PATTERN_DESTROYED); - } - - switch(allocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaBlockVector* pBlockVector = VMA_NULL; - VmaPool hPool = allocation->GetBlock()->GetParentPool(); - if(hPool != VK_NULL_HANDLE) - { - pBlockVector = &hPool->m_BlockVector; - } - else - { - const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); - pBlockVector = m_pBlockVectors[memTypeIndex]; - } - pBlockVector->Free(allocation); - } - break; - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - FreeDedicatedMemory(allocation); - break; - default: - VMA_ASSERT(0); - } - } - - // Do this regardless of whether the allocation is lost. Lost allocations still account to Budget.AllocationBytes. - m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize()); - allocation->SetUserData(this, VMA_NULL); - allocation->Dtor(); - m_AllocationObjectAllocator.Free(allocation); - } - } -} - -VkResult VmaAllocator_T::ResizeAllocation( - const VmaAllocation alloc, - VkDeviceSize newSize) -{ - // This function is deprecated and so it does nothing. It's left for backward compatibility. - if(newSize == 0 || alloc->GetLastUseFrameIndex() == VMA_FRAME_INDEX_LOST) - { - return VK_ERROR_VALIDATION_FAILED_EXT; - } - if(newSize == alloc->GetSize()) - { - return VK_SUCCESS; - } - return VK_ERROR_OUT_OF_POOL_MEMORY; -} - -void VmaAllocator_T::CalculateStats(VmaStats* pStats) -{ - // Initialize. - InitStatInfo(pStats->total); - for(size_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i) - InitStatInfo(pStats->memoryType[i]); - for(size_t i = 0; i < VK_MAX_MEMORY_HEAPS; ++i) - InitStatInfo(pStats->memoryHeap[i]); - - // Process default pools. - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex]; - VMA_ASSERT(pBlockVector); - pBlockVector->AddStats(pStats); - } - - // Process custom pools. - { - VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); - for(size_t poolIndex = 0, poolCount = m_Pools.size(); poolIndex < poolCount; ++poolIndex) - { - m_Pools[poolIndex]->m_BlockVector.AddStats(pStats); - } - } - - // Process dedicated allocations. - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - const uint32_t memHeapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex); - VmaMutexLockRead dedicatedAllocationsLock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex); - AllocationVectorType* const pDedicatedAllocVector = m_pDedicatedAllocations[memTypeIndex]; - VMA_ASSERT(pDedicatedAllocVector); - for(size_t allocIndex = 0, allocCount = pDedicatedAllocVector->size(); allocIndex < allocCount; ++allocIndex) - { - VmaStatInfo allocationStatInfo; - (*pDedicatedAllocVector)[allocIndex]->DedicatedAllocCalcStatsInfo(allocationStatInfo); - VmaAddStatInfo(pStats->total, allocationStatInfo); - VmaAddStatInfo(pStats->memoryType[memTypeIndex], allocationStatInfo); - VmaAddStatInfo(pStats->memoryHeap[memHeapIndex], allocationStatInfo); - } - } - - // Postprocess. - VmaPostprocessCalcStatInfo(pStats->total); - for(size_t i = 0; i < GetMemoryTypeCount(); ++i) - VmaPostprocessCalcStatInfo(pStats->memoryType[i]); - for(size_t i = 0; i < GetMemoryHeapCount(); ++i) - VmaPostprocessCalcStatInfo(pStats->memoryHeap[i]); -} - -void VmaAllocator_T::GetBudget(VmaBudget* outBudget, uint32_t firstHeap, uint32_t heapCount) -{ -#if VMA_MEMORY_BUDGET - if(m_UseExtMemoryBudget) - { - if(m_Budget.m_OperationsSinceBudgetFetch < 30) - { - VmaMutexLockRead lockRead(m_Budget.m_BudgetMutex, m_UseMutex); - for(uint32_t i = 0; i < heapCount; ++i, ++outBudget) - { - const uint32_t heapIndex = firstHeap + i; - - outBudget->blockBytes = m_Budget.m_BlockBytes[heapIndex]; - outBudget->allocationBytes = m_Budget.m_AllocationBytes[heapIndex]; - - if(m_Budget.m_VulkanUsage[heapIndex] + outBudget->blockBytes > m_Budget.m_BlockBytesAtBudgetFetch[heapIndex]) - { - outBudget->usage = m_Budget.m_VulkanUsage[heapIndex] + - outBudget->blockBytes - m_Budget.m_BlockBytesAtBudgetFetch[heapIndex]; - } - else - { - outBudget->usage = 0; - } - - // Have to take MIN with heap size because explicit HeapSizeLimit is included in it. - outBudget->budget = VMA_MIN( - m_Budget.m_VulkanBudget[heapIndex], m_MemProps.memoryHeaps[heapIndex].size); - } - } - else - { - UpdateVulkanBudget(); // Outside of mutex lock - GetBudget(outBudget, firstHeap, heapCount); // Recursion - } - } - else -#endif - { - for(uint32_t i = 0; i < heapCount; ++i, ++outBudget) - { - const uint32_t heapIndex = firstHeap + i; - - outBudget->blockBytes = m_Budget.m_BlockBytes[heapIndex]; - outBudget->allocationBytes = m_Budget.m_AllocationBytes[heapIndex]; - - outBudget->usage = outBudget->blockBytes; - outBudget->budget = m_MemProps.memoryHeaps[heapIndex].size * 8 / 10; // 80% heuristics. - } - } -} - -static const uint32_t VMA_VENDOR_ID_AMD = 4098; - -VkResult VmaAllocator_T::DefragmentationBegin( - const VmaDefragmentationInfo2& info, - VmaDefragmentationStats* pStats, - VmaDefragmentationContext* pContext) -{ - if(info.pAllocationsChanged != VMA_NULL) - { - memset(info.pAllocationsChanged, 0, info.allocationCount * sizeof(VkBool32)); - } - - *pContext = vma_new(this, VmaDefragmentationContext_T)( - this, m_CurrentFrameIndex.load(), info.flags, pStats); - - (*pContext)->AddPools(info.poolCount, info.pPools); - (*pContext)->AddAllocations( - info.allocationCount, info.pAllocations, info.pAllocationsChanged); - - VkResult res = (*pContext)->Defragment( - info.maxCpuBytesToMove, info.maxCpuAllocationsToMove, - info.maxGpuBytesToMove, info.maxGpuAllocationsToMove, - info.commandBuffer, pStats, info.flags); - - if(res != VK_NOT_READY) - { - vma_delete(this, *pContext); - *pContext = VMA_NULL; - } - - return res; -} - -VkResult VmaAllocator_T::DefragmentationEnd( - VmaDefragmentationContext context) -{ - vma_delete(this, context); - return VK_SUCCESS; -} - -VkResult VmaAllocator_T::DefragmentationPassBegin( - VmaDefragmentationPassInfo* pInfo, - VmaDefragmentationContext context) -{ - return context->DefragmentPassBegin(pInfo); -} -VkResult VmaAllocator_T::DefragmentationPassEnd( - VmaDefragmentationContext context) -{ - return context->DefragmentPassEnd(); - -} - -void VmaAllocator_T::GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo) -{ - if(hAllocation->CanBecomeLost()) - { - /* - Warning: This is a carefully designed algorithm. - Do not modify unless you really know what you're doing :) - */ - const uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load(); - uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex(); - for(;;) - { - if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST) - { - pAllocationInfo->memoryType = UINT32_MAX; - pAllocationInfo->deviceMemory = VK_NULL_HANDLE; - pAllocationInfo->offset = 0; - pAllocationInfo->size = hAllocation->GetSize(); - pAllocationInfo->pMappedData = VMA_NULL; - pAllocationInfo->pUserData = hAllocation->GetUserData(); - return; - } - else if(localLastUseFrameIndex == localCurrFrameIndex) - { - pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex(); - pAllocationInfo->deviceMemory = hAllocation->GetMemory(); - pAllocationInfo->offset = hAllocation->GetOffset(); - pAllocationInfo->size = hAllocation->GetSize(); - pAllocationInfo->pMappedData = VMA_NULL; - pAllocationInfo->pUserData = hAllocation->GetUserData(); - return; - } - else // Last use time earlier than current time. - { - if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex)) - { - localLastUseFrameIndex = localCurrFrameIndex; - } - } - } - } - else - { -#if VMA_STATS_STRING_ENABLED - uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load(); - uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex(); - for(;;) - { - VMA_ASSERT(localLastUseFrameIndex != VMA_FRAME_INDEX_LOST); - if(localLastUseFrameIndex == localCurrFrameIndex) - { - break; - } - else // Last use time earlier than current time. - { - if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex)) - { - localLastUseFrameIndex = localCurrFrameIndex; - } - } - } -#endif - - pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex(); - pAllocationInfo->deviceMemory = hAllocation->GetMemory(); - pAllocationInfo->offset = hAllocation->GetOffset(); - pAllocationInfo->size = hAllocation->GetSize(); - pAllocationInfo->pMappedData = hAllocation->GetMappedData(); - pAllocationInfo->pUserData = hAllocation->GetUserData(); - } -} - -bool VmaAllocator_T::TouchAllocation(VmaAllocation hAllocation) -{ - // This is a stripped-down version of VmaAllocator_T::GetAllocationInfo. - if(hAllocation->CanBecomeLost()) - { - uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load(); - uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex(); - for(;;) - { - if(localLastUseFrameIndex == VMA_FRAME_INDEX_LOST) - { - return false; - } - else if(localLastUseFrameIndex == localCurrFrameIndex) - { - return true; - } - else // Last use time earlier than current time. - { - if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex)) - { - localLastUseFrameIndex = localCurrFrameIndex; - } - } - } - } - else - { -#if VMA_STATS_STRING_ENABLED - uint32_t localCurrFrameIndex = m_CurrentFrameIndex.load(); - uint32_t localLastUseFrameIndex = hAllocation->GetLastUseFrameIndex(); - for(;;) - { - VMA_ASSERT(localLastUseFrameIndex != VMA_FRAME_INDEX_LOST); - if(localLastUseFrameIndex == localCurrFrameIndex) - { - break; - } - else // Last use time earlier than current time. - { - if(hAllocation->CompareExchangeLastUseFrameIndex(localLastUseFrameIndex, localCurrFrameIndex)) - { - localLastUseFrameIndex = localCurrFrameIndex; - } - } - } -#endif - - return true; - } -} - -VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool) -{ - VMA_DEBUG_LOG(" CreatePool: MemoryTypeIndex=%u, flags=%u", pCreateInfo->memoryTypeIndex, pCreateInfo->flags); - - VmaPoolCreateInfo newCreateInfo = *pCreateInfo; - - if(newCreateInfo.maxBlockCount == 0) - { - newCreateInfo.maxBlockCount = SIZE_MAX; - } - if(newCreateInfo.minBlockCount > newCreateInfo.maxBlockCount) - { - return VK_ERROR_INITIALIZATION_FAILED; - } - - const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(newCreateInfo.memoryTypeIndex); - - *pPool = vma_new(this, VmaPool_T)(this, newCreateInfo, preferredBlockSize); - - VkResult res = (*pPool)->m_BlockVector.CreateMinBlocks(); - if(res != VK_SUCCESS) - { - vma_delete(this, *pPool); - *pPool = VMA_NULL; - return res; - } - - // Add to m_Pools. - { - VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex); - (*pPool)->SetId(m_NextPoolId++); - VmaVectorInsertSorted(m_Pools, *pPool); - } - - return VK_SUCCESS; -} - -void VmaAllocator_T::DestroyPool(VmaPool pool) -{ - // Remove from m_Pools. - { - VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex); - bool success = VmaVectorRemoveSorted(m_Pools, pool); - VMA_ASSERT(success && "Pool not found in Allocator."); - } - - vma_delete(this, pool); -} - -void VmaAllocator_T::GetPoolStats(VmaPool pool, VmaPoolStats* pPoolStats) -{ - pool->m_BlockVector.GetPoolStats(pPoolStats); -} - -void VmaAllocator_T::SetCurrentFrameIndex(uint32_t frameIndex) -{ - m_CurrentFrameIndex.store(frameIndex); - -#if VMA_MEMORY_BUDGET - if(m_UseExtMemoryBudget) - { - UpdateVulkanBudget(); - } -#endif // #if VMA_MEMORY_BUDGET -} - -void VmaAllocator_T::MakePoolAllocationsLost( - VmaPool hPool, - size_t* pLostAllocationCount) -{ - hPool->m_BlockVector.MakePoolAllocationsLost( - m_CurrentFrameIndex.load(), - pLostAllocationCount); -} - -VkResult VmaAllocator_T::CheckPoolCorruption(VmaPool hPool) -{ - return hPool->m_BlockVector.CheckCorruption(); -} - -VkResult VmaAllocator_T::CheckCorruption(uint32_t memoryTypeBits) -{ - VkResult finalRes = VK_ERROR_FEATURE_NOT_PRESENT; - - // Process default pools. - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - if(((1u << memTypeIndex) & memoryTypeBits) != 0) - { - VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex]; - VMA_ASSERT(pBlockVector); - VkResult localRes = pBlockVector->CheckCorruption(); - switch(localRes) - { - case VK_ERROR_FEATURE_NOT_PRESENT: - break; - case VK_SUCCESS: - finalRes = VK_SUCCESS; - break; - default: - return localRes; - } - } - } - - // Process custom pools. - { - VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); - for(size_t poolIndex = 0, poolCount = m_Pools.size(); poolIndex < poolCount; ++poolIndex) - { - if(((1u << m_Pools[poolIndex]->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0) - { - VkResult localRes = m_Pools[poolIndex]->m_BlockVector.CheckCorruption(); - switch(localRes) - { - case VK_ERROR_FEATURE_NOT_PRESENT: - break; - case VK_SUCCESS: - finalRes = VK_SUCCESS; - break; - default: - return localRes; - } - } - } - } - - return finalRes; -} - -void VmaAllocator_T::CreateLostAllocation(VmaAllocation* pAllocation) -{ - *pAllocation = m_AllocationObjectAllocator.Allocate(); - (*pAllocation)->Ctor(VMA_FRAME_INDEX_LOST, false); - (*pAllocation)->InitLost(); -} - -VkResult VmaAllocator_T::AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory) -{ - const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex); - - // HeapSizeLimit is in effect for this heap. - if((m_HeapSizeLimitMask & (1u << heapIndex)) != 0) - { - const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size; - VkDeviceSize blockBytes = m_Budget.m_BlockBytes[heapIndex]; - for(;;) - { - const VkDeviceSize blockBytesAfterAllocation = blockBytes + pAllocateInfo->allocationSize; - if(blockBytesAfterAllocation > heapSize) - { - return VK_ERROR_OUT_OF_DEVICE_MEMORY; - } - if(m_Budget.m_BlockBytes[heapIndex].compare_exchange_strong(blockBytes, blockBytesAfterAllocation)) - { - break; - } - } - } - else - { - m_Budget.m_BlockBytes[heapIndex] += pAllocateInfo->allocationSize; - } - - // VULKAN CALL vkAllocateMemory. - VkResult res = (*m_VulkanFunctions.vkAllocateMemory)(m_hDevice, pAllocateInfo, GetAllocationCallbacks(), pMemory); - - if(res == VK_SUCCESS) - { -#if VMA_MEMORY_BUDGET - ++m_Budget.m_OperationsSinceBudgetFetch; -#endif - - // Informative callback. - if(m_DeviceMemoryCallbacks.pfnAllocate != VMA_NULL) - { - (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize); - } - } - else - { - m_Budget.m_BlockBytes[heapIndex] -= pAllocateInfo->allocationSize; - } - - return res; -} - -void VmaAllocator_T::FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory) -{ - // Informative callback. - if(m_DeviceMemoryCallbacks.pfnFree != VMA_NULL) - { - (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size); - } - - // VULKAN CALL vkFreeMemory. - (*m_VulkanFunctions.vkFreeMemory)(m_hDevice, hMemory, GetAllocationCallbacks()); - - m_Budget.m_BlockBytes[MemoryTypeIndexToHeapIndex(memoryType)] -= size; -} - -VkResult VmaAllocator_T::BindVulkanBuffer( - VkDeviceMemory memory, - VkDeviceSize memoryOffset, - VkBuffer buffer, - const void* pNext) -{ - if(pNext != VMA_NULL) - { -#if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2 - if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) && - m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL) - { - VkBindBufferMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR }; - bindBufferMemoryInfo.pNext = pNext; - bindBufferMemoryInfo.buffer = buffer; - bindBufferMemoryInfo.memory = memory; - bindBufferMemoryInfo.memoryOffset = memoryOffset; - return (*m_VulkanFunctions.vkBindBufferMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo); - } - else -#endif // #if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2 - { - return VK_ERROR_EXTENSION_NOT_PRESENT; - } - } - else - { - return (*m_VulkanFunctions.vkBindBufferMemory)(m_hDevice, buffer, memory, memoryOffset); - } -} - -VkResult VmaAllocator_T::BindVulkanImage( - VkDeviceMemory memory, - VkDeviceSize memoryOffset, - VkImage image, - const void* pNext) -{ - if(pNext != VMA_NULL) - { -#if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2 - if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) && - m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL) - { - VkBindImageMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR }; - bindBufferMemoryInfo.pNext = pNext; - bindBufferMemoryInfo.image = image; - bindBufferMemoryInfo.memory = memory; - bindBufferMemoryInfo.memoryOffset = memoryOffset; - return (*m_VulkanFunctions.vkBindImageMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo); - } - else -#endif // #if VMA_BIND_MEMORY2 - { - return VK_ERROR_EXTENSION_NOT_PRESENT; - } - } - else - { - return (*m_VulkanFunctions.vkBindImageMemory)(m_hDevice, image, memory, memoryOffset); - } -} - -VkResult VmaAllocator_T::Map(VmaAllocation hAllocation, void** ppData) -{ - if(hAllocation->CanBecomeLost()) - { - return VK_ERROR_MEMORY_MAP_FAILED; - } - - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); - char *pBytes = VMA_NULL; - VkResult res = pBlock->Map(this, 1, (void**)&pBytes); - if(res == VK_SUCCESS) - { - *ppData = pBytes + (ptrdiff_t)hAllocation->GetOffset(); - hAllocation->BlockAllocMap(); - } - return res; - } - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - return hAllocation->DedicatedAllocMap(this, ppData); - default: - VMA_ASSERT(0); - return VK_ERROR_MEMORY_MAP_FAILED; - } -} - -void VmaAllocator_T::Unmap(VmaAllocation hAllocation) -{ - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); - hAllocation->BlockAllocUnmap(); - pBlock->Unmap(this, 1); - } - break; - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - hAllocation->DedicatedAllocUnmap(this); - break; - default: - VMA_ASSERT(0); - } -} - -VkResult VmaAllocator_T::BindBufferMemory( - VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkBuffer hBuffer, - const void* pNext) -{ - VkResult res = VK_SUCCESS; - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - res = BindVulkanBuffer(hAllocation->GetMemory(), allocationLocalOffset, hBuffer, pNext); - break; - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock(); - VMA_ASSERT(pBlock && "Binding buffer to allocation that doesn't belong to any block. Is the allocation lost?"); - res = pBlock->BindBufferMemory(this, hAllocation, allocationLocalOffset, hBuffer, pNext); - break; - } - default: - VMA_ASSERT(0); - } - return res; -} - -VkResult VmaAllocator_T::BindImageMemory( - VmaAllocation hAllocation, - VkDeviceSize allocationLocalOffset, - VkImage hImage, - const void* pNext) -{ - VkResult res = VK_SUCCESS; - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - res = BindVulkanImage(hAllocation->GetMemory(), allocationLocalOffset, hImage, pNext); - break; - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock(); - VMA_ASSERT(pBlock && "Binding image to allocation that doesn't belong to any block. Is the allocation lost?"); - res = pBlock->BindImageMemory(this, hAllocation, allocationLocalOffset, hImage, pNext); - break; - } - default: - VMA_ASSERT(0); - } - return res; -} - -void VmaAllocator_T::FlushOrInvalidateAllocation( - VmaAllocation hAllocation, - VkDeviceSize offset, VkDeviceSize size, - VMA_CACHE_OPERATION op) -{ - const uint32_t memTypeIndex = hAllocation->GetMemoryTypeIndex(); - if(size > 0 && IsMemoryTypeNonCoherent(memTypeIndex)) - { - const VkDeviceSize allocationSize = hAllocation->GetSize(); - VMA_ASSERT(offset <= allocationSize); - - const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize; - - VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE }; - memRange.memory = hAllocation->GetMemory(); - - switch(hAllocation->GetType()) - { - case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED: - memRange.offset = VmaAlignDown(offset, nonCoherentAtomSize); - if(size == VK_WHOLE_SIZE) - { - memRange.size = allocationSize - memRange.offset; - } - else - { - VMA_ASSERT(offset + size <= allocationSize); - memRange.size = VMA_MIN( - VmaAlignUp(size + (offset - memRange.offset), nonCoherentAtomSize), - allocationSize - memRange.offset); - } - break; - - case VmaAllocation_T::ALLOCATION_TYPE_BLOCK: - { - // 1. Still within this allocation. - memRange.offset = VmaAlignDown(offset, nonCoherentAtomSize); - if(size == VK_WHOLE_SIZE) - { - size = allocationSize - offset; - } - else - { - VMA_ASSERT(offset + size <= allocationSize); - } - memRange.size = VmaAlignUp(size + (offset - memRange.offset), nonCoherentAtomSize); - - // 2. Adjust to whole block. - const VkDeviceSize allocationOffset = hAllocation->GetOffset(); - VMA_ASSERT(allocationOffset % nonCoherentAtomSize == 0); - const VkDeviceSize blockSize = hAllocation->GetBlock()->m_pMetadata->GetSize(); - memRange.offset += allocationOffset; - memRange.size = VMA_MIN(memRange.size, blockSize - memRange.offset); - - break; - } - - default: - VMA_ASSERT(0); - } - - switch(op) - { - case VMA_CACHE_FLUSH: - (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, 1, &memRange); - break; - case VMA_CACHE_INVALIDATE: - (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, 1, &memRange); - break; - default: - VMA_ASSERT(0); - } - } - // else: Just ignore this call. -} - -void VmaAllocator_T::FreeDedicatedMemory(const VmaAllocation allocation) -{ - VMA_ASSERT(allocation && allocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED); - - const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex(); - { - VmaMutexLockWrite lock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex); - AllocationVectorType* const pDedicatedAllocations = m_pDedicatedAllocations[memTypeIndex]; - VMA_ASSERT(pDedicatedAllocations); - bool success = VmaVectorRemoveSorted(*pDedicatedAllocations, allocation); - VMA_ASSERT(success); - } - - VkDeviceMemory hMemory = allocation->GetMemory(); - - /* - There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory - before vkFreeMemory. - - if(allocation->GetMappedData() != VMA_NULL) - { - (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory); - } - */ - - FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory); - - VMA_DEBUG_LOG(" Freed DedicatedMemory MemoryTypeIndex=%u", memTypeIndex); -} - -uint32_t VmaAllocator_T::CalculateGpuDefragmentationMemoryTypeBits() const -{ - VkBufferCreateInfo dummyBufCreateInfo; - VmaFillGpuDefragmentationBufferCreateInfo(dummyBufCreateInfo); - - uint32_t memoryTypeBits = 0; - - // Create buffer. - VkBuffer buf = VK_NULL_HANDLE; - VkResult res = (*GetVulkanFunctions().vkCreateBuffer)( - m_hDevice, &dummyBufCreateInfo, GetAllocationCallbacks(), &buf); - if(res == VK_SUCCESS) - { - // Query for supported memory types. - VkMemoryRequirements memReq; - (*GetVulkanFunctions().vkGetBufferMemoryRequirements)(m_hDevice, buf, &memReq); - memoryTypeBits = memReq.memoryTypeBits; - - // Destroy buffer. - (*GetVulkanFunctions().vkDestroyBuffer)(m_hDevice, buf, GetAllocationCallbacks()); - } - - return memoryTypeBits; -} - -#if VMA_MEMORY_BUDGET - -void VmaAllocator_T::UpdateVulkanBudget() -{ - VMA_ASSERT(m_UseExtMemoryBudget); - - VkPhysicalDeviceMemoryProperties2KHR memProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR }; - - VkPhysicalDeviceMemoryBudgetPropertiesEXT budgetProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT }; - memProps.pNext = &budgetProps; - - GetVulkanFunctions().vkGetPhysicalDeviceMemoryProperties2KHR(m_PhysicalDevice, &memProps); - - { - VmaMutexLockWrite lockWrite(m_Budget.m_BudgetMutex, m_UseMutex); - - for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex) - { - m_Budget.m_VulkanUsage[heapIndex] = budgetProps.heapUsage[heapIndex]; - m_Budget.m_VulkanBudget[heapIndex] = budgetProps.heapBudget[heapIndex]; - m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] = m_Budget.m_BlockBytes[heapIndex].load(); - } - m_Budget.m_OperationsSinceBudgetFetch = 0; - } -} - -#endif // #if VMA_MEMORY_BUDGET - -void VmaAllocator_T::FillAllocation(const VmaAllocation hAllocation, uint8_t pattern) -{ - if(VMA_DEBUG_INITIALIZE_ALLOCATIONS && - !hAllocation->CanBecomeLost() && - (m_MemProps.memoryTypes[hAllocation->GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0) - { - void* pData = VMA_NULL; - VkResult res = Map(hAllocation, &pData); - if(res == VK_SUCCESS) - { - memset(pData, (int)pattern, (size_t)hAllocation->GetSize()); - FlushOrInvalidateAllocation(hAllocation, 0, VK_WHOLE_SIZE, VMA_CACHE_FLUSH); - Unmap(hAllocation); - } - else - { - VMA_ASSERT(0 && "VMA_DEBUG_INITIALIZE_ALLOCATIONS is enabled, but couldn't map memory to fill allocation."); - } - } -} - -uint32_t VmaAllocator_T::GetGpuDefragmentationMemoryTypeBits() -{ - uint32_t memoryTypeBits = m_GpuDefragmentationMemoryTypeBits.load(); - if(memoryTypeBits == UINT32_MAX) - { - memoryTypeBits = CalculateGpuDefragmentationMemoryTypeBits(); - m_GpuDefragmentationMemoryTypeBits.store(memoryTypeBits); - } - return memoryTypeBits; -} - -#if VMA_STATS_STRING_ENABLED - -void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json) -{ - bool dedicatedAllocationsStarted = false; - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - VmaMutexLockRead dedicatedAllocationsLock(m_DedicatedAllocationsMutex[memTypeIndex], m_UseMutex); - AllocationVectorType* const pDedicatedAllocVector = m_pDedicatedAllocations[memTypeIndex]; - VMA_ASSERT(pDedicatedAllocVector); - if(pDedicatedAllocVector->empty() == false) - { - if(dedicatedAllocationsStarted == false) - { - dedicatedAllocationsStarted = true; - json.WriteString("DedicatedAllocations"); - json.BeginObject(); - } - - json.BeginString("Type "); - json.ContinueString(memTypeIndex); - json.EndString(); - - json.BeginArray(); - - for(size_t i = 0; i < pDedicatedAllocVector->size(); ++i) - { - json.BeginObject(true); - const VmaAllocation hAlloc = (*pDedicatedAllocVector)[i]; - hAlloc->PrintParameters(json); - json.EndObject(); - } - - json.EndArray(); - } - } - if(dedicatedAllocationsStarted) - { - json.EndObject(); - } - - { - bool allocationsStarted = false; - for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex) - { - if(m_pBlockVectors[memTypeIndex]->IsEmpty() == false) - { - if(allocationsStarted == false) - { - allocationsStarted = true; - json.WriteString("DefaultPools"); - json.BeginObject(); - } - - json.BeginString("Type "); - json.ContinueString(memTypeIndex); - json.EndString(); - - m_pBlockVectors[memTypeIndex]->PrintDetailedMap(json); - } - } - if(allocationsStarted) - { - json.EndObject(); - } - } - - // Custom pools - { - VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex); - const size_t poolCount = m_Pools.size(); - if(poolCount > 0) - { - json.WriteString("Pools"); - json.BeginObject(); - for(size_t poolIndex = 0; poolIndex < poolCount; ++poolIndex) - { - json.BeginString(); - json.ContinueString(m_Pools[poolIndex]->GetId()); - json.EndString(); - - m_Pools[poolIndex]->m_BlockVector.PrintDetailedMap(json); - } - json.EndObject(); - } - } -} - -#endif // #if VMA_STATS_STRING_ENABLED - -//////////////////////////////////////////////////////////////////////////////// -// Public interface - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator( - const VmaAllocatorCreateInfo* pCreateInfo, - VmaAllocator* pAllocator) -{ - VMA_ASSERT(pCreateInfo && pAllocator); - VMA_ASSERT(pCreateInfo->vulkanApiVersion == 0 || - (VK_VERSION_MAJOR(pCreateInfo->vulkanApiVersion) == 1 && VK_VERSION_MINOR(pCreateInfo->vulkanApiVersion) <= 1)); - VMA_DEBUG_LOG("vmaCreateAllocator"); - *pAllocator = vma_new(pCreateInfo->pAllocationCallbacks, VmaAllocator_T)(pCreateInfo); - return (*pAllocator)->Init(pCreateInfo); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator( - VmaAllocator allocator) -{ - if(allocator != VK_NULL_HANDLE) - { - VMA_DEBUG_LOG("vmaDestroyAllocator"); - VkAllocationCallbacks allocationCallbacks = allocator->m_AllocationCallbacks; - vma_delete(&allocationCallbacks, allocator); - } -} - -VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties( - VmaAllocator allocator, - const VkPhysicalDeviceProperties **ppPhysicalDeviceProperties) -{ - VMA_ASSERT(allocator && ppPhysicalDeviceProperties); - *ppPhysicalDeviceProperties = &allocator->m_PhysicalDeviceProperties; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties( - VmaAllocator allocator, - const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties) -{ - VMA_ASSERT(allocator && ppPhysicalDeviceMemoryProperties); - *ppPhysicalDeviceMemoryProperties = &allocator->m_MemProps; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties( - VmaAllocator allocator, - uint32_t memoryTypeIndex, - VkMemoryPropertyFlags* pFlags) -{ - VMA_ASSERT(allocator && pFlags); - VMA_ASSERT(memoryTypeIndex < allocator->GetMemoryTypeCount()); - *pFlags = allocator->m_MemProps.memoryTypes[memoryTypeIndex].propertyFlags; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex( - VmaAllocator allocator, - uint32_t frameIndex) -{ - VMA_ASSERT(allocator); - VMA_ASSERT(frameIndex != VMA_FRAME_INDEX_LOST); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - allocator->SetCurrentFrameIndex(frameIndex); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStats( - VmaAllocator allocator, - VmaStats* pStats) -{ - VMA_ASSERT(allocator && pStats); - VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->CalculateStats(pStats); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaGetBudget( - VmaAllocator allocator, - VmaBudget* pBudget) -{ - VMA_ASSERT(allocator && pBudget); - VMA_DEBUG_GLOBAL_MUTEX_LOCK - allocator->GetBudget(pBudget, 0, allocator->GetMemoryHeapCount()); -} - -#if VMA_STATS_STRING_ENABLED - -VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString( - VmaAllocator allocator, - char** ppStatsString, - VkBool32 detailedMap) -{ - VMA_ASSERT(allocator && ppStatsString); - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VmaStringBuilder sb(allocator); - { - VmaJsonWriter json(allocator->GetAllocationCallbacks(), sb); - json.BeginObject(); - - VmaBudget budget[VK_MAX_MEMORY_HEAPS]; - allocator->GetBudget(budget, 0, allocator->GetMemoryHeapCount()); - - VmaStats stats; - allocator->CalculateStats(&stats); - - json.WriteString("Total"); - VmaPrintStatInfo(json, stats.total); - - for(uint32_t heapIndex = 0; heapIndex < allocator->GetMemoryHeapCount(); ++heapIndex) - { - json.BeginString("Heap "); - json.ContinueString(heapIndex); - json.EndString(); - json.BeginObject(); - - json.WriteString("Size"); - json.WriteNumber(allocator->m_MemProps.memoryHeaps[heapIndex].size); - - json.WriteString("Flags"); - json.BeginArray(true); - if((allocator->m_MemProps.memoryHeaps[heapIndex].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) != 0) - { - json.WriteString("DEVICE_LOCAL"); - } - json.EndArray(); - - json.WriteString("Budget"); - json.BeginObject(); - { - json.WriteString("BlockBytes"); - json.WriteNumber(budget[heapIndex].blockBytes); - json.WriteString("AllocationBytes"); - json.WriteNumber(budget[heapIndex].allocationBytes); - json.WriteString("Usage"); - json.WriteNumber(budget[heapIndex].usage); - json.WriteString("Budget"); - json.WriteNumber(budget[heapIndex].budget); - } - json.EndObject(); - - if(stats.memoryHeap[heapIndex].blockCount > 0) - { - json.WriteString("Stats"); - VmaPrintStatInfo(json, stats.memoryHeap[heapIndex]); - } - - for(uint32_t typeIndex = 0; typeIndex < allocator->GetMemoryTypeCount(); ++typeIndex) - { - if(allocator->MemoryTypeIndexToHeapIndex(typeIndex) == heapIndex) - { - json.BeginString("Type "); - json.ContinueString(typeIndex); - json.EndString(); - - json.BeginObject(); - - json.WriteString("Flags"); - json.BeginArray(true); - VkMemoryPropertyFlags flags = allocator->m_MemProps.memoryTypes[typeIndex].propertyFlags; - if((flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) != 0) - { - json.WriteString("DEVICE_LOCAL"); - } - if((flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0) - { - json.WriteString("HOST_VISIBLE"); - } - if((flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0) - { - json.WriteString("HOST_COHERENT"); - } - if((flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) != 0) - { - json.WriteString("HOST_CACHED"); - } - if((flags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) != 0) - { - json.WriteString("LAZILY_ALLOCATED"); - } - json.EndArray(); - - if(stats.memoryType[typeIndex].blockCount > 0) - { - json.WriteString("Stats"); - VmaPrintStatInfo(json, stats.memoryType[typeIndex]); - } - - json.EndObject(); - } - } - - json.EndObject(); - } - if(detailedMap == VK_TRUE) - { - allocator->PrintDetailedMap(json); - } - - json.EndObject(); - } - - const size_t len = sb.GetLength(); - char* const pChars = vma_new_array(allocator, char, len + 1); - if(len > 0) - { - memcpy(pChars, sb.GetData(), len); - } - pChars[len] = '\0'; - *ppStatsString = pChars; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( - VmaAllocator allocator, - char* pStatsString) -{ - if(pStatsString != VMA_NULL) - { - VMA_ASSERT(allocator); - size_t len = strlen(pStatsString); - vma_delete_array(allocator, pStatsString, len + 1); - } -} - -#endif // #if VMA_STATS_STRING_ENABLED - -/* -This function is not protected by any mutex because it just reads immutable data. -*/ -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex( - VmaAllocator allocator, - uint32_t memoryTypeBits, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex) -{ - VMA_ASSERT(allocator != VK_NULL_HANDLE); - VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); - VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); - - if(pAllocationCreateInfo->memoryTypeBits != 0) - { - memoryTypeBits &= pAllocationCreateInfo->memoryTypeBits; - } - - uint32_t requiredFlags = pAllocationCreateInfo->requiredFlags; - uint32_t preferredFlags = pAllocationCreateInfo->preferredFlags; - uint32_t notPreferredFlags = 0; - - // Convert usage to requiredFlags and preferredFlags. - switch(pAllocationCreateInfo->usage) - { - case VMA_MEMORY_USAGE_UNKNOWN: - break; - case VMA_MEMORY_USAGE_GPU_ONLY: - if(!allocator->IsIntegratedGpu() || (preferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) - { - preferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - } - break; - case VMA_MEMORY_USAGE_CPU_ONLY: - requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; - break; - case VMA_MEMORY_USAGE_CPU_TO_GPU: - requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - if(!allocator->IsIntegratedGpu() || (preferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) - { - preferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - } - break; - case VMA_MEMORY_USAGE_GPU_TO_CPU: - requiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - preferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; - break; - case VMA_MEMORY_USAGE_CPU_COPY: - notPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - break; - case VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED: - requiredFlags |= VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT; - break; - default: - VMA_ASSERT(0); - break; - } - - *pMemoryTypeIndex = UINT32_MAX; - uint32_t minCost = UINT32_MAX; - for(uint32_t memTypeIndex = 0, memTypeBit = 1; - memTypeIndex < allocator->GetMemoryTypeCount(); - ++memTypeIndex, memTypeBit <<= 1) - { - // This memory type is acceptable according to memoryTypeBits bitmask. - if((memTypeBit & memoryTypeBits) != 0) - { - const VkMemoryPropertyFlags currFlags = - allocator->m_MemProps.memoryTypes[memTypeIndex].propertyFlags; - // This memory type contains requiredFlags. - if((requiredFlags & ~currFlags) == 0) - { - // Calculate cost as number of bits from preferredFlags not present in this memory type. - uint32_t currCost = VmaCountBitsSet(preferredFlags & ~currFlags) + - VmaCountBitsSet(currFlags & notPreferredFlags); - // Remember memory type with lowest cost. - if(currCost < minCost) - { - *pMemoryTypeIndex = memTypeIndex; - if(currCost == 0) - { - return VK_SUCCESS; - } - minCost = currCost; - } - } - } - } - return (*pMemoryTypeIndex != UINT32_MAX) ? VK_SUCCESS : VK_ERROR_FEATURE_NOT_PRESENT; -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo( - VmaAllocator allocator, - const VkBufferCreateInfo* pBufferCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex) -{ - VMA_ASSERT(allocator != VK_NULL_HANDLE); - VMA_ASSERT(pBufferCreateInfo != VMA_NULL); - VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); - VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); - - const VkDevice hDev = allocator->m_hDevice; - VkBuffer hBuffer = VK_NULL_HANDLE; - VkResult res = allocator->GetVulkanFunctions().vkCreateBuffer( - hDev, pBufferCreateInfo, allocator->GetAllocationCallbacks(), &hBuffer); - if(res == VK_SUCCESS) - { - VkMemoryRequirements memReq = {}; - allocator->GetVulkanFunctions().vkGetBufferMemoryRequirements( - hDev, hBuffer, &memReq); - - res = vmaFindMemoryTypeIndex( - allocator, - memReq.memoryTypeBits, - pAllocationCreateInfo, - pMemoryTypeIndex); - - allocator->GetVulkanFunctions().vkDestroyBuffer( - hDev, hBuffer, allocator->GetAllocationCallbacks()); - } - return res; -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo( - VmaAllocator allocator, - const VkImageCreateInfo* pImageCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - uint32_t* pMemoryTypeIndex) -{ - VMA_ASSERT(allocator != VK_NULL_HANDLE); - VMA_ASSERT(pImageCreateInfo != VMA_NULL); - VMA_ASSERT(pAllocationCreateInfo != VMA_NULL); - VMA_ASSERT(pMemoryTypeIndex != VMA_NULL); - - const VkDevice hDev = allocator->m_hDevice; - VkImage hImage = VK_NULL_HANDLE; - VkResult res = allocator->GetVulkanFunctions().vkCreateImage( - hDev, pImageCreateInfo, allocator->GetAllocationCallbacks(), &hImage); - if(res == VK_SUCCESS) - { - VkMemoryRequirements memReq = {}; - allocator->GetVulkanFunctions().vkGetImageMemoryRequirements( - hDev, hImage, &memReq); - - res = vmaFindMemoryTypeIndex( - allocator, - memReq.memoryTypeBits, - pAllocationCreateInfo, - pMemoryTypeIndex); - - allocator->GetVulkanFunctions().vkDestroyImage( - hDev, hImage, allocator->GetAllocationCallbacks()); - } - return res; -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool( - VmaAllocator allocator, - const VmaPoolCreateInfo* pCreateInfo, - VmaPool* pPool) -{ - VMA_ASSERT(allocator && pCreateInfo && pPool); - - VMA_DEBUG_LOG("vmaCreatePool"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VkResult res = allocator->CreatePool(pCreateInfo, pPool); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordCreatePool(allocator->GetCurrentFrameIndex(), *pCreateInfo, *pPool); - } -#endif - - return res; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool( - VmaAllocator allocator, - VmaPool pool) -{ - VMA_ASSERT(allocator); - - if(pool == VK_NULL_HANDLE) - { - return; - } - - VMA_DEBUG_LOG("vmaDestroyPool"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordDestroyPool(allocator->GetCurrentFrameIndex(), pool); - } -#endif - - allocator->DestroyPool(pool); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStats( - VmaAllocator allocator, - VmaPool pool, - VmaPoolStats* pPoolStats) -{ - VMA_ASSERT(allocator && pool && pPoolStats); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - allocator->GetPoolStats(pool, pPoolStats); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaMakePoolAllocationsLost( - VmaAllocator allocator, - VmaPool pool, - size_t* pLostAllocationCount) -{ - VMA_ASSERT(allocator && pool); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordMakePoolAllocationsLost(allocator->GetCurrentFrameIndex(), pool); - } -#endif - - allocator->MakePoolAllocationsLost(pool, pLostAllocationCount); -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool) -{ - VMA_ASSERT(allocator && pool); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VMA_DEBUG_LOG("vmaCheckPoolCorruption"); - - return allocator->CheckPoolCorruption(pool); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName( - VmaAllocator allocator, - VmaPool pool, - const char** ppName) -{ - VMA_ASSERT(allocator && pool); - - VMA_DEBUG_LOG("vmaGetPoolName"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - *ppName = pool->GetName(); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName( - VmaAllocator allocator, - VmaPool pool, - const char* pName) -{ - VMA_ASSERT(allocator && pool); - - VMA_DEBUG_LOG("vmaSetPoolName"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - pool->SetName(pName); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordSetPoolName(allocator->GetCurrentFrameIndex(), pool, pName); - } -#endif -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory( - VmaAllocator allocator, - const VkMemoryRequirements* pVkMemoryRequirements, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) -{ - VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocation); - - VMA_DEBUG_LOG("vmaAllocateMemory"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VkResult result = allocator->AllocateMemory( - *pVkMemoryRequirements, - false, // requiresDedicatedAllocation - false, // prefersDedicatedAllocation - VK_NULL_HANDLE, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - *pCreateInfo, - VMA_SUBALLOCATION_TYPE_UNKNOWN, - 1, // allocationCount - pAllocation); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordAllocateMemory( - allocator->GetCurrentFrameIndex(), - *pVkMemoryRequirements, - *pCreateInfo, - *pAllocation); - } -#endif - - if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } - - return result; -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages( - VmaAllocator allocator, - const VkMemoryRequirements* pVkMemoryRequirements, - const VmaAllocationCreateInfo* pCreateInfo, - size_t allocationCount, - VmaAllocation* pAllocations, - VmaAllocationInfo* pAllocationInfo) -{ - if(allocationCount == 0) - { - return VK_SUCCESS; - } - - VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocations); - - VMA_DEBUG_LOG("vmaAllocateMemoryPages"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VkResult result = allocator->AllocateMemory( - *pVkMemoryRequirements, - false, // requiresDedicatedAllocation - false, // prefersDedicatedAllocation - VK_NULL_HANDLE, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - *pCreateInfo, - VMA_SUBALLOCATION_TYPE_UNKNOWN, - allocationCount, - pAllocations); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordAllocateMemoryPages( - allocator->GetCurrentFrameIndex(), - *pVkMemoryRequirements, - *pCreateInfo, - (uint64_t)allocationCount, - pAllocations); - } -#endif - - if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS) - { - for(size_t i = 0; i < allocationCount; ++i) - { - allocator->GetAllocationInfo(pAllocations[i], pAllocationInfo + i); - } - } - - return result; -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer( - VmaAllocator allocator, - VkBuffer buffer, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) -{ - VMA_ASSERT(allocator && buffer != VK_NULL_HANDLE && pCreateInfo && pAllocation); - - VMA_DEBUG_LOG("vmaAllocateMemoryForBuffer"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetBufferMemoryRequirements(buffer, vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation); - - VkResult result = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - buffer, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - *pCreateInfo, - VMA_SUBALLOCATION_TYPE_BUFFER, - 1, // allocationCount - pAllocation); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordAllocateMemoryForBuffer( - allocator->GetCurrentFrameIndex(), - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - *pCreateInfo, - *pAllocation); - } -#endif - - if(pAllocationInfo && result == VK_SUCCESS) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } - - return result; -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage( - VmaAllocator allocator, - VkImage image, - const VmaAllocationCreateInfo* pCreateInfo, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) -{ - VMA_ASSERT(allocator && image != VK_NULL_HANDLE && pCreateInfo && pAllocation); - - VMA_DEBUG_LOG("vmaAllocateMemoryForImage"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetImageMemoryRequirements(image, vkMemReq, - requiresDedicatedAllocation, prefersDedicatedAllocation); - - VkResult result = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - VK_NULL_HANDLE, // dedicatedBuffer - image, // dedicatedImage - *pCreateInfo, - VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN, - 1, // allocationCount - pAllocation); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordAllocateMemoryForImage( - allocator->GetCurrentFrameIndex(), - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - *pCreateInfo, - *pAllocation); - } -#endif - - if(pAllocationInfo && result == VK_SUCCESS) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } - - return result; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory( - VmaAllocator allocator, - VmaAllocation allocation) -{ - VMA_ASSERT(allocator); - - if(allocation == VK_NULL_HANDLE) - { - return; - } - - VMA_DEBUG_LOG("vmaFreeMemory"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordFreeMemory( - allocator->GetCurrentFrameIndex(), - allocation); - } -#endif - - allocator->FreeMemory( - 1, // allocationCount - &allocation); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages( - VmaAllocator allocator, - size_t allocationCount, - VmaAllocation* pAllocations) -{ - if(allocationCount == 0) - { - return; - } - - VMA_ASSERT(allocator); - - VMA_DEBUG_LOG("vmaFreeMemoryPages"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordFreeMemoryPages( - allocator->GetCurrentFrameIndex(), - (uint64_t)allocationCount, - pAllocations); - } -#endif - - allocator->FreeMemory(allocationCount, pAllocations); -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaResizeAllocation( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize newSize) -{ - VMA_ASSERT(allocator && allocation); - - VMA_DEBUG_LOG("vmaResizeAllocation"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - return allocator->ResizeAllocation(allocation, newSize); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo( - VmaAllocator allocator, - VmaAllocation allocation, - VmaAllocationInfo* pAllocationInfo) -{ - VMA_ASSERT(allocator && allocation && pAllocationInfo); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordGetAllocationInfo( - allocator->GetCurrentFrameIndex(), - allocation); - } -#endif - - allocator->GetAllocationInfo(allocation, pAllocationInfo); -} - -VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaTouchAllocation( - VmaAllocator allocator, - VmaAllocation allocation) -{ - VMA_ASSERT(allocator && allocation); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordTouchAllocation( - allocator->GetCurrentFrameIndex(), - allocation); - } -#endif - - return allocator->TouchAllocation(allocation); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData( - VmaAllocator allocator, - VmaAllocation allocation, - void* pUserData) -{ - VMA_ASSERT(allocator && allocation); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - allocation->SetUserData(allocator, pUserData); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordSetAllocationUserData( - allocator->GetCurrentFrameIndex(), - allocation, - pUserData); - } -#endif -} - -VMA_CALL_PRE void VMA_CALL_POST vmaCreateLostAllocation( - VmaAllocator allocator, - VmaAllocation* pAllocation) -{ - VMA_ASSERT(allocator && pAllocation); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK; - - allocator->CreateLostAllocation(pAllocation); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordCreateLostAllocation( - allocator->GetCurrentFrameIndex(), - *pAllocation); - } -#endif -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory( - VmaAllocator allocator, - VmaAllocation allocation, - void** ppData) -{ - VMA_ASSERT(allocator && allocation && ppData); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VkResult res = allocator->Map(allocation, ppData); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordMapMemory( - allocator->GetCurrentFrameIndex(), - allocation); - } -#endif - - return res; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory( - VmaAllocator allocator, - VmaAllocation allocation) -{ - VMA_ASSERT(allocator && allocation); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordUnmapMemory( - allocator->GetCurrentFrameIndex(), - allocation); - } -#endif - - allocator->Unmap(allocation); -} - -VMA_CALL_PRE void VMA_CALL_POST vmaFlushAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size) -{ - VMA_ASSERT(allocator && allocation); - - VMA_DEBUG_LOG("vmaFlushAllocation"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_FLUSH); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordFlushAllocation( - allocator->GetCurrentFrameIndex(), - allocation, offset, size); - } -#endif -} - -VMA_CALL_PRE void VMA_CALL_POST vmaInvalidateAllocation(VmaAllocator allocator, VmaAllocation allocation, VkDeviceSize offset, VkDeviceSize size) -{ - VMA_ASSERT(allocator && allocation); - - VMA_DEBUG_LOG("vmaInvalidateAllocation"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_INVALIDATE); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordInvalidateAllocation( - allocator->GetCurrentFrameIndex(), - allocation, offset, size); - } -#endif -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption(VmaAllocator allocator, uint32_t memoryTypeBits) -{ - VMA_ASSERT(allocator); - - VMA_DEBUG_LOG("vmaCheckCorruption"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - return allocator->CheckCorruption(memoryTypeBits); -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragment( - VmaAllocator allocator, - VmaAllocation* pAllocations, - size_t allocationCount, - VkBool32* pAllocationsChanged, - const VmaDefragmentationInfo *pDefragmentationInfo, - VmaDefragmentationStats* pDefragmentationStats) -{ - // Deprecated interface, reimplemented using new one. - - VmaDefragmentationInfo2 info2 = {}; - info2.allocationCount = (uint32_t)allocationCount; - info2.pAllocations = pAllocations; - info2.pAllocationsChanged = pAllocationsChanged; - if(pDefragmentationInfo != VMA_NULL) - { - info2.maxCpuAllocationsToMove = pDefragmentationInfo->maxAllocationsToMove; - info2.maxCpuBytesToMove = pDefragmentationInfo->maxBytesToMove; - } - else - { - info2.maxCpuAllocationsToMove = UINT32_MAX; - info2.maxCpuBytesToMove = VK_WHOLE_SIZE; - } - // info2.flags, maxGpuAllocationsToMove, maxGpuBytesToMove, commandBuffer deliberately left zero. - - VmaDefragmentationContext ctx; - VkResult res = vmaDefragmentationBegin(allocator, &info2, pDefragmentationStats, &ctx); - if(res == VK_NOT_READY) - { - res = vmaDefragmentationEnd( allocator, ctx); - } - return res; -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragmentationBegin( - VmaAllocator allocator, - const VmaDefragmentationInfo2* pInfo, - VmaDefragmentationStats* pStats, - VmaDefragmentationContext *pContext) -{ - VMA_ASSERT(allocator && pInfo && pContext); - - // Degenerate case: Nothing to defragment. - if(pInfo->allocationCount == 0 && pInfo->poolCount == 0) - { - return VK_SUCCESS; - } - - VMA_ASSERT(pInfo->allocationCount == 0 || pInfo->pAllocations != VMA_NULL); - VMA_ASSERT(pInfo->poolCount == 0 || pInfo->pPools != VMA_NULL); - VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->allocationCount, pInfo->pAllocations)); - VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->poolCount, pInfo->pPools)); - - VMA_DEBUG_LOG("vmaDefragmentationBegin"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - VkResult res = allocator->DefragmentationBegin(*pInfo, pStats, pContext); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordDefragmentationBegin( - allocator->GetCurrentFrameIndex(), *pInfo, *pContext); - } -#endif - - return res; -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaDefragmentationEnd( - VmaAllocator allocator, - VmaDefragmentationContext context) -{ - VMA_ASSERT(allocator); - - VMA_DEBUG_LOG("vmaDefragmentationEnd"); - - if(context != VK_NULL_HANDLE) - { - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordDefragmentationEnd( - allocator->GetCurrentFrameIndex(), context); - } -#endif - - return allocator->DefragmentationEnd(context); - } - else - { - return VK_SUCCESS; - } -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass( - VmaAllocator allocator, - VmaDefragmentationContext context, - VmaDefragmentationPassInfo* pInfo - ) -{ - VMA_ASSERT(allocator); - VMA_ASSERT(pInfo); - VMA_HEAVY_ASSERT(VmaValidatePointerArray(pInfo->moveCount, pInfo->pMoves)); - - VMA_DEBUG_LOG("vmaBeginDefragmentationPass"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - if(context == VK_NULL_HANDLE) - { - pInfo->moveCount = 0; - return VK_SUCCESS; - } - - return allocator->DefragmentationPassBegin(pInfo, context); -} -VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass( - VmaAllocator allocator, - VmaDefragmentationContext context) -{ - VMA_ASSERT(allocator); - - VMA_DEBUG_LOG("vmaEndDefragmentationPass"); - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - if(context == VK_NULL_HANDLE) - return VK_SUCCESS; - - return allocator->DefragmentationPassEnd(context); -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory( - VmaAllocator allocator, - VmaAllocation allocation, - VkBuffer buffer) -{ - VMA_ASSERT(allocator && allocation && buffer); - - VMA_DEBUG_LOG("vmaBindBufferMemory"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - return allocator->BindBufferMemory(allocation, 0, buffer, VMA_NULL); -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize allocationLocalOffset, - VkBuffer buffer, - const void* pNext) -{ - VMA_ASSERT(allocator && allocation && buffer); - - VMA_DEBUG_LOG("vmaBindBufferMemory2"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - return allocator->BindBufferMemory(allocation, allocationLocalOffset, buffer, pNext); -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory( - VmaAllocator allocator, - VmaAllocation allocation, - VkImage image) -{ - VMA_ASSERT(allocator && allocation && image); - - VMA_DEBUG_LOG("vmaBindImageMemory"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - return allocator->BindImageMemory(allocation, 0, image, VMA_NULL); -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2( - VmaAllocator allocator, - VmaAllocation allocation, - VkDeviceSize allocationLocalOffset, - VkImage image, - const void* pNext) -{ - VMA_ASSERT(allocator && allocation && image); - - VMA_DEBUG_LOG("vmaBindImageMemory2"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - return allocator->BindImageMemory(allocation, allocationLocalOffset, image, pNext); -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer( - VmaAllocator allocator, - const VkBufferCreateInfo* pBufferCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkBuffer* pBuffer, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) -{ - VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && pBuffer && pAllocation); - - if(pBufferCreateInfo->size == 0) - { - return VK_ERROR_VALIDATION_FAILED_EXT; - } - - VMA_DEBUG_LOG("vmaCreateBuffer"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - *pBuffer = VK_NULL_HANDLE; - *pAllocation = VK_NULL_HANDLE; - - // 1. Create VkBuffer. - VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)( - allocator->m_hDevice, - pBufferCreateInfo, - allocator->GetAllocationCallbacks(), - pBuffer); - if(res >= 0) - { - // 2. vkGetBufferMemoryRequirements. - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq, - requiresDedicatedAllocation, prefersDedicatedAllocation); - - // Make sure alignment requirements for specific buffer usages reported - // in Physical Device Properties are included in alignment reported by memory requirements. - if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT) != 0) - { - VMA_ASSERT(vkMemReq.alignment % - allocator->m_PhysicalDeviceProperties.limits.minTexelBufferOffsetAlignment == 0); - } - if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT) != 0) - { - VMA_ASSERT(vkMemReq.alignment % - allocator->m_PhysicalDeviceProperties.limits.minUniformBufferOffsetAlignment == 0); - } - if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) != 0) - { - VMA_ASSERT(vkMemReq.alignment % - allocator->m_PhysicalDeviceProperties.limits.minStorageBufferOffsetAlignment == 0); - } - - // 3. Allocate memory using allocator. - res = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - *pBuffer, // dedicatedBuffer - VK_NULL_HANDLE, // dedicatedImage - *pAllocationCreateInfo, - VMA_SUBALLOCATION_TYPE_BUFFER, - 1, // allocationCount - pAllocation); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordCreateBuffer( - allocator->GetCurrentFrameIndex(), - *pBufferCreateInfo, - *pAllocationCreateInfo, - *pAllocation); - } -#endif - - if(res >= 0) - { - // 3. Bind buffer with memory. - if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0) - { - res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL); - } - if(res >= 0) - { - // All steps succeeded. - #if VMA_STATS_STRING_ENABLED - (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage); - #endif - if(pAllocationInfo != VMA_NULL) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } - - return VK_SUCCESS; - } - allocator->FreeMemory( - 1, // allocationCount - pAllocation); - *pAllocation = VK_NULL_HANDLE; - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); - *pBuffer = VK_NULL_HANDLE; - return res; - } - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks()); - *pBuffer = VK_NULL_HANDLE; - return res; - } - return res; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer( - VmaAllocator allocator, - VkBuffer buffer, - VmaAllocation allocation) -{ - VMA_ASSERT(allocator); - - if(buffer == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE) - { - return; - } - - VMA_DEBUG_LOG("vmaDestroyBuffer"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordDestroyBuffer( - allocator->GetCurrentFrameIndex(), - allocation); - } -#endif - - if(buffer != VK_NULL_HANDLE) - { - (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, buffer, allocator->GetAllocationCallbacks()); - } - - if(allocation != VK_NULL_HANDLE) - { - allocator->FreeMemory( - 1, // allocationCount - &allocation); - } -} - -VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage( - VmaAllocator allocator, - const VkImageCreateInfo* pImageCreateInfo, - const VmaAllocationCreateInfo* pAllocationCreateInfo, - VkImage* pImage, - VmaAllocation* pAllocation, - VmaAllocationInfo* pAllocationInfo) -{ - VMA_ASSERT(allocator && pImageCreateInfo && pAllocationCreateInfo && pImage && pAllocation); - - if(pImageCreateInfo->extent.width == 0 || - pImageCreateInfo->extent.height == 0 || - pImageCreateInfo->extent.depth == 0 || - pImageCreateInfo->mipLevels == 0 || - pImageCreateInfo->arrayLayers == 0) - { - return VK_ERROR_VALIDATION_FAILED_EXT; - } - - VMA_DEBUG_LOG("vmaCreateImage"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - - *pImage = VK_NULL_HANDLE; - *pAllocation = VK_NULL_HANDLE; - - // 1. Create VkImage. - VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)( - allocator->m_hDevice, - pImageCreateInfo, - allocator->GetAllocationCallbacks(), - pImage); - if(res >= 0) - { - VmaSuballocationType suballocType = pImageCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ? - VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL : - VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR; - - // 2. Allocate memory using allocator. - VkMemoryRequirements vkMemReq = {}; - bool requiresDedicatedAllocation = false; - bool prefersDedicatedAllocation = false; - allocator->GetImageMemoryRequirements(*pImage, vkMemReq, - requiresDedicatedAllocation, prefersDedicatedAllocation); - - res = allocator->AllocateMemory( - vkMemReq, - requiresDedicatedAllocation, - prefersDedicatedAllocation, - VK_NULL_HANDLE, // dedicatedBuffer - *pImage, // dedicatedImage - *pAllocationCreateInfo, - suballocType, - 1, // allocationCount - pAllocation); - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordCreateImage( - allocator->GetCurrentFrameIndex(), - *pImageCreateInfo, - *pAllocationCreateInfo, - *pAllocation); - } -#endif - - if(res >= 0) - { - // 3. Bind image with memory. - if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0) - { - res = allocator->BindImageMemory(*pAllocation, 0, *pImage, VMA_NULL); - } - if(res >= 0) - { - // All steps succeeded. - #if VMA_STATS_STRING_ENABLED - (*pAllocation)->InitBufferImageUsage(pImageCreateInfo->usage); - #endif - if(pAllocationInfo != VMA_NULL) - { - allocator->GetAllocationInfo(*pAllocation, pAllocationInfo); - } - - return VK_SUCCESS; - } - allocator->FreeMemory( - 1, // allocationCount - pAllocation); - *pAllocation = VK_NULL_HANDLE; - (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks()); - *pImage = VK_NULL_HANDLE; - return res; - } - (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks()); - *pImage = VK_NULL_HANDLE; - return res; - } - return res; -} - -VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage( - VmaAllocator allocator, - VkImage image, - VmaAllocation allocation) -{ - VMA_ASSERT(allocator); - - if(image == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE) - { - return; - } - - VMA_DEBUG_LOG("vmaDestroyImage"); - - VMA_DEBUG_GLOBAL_MUTEX_LOCK - -#if VMA_RECORDING_ENABLED - if(allocator->GetRecorder() != VMA_NULL) - { - allocator->GetRecorder()->RecordDestroyImage( - allocator->GetCurrentFrameIndex(), - allocation); - } -#endif - - if(image != VK_NULL_HANDLE) - { - (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, image, allocator->GetAllocationCallbacks()); - } - if(allocation != VK_NULL_HANDLE) - { - allocator->FreeMemory( - 1, // allocationCount - &allocation); - } -} - -#endif // #ifdef VMA_IMPLEMENTATION diff --git a/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp b/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp index e3a1d90a42..e6cf921dc7 100644 --- a/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp +++ b/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp @@ -53,7 +53,7 @@ private: #pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn" #endif #endif -#include "3rdparty/GPUOpen/include/vk_mem_alloc.h" +#include "3rdparty/GPUOpen/VulkanMemoryAllocator/src/vk_mem_alloc.h" #ifdef _MSC_VER #pragma warning(pop) #else diff --git a/rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h b/rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h deleted file mode 100644 index 67e2d14af8..0000000000 --- a/rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "../VulkanAPI.h" -#include "../../rsx_utils.h" -#include "shared.h" - -#include "3rdparty/GPUOpen/include/vk_mem_alloc.h" - -namespace vk -{ - // Memory Allocator - base class - - -} diff --git a/rpcs3/Emu/RSX/VK/vkutils/memory.h b/rpcs3/Emu/RSX/VK/vkutils/memory.h index 61509b2e47..9ab7d44f88 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/memory.h +++ b/rpcs3/Emu/RSX/VK/vkutils/memory.h @@ -4,7 +4,7 @@ #include "../../rsx_utils.h" #include "shared.h" -#include "3rdparty/GPUOpen/include/vk_mem_alloc.h" +#include "3rdparty/GPUOpen/VulkanMemoryAllocator/src/vk_mem_alloc.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp b/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp index 9127afcc4e..073fc514d0 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp @@ -22,7 +22,7 @@ namespace vk } border_color_t::border_color_t(const color4f& color, VkFormat fmt, VkImageAspectFlags aspect) - : format(fmt), aspect(aspect), color_value(color) + : storage_key(0), format(fmt), aspect(aspect), color_value(color) { const auto encoded_color = rsx::encode_color_to_storage_key(color); value = vk::get_border_color(encoded_color); From 91427646f532382d878afa30a6cf8b82ef876209 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 28 Mar 2025 20:18:13 +0100 Subject: [PATCH 178/529] VulkanMemoryAllocator: Match current master commit --- 3rdparty/GPUOpen/VulkanMemoryAllocator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/GPUOpen/VulkanMemoryAllocator b/3rdparty/GPUOpen/VulkanMemoryAllocator index 3951bb11de..3706484339 160000 --- a/3rdparty/GPUOpen/VulkanMemoryAllocator +++ b/3rdparty/GPUOpen/VulkanMemoryAllocator @@ -1 +1 @@ -Subproject commit 3951bb11de459d8019ce8b28e276170860c079c0 +Subproject commit 37064843398c69cc0ca7f8cf5b33128c03a2bd74 From bd1102d3b751cf9e6fd58247deb784ab4c14ae63 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 29 Mar 2025 11:22:24 +0100 Subject: [PATCH 179/529] Qt: simplify icon_ready_callback in game list --- rpcs3/rpcs3qt/game_list.cpp | 4 ++-- rpcs3/rpcs3qt/game_list.h | 2 +- rpcs3/rpcs3qt/game_list_base.cpp | 2 +- rpcs3/rpcs3qt/game_list_base.h | 2 +- rpcs3/rpcs3qt/game_list_grid.cpp | 9 ++++----- rpcs3/rpcs3qt/game_list_grid.h | 2 +- rpcs3/rpcs3qt/game_list_table.cpp | 5 ++--- rpcs3/rpcs3qt/savestate_manager_dialog.h | 2 +- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list.cpp b/rpcs3/rpcs3qt/game_list.cpp index 77f015f7cf..97e3e9e1db 100644 --- a/rpcs3/rpcs3qt/game_list.cpp +++ b/rpcs3/rpcs3qt/game_list.cpp @@ -8,9 +8,9 @@ game_list::game_list() : QTableWidget(), game_list_base() { - m_icon_ready_callback = [this](const game_info& game) + m_icon_ready_callback = [this](const movie_item_base* item) { - Q_EMIT IconReady(game); + Q_EMIT IconReady(item); }; } diff --git a/rpcs3/rpcs3qt/game_list.h b/rpcs3/rpcs3qt/game_list.h index 3007ee62d7..c49f5b5aa1 100644 --- a/rpcs3/rpcs3qt/game_list.h +++ b/rpcs3/rpcs3qt/game_list.h @@ -36,7 +36,7 @@ public Q_SLOTS: Q_SIGNALS: void FocusToSearchBar(); - void IconReady(const game_info& game); + void IconReady(const movie_item_base* item); protected: movie_item* m_last_hover_item = nullptr; diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp index a29388480b..631bf4c066 100644 --- a/rpcs3/rpcs3qt/game_list_base.cpp +++ b/rpcs3/rpcs3qt/game_list_base.cpp @@ -79,7 +79,7 @@ void game_list_base::IconLoadFunction(game_info game, qreal device_pixel_ratio, if (!cancel || !cancel->load()) { if (m_icon_ready_callback) - m_icon_ready_callback(game); + m_icon_ready_callback(game->item); } } diff --git a/rpcs3/rpcs3qt/game_list_base.h b/rpcs3/rpcs3qt/game_list_base.h index 66012d9e34..ce6df55825 100644 --- a/rpcs3/rpcs3qt/game_list_base.h +++ b/rpcs3/rpcs3qt/game_list_base.h @@ -32,7 +32,7 @@ protected: QPixmap PaintedPixmap(const QPixmap& icon, qreal device_pixel_ratio, bool paint_config_icon = false, bool paint_pad_config_icon = false, const QColor& compatibility_color = {}) const; QColor GetGridCompatibilityColor(const QString& string) const; - std::function m_icon_ready_callback{}; + std::function m_icon_ready_callback{}; bool m_draw_compat_status_to_grid{}; bool m_is_list_layout{}; QSize m_icon_size{}; diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3qt/game_list_grid.cpp index fa71407bd1..30b8cd0745 100644 --- a/rpcs3/rpcs3qt/game_list_grid.cpp +++ b/rpcs3/rpcs3qt/game_list_grid.cpp @@ -14,15 +14,14 @@ game_list_grid::game_list_grid() setObjectName("game_list_grid"); setContextMenuPolicy(Qt::CustomContextMenu); - m_icon_ready_callback = [this](const game_info& game) + m_icon_ready_callback = [this](const movie_item_base* item) { - Q_EMIT IconReady(game); + Q_EMIT IconReady(item); }; - connect(this, &game_list_grid::IconReady, this, [this](const game_info& game) + connect(this, &game_list_grid::IconReady, this, [this](const movie_item_base* item) { - if (!game || !game->item) return; - game->item->call_icon_func(); + if (item) item->call_icon_func(); }, Qt::QueuedConnection); // The default 'AutoConnection' doesn't seem to work in this specific case... connect(this, &flow_widget::ItemSelectionChanged, this, [this](int index) diff --git a/rpcs3/rpcs3qt/game_list_grid.h b/rpcs3/rpcs3qt/game_list_grid.h index 730458b625..aaa1e267d3 100644 --- a/rpcs3/rpcs3qt/game_list_grid.h +++ b/rpcs3/rpcs3qt/game_list_grid.h @@ -33,5 +33,5 @@ Q_SIGNALS: void FocusToSearchBar(); void ItemDoubleClicked(const game_info& game); void ItemSelectionChanged(const game_info& game); - void IconReady(const game_info& game); + void IconReady(const movie_item_base* item); }; diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3qt/game_list_table.cpp index a1b0f06b86..3aed99dcf9 100644 --- a/rpcs3/rpcs3qt/game_list_table.cpp +++ b/rpcs3/rpcs3qt/game_list_table.cpp @@ -52,10 +52,9 @@ game_list_table::game_list_table(game_list_frame* frame, std::shared_ptritem) return; - game->item->call_icon_func(); + if (item) item->call_icon_func(); }); } diff --git a/rpcs3/rpcs3qt/savestate_manager_dialog.h b/rpcs3/rpcs3qt/savestate_manager_dialog.h index 9c39f75765..950fede559 100644 --- a/rpcs3/rpcs3qt/savestate_manager_dialog.h +++ b/rpcs3/rpcs3qt/savestate_manager_dialog.h @@ -1,6 +1,6 @@ #pragma once -#include "game_list_base.h" +#include "gui_game_info.h" #include #include From 0ffb4e62e6f7f7f28c9359e05d23cfa0a62066d3 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 29 Mar 2025 11:23:00 +0100 Subject: [PATCH 180/529] Qt: pass game list events to base class --- rpcs3/rpcs3qt/game_list.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rpcs3/rpcs3qt/game_list.cpp b/rpcs3/rpcs3qt/game_list.cpp index 97e3e9e1db..4c9c5e9b5a 100644 --- a/rpcs3/rpcs3qt/game_list.cpp +++ b/rpcs3/rpcs3qt/game_list.cpp @@ -139,6 +139,8 @@ void game_list::mouseMoveEvent(QMouseEvent* event) } m_last_hover_item = new_item; + + QTableWidget::mouseMoveEvent(event); } void game_list::mouseDoubleClickEvent(QMouseEvent* ev) @@ -169,13 +171,15 @@ void game_list::keyPressEvent(QKeyEvent* event) QTableWidget::keyPressEvent(event); } -void game_list::leaveEvent(QEvent* /*event*/) +void game_list::leaveEvent(QEvent* event) { if (m_last_hover_item) { m_last_hover_item->set_active(false); m_last_hover_item = nullptr; } + + QTableWidget::leaveEvent(event); } void game_list::FocusAndSelectFirstEntryIfNoneIs() From fccb761ef20039c1bf425927cd7e86dfb5b307f2 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 29 Mar 2025 11:25:53 +0100 Subject: [PATCH 181/529] Qt: play ICON1.PAM in save data manager --- rpcs3/rpcs3qt/save_manager_dialog.cpp | 62 +++++++++++++++++++++------ rpcs3/rpcs3qt/save_manager_dialog.h | 3 +- 2 files changed, 51 insertions(+), 14 deletions(-) diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index 735d07217e..1485d12ec0 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -55,6 +55,7 @@ enum SaveColumns enum SaveUserRole { Pixmap = Qt::UserRole, + PixmapScaled, PixmapLoaded }; @@ -77,7 +78,7 @@ save_manager_dialog::save_manager_dialog(std::shared_ptr gui_setti void save_manager_dialog::Init() { // Table - m_list = new QTableWidget(this); + m_list = new game_list(); m_list->setItemDelegate(new game_list_delegate(m_list)); m_list->setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection); m_list->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -90,6 +91,7 @@ void save_manager_dialog::Init() m_list->setHorizontalHeaderLabels(QStringList() << tr("Icon") << tr("Title & Subtitle") << tr("Last Modified") << tr("Save ID") << tr("Notes")); m_list->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed); m_list->horizontalHeader()->setStretchLastSection(true); + m_list->setMouseTracking(true); // Bottom bar const int icon_size = m_gui_settings->GetValue(gui::sd_icon_size).toInt(); @@ -203,9 +205,10 @@ void save_manager_dialog::Init() connect(m_list, &QTableWidget::itemSelectionChanged, this, &save_manager_dialog::UpdateDetails); connect(this, &save_manager_dialog::IconReady, this, [this](int index, const QPixmap& pixmap) { - if (QTableWidgetItem* icon_item = m_list->item(index, SaveColumns::Icon)) + if (movie_item* item = static_cast(m_list->item(index, SaveColumns::Icon))) { - icon_item->setData(Qt::DecorationRole, pixmap); + item->setData(SaveUserRole::PixmapScaled, pixmap); + item->call_icon_func(); } }); connect(search_bar, &QLineEdit::textChanged, this, &save_manager_dialog::text_changed); @@ -321,34 +324,66 @@ void save_manager_dialog::UpdateList() QPixmap placeholder(320, 176); placeholder.fill(Qt::transparent); + const s32 language_index = gui_application::get_language_id(); + const std::string localized_movie = fmt::format("ICON1_%02d.PAM", language_index); + for (int i = 0; i < static_cast(m_save_entries.size()); ++i) { const SaveDataEntry& entry = ::at32(m_save_entries, i); const QString title = QString::fromStdString(entry.title) + QStringLiteral("\n") + QString::fromStdString(entry.subtitle); const QString dir_name = QString::fromStdString(entry.dirName); + const std::string dir_path = m_dir + entry.dirName + "/"; - custom_table_widget_item* iconItem = new custom_table_widget_item; - iconItem->setData(Qt::DecorationRole, placeholder); - iconItem->setData(SaveUserRole::Pixmap, placeholder); - iconItem->setData(SaveUserRole::PixmapLoaded, false); - iconItem->setFlags(iconItem->flags() & ~Qt::ItemIsEditable); - m_list->setItem(i, SaveColumns::Icon, iconItem); + custom_table_widget_item* icon_item = new custom_table_widget_item; + icon_item->setData(Qt::DecorationRole, placeholder); + icon_item->setData(SaveUserRole::Pixmap, placeholder); + icon_item->setData(SaveUserRole::PixmapScaled, placeholder); + icon_item->setData(SaveUserRole::PixmapLoaded, false); + icon_item->setFlags(icon_item->flags() & ~Qt::ItemIsEditable); - QTableWidgetItem* titleItem = new QTableWidgetItem(title); + if (const std::string movie_path = dir_path + localized_movie; fs::is_file(movie_path)) + { + icon_item->set_movie_path(QString::fromStdString(movie_path)); + } + else if (const std::string movie_path = dir_path + "ICON1.PAM"; fs::is_file(movie_path)) + { + icon_item->set_movie_path(QString::fromStdString(movie_path)); + } + + icon_item->set_icon_func([this, icon_item](const QVideoFrame& frame) + { + if (!icon_item) + { + return; + } + + if (const QPixmap pixmap = icon_item->get_movie_image(frame); icon_item->get_active() && !pixmap.isNull()) + { + icon_item->setData(Qt::DecorationRole, pixmap.scaled(m_icon_size, Qt::KeepAspectRatio)); + } + else + { + icon_item->setData(Qt::DecorationRole, icon_item->data(SaveUserRole::PixmapScaled).value()); + icon_item->stop_movie(); + } + }); + m_list->setItem(i, SaveColumns::Icon, icon_item); + + custom_table_widget_item* titleItem = new custom_table_widget_item(title); titleItem->setData(Qt::UserRole, i); // For sorting to work properly titleItem->setFlags(titleItem->flags() & ~Qt::ItemIsEditable); m_list->setItem(i, SaveColumns::Name, titleItem); - QTableWidgetItem* timeItem = new QTableWidgetItem(FormatTimestamp(entry.mtime)); + custom_table_widget_item* timeItem = new custom_table_widget_item(FormatTimestamp(entry.mtime)); timeItem->setFlags(timeItem->flags() & ~Qt::ItemIsEditable); m_list->setItem(i, SaveColumns::Time, timeItem); - QTableWidgetItem* dirNameItem = new QTableWidgetItem(dir_name); + custom_table_widget_item* dirNameItem = new custom_table_widget_item(dir_name); dirNameItem->setFlags(dirNameItem->flags() & ~Qt::ItemIsEditable); m_list->setItem(i, SaveColumns::Dir, dirNameItem); - QTableWidgetItem* noteItem = new QTableWidgetItem(); + custom_table_widget_item* noteItem = new custom_table_widget_item(); noteItem->setFlags(noteItem->flags() | Qt::ItemIsEditable); if (notes.contains(dir_name)) { @@ -399,6 +434,7 @@ void save_manager_dialog::UpdateIcons() { if (movie_item* icon_item = static_cast(m_list->item(i, SaveColumns::Icon))) { + icon_item->setData(SaveUserRole::PixmapScaled, placeholder); icon_item->setData(Qt::DecorationRole, placeholder); } } diff --git a/rpcs3/rpcs3qt/save_manager_dialog.h b/rpcs3/rpcs3qt/save_manager_dialog.h index e0f94c2a8f..aa23ccaaef 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.h +++ b/rpcs3/rpcs3qt/save_manager_dialog.h @@ -1,5 +1,6 @@ #pragma once +#include "game_list.h" #include "Emu/Cell/Modules/cellSaveData.h" #include @@ -46,7 +47,7 @@ private: std::vector GetSaveEntries(const std::string& base_dir); - QTableWidget* m_list = nullptr; + game_list* m_list = nullptr; std::string m_dir; std::vector m_save_entries; From b9e0a3681662dbb00f3f73888b36b4372462a20e Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 28 Mar 2025 23:29:14 +0100 Subject: [PATCH 182/529] Qt: Add qt video source class for more generic video playback --- rpcs3/emucore.vcxproj | 1 + rpcs3/emucore.vcxproj.filters | 3 + rpcs3/rpcs3.vcxproj | 2 + rpcs3/rpcs3.vcxproj.filters | 9 + rpcs3/rpcs3qt/CMakeLists.txt | 1 + rpcs3/rpcs3qt/game_list_base.cpp | 2 +- rpcs3/rpcs3qt/game_list_grid.cpp | 8 +- rpcs3/rpcs3qt/game_list_table.cpp | 6 +- rpcs3/rpcs3qt/movie_item_base.cpp | 154 +--------------- rpcs3/rpcs3qt/movie_item_base.h | 42 +---- rpcs3/rpcs3qt/qt_video_source.cpp | 244 ++++++++++++++++++++++++++ rpcs3/rpcs3qt/qt_video_source.h | 76 ++++++++ rpcs3/rpcs3qt/save_manager_dialog.cpp | 8 +- rpcs3/util/video_source.h | 20 +++ 14 files changed, 372 insertions(+), 204 deletions(-) create mode 100644 rpcs3/rpcs3qt/qt_video_source.cpp create mode 100644 rpcs3/rpcs3qt/qt_video_source.h create mode 100644 rpcs3/util/video_source.h diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index d5d9f992b2..7a5234d01a 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -760,6 +760,7 @@ + diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index d08488e266..50e3e666a7 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -2716,6 +2716,9 @@ Emu\GPU\RSX\Program + + Utilities + diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 7c39b0a88c..acee714f24 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -807,6 +807,7 @@ + @@ -1514,6 +1515,7 @@ .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + $(QTDIR)\bin\moc.exe;%(FullPath) diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index a2e4afd1a6..0bb0890b41 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -196,6 +196,9 @@ {9b51636c-b371-425b-86d3-be003774a1b7} + + {2bb5cec5-5acb-40c0-a388-68db05dff305} + @@ -1176,6 +1179,9 @@ Gui\game list + + Io\video + @@ -1385,6 +1391,9 @@ Gui\game list + + Io\video + diff --git a/rpcs3/rpcs3qt/CMakeLists.txt b/rpcs3/rpcs3qt/CMakeLists.txt index ffe2a96d9f..66c4fa3144 100644 --- a/rpcs3/rpcs3qt/CMakeLists.txt +++ b/rpcs3/rpcs3qt/CMakeLists.txt @@ -73,6 +73,7 @@ add_library(rpcs3_ui STATIC qt_camera_video_sink.cpp qt_music_handler.cpp qt_utils.cpp + qt_video_source.cpp raw_mouse_settings_dialog.cpp register_editor_dialog.cpp recvmessage_dialog_frame.cpp diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp index 631bf4c066..72b45d33bf 100644 --- a/rpcs3/rpcs3qt/game_list_base.cpp +++ b/rpcs3/rpcs3qt/game_list_base.cpp @@ -33,7 +33,7 @@ void game_list_base::repaint_icons(std::vector& game_data, const QCol IconLoadFunction(game, device_pixel_ratio, cancel); }); - item->call_icon_func(); + item->image_change_callback(); } } } diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3qt/game_list_grid.cpp index 30b8cd0745..5d4b90203f 100644 --- a/rpcs3/rpcs3qt/game_list_grid.cpp +++ b/rpcs3/rpcs3qt/game_list_grid.cpp @@ -21,7 +21,7 @@ game_list_grid::game_list_grid() connect(this, &game_list_grid::IconReady, this, [this](const movie_item_base* item) { - if (item) item->call_icon_func(); + if (item) item->image_change_callback(); }, Qt::QueuedConnection); // The default 'AutoConnection' doesn't seem to work in this specific case... connect(this, &flow_widget::ItemSelectionChanged, this, [this](int index) @@ -81,7 +81,7 @@ void game_list_grid::populate( item->setToolTip(tr("%0 [%1]").arg(title).arg(serial)); } - item->set_icon_func([this, item, game](const QVideoFrame& frame) + item->set_image_change_callback([this, item, game](const QVideoFrame& frame) { if (!item || !game) { @@ -109,7 +109,7 @@ void game_list_grid::populate( if (play_hover_movies && (game->has_hover_gif || game->has_hover_pam)) { - item->set_movie_path(QString::fromStdString(game->info.movie_path)); + item->set_video_path(game->info.movie_path); } if (selected_item_id == game->info.path + game->info.icon_path) @@ -154,7 +154,7 @@ void game_list_grid::repaint_icons(std::vector& game_data, const QCol { // We don't have an icon. Set a placeholder to initialize the layout. game->pxmap = placeholder; - item->call_icon_func(); + item->image_change_callback(); } item->set_icon_load_func([this, game, device_pixel_ratio, cancel = item->icon_loading_aborted()](int) diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3qt/game_list_table.cpp index 3aed99dcf9..f526bcea43 100644 --- a/rpcs3/rpcs3qt/game_list_table.cpp +++ b/rpcs3/rpcs3qt/game_list_table.cpp @@ -54,7 +54,7 @@ game_list_table::game_list_table(game_list_frame* frame, std::shared_ptrcall_icon_func(); + if (item) item->image_change_callback(); }); } @@ -242,7 +242,7 @@ void game_list_table::populate( custom_table_widget_item* icon_item = new custom_table_widget_item; game->item = icon_item; - icon_item->set_icon_func([this, icon_item, game](const QVideoFrame& frame) + icon_item->set_image_change_callback([this, icon_item, game](const QVideoFrame& frame) { if (!icon_item || !game) { @@ -292,7 +292,7 @@ void game_list_table::populate( if (play_hover_movies && (game->has_hover_gif || game->has_hover_pam)) { - icon_item->set_movie_path(QString::fromStdString(game->info.movie_path)); + icon_item->set_video_path(game->info.movie_path); } icon_item->setData(Qt::UserRole, index, true); diff --git a/rpcs3/rpcs3qt/movie_item_base.cpp b/rpcs3/rpcs3qt/movie_item_base.cpp index d413f4d0b3..fdf820ae5f 100644 --- a/rpcs3/rpcs3qt/movie_item_base.cpp +++ b/rpcs3/rpcs3qt/movie_item_base.cpp @@ -1,24 +1,14 @@ #include "stdafx.h" #include "movie_item_base.h" -#include - -movie_item_base::movie_item_base() +movie_item_base::movie_item_base() : qt_video_source() { init_pointers(); } movie_item_base::~movie_item_base() { - if (m_movie) - { - m_movie->stop(); - } - - if (m_media_player) - { - m_media_player->stop(); - } + stop_movie(); wait_for_icon_loading(true); wait_for_size_on_disk_loading(true); @@ -30,146 +20,6 @@ void movie_item_base::init_pointers() m_size_on_disk_loading_aborted.reset(new atomic_t(false)); } -void movie_item_base::set_active(bool active) -{ - if (!std::exchange(m_active, active) && active) - { - init_movie(); - - if (m_movie) - { - m_movie->jumpToFrame(1); - m_movie->start(); - } - - if (m_media_player) - { - m_media_player->play(); - } - } -} - -void movie_item_base::init_movie() -{ - if (m_movie || m_media_player) - { - // Already initialized - return; - } - - if (!m_icon_callback || m_movie_path.isEmpty() || !QFile::exists(m_movie_path)) - { - m_movie_path.clear(); - return; - } - - const QString lower = m_movie_path.toLower(); - - if (lower.endsWith(".gif")) - { - m_movie.reset(new QMovie(m_movie_path)); - m_movie_path.clear(); - - if (!m_movie->isValid()) - { - m_movie.reset(); - return; - } - - QObject::connect(m_movie.get(), &QMovie::frameChanged, m_movie.get(), [this](int) - { - m_icon_callback({}); - }); - return; - } - - if (lower.endsWith(".pam")) - { - // We can't set PAM files as source of the video player, so we have to feed them as raw data. - QFile file(m_movie_path); - if (!file.open(QFile::OpenModeFlag::ReadOnly)) - { - return; - } - - // TODO: Decode the pam properly before pushing it to the player - m_movie_data = file.readAll(); - if (m_movie_data.isEmpty()) - { - return; - } - - m_movie_buffer.reset(new QBuffer(&m_movie_data)); - m_movie_buffer->open(QIODevice::ReadOnly); - } - - m_video_sink.reset(new QVideoSink()); - QObject::connect(m_video_sink.get(), &QVideoSink::videoFrameChanged, m_video_sink.get(), [this](const QVideoFrame& frame) - { - m_icon_callback(frame); - }); - - m_media_player.reset(new QMediaPlayer()); - m_media_player->setVideoSink(m_video_sink.get()); - m_media_player->setLoops(QMediaPlayer::Infinite); - - if (m_movie_buffer) - { - m_media_player->setSourceDevice(m_movie_buffer.get()); - } - else - { - m_media_player->setSource(m_movie_path); - } -} - -void movie_item_base::stop_movie() -{ - if (m_movie) - { - m_movie->stop(); - } - - m_video_sink.reset(); - m_media_player.reset(); - m_movie_buffer.reset(); - m_movie_data.clear(); -} - -QPixmap movie_item_base::get_movie_image(const QVideoFrame& frame) const -{ - if (!m_active) - { - return {}; - } - - if (m_movie) - { - return m_movie->currentPixmap(); - } - - if (!frame.isValid()) - { - return {}; - } - - // Get image. This usually also converts the image to ARGB32. - return QPixmap::fromImage(frame.toImage()); -} - -void movie_item_base::call_icon_func() const -{ - if (m_icon_callback) - { - m_icon_callback({}); - } -} - -void movie_item_base::set_icon_func(const icon_callback_t& func) -{ - m_icon_callback = func; -} - void movie_item_base::call_icon_load_func(int index) { if (!m_icon_load_callback || m_icon_loading || m_icon_loading_aborted->load()) diff --git a/rpcs3/rpcs3qt/movie_item_base.h b/rpcs3/rpcs3qt/movie_item_base.h index f13bce91b2..3784de4e1f 100644 --- a/rpcs3/rpcs3qt/movie_item_base.h +++ b/rpcs3/rpcs3qt/movie_item_base.h @@ -1,25 +1,16 @@ #pragma once -#include "movie_item_base.h" -#include "util/atomic.hpp" -#include "Utilities/mutex.h" +#include "qt_video_source.h" -#include #include -#include -#include -#include -#include -#include #include #include -using icon_callback_t = std::function; using icon_load_callback_t = std::function; using size_calc_callback_t = std::function; -class movie_item_base +class movie_item_base : public qt_video_source { public: movie_item_base(); @@ -27,25 +18,6 @@ public: void init_pointers(); - void set_active(bool active); - - [[nodiscard]] bool get_active() const - { - return m_active; - } - - void set_movie_path(QString path) - { - m_movie_path = std::move(path); - } - - void init_movie(); - void stop_movie(); - QPixmap get_movie_image(const QVideoFrame& frame) const; - - void call_icon_func() const; - void set_icon_func(const icon_callback_t& func); - void call_icon_load_func(int index); void set_icon_load_func(const icon_load_callback_t& func); @@ -77,23 +49,13 @@ public: shared_mutex pixmap_mutex; -protected: - QString m_movie_path; - QByteArray m_movie_data{}; - std::unique_ptr m_movie_buffer; - std::unique_ptr m_media_player; - std::shared_ptr m_video_sink; - std::shared_ptr m_movie; - private: std::unique_ptr m_icon_load_thread; std::unique_ptr m_size_calc_thread; - bool m_active = false; atomic_t m_size_on_disk_loading = false; atomic_t m_icon_loading = false; size_calc_callback_t m_size_calc_callback = nullptr; icon_load_callback_t m_icon_load_callback = nullptr; - icon_callback_t m_icon_callback = nullptr; std::shared_ptr> m_icon_loading_aborted; std::shared_ptr> m_size_on_disk_loading_aborted; diff --git a/rpcs3/rpcs3qt/qt_video_source.cpp b/rpcs3/rpcs3qt/qt_video_source.cpp new file mode 100644 index 0000000000..263c1f2121 --- /dev/null +++ b/rpcs3/rpcs3qt/qt_video_source.cpp @@ -0,0 +1,244 @@ +#include "stdafx.h" +#include "Emu/System.h" +#include "qt_video_source.h" + +#include + +qt_video_source::qt_video_source() + : video_source() +{ +} + +qt_video_source::~qt_video_source() +{ + stop_movie(); +} + +void qt_video_source::set_video_path(const std::string& path) +{ + m_video_path = QString::fromStdString(path); +} + +void qt_video_source::set_active(bool active) +{ + if (!m_active.exchange(active) && active) + { + start_movie(); + } +} + +void qt_video_source::image_change_callback() const +{ + if (m_image_change_callback) + { + m_image_change_callback({}); + } +} + +void qt_video_source::set_image_change_callback(const std::function& func) +{ + m_image_change_callback = func; +} + +void qt_video_source::init_movie() +{ + if (m_movie || m_media_player) + { + // Already initialized + return; + } + + if (!m_image_change_callback || m_video_path.isEmpty() || !QFile::exists(m_video_path)) + { + m_video_path.clear(); + return; + } + + const QString lower = m_video_path.toLower(); + + if (lower.endsWith(".gif")) + { + m_movie.reset(new QMovie(m_video_path)); + m_video_path.clear(); + + if (!m_movie->isValid()) + { + m_movie.reset(); + return; + } + + QObject::connect(m_movie.get(), &QMovie::frameChanged, m_movie.get(), [this](int) + { + m_image_change_callback({}); + m_has_new = true; + }); + return; + } + + if (lower.endsWith(".pam")) + { + // We can't set PAM files as source of the video player, so we have to feed them as raw data. + QFile file(m_video_path); + if (!file.open(QFile::OpenModeFlag::ReadOnly)) + { + return; + } + + // TODO: Decode the pam properly before pushing it to the player + m_video_data = file.readAll(); + if (m_video_data.isEmpty()) + { + return; + } + + m_video_buffer.reset(new QBuffer(&m_video_data)); + m_video_buffer->open(QIODevice::ReadOnly); + } + + m_video_sink.reset(new QVideoSink()); + QObject::connect(m_video_sink.get(), &QVideoSink::videoFrameChanged, m_video_sink.get(), [this](const QVideoFrame& frame) + { + m_image_change_callback(frame); + m_has_new = true; + }); + + m_media_player.reset(new QMediaPlayer()); + m_media_player->setVideoSink(m_video_sink.get()); + m_media_player->setLoops(QMediaPlayer::Infinite); + + if (m_video_buffer) + { + m_media_player->setSourceDevice(m_video_buffer.get()); + } + else + { + m_media_player->setSource(m_video_path); + } +} + +void qt_video_source::start_movie() +{ + init_movie(); + + if (m_movie) + { + m_movie->jumpToFrame(1); + m_movie->start(); + } + + if (m_media_player) + { + m_media_player->play(); + } + + m_active = true; +} + +void qt_video_source::stop_movie() +{ + m_active = false; + + if (m_movie) + { + m_movie->stop(); + } + + m_video_sink.reset(); + m_media_player.reset(); + m_video_buffer.reset(); + m_video_data.clear(); +} + +QPixmap qt_video_source::get_movie_image(const QVideoFrame& frame) const +{ + if (!m_active) + { + return {}; + } + + if (m_movie) + { + return m_movie->currentPixmap(); + } + + if (!frame.isValid()) + { + return {}; + } + + // Get image. This usually also converts the image to ARGB32. + return QPixmap::fromImage(frame.toImage()); +} + +void qt_video_source::get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) +{ + if (!m_has_new.exchange(false)) + { + return; + } + + std::lock_guard lock(m_image_mutex); + + if (m_image.isNull()) + { + w = h = ch = bpp = 0; + data.clear(); + return; + } + + w = m_image.width(); + h = m_image.height(); + ch = m_image.colorCount(); + bpp = m_image.depth(); + + data.resize(m_image.height() * m_image.bytesPerLine()); + std::memcpy(data.data(), m_image.constBits(), data.size()); +} + +qt_video_source_wrapper::~qt_video_source_wrapper() +{ + Emu.BlockingCallFromMainThread([this]() + { + m_qt_video_source.reset(); + }); +} + +void qt_video_source_wrapper::set_video_path(const std::string& path) +{ + Emu.BlockingCallFromMainThread([this, &path]() + { + m_qt_video_source = std::make_unique(); + m_qt_video_source->m_image_change_callback = [this](const QVideoFrame& frame) + { + std::lock_guard lock(m_qt_video_source->m_image_mutex); + + if (m_qt_video_source->m_movie) + { + m_qt_video_source->m_image = m_qt_video_source->m_movie->currentImage(); + } + else if (frame.isValid()) + { + // Get image. This usually also converts the image to ARGB32. + m_qt_video_source->m_image = frame.toImage(); + } + else + { + return; + } + + if (m_qt_video_source->m_image.format() != QImage::Format_RGBA8888) + { + m_qt_video_source->m_image.convertTo(QImage::Format_RGBA8888); + } + }; + m_qt_video_source->set_video_path(path); + m_qt_video_source->set_active(true); + }); +} + +void qt_video_source_wrapper::get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) +{ + ensure(m_qt_video_source); + + m_qt_video_source->get_image(data, w, h, ch, bpp); +} diff --git a/rpcs3/rpcs3qt/qt_video_source.h b/rpcs3/rpcs3qt/qt_video_source.h new file mode 100644 index 0000000000..44cdebc034 --- /dev/null +++ b/rpcs3/rpcs3qt/qt_video_source.h @@ -0,0 +1,76 @@ +#pragma once + +#include "util/video_source.h" +#include "util/atomic.hpp" +#include "Utilities/mutex.h" + +#include +#include +#include +#include +#include +#include + +class qt_video_source : public video_source +{ +public: + qt_video_source(); + virtual ~qt_video_source(); + + void set_video_path(const std::string& path) override; + const QString& video_path() const { return m_video_path; } + + void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) override; + bool has_new() const override { return m_has_new; } + + void set_active(bool active); + [[nodiscard]] bool get_active() const + { + return m_active; + } + + void start_movie(); + void stop_movie(); + + QPixmap get_movie_image(const QVideoFrame& frame) const; + + void image_change_callback() const; + void set_image_change_callback(const std::function& func); + +protected: + void init_movie(); + + shared_mutex m_image_mutex; + + atomic_t m_active = false; + atomic_t m_has_new = false; + + QString m_video_path; + QByteArray m_video_data{}; + QImage m_image{}; + std::vector m_image_path; + + std::unique_ptr m_video_buffer; + std::unique_ptr m_media_player; + std::shared_ptr m_video_sink; + std::shared_ptr m_movie; + + std::function m_image_change_callback = nullptr; + + friend class qt_video_source_wrapper; +}; + +// Wrapper for emulator usage +class qt_video_source_wrapper : public video_source +{ +public: + qt_video_source_wrapper() : video_source() {} + virtual ~qt_video_source_wrapper(); + + void set_video_path(const std::string& path) override; + void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) override; + bool has_new() const override { return m_qt_video_source && m_qt_video_source->has_new(); } + +private: + std::unique_ptr m_qt_video_source; +}; diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index 1485d12ec0..bdb085d7df 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -208,7 +208,7 @@ void save_manager_dialog::Init() if (movie_item* item = static_cast(m_list->item(index, SaveColumns::Icon))) { item->setData(SaveUserRole::PixmapScaled, pixmap); - item->call_icon_func(); + item->image_change_callback(); } }); connect(search_bar, &QLineEdit::textChanged, this, &save_manager_dialog::text_changed); @@ -344,14 +344,14 @@ void save_manager_dialog::UpdateList() if (const std::string movie_path = dir_path + localized_movie; fs::is_file(movie_path)) { - icon_item->set_movie_path(QString::fromStdString(movie_path)); + icon_item->set_video_path(movie_path); } else if (const std::string movie_path = dir_path + "ICON1.PAM"; fs::is_file(movie_path)) { - icon_item->set_movie_path(QString::fromStdString(movie_path)); + icon_item->set_video_path(movie_path); } - icon_item->set_icon_func([this, icon_item](const QVideoFrame& frame) + icon_item->set_image_change_callback([this, icon_item](const QVideoFrame& frame) { if (!icon_item) { diff --git a/rpcs3/util/video_source.h b/rpcs3/util/video_source.h new file mode 100644 index 0000000000..b5737bccc0 --- /dev/null +++ b/rpcs3/util/video_source.h @@ -0,0 +1,20 @@ +#pragma once + +#include "types.hpp" + +class video_source +{ +public: + video_source() {}; + virtual ~video_source() {}; + virtual void set_video_path(const std::string& path) { static_cast(path); } + virtual bool has_new() const { return false; }; + virtual void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) + { + static_cast(data); + static_cast(w); + static_cast(h); + static_cast(ch); + static_cast(bpp); + } +}; From 01cdc83aeb439b3b9c15e1b681c30a97a56af85a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 29 Mar 2025 12:18:43 +0100 Subject: [PATCH 183/529] Qt: play ICON1.PAM in save data manager details --- rpcs3/rpcs3.vcxproj | 2 ++ rpcs3/rpcs3.vcxproj.filters | 15 ++++++-- rpcs3/rpcs3qt/CMakeLists.txt | 1 + rpcs3/rpcs3qt/qt_video_source.cpp | 8 ++++- rpcs3/rpcs3qt/qt_video_source.h | 2 +- rpcs3/rpcs3qt/save_manager_dialog.cpp | 19 +++++++--- rpcs3/rpcs3qt/save_manager_dialog.h | 4 ++- rpcs3/rpcs3qt/video_label.cpp | 51 +++++++++++++++++++++++++++ rpcs3/rpcs3qt/video_label.h | 22 ++++++++++++ 9 files changed, 114 insertions(+), 10 deletions(-) create mode 100644 rpcs3/rpcs3qt/video_label.cpp create mode 100644 rpcs3/rpcs3qt/video_label.h diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index acee714f24..60c49a60d7 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -832,6 +832,7 @@ + @@ -1671,6 +1672,7 @@ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + $(QTDIR)\bin\moc.exe;%(FullPath) diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index 0bb0890b41..582e8ac59b 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -199,6 +199,9 @@ {2bb5cec5-5acb-40c0-a388-68db05dff305} + + {149c596b-83e7-43f8-b5db-6108694434ef} + @@ -1182,6 +1185,9 @@ Io\video + + Gui\widgets + @@ -1226,9 +1232,6 @@ Gui\utils - - Gui - Gui\user accounts @@ -1394,6 +1397,12 @@ Io\video + + Gui\widgets + + + Gui\widgets + diff --git a/rpcs3/rpcs3qt/CMakeLists.txt b/rpcs3/rpcs3qt/CMakeLists.txt index 66c4fa3144..1c8875c372 100644 --- a/rpcs3/rpcs3qt/CMakeLists.txt +++ b/rpcs3/rpcs3qt/CMakeLists.txt @@ -113,6 +113,7 @@ add_library(rpcs3_ui STATIC vfs_dialog_usb_input.cpp vfs_dialog_usb_tab.cpp vfs_tool_dialog.cpp + video_label.cpp welcome_dialog.cpp about_dialog.ui diff --git a/rpcs3/rpcs3qt/qt_video_source.cpp b/rpcs3/rpcs3qt/qt_video_source.cpp index 263c1f2121..2338c09bf8 100644 --- a/rpcs3/rpcs3qt/qt_video_source.cpp +++ b/rpcs3/rpcs3qt/qt_video_source.cpp @@ -21,10 +21,16 @@ void qt_video_source::set_video_path(const std::string& path) void qt_video_source::set_active(bool active) { - if (!m_active.exchange(active) && active) + if (m_active.exchange(active) == active) return; + + if (active) { start_movie(); } + else + { + stop_movie(); + } } void qt_video_source::image_change_callback() const diff --git a/rpcs3/rpcs3qt/qt_video_source.h b/rpcs3/rpcs3qt/qt_video_source.h index 44cdebc034..f8b2267e5f 100644 --- a/rpcs3/rpcs3qt/qt_video_source.h +++ b/rpcs3/rpcs3qt/qt_video_source.h @@ -23,7 +23,7 @@ public: void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) override; bool has_new() const override { return m_has_new; } - void set_active(bool active); + virtual void set_active(bool active); [[nodiscard]] bool get_active() const { return m_active; diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index bdb085d7df..3460a43098 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -2,11 +2,13 @@ #include "custom_table_widget_item.h" #include "qt_utils.h" +#include "qt_video_source.h" #include "gui_application.h" #include "gui_settings.h" #include "persistent_settings.h" #include "game_list_delegate.h" #include "progress_dialog.h" +#include "video_label.h" #include "Emu/System.h" #include "Emu/system_utils.hpp" @@ -107,7 +109,7 @@ void save_manager_dialog::Init() push_close->setAutoDefault(true); // Details - m_details_icon = new QLabel(this); + m_details_icon = new video_label(this); m_details_icon->setMinimumSize(320, 176); m_details_title = new QLabel(tr("Select an item to view details"), this); m_details_title->setWordWrap(true); @@ -640,7 +642,9 @@ void save_manager_dialog::UpdateDetails() { if (const int selected = m_list->selectionModel()->selectedRows().size(); selected != 1) { - m_details_icon->setPixmap(QPixmap()); + m_details_icon->set_thumbnail({}); + m_details_icon->set_active(false); + m_details_subtitle->setText(""); m_details_modified->setText(""); m_details_details->setText(""); @@ -664,7 +668,7 @@ void save_manager_dialog::UpdateDetails() const int row = m_list->currentRow(); QTableWidgetItem* item = m_list->item(row, SaveColumns::Name); - QTableWidgetItem* icon_item = m_list->item(row, SaveColumns::Icon); + movie_item* icon_item = static_cast(m_list->item(row, SaveColumns::Icon)); if (!item || !icon_item) { @@ -674,7 +678,14 @@ void save_manager_dialog::UpdateDetails() const int idx = item->data(Qt::UserRole).toInt(); const SaveDataEntry& save = ::at32(m_save_entries, idx); - m_details_icon->setPixmap(icon_item->data(Qt::UserRole).value()); + if (!icon_item->video_path().isEmpty()) + { + m_details_icon->set_video_path(icon_item->video_path().toStdString()); + } + + m_details_icon->set_thumbnail(icon_item->data(SaveUserRole::Pixmap).value()); + m_details_icon->set_active(false); + m_details_title->setText(QString::fromStdString(save.title)); m_details_subtitle->setText(QString::fromStdString(save.subtitle)); m_details_modified->setText(tr("Last modified: %1").arg(FormatTimestamp(save.mtime))); diff --git a/rpcs3/rpcs3qt/save_manager_dialog.h b/rpcs3/rpcs3qt/save_manager_dialog.h index aa23ccaaef..e685b2b6d5 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.h +++ b/rpcs3/rpcs3qt/save_manager_dialog.h @@ -1,6 +1,7 @@ #pragma once #include "game_list.h" + #include "Emu/Cell/Modules/cellSaveData.h" #include @@ -11,6 +12,7 @@ class gui_settings; class persistent_settings; +class video_label; class save_manager_dialog : public QDialog { @@ -59,7 +61,7 @@ private: QSize m_icon_size; QColor m_icon_color; - QLabel* m_details_icon = nullptr; + video_label* m_details_icon = nullptr; QLabel* m_details_title = nullptr; QLabel* m_details_subtitle = nullptr; QLabel* m_details_modified = nullptr; diff --git a/rpcs3/rpcs3qt/video_label.cpp b/rpcs3/rpcs3qt/video_label.cpp new file mode 100644 index 0000000000..bdf36a0e46 --- /dev/null +++ b/rpcs3/rpcs3qt/video_label.cpp @@ -0,0 +1,51 @@ +#include "stdafx.h" +#include "video_label.h" + +video_label::video_label(QWidget* parent) + : QLabel(parent), qt_video_source() +{ +} + +video_label::~video_label() +{ +} + +void video_label::set_thumbnail(const QPixmap& pxmap) +{ + m_current_pixmap = pxmap; +} + +void video_label::set_active(bool active) +{ + if (active) + { + set_image_change_callback([this](const QVideoFrame& frame) + { + if (const QPixmap pixmap = get_movie_image(frame); get_active() && !pixmap.isNull()) + { + setPixmap(pixmap); + } + }); + start_movie(); + } + else + { + set_image_change_callback({}); + stop_movie(); + setPixmap(m_current_pixmap); + } +} + +void video_label::enterEvent(QEnterEvent* event) +{ + set_active(true); + + QLabel::enterEvent(event); +} + +void video_label::leaveEvent(QEvent* event) +{ + set_active(false); + + QLabel::leaveEvent(event); +} diff --git a/rpcs3/rpcs3qt/video_label.h b/rpcs3/rpcs3qt/video_label.h new file mode 100644 index 0000000000..58f0bf8d21 --- /dev/null +++ b/rpcs3/rpcs3qt/video_label.h @@ -0,0 +1,22 @@ +#pragma once + +#include "qt_video_source.h" +#include +#include +#include + +class video_label : public QLabel, public qt_video_source +{ +public: + video_label(QWidget* parent = nullptr); + virtual ~video_label(); + + void set_thumbnail(const QPixmap& pxmap); + void set_active(bool active) override; + + void enterEvent(QEnterEvent* event) override; + void leaveEvent(QEvent* event) override; + +private: + QPixmap m_current_pixmap; +}; From 55190c21255049c86e9b1e6b485465f085b48db1 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Sat, 29 Mar 2025 12:51:17 -0700 Subject: [PATCH 184/529] Update Qt to 6.8.3 and update clang compiler --- .github/workflows/rpcs3.yml | 6 +++--- azure-pipelines.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 37ed5f55d9..d468496f76 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -25,17 +25,17 @@ jobs: matrix: include: - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.2" + docker_img: "rpcs3/rpcs3-ci-jammy:1.3" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: clang UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.2" + docker_img: "rpcs3/rpcs3-ci-jammy:1.3" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: gcc - os: ubuntu-24.04-arm - docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.2" + docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.3" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" compiler: clang UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fb19dcb7f1..bc09a1524f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,13 +40,13 @@ jobs: # displayName: ccache # - bash: | -# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.2 +# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.3 # docker run \ # -v $(pwd):/rpcs3 \ # --env-file .ci/docker.env \ # -v $CCACHE_DIR:/root/.ccache \ # -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -# rpcs3/rpcs3-ci-jammy:1.2 \ +# rpcs3/rpcs3-ci-jammy:1.3 \ # /rpcs3/.ci/build-linux.sh # displayName: Docker setup and build From cd840ef70ac31915638454992b9f9df361fc1ddb Mon Sep 17 00:00:00 2001 From: DH Date: Thu, 20 Mar 2025 01:12:53 +0300 Subject: [PATCH 185/529] LLVM JIT: do not produce broken binaries on crash --- Utilities/JITLLVM.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Utilities/JITLLVM.cpp b/Utilities/JITLLVM.cpp index 578f96e074..2b82d57d54 100644 --- a/Utilities/JITLLVM.cpp +++ b/Utilities/JITLLVM.cpp @@ -413,7 +413,7 @@ public: { std::string name = m_path; - name.append(_module->getName().data()); + name.append(_module->getName()); //fs::file(name, fs::rewrite).write(obj.getBufferStart(), obj.getBufferSize()); name.append(".gz"); @@ -425,9 +425,9 @@ public: ensure(m_compiler); - fs::file module_file(name, fs::rewrite); + fs::pending_file module_file; - if (!module_file) + if (!module_file.open((name))) { jit_log.error("LLVM: Failed to create module file: %s (%s)", name, fs::g_tls_error); return; @@ -442,18 +442,17 @@ public: return; } - if (!zip(obj.getBufferStart(), obj.getBufferSize(), module_file)) + if (!zip(obj.getBufferStart(), obj.getBufferSize(), module_file.file)) { - jit_log.error("LLVM: Failed to compress module: %s", _module->getName().data()); - module_file.close(); - fs::remove_file(name); + jit_log.error("LLVM: Failed to compress module: %s", std::string(_module->getName())); return; } - jit_log.trace("LLVM: Created module: %s", _module->getName().data()); + jit_log.trace("LLVM: Created module: %s", std::string(_module->getName())); // Restore space that was overestimated - ensure(m_compiler->add_sub_disk_space(max_size - module_file.size())); + ensure(m_compiler->add_sub_disk_space(max_size - module_file.file.size())); + module_file.commit(); } static std::unique_ptr load(const std::string& path) From cd9c156937bdb596d33dd8419e41b55b58a54f3a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 30 Mar 2025 12:07:28 +0200 Subject: [PATCH 186/529] 7z: log error code when opening the file --- rpcs3/rpcs3qt/update_manager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp index 92c5416d81..d4cb457cf1 100644 --- a/rpcs3/rpcs3qt/update_manager.cpp +++ b/rpcs3/rpcs3qt/update_manager.cpp @@ -499,14 +499,14 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept) UInt16 temp_u16[PATH_MAX]; u8 temp_u8[PATH_MAX]; const usz kInputBufSize = static_cast(1u << 18u); - const ISzAlloc g_Alloc = {SzAlloc, SzFree}; + const ISzAlloc g_Alloc = {SzAlloc, SzFree}; ISzAlloc allocImp = g_Alloc; ISzAlloc allocTempImp = g_Alloc; - if (InFile_Open(&archiveStream.file, tmpfile_path.c_str())) + if (const WRes res = InFile_Open(&archiveStream.file, tmpfile_path.c_str())) { - update_log.error("Failed to open temporary storage file: %s", tmpfile_path); + update_log.error("Failed to open temporary storage file: '%s' (error=%d)", tmpfile_path, static_cast(res)); return false; } @@ -534,7 +534,8 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept) SzArEx_Free(&db, &allocImp); ISzAlloc_Free(&allocImp, lookStream.buf); - File_Close(&archiveStream.file); + const WRes res2 = File_Close(&archiveStream.file); + if (res2) update_log.warning("7z failed to close file (error=%d)", static_cast(res2)); switch (res) { From 282fbcc3e52e81dc051c7b1d91e3cbc04fad3a3c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 30 Mar 2025 12:15:54 +0200 Subject: [PATCH 187/529] Qt: fix wrong save data movie playing when selecting a different entry --- rpcs3/rpcs3qt/save_manager_dialog.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index 3460a43098..9e3b51b8e2 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -678,11 +678,7 @@ void save_manager_dialog::UpdateDetails() const int idx = item->data(Qt::UserRole).toInt(); const SaveDataEntry& save = ::at32(m_save_entries, idx); - if (!icon_item->video_path().isEmpty()) - { - m_details_icon->set_video_path(icon_item->video_path().toStdString()); - } - + m_details_icon->set_video_path(icon_item->video_path().toStdString()); m_details_icon->set_thumbnail(icon_item->data(SaveUserRole::Pixmap).value()); m_details_icon->set_active(false); From 1e6a4dc5c88202d1dc403e7fb50bdceae9e66574 Mon Sep 17 00:00:00 2001 From: Vestral <16190165+Vestrel@users.noreply.github.com> Date: Sun, 30 Mar 2025 21:38:42 +0900 Subject: [PATCH 188/529] Fix discord after #16885 --- 3rdparty/discord-rpc/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/3rdparty/discord-rpc/CMakeLists.txt b/3rdparty/discord-rpc/CMakeLists.txt index a576bb21f3..2ad705d52c 100644 --- a/3rdparty/discord-rpc/CMakeLists.txt +++ b/3rdparty/discord-rpc/CMakeLists.txt @@ -9,5 +9,7 @@ if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE)) set(WARNINGS_AS_ERRORS FALSE CACHE BOOL "When enabled, compiles with `-Werror` (on *nix platforms).") add_subdirectory(discord-rpc EXCLUDE_FROM_ALL) + target_include_directories(3rdparty_discordRPC INTERFACE discord-rpc/include) + target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC) target_link_libraries(3rdparty_discordRPC INTERFACE discord-rpc) endif() From 781da9dc598da494913cf4ad51ac9c1ed5d963df Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 30 Mar 2025 14:45:58 +0200 Subject: [PATCH 189/529] input: disable pad vibration after no new data was sent for 3 seconds This is supposedly how the lib does it. --- rpcs3/Emu/Io/PadHandler.cpp | 16 ++++++++++++++++ rpcs3/Emu/Io/pad_types.h | 2 ++ rpcs3/Input/pad_thread.cpp | 1 + 3 files changed, 19 insertions(+) diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp index cafb85bd78..19b9347da6 100644 --- a/rpcs3/Emu/Io/PadHandler.cpp +++ b/rpcs3/Emu/Io/PadHandler.cpp @@ -752,6 +752,22 @@ void PadHandlerBase::process() pad->move_data.orientation_enabled = b_has_orientation && device->config && device->config->orientation_enabled.get(); + // Disable pad vibration if no new data was sent for 3 seconds + if (pad->m_last_rumble_time_us > 0) + { + std::lock_guard lock(pad::g_pad_mutex); + + if ((get_system_time() - pad->m_last_rumble_time_us) > 3'000'000) + { + for (VibrateMotor& motor : pad->m_vibrateMotors) + { + motor.m_value = 0; + } + + pad->m_last_rumble_time_us = 0; + } + } + const connection status = update_connection(device); switch (status) diff --git a/rpcs3/Emu/Io/pad_types.h b/rpcs3/Emu/Io/pad_types.h index 26a21f1f53..710edb2743 100644 --- a/rpcs3/Emu/Io/pad_types.h +++ b/rpcs3/Emu/Io/pad_types.h @@ -522,6 +522,8 @@ struct Pad s32 m_orientation_reset_button_index{-1}; // Special button index. -1 if not set. bool get_orientation_reset_button_active(); + u64 m_last_rumble_time_us{0}; + // Cable State: 0 - 1 plugged in ? u8 m_cable_state{0}; diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp index a4f020ffd4..df50ec2bc4 100644 --- a/rpcs3/Input/pad_thread.cpp +++ b/rpcs3/Input/pad_thread.cpp @@ -236,6 +236,7 @@ void pad_thread::SetRumble(const u32 pad, u8 large_motor, bool small_motor) if (pad >= m_pads.size()) return; + m_pads[pad]->m_last_rumble_time_us = get_system_time(); m_pads[pad]->m_vibrateMotors[0].m_value = large_motor; m_pads[pad]->m_vibrateMotors[1].m_value = small_motor ? 255 : 0; } From 2f8ed1a6bd7a6424e05c4425a647c9eecca13a91 Mon Sep 17 00:00:00 2001 From: Ani Date: Sun, 30 Mar 2025 20:44:13 +0200 Subject: [PATCH 190/529] rpcs3_version: Bump to 0.0.36 --- rpcs3/rpcs3_version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/rpcs3_version.cpp b/rpcs3/rpcs3_version.cpp index 57bac63f22..df428e93de 100644 --- a/rpcs3/rpcs3_version.cpp +++ b/rpcs3/rpcs3_version.cpp @@ -28,7 +28,7 @@ namespace rpcs3 // Currently accessible by Windows and Linux build scripts, see implementations when doing MACOSX const utils::version& get_version() { - static constexpr utils::version version{ 0, 0, 35, utils::version_type::alpha, 1, RPCS3_GIT_VERSION }; + static constexpr utils::version version{ 0, 0, 36, utils::version_type::alpha, 1, RPCS3_GIT_VERSION }; return version; } From 7cec2d0e1849148010f5162e42a8432e3e571d9e Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 11:08:43 +0200 Subject: [PATCH 191/529] Qt: set audio hotkey defaults to additionally need Ctrl pressed --- rpcs3/rpcs3qt/shortcut_settings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/rpcs3qt/shortcut_settings.cpp b/rpcs3/rpcs3qt/shortcut_settings.cpp index bca0fd57a9..fad59342a1 100644 --- a/rpcs3/rpcs3qt/shortcut_settings.cpp +++ b/rpcs3/rpcs3qt/shortcut_settings.cpp @@ -76,9 +76,9 @@ shortcut_settings::shortcut_settings() { shortcut::gw_frame_limit, shortcut_info{ "game_window_frame_limit", tr("Toggle Framelimit"), "Ctrl+F10", shortcut_handler_id::game_window, false } }, { shortcut::gw_toggle_mouse_and_keyboard, shortcut_info{ "game_window_toggle_mouse_and_keyboard", tr("Toggle Keyboard"), "Ctrl+F11", shortcut_handler_id::game_window, false } }, { shortcut::gw_home_menu, shortcut_info{ "gw_home_menu", tr("Open Home Menu"), "Shift+F10", shortcut_handler_id::game_window, false } }, - { shortcut::gw_mute_unmute, shortcut_info{ "gw_mute_unmute", tr("Mute/Unmute Audio"), "Shift+M", shortcut_handler_id::game_window, false } }, - { shortcut::gw_volume_up, shortcut_info{ "gw_volume_up", tr("Volume Up"), "Shift++", shortcut_handler_id::game_window, true } }, - { shortcut::gw_volume_down, shortcut_info{ "gw_volume_down", tr("Volume Down"), "Shift+-", shortcut_handler_id::game_window, true } }, + { shortcut::gw_mute_unmute, shortcut_info{ "gw_mute_unmute", tr("Mute/Unmute Audio"), "Ctrl+Shift+M", shortcut_handler_id::game_window, false } }, + { shortcut::gw_volume_up, shortcut_info{ "gw_volume_up", tr("Volume Up"), "Ctrl+Shift++", shortcut_handler_id::game_window, true } }, + { shortcut::gw_volume_down, shortcut_info{ "gw_volume_down", tr("Volume Down"), "Ctrl+Shift+-", shortcut_handler_id::game_window, true } }, }) { } From 82c85c1a9c287fc32b20cd1c11bade36fc3a8107 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 11:09:41 +0200 Subject: [PATCH 192/529] Qt: disable shortcuts completely if disable kb hotkeys is enabled --- rpcs3/rpcs3qt/gs_frame.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index 7b5481d2d4..46469db968 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -68,8 +68,6 @@ gs_frame::gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, , m_start_games_fullscreen(force_fullscreen) , m_renderer(g_cfg.video.renderer) { - load_gui_settings(); - m_window_title = Emu.GetFormattedTitle(0); if (!g_cfg_recording.load()) @@ -121,8 +119,7 @@ gs_frame::gs_frame(QScreen* screen, const QRect& geometry, const QIcon& appIcon, create(); } - m_shortcut_handler = new shortcut_handler(gui::shortcuts::shortcut_handler_id::game_window, this, m_gui_settings); - connect(m_shortcut_handler, &shortcut_handler::shortcut_activated, this, &gs_frame::handle_shortcut); + load_gui_settings(); // Change cursor when in fullscreen. connect(this, &QWindow::visibilityChanged, this, [this](QWindow::Visibility visibility) @@ -174,6 +171,20 @@ void gs_frame::load_gui_settings() m_lock_mouse_in_fullscreen = m_gui_settings->GetValue(gui::gs_lockMouseFs).toBool(); m_hide_mouse_after_idletime = m_gui_settings->GetValue(gui::gs_hideMouseIdle).toBool(); m_hide_mouse_idletime = m_gui_settings->GetValue(gui::gs_hideMouseIdleTime).toUInt(); + + if (m_disable_kb_hotkeys) + { + if (m_shortcut_handler) + { + m_shortcut_handler->deleteLater(); + m_shortcut_handler = nullptr; + } + } + else if (!m_shortcut_handler) + { + m_shortcut_handler = new shortcut_handler(gui::shortcuts::shortcut_handler_id::game_window, this, m_gui_settings); + connect(m_shortcut_handler, &shortcut_handler::shortcut_activated, this, &gs_frame::handle_shortcut); + } } void gs_frame::update_shortcuts() @@ -1101,7 +1112,7 @@ void gs_frame::handle_cursor(QWindow::Visibility visibility, bool visibility_cha void gs_frame::mouse_hide_timeout() { - // Our idle timeout occured, so we update the cursor + // Our idle timeout occurred, so we update the cursor if (m_hide_mouse_after_idletime && m_show_mouse) { handle_cursor(visibility(), false, false, false); From 9c1c932e68206c1cddd7a0cfd3af7ad2c8d4ccac Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 11:40:53 +0200 Subject: [PATCH 193/529] Update OpenAL to 1.24.3 --- 3rdparty/OpenAL/openal-soft | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/OpenAL/openal-soft b/3rdparty/OpenAL/openal-soft index 90191edd20..dc7d7054a5 160000 --- a/3rdparty/OpenAL/openal-soft +++ b/3rdparty/OpenAL/openal-soft @@ -1 +1 @@ -Subproject commit 90191edd20bb877c5cbddfdac7ec0fe49ad93727 +Subproject commit dc7d7054a5b4f3bec1dc23a42fd616a0847af948 From 6511e0f3e6f72a3bf46057f9fee0957edc333d34 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 00:46:08 +0200 Subject: [PATCH 194/529] cellSaveData: properly initialize SaveDataEntry --- rpcs3/Emu/Cell/Modules/cellSaveData.cpp | 15 +++++++-------- rpcs3/rpcs3qt/save_manager_dialog.cpp | 3 +-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp index be7583074a..8afee44408 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp @@ -244,7 +244,7 @@ static std::vector get_save_entries(const std::string& base_dir, continue; } - SaveDataEntry save_entry; + SaveDataEntry save_entry {}; save_entry.dirName = psf::get_string(psf, "SAVEDATA_DIRECTORY"); save_entry.listParam = psf::get_string(psf, "SAVEDATA_LIST_PARAM"); save_entry.title = psf::get_string(psf, "TITLE"); @@ -326,7 +326,7 @@ static error_code select_and_delete(ppu_thread& ppu) focused = save_entries.empty() ? -1 : selected; // Get information from the selected entry - SaveDataEntry entry = save_entries[selected]; + const SaveDataEntry& entry = ::at32(save_entries, selected); const std::string info = entry.title + "\n" + entry.subtitle + "\n" + entry.details; // Reusable display message string @@ -760,7 +760,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v result->userdata = userdata; // probably should be assigned only once (allows the callback to change it) - SaveDataEntry save_entry; + SaveDataEntry save_entry {}; if (setList) { @@ -820,7 +820,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v break; } - SaveDataEntry save_entry2; + SaveDataEntry save_entry2 {}; save_entry2.dirName = psf::get_string(psf, "SAVEDATA_DIRECTORY"); save_entry2.listParam = psf::get_string(psf, "SAVEDATA_LIST_PARAM"); save_entry2.title = psf::get_string(psf, "TITLE"); @@ -1214,8 +1214,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v else { // Get information from the selected entry - SaveDataEntry entry = save_entries[selected]; - message = get_confirmation_message(operation, entry); + message = get_confirmation_message(operation, ::at32(save_entries, selected)); } // Yield before a blocking dialog is being spawned @@ -1345,14 +1344,14 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v else { // Get information from the selected entry - SaveDataEntry entry = save_entries[selected]; - message = get_confirmation_message(operation, entry); + message = get_confirmation_message(operation, ::at32(save_entries, selected)); } // Yield before a blocking dialog is being spawned lv2_obj::sleep(ppu); // Get user confirmation by opening a blocking dialog + // TODO: show fixedSet->newIcon s32 return_code = CELL_MSGDIALOG_BUTTON_NONE; error_code res = open_msg_dialog(true, CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_YESNO, vm::make_str(message), msg_dialog_source::_cellSaveData, vm::null, vm::null, vm::null, &return_code); diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index 9e3b51b8e2..d3cd03f4ec 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -270,13 +270,12 @@ std::vector save_manager_dialog::GetSaveEntries(const std::string return; } - SaveDataEntry save_entry2; + SaveDataEntry save_entry2 {}; save_entry2.dirName = psf::get_string(psf, "SAVEDATA_DIRECTORY"); save_entry2.listParam = psf::get_string(psf, "SAVEDATA_LIST_PARAM"); save_entry2.title = psf::get_string(psf, "TITLE"); save_entry2.subtitle = psf::get_string(psf, "SUB_TITLE"); save_entry2.details = psf::get_string(psf, "DETAIL"); - save_entry2.size = 0; for (const auto& entry2 : fs::dir(base_dir + entry.name)) { From fac1cc57d7632fa324b3975c27d6d8b588960061 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 28 Mar 2025 23:29:14 +0100 Subject: [PATCH 195/529] Overlays: set layouts dirty if children are dirty This fixes updates of widget items in lists. Only set text dirty if it changed. Properly mark spacers as compiled. --- .../HomeMenu/overlay_home_menu_components.cpp | 2 +- .../HomeMenu/overlay_home_menu_components.h | 6 +- .../overlay_home_menu_message_box.cpp | 2 +- .../HomeMenu/overlay_home_menu_page.cpp | 6 +- .../RSX/Overlays/overlay_animated_icon.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_controls.cpp | 79 ++++++++++++------- rpcs3/Emu/RSX/Overlays/overlay_controls.h | 8 +- rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp | 4 +- rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp | 4 +- rpcs3/Emu/RSX/Overlays/overlay_message.cpp | 2 +- .../Emu/RSX/Overlays/overlay_perf_metrics.cpp | 2 +- .../Emu/RSX/Overlays/overlay_progress_bar.cpp | 8 +- 12 files changed, 76 insertions(+), 49 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp index c1c685210b..d0ed9dc460 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp @@ -40,7 +40,7 @@ namespace rsx { update_value(); - if (!is_compiled) + if (!is_compiled()) { const f32 col = m_last_value ? 1.0f : 0.3f; const f32 bkg = m_last_value ? 0.3f : 1.0f; diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h index 186f67c3fe..7a54acddd8 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h @@ -64,7 +64,7 @@ namespace rsx if (const T new_value = m_setting->get(); new_value != m_last_value || initializing) { m_last_value = new_value; - is_compiled = false; + m_is_compiled = false; } } } @@ -101,7 +101,7 @@ namespace rsx { this->update_value(); - if (!this->is_compiled) + if (!this->is_compiled()) { const std::string value_text = Emu.GetCallbacks().get_localized_setting(home_menu_setting>::m_setting, static_cast(this->m_last_value)); m_dropdown.set_text(value_text); @@ -145,7 +145,7 @@ namespace rsx { this->update_value(); - if (!this->is_compiled) + if (!this->is_compiled()) { const f64 percentage = std::clamp((this->m_last_value - static_cast(m_minimum)) / std::fabs(m_maximum - m_minimum), 0.0, 1.0); m_slider.set_pos(m_slider.x, this->y + (this->h - m_slider.h) / 2); diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp index 1f1ac3c5fa..4d9196ad07 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp @@ -44,7 +44,7 @@ namespace rsx compiled_resource& home_menu_message_box::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { compiled_resource& compiled = overlay_element::get_compiled(); compiled.add(m_label.get_compiled()); diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp index 9be95e016b..f298de0a81 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp @@ -258,9 +258,9 @@ namespace rsx compiled_resource& home_menu_page::get_compiled() { - if (!is_compiled || (m_message_box && !m_message_box->is_compiled)) + if (!is_compiled() || (m_message_box && !m_message_box->is_compiled())) { - is_compiled = false; + m_is_compiled = false; if (home_menu_page* page = get_current_page(false)) { @@ -281,7 +281,7 @@ namespace rsx } } - is_compiled = true; + m_is_compiled = true; } return compiled_resources; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp index 55f1f5dc84..7361856976 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp @@ -58,7 +58,7 @@ namespace rsx compiled_resource& animated_icon::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { compiled_resources = image_view::get_compiled(); } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp index ca6410e19a..fcccaa4645 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp @@ -302,7 +302,7 @@ namespace rsx void overlay_element::refresh() { // Just invalidate for draw when get_compiled() is called - is_compiled = false; + m_is_compiled = false; } void overlay_element::translate(s16 _x, s16 _y) @@ -310,7 +310,7 @@ namespace rsx x += _x; y += _y; - is_compiled = false; + m_is_compiled = false; } void overlay_element::scale(f32 _x, f32 _y, bool origin_scaling) @@ -324,7 +324,7 @@ namespace rsx w = static_cast(_x * w); h = static_cast(_y * h); - is_compiled = false; + m_is_compiled = false; } void overlay_element::set_pos(s16 _x, s16 _y) @@ -332,7 +332,7 @@ namespace rsx x = _x; y = _y; - is_compiled = false; + m_is_compiled = false; } void overlay_element::set_size(u16 _w, u16 _h) @@ -340,7 +340,7 @@ namespace rsx w = _w; h = _h; - is_compiled = false; + m_is_compiled = false; } void overlay_element::set_padding(u16 left, u16 right, u16 top, u16 bottom) @@ -350,13 +350,13 @@ namespace rsx padding_top = top; padding_bottom = bottom; - is_compiled = false; + m_is_compiled = false; } void overlay_element::set_padding(u16 padding) { padding_left = padding_right = padding_top = padding_bottom = padding; - is_compiled = false; + m_is_compiled = false; } // NOTE: Functions as a simple position offset. Top left corner is the anchor. @@ -365,25 +365,36 @@ namespace rsx margin_left = left; margin_top = top; - is_compiled = false; + m_is_compiled = false; } void overlay_element::set_margin(u16 margin) { margin_left = margin_top = margin; - is_compiled = false; + m_is_compiled = false; } void overlay_element::set_text(const std::string& text) { - this->text = utf8_to_u32string(text); - is_compiled = false; + std::u32string new_text = utf8_to_u32string(text); + const bool is_dirty = this->text != new_text; + this->text = std::move(new_text); + + if (is_dirty) + { + m_is_compiled = false; + } } void overlay_element::set_unicode_text(const std::u32string& text) { + const bool is_dirty = this->text != text; this->text = text; - is_compiled = false; + + if (is_dirty) + { + m_is_compiled = false; + } } void overlay_element::set_text(localized_string_id id) @@ -394,19 +405,19 @@ namespace rsx void overlay_element::set_font(const char* font_name, u16 font_size) { font_ref = fontmgr::get(font_name, font_size); - is_compiled = false; + m_is_compiled = false; } void overlay_element::align_text(text_align align) { alignment = align; - is_compiled = false; + m_is_compiled = false; } void overlay_element::set_wrap_text(bool state) { wrap_text = state; - is_compiled = false; + m_is_compiled = false; } font* overlay_element::get_font() const @@ -563,7 +574,7 @@ namespace rsx compiled_resource& overlay_element::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { compiled_resources.clear(); @@ -599,7 +610,7 @@ namespace rsx compiled_resources.add(std::move(compiled_resources_temp), margin_left - horizontal_scroll_offset, margin_top - vertical_scroll_offset); } - is_compiled = true; + m_is_compiled = true; } return compiled_resources; @@ -664,7 +675,7 @@ namespace rsx { overlay_element::translate(_x, _y); - for (auto &itm : m_items) + for (auto& itm : m_items) itm->translate(_x, _y); } @@ -675,13 +686,23 @@ namespace rsx translate(dx, dy); } + bool layout_container::is_compiled() + { + if (m_is_compiled && std::any_of(m_items.cbegin(), m_items.cend(), [](const auto& item){ return item && !item->is_compiled(); })) + { + m_is_compiled = false; + } + + return m_is_compiled; + } + compiled_resource& layout_container::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { compiled_resource result = overlay_element::get_compiled(); - for (auto &itm : m_items) + for (auto& itm : m_items) result.add(itm->get_compiled()); compiled_resources = result; @@ -716,7 +737,7 @@ namespace rsx return m_items.back().get(); } - auto result = item.get(); + overlay_element* result = item.get(); m_items.insert(m_items.begin() + offset, std::move(item)); return result; } @@ -726,12 +747,12 @@ namespace rsx if (scroll_offset_value == 0 && auto_resize) return layout_container::get_compiled(); - if (!is_compiled) + if (!is_compiled()) { compiled_resource result = overlay_element::get_compiled(); const f32 global_y_offset = static_cast(-scroll_offset_value); - for (auto &item : m_items) + for (auto& item : m_items) { if (!item) { @@ -808,7 +829,7 @@ namespace rsx if (scroll_offset_value == 0 && auto_resize) return layout_container::get_compiled(); - if (!is_compiled) + if (!is_compiled()) { compiled_resource result = overlay_element::get_compiled(); const f32 global_x_offset = static_cast(-scroll_offset_value); @@ -862,7 +883,7 @@ namespace rsx compiled_resource& image_view::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { auto& result = overlay_element::get_compiled(); auto& cmd_img = result.draw_commands.front(); @@ -880,7 +901,7 @@ namespace rsx verts[2] += vertex(padding_left, -padding_top, 0, 0); verts[3] += vertex(-padding_right, -padding_top, 0, 0); - is_compiled = true; + m_is_compiled = true; } return compiled_resources; @@ -935,7 +956,7 @@ namespace rsx compiled_resource& image_button::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { auto& compiled = image_view::get_compiled(); for (auto& cmd : compiled.draw_commands) @@ -987,7 +1008,7 @@ namespace rsx compiled_resource& rounded_rect::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { compiled_resources.clear(); @@ -1068,7 +1089,7 @@ namespace rsx compiled_resources.add(std::move(compiled_resources_temp), margin_left, margin_top); } - is_compiled = true; + m_is_compiled = true; } return compiled_resources; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index 0229767af8..07f1a8c5f0 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -165,7 +165,6 @@ namespace rsx void set_sinus_offset(f32 sinus_modifier); compiled_resource compiled_resources; - bool is_compiled = false; bool visible = true; @@ -185,6 +184,7 @@ namespace rsx virtual ~overlay_element() = default; virtual void refresh(); + virtual bool is_compiled() { return m_is_compiled; } virtual void translate(s16 _x, s16 _y); virtual void scale(f32 _x, f32 _y, bool origin_scaling); virtual void set_pos(s16 _x, s16 _y); @@ -204,6 +204,9 @@ namespace rsx virtual std::vector render_text(const char32_t* string, f32 x, f32 y); virtual compiled_resource& get_compiled(); void measure_text(u16& width, u16& height, bool ignore_word_wrap = false) const; + + protected: + bool m_is_compiled = false; // Only use m_is_compiled as a getter in is_compiled() if possible }; struct layout_container : public overlay_element @@ -221,6 +224,8 @@ namespace rsx void translate(s16 _x, s16 _y) override; void set_pos(s16 _x, s16 _y) override; + bool is_compiled() override; + compiled_resource& get_compiled() override; virtual u16 get_scroll_offset_px() = 0; @@ -248,6 +253,7 @@ namespace rsx compiled_resource& get_compiled() override { // No draw + m_is_compiled = true; return compiled_resources; } }; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp index 7658563bcc..ce2b685046 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp @@ -196,7 +196,7 @@ namespace rsx compiled_resource& edit_text::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { auto renderer = get_font(); const auto [caret_x, caret_y] = renderer->get_char_offset(text.c_str(), caret_position, clip_text ? w : -1, wrap_text); @@ -252,7 +252,7 @@ namespace rsx cmd.config.clip_rect = {static_cast(x), static_cast(y), static_cast(x + w), static_cast(y + h)}; } - is_compiled = true; + m_is_compiled = true; } return compiled_resources; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp b/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp index 0802d3ff95..a0d7944036 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp @@ -195,7 +195,7 @@ namespace rsx m_cancel_btn->set_pos(x + 180, y + h + 20); m_cancel_only = cancel_only; - is_compiled = false; + m_is_compiled = false; } bool list_view::get_cancel_only() const @@ -219,7 +219,7 @@ namespace rsx compiled_resource& list_view::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { auto& compiled = vertical_layout::get_compiled(); compiled.add(m_highlight_box->get_compiled()); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp index b00f0cc5b3..218f7a2a3a 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp @@ -100,7 +100,7 @@ namespace rsx } // Disable caching - is_compiled = false; + m_is_compiled = false; compiled_resources = rounded_rect::get_compiled(); compiled_resources.add(m_text.get_compiled()); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp index 0c4b9becac..8b68357208 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp @@ -814,7 +814,7 @@ namespace rsx compiled_resource& graph::get_compiled() { - if (is_compiled) + if (is_compiled()) { return compiled_resources; } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp b/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp index ee9ce7b4d3..860f54544a 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp @@ -23,7 +23,7 @@ namespace rsx void progress_bar::set_limit(f32 limit) { m_limit = limit; - is_compiled = false; + m_is_compiled = false; } void progress_bar::set_value(f32 value) @@ -32,7 +32,7 @@ namespace rsx f32 indicator_width = (w * m_value) / m_limit; indicator.set_size(static_cast(indicator_width), h); - is_compiled = false; + m_is_compiled = false; } void progress_bar::set_pos(s16 _x, s16 _y) @@ -68,12 +68,12 @@ namespace rsx text_view.set_size(w, text_h); set_pos(text_view.x, text_view.y); - is_compiled = false; + m_is_compiled = false; } compiled_resource& progress_bar::get_compiled() { - if (!is_compiled) + if (!is_compiled()) { auto& compiled = overlay_element::get_compiled(); compiled.add(text_view.get_compiled()); From 8e83fd7d50244fea8e8f2c332bc1063b98ec0ea2 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 01:02:05 +0200 Subject: [PATCH 196/529] Qt/overlays: expose qt_video_source_wrapper as emu callback --- rpcs3/Emu/System.h | 1 + rpcs3/headless_application.cpp | 3 +++ rpcs3/rpcs3qt/gui_application.cpp | 3 +++ rpcs3/rpcs3qt/qt_video_source.cpp | 28 +++++++++++++++++++++++----- rpcs3/rpcs3qt/qt_video_source.h | 13 ++++++------- rpcs3/util/video_source.h | 29 +++++++++++++++++++++-------- 6 files changed, 57 insertions(+), 20 deletions(-) diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 2d9b2d954b..4306fe9658 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -111,6 +111,7 @@ struct EmuCallbacks std::function display_sleep_control_supported; std::function enable_display_sleep; std::function check_microphone_permissions; + std::function()> make_video_source; }; namespace utils diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp index ee7cd42cee..0d0eb8d834 100644 --- a/rpcs3/headless_application.cpp +++ b/rpcs3/headless_application.cpp @@ -8,6 +8,7 @@ #include "Emu/Cell/Modules/sceNpTrophy.h" #include "Emu/Io/Null/null_camera_handler.h" #include "Emu/Io/Null/null_music_handler.h" +#include "util/video_source.h" #include @@ -173,6 +174,8 @@ void headless_application::InitializeCallbacks() callbacks.check_microphone_permissions = [](){}; + callbacks.make_video_source = [](){ return nullptr; }; + Emu.SetCallbacks(std::move(callbacks)); } diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 077e05ca68..b170737e43 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -27,6 +27,7 @@ #include "Emu/vfs_config.h" #include "util/init_mutex.hpp" #include "util/console.h" +#include "qt_video_source.h" #include "trophy_notification_helper.h" #include "save_data_dialog.h" #include "msg_dialog_frame.h" @@ -955,6 +956,8 @@ void gui_application::InitializeCallbacks() }); }; + callbacks.make_video_source = [](){ return std::make_unique(); }; + Emu.SetCallbacks(std::move(callbacks)); } diff --git a/rpcs3/rpcs3qt/qt_video_source.cpp b/rpcs3/rpcs3qt/qt_video_source.cpp index 2338c09bf8..9537f89127 100644 --- a/rpcs3/rpcs3qt/qt_video_source.cpp +++ b/rpcs3/rpcs3qt/qt_video_source.cpp @@ -14,9 +14,9 @@ qt_video_source::~qt_video_source() stop_movie(); } -void qt_video_source::set_video_path(const std::string& path) +void qt_video_source::set_video_path(const std::string& video_path) { - m_video_path = QString::fromStdString(path); + m_video_path = QString::fromStdString(video_path); } void qt_video_source::set_active(bool active) @@ -209,14 +209,14 @@ qt_video_source_wrapper::~qt_video_source_wrapper() }); } -void qt_video_source_wrapper::set_video_path(const std::string& path) +void qt_video_source_wrapper::set_video_path(const std::string& video_path) { - Emu.BlockingCallFromMainThread([this, &path]() + Emu.CallFromMainThread([this, path = video_path]() { m_qt_video_source = std::make_unique(); m_qt_video_source->m_image_change_callback = [this](const QVideoFrame& frame) { - std::lock_guard lock(m_qt_video_source->m_image_mutex); + std::unique_lock lock(m_qt_video_source->m_image_mutex); if (m_qt_video_source->m_movie) { @@ -236,12 +236,30 @@ void qt_video_source_wrapper::set_video_path(const std::string& path) { m_qt_video_source->m_image.convertTo(QImage::Format_RGBA8888); } + + lock.unlock(); + + notify_update(); }; m_qt_video_source->set_video_path(path); + }); +} + +void qt_video_source_wrapper::set_active(bool active) +{ + Emu.CallFromMainThread([this, active]() + { m_qt_video_source->set_active(true); }); } +bool qt_video_source_wrapper::get_active() const +{ + ensure(m_qt_video_source); + + return m_qt_video_source->get_active(); +} + void qt_video_source_wrapper::get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) { ensure(m_qt_video_source); diff --git a/rpcs3/rpcs3qt/qt_video_source.h b/rpcs3/rpcs3qt/qt_video_source.h index f8b2267e5f..aa6e61af94 100644 --- a/rpcs3/rpcs3qt/qt_video_source.h +++ b/rpcs3/rpcs3qt/qt_video_source.h @@ -17,17 +17,14 @@ public: qt_video_source(); virtual ~qt_video_source(); - void set_video_path(const std::string& path) override; + void set_video_path(const std::string& video_path) override; const QString& video_path() const { return m_video_path; } void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) override; bool has_new() const override { return m_has_new; } virtual void set_active(bool active); - [[nodiscard]] bool get_active() const - { - return m_active; - } + bool get_active() const override { return m_active; } void start_movie(); void stop_movie(); @@ -67,9 +64,11 @@ public: qt_video_source_wrapper() : video_source() {} virtual ~qt_video_source_wrapper(); - void set_video_path(const std::string& path) override; - void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) override; + void set_video_path(const std::string& video_path) override; + void set_active(bool active) override; + bool get_active() const override; bool has_new() const override { return m_qt_video_source && m_qt_video_source->has_new(); } + void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) override; private: std::unique_ptr m_qt_video_source; diff --git a/rpcs3/util/video_source.h b/rpcs3/util/video_source.h index b5737bccc0..9449ed238e 100644 --- a/rpcs3/util/video_source.h +++ b/rpcs3/util/video_source.h @@ -1,20 +1,33 @@ #pragma once #include "types.hpp" +#include class video_source { public: video_source() {}; virtual ~video_source() {}; - virtual void set_video_path(const std::string& path) { static_cast(path); } - virtual bool has_new() const { return false; }; - virtual void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) + virtual void set_video_path(const std::string& video_path) = 0; + virtual void set_active(bool active) = 0; + virtual bool get_active() const = 0; + virtual bool has_new() const = 0; + virtual void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) = 0; + + void set_update_callback(std::function callback) { - static_cast(data); - static_cast(w); - static_cast(h); - static_cast(ch); - static_cast(bpp); + m_update_callback = callback; } + +protected: + void notify_update() + { + if (m_update_callback) + { + m_update_callback(); + } + } + +private: + std::function m_update_callback; }; From 9684467dc0b6e70103334547267497b301822e51 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 01:05:21 +0200 Subject: [PATCH 197/529] overlays: implement video overlay class --- rpcs3/Emu/CMakeLists.txt | 1 + rpcs3/Emu/RSX/GL/GLOverlays.cpp | 25 +++-- rpcs3/Emu/RSX/GL/GLOverlays.h | 4 +- rpcs3/Emu/RSX/Overlays/overlay_controls.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_controls.h | 21 ++-- rpcs3/Emu/RSX/Overlays/overlay_video.cpp | 116 ++++++++++++++++++++ rpcs3/Emu/RSX/Overlays/overlay_video.h | 40 +++++++ rpcs3/Emu/RSX/VK/VKOverlays.cpp | 69 +++++++----- rpcs3/Emu/RSX/VK/VKOverlays.h | 5 +- rpcs3/emucore.vcxproj | 2 + rpcs3/emucore.vcxproj.filters | 6 + 11 files changed, 246 insertions(+), 45 deletions(-) create mode 100644 rpcs3/Emu/RSX/Overlays/overlay_video.cpp create mode 100644 rpcs3/Emu/RSX/Overlays/overlay_video.h diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index 743b6c88d3..d68ab8c795 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -546,6 +546,7 @@ target_sources(rpcs3_emu PRIVATE RSX/Overlays/overlay_trophy_notification.cpp RSX/Overlays/overlay_user_list_dialog.cpp RSX/Overlays/overlay_utils.cpp + RSX/Overlays/overlay_video.cpp RSX/Overlays/Shaders/shader_loading_dialog.cpp RSX/Overlays/Shaders/shader_loading_dialog_native.cpp RSX/Program/CgBinaryFragmentProgram.cpp diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.cpp b/rpcs3/Emu/RSX/GL/GLOverlays.cpp index c5fac83404..983bed6f85 100644 --- a/rpcs3/Emu/RSX/GL/GLOverlays.cpp +++ b/rpcs3/Emu/RSX/GL/GLOverlays.cpp @@ -218,12 +218,12 @@ namespace gl m_input_filter = gl::filter::linear; } - gl::texture_view* ui_overlay_renderer::load_simple_image(rsx::overlays::image_info* desc, bool temp_resource, u32 owner_uid) + gl::texture_view* ui_overlay_renderer::load_simple_image(rsx::overlays::image_info_base* desc, bool temp_resource, u32 owner_uid) { auto tex = std::make_unique(GL_TEXTURE_2D, desc->w, desc->h, 1, 1, 1, GL_RGBA8, RSX_FORMAT_CLASS_COLOR); tex->copy_from(desc->get_data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {}); - GLenum remap[] = { GL_RED, GL_ALPHA, GL_BLUE, GL_GREEN }; + const GLenum remap[] = { GL_RED, GL_ALPHA, GL_BLUE, GL_GREEN }; auto view = std::make_unique(tex.get(), remap); auto result = view.get(); @@ -234,7 +234,7 @@ namespace gl } else { - u64 key = reinterpret_cast(desc); + const u64 key = reinterpret_cast(desc); temp_image_cache[key] = std::make_pair(owner_uid, std::move(tex)); temp_view_cache[key] = std::move(view); } @@ -249,7 +249,7 @@ namespace gl rsx::overlays::resource_config configuration; configuration.load_files(); - for (const auto &res : configuration.texture_raw_data) + for (const auto& res : configuration.texture_raw_data) { load_simple_image(res.get(), false, -1); } @@ -318,13 +318,22 @@ namespace gl return result; } - gl::texture_view* ui_overlay_renderer::find_temp_image(rsx::overlays::image_info* desc, u32 owner_uid) + gl::texture_view* ui_overlay_renderer::find_temp_image(rsx::overlays::image_info_base* desc, u32 owner_uid) { - auto key = reinterpret_cast(desc); + const bool dirty = std::exchange(desc->dirty, false); + const u64 key = reinterpret_cast(desc); + auto cached = temp_view_cache.find(key); if (cached != temp_view_cache.end()) { - return cached->second.get(); + gl::texture_view* view = cached->second.get(); + + if (dirty) + { + view->image()->copy_from(desc->get_data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {}); + } + + return view; } return load_simple_image(desc, true, owner_uid); @@ -420,7 +429,7 @@ namespace gl } case rsx::overlays::image_resource_id::raw_image: { - cmd_->bind_texture(31, GL_TEXTURE_2D, find_temp_image(static_cast(cmd.config.external_data_ref), ui.uid)->id()); + cmd_->bind_texture(31, GL_TEXTURE_2D, find_temp_image(static_cast(cmd.config.external_data_ref), ui.uid)->id()); break; } case rsx::overlays::image_resource_id::font_file: diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.h b/rpcs3/Emu/RSX/GL/GLOverlays.h index f70e885d2e..bd2be2d0ed 100644 --- a/rpcs3/Emu/RSX/GL/GLOverlays.h +++ b/rpcs3/Emu/RSX/GL/GLOverlays.h @@ -75,7 +75,7 @@ namespace gl ui_overlay_renderer(); - gl::texture_view* load_simple_image(rsx::overlays::image_info* desc, bool temp_resource, u32 owner_uid); + gl::texture_view* load_simple_image(rsx::overlays::image_info_base* desc, bool temp_resource, u32 owner_uid); void create(); void destroy(); @@ -84,7 +84,7 @@ namespace gl gl::texture_view* find_font(rsx::overlays::font* font); - gl::texture_view* find_temp_image(rsx::overlays::image_info* desc, u32 owner_uid); + gl::texture_view* find_temp_image(rsx::overlays::image_info_base* desc, u32 owner_uid); void set_primitive_type(rsx::overlays::primitive_type type); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp index fcccaa4645..23e7fccb55 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp @@ -913,7 +913,7 @@ namespace rsx external_ref = nullptr; } - void image_view::set_raw_image(image_info* raw_image) + void image_view::set_raw_image(image_info_base* raw_image) { image_resource_ref = image_resource_id::raw_image; external_ref = raw_image; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index 07f1a8c5f0..b6dd2b84da 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -30,23 +30,29 @@ namespace rsx triangle_fan = 4 }; - struct image_info + struct image_info_base + { + int w = 0, h = 0, channels = 0; + int bpp = 0; + bool dirty = false; + + virtual const u8* get_data() const = 0; + }; + + struct image_info : public image_info_base { private: u8* data = nullptr; std::vector data_grey; public: - int w = 0, h = 0, channels = 0; - int bpp = 0; - image_info(image_info&) = delete; image_info(const std::string& filename, bool grayscaled = false); image_info(const std::vector& bytes, bool grayscaled = false); ~image_info(); void load_data(const std::vector& bytes, bool grayscaled = false); - const u8* get_data() const { return channels == 4 ? data : data_grey.empty() ? nullptr : data_grey.data(); } + const u8* get_data() const override { return channels == 4 ? data : data_grey.empty() ? nullptr : data_grey.data(); } }; struct resource_config @@ -204,6 +210,7 @@ namespace rsx virtual std::vector render_text(const char32_t* string, f32 x, f32 y); virtual compiled_resource& get_compiled(); void measure_text(u16& width, u16& height, bool ignore_word_wrap = false) const; + virtual void set_selected(bool selected) { static_cast(selected); } protected: bool m_is_compiled = false; // Only use m_is_compiled as a getter in is_compiled() if possible @@ -269,7 +276,7 @@ namespace rsx struct image_view : public overlay_element { - private: + protected: u8 image_resource_ref = image_resource_id::none; void* external_ref = nullptr; @@ -282,7 +289,7 @@ namespace rsx compiled_resource& get_compiled() override; void set_image_resource(u8 resource_id); - void set_raw_image(image_info* raw_image); + void set_raw_image(image_info_base* raw_image); void clear_image(); void set_blur_strength(u8 strength); }; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_video.cpp b/rpcs3/Emu/RSX/Overlays/overlay_video.cpp new file mode 100644 index 0000000000..ac6017d35f --- /dev/null +++ b/rpcs3/Emu/RSX/Overlays/overlay_video.cpp @@ -0,0 +1,116 @@ +#include "stdafx.h" +#include "overlay_video.h" +#include "Emu/System.h" + +namespace rsx +{ + namespace overlays + { + video_view::video_view(const std::string& video_path, const std::string& thumbnail_path) + { + init_video(video_path); + + if (!thumbnail_path.empty()) + { + m_thumbnail_info = std::make_unique(thumbnail_path); + set_raw_image(m_thumbnail_info.get()); + } + } + + video_view::video_view(const std::string& video_path, const std::vector& thumbnail_buf) + { + init_video(video_path); + + if (!thumbnail_buf.empty()) + { + m_thumbnail_info = std::make_unique(thumbnail_buf); + set_raw_image(m_thumbnail_info.get()); + } + } + + video_view::video_view(const std::string& video_path, u8 thumbnail_id) + : m_thumbnail_id(thumbnail_id) + { + init_video(video_path); + set_image_resource(thumbnail_id); + } + + video_view::~video_view() + { + } + + void video_view::init_video(const std::string& video_path) + { + if (video_path.empty()) return; + + m_video_source = Emu.GetCallbacks().make_video_source(); + ensure(!!m_video_source); + + m_video_source->set_update_callback([this]() + { + if (m_video_active) + { + m_is_compiled = false; + } + }); + m_video_source->set_video_path(video_path); + } + + void video_view::set_active(bool active) + { + if (m_video_source) + { + m_video_source->set_active(active); + m_video_active = active; + m_is_compiled = false; + } + } + + void video_view::update() + { + if (m_video_active && m_video_source && m_video_source->get_active()) + { + if (!m_video_source->has_new()) + { + return; + } + + m_buffer_index = (m_buffer_index + 1) % m_video_info.size(); + + auto& info = m_video_info.at(m_buffer_index); + if (!info) + { + info = std::make_unique(); + } + + m_video_source->get_image(info->data, info->w, info->h, info->channels, info->bpp); + info->dirty = true; + + set_raw_image(info.get()); + m_is_compiled = false; + return; + } + + if (m_thumbnail_info && m_thumbnail_info.get() != external_ref) + { + set_raw_image(m_thumbnail_info.get()); + m_is_compiled = false; + return; + } + + if (m_thumbnail_id != image_resource_id::none && m_thumbnail_id != image_resource_ref) + { + set_image_resource(m_thumbnail_id); + m_is_compiled = false; + return; + } + } + + compiled_resource& video_view::get_compiled() + { + update(); + + return external_ref ? image_view::get_compiled() : overlay_element::get_compiled(); + } + } +} diff --git a/rpcs3/Emu/RSX/Overlays/overlay_video.h b/rpcs3/Emu/RSX/Overlays/overlay_video.h new file mode 100644 index 0000000000..bdff580f0e --- /dev/null +++ b/rpcs3/Emu/RSX/Overlays/overlay_video.h @@ -0,0 +1,40 @@ +#pragma once + +#include "overlay_controls.h" +#include "util/video_source.h" + +namespace rsx +{ + namespace overlays + { + struct video_info : public image_info_base + { + std::vector data; + const u8* get_data() const override { return data.empty() ? nullptr : data.data(); } + }; + + class video_view final : public image_view + { + public: + video_view(const std::string& video_path, const std::string& thumbnail_path); + video_view(const std::string& video_path, const std::vector& thumbnail_buf); + video_view(const std::string& video_path, u8 thumbnail_id); + virtual ~video_view(); + + void set_active(bool active); + + void update(); + compiled_resource& get_compiled() override; + + private: + void init_video(const std::string& video_path); + + usz m_buffer_index = 0; + std::array, 2> m_video_info; // double buffer + std::unique_ptr m_video_source; + std::unique_ptr m_thumbnail_info; + u8 m_thumbnail_id = image_resource_id::none; + bool m_video_active = false; // This is the expected state. The actual state is found in the video source. + }; + } +} diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.cpp b/rpcs3/Emu/RSX/VK/VKOverlays.cpp index 2976d90c76..f195ee6c15 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.cpp +++ b/rpcs3/Emu/RSX/VK/VKOverlays.cpp @@ -386,22 +386,14 @@ namespace vk VK_BLEND_OP_ADD, VK_BLEND_OP_ADD); } - vk::image_view* ui_overlay_renderer::upload_simple_texture(vk::render_device& dev, vk::command_buffer& cmd, - vk::data_heap& upload_heap, u64 key, u32 w, u32 h, u32 layers, bool font, bool temp, const void* pixel_src, u32 owner_uid) + void ui_overlay_renderer::upload_simple_texture(vk::image* tex, vk::command_buffer& cmd, + vk::data_heap& upload_heap, u32 w, u32 h, u32 layers, bool font, const void* pixel_src) { - const VkFormat format = (font) ? VK_FORMAT_R8_UNORM : VK_FORMAT_B8G8R8A8_UNORM; const u32 pitch = (font) ? w : w * 4; const u32 data_size = pitch * h * layers; const auto offset = upload_heap.alloc<512>(data_size); const auto addr = upload_heap.map(offset, data_size); - const VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers }; - - auto tex = std::make_unique(dev, dev.get_memory_mapping().device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, - VK_IMAGE_TYPE_2D, format, std::max(w, 1u), std::max(h, 1u), 1, 1, layers, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED, - VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, - 0, VMM_ALLOCATION_POOL_UNDEFINED); - if (pixel_src && data_size) std::memcpy(addr, pixel_src, data_size); else if (data_size) @@ -409,17 +401,31 @@ namespace vk upload_heap.unmap(); - VkBufferImageCopy region; - region.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, layers }; - region.bufferOffset = offset; - region.bufferRowLength = w; - region.bufferImageHeight = h; - region.imageOffset = {}; - region.imageExtent = { static_cast(w), static_cast(h), 1u }; - - change_image_layout(cmd, tex.get(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, range); + const VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers }; + VkBufferImageCopy region { + .bufferOffset = offset, + .bufferRowLength = w, + .bufferImageHeight = h, + .imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, layers }, + .imageOffset = {}, + .imageExtent = { static_cast(w), static_cast(h), 1u } + }; + change_image_layout(cmd, tex, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, range); vkCmdCopyBufferToImage(cmd, upload_heap.heap->value, tex->value, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion); - change_image_layout(cmd, tex.get(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, range); + change_image_layout(cmd, tex, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, range); + } + + vk::image_view* ui_overlay_renderer::upload_simple_texture(vk::render_device& dev, vk::command_buffer& cmd, + vk::data_heap& upload_heap, u64 key, u32 w, u32 h, u32 layers, bool font, bool temp, const void* pixel_src, u32 owner_uid) + { + const VkFormat format = (font) ? VK_FORMAT_R8_UNORM : VK_FORMAT_B8G8R8A8_UNORM; + + auto tex = std::make_unique(dev, dev.get_memory_mapping().device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, + VK_IMAGE_TYPE_2D, format, std::max(w, 1u), std::max(h, 1u), 1, 1, layers, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED, + VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, + 0, VMM_ALLOCATION_POOL_UNDEFINED); + + upload_simple_texture(tex.get(), cmd, upload_heap, w, h, layers, font, pixel_src); auto view = std::make_unique(dev, tex.get()); @@ -521,12 +527,23 @@ namespace vk true, false, bytes.data(), -1); } - vk::image_view* ui_overlay_renderer::find_temp_image(rsx::overlays::image_info* desc, vk::command_buffer& cmd, vk::data_heap& upload_heap, u32 owner_uid) + vk::image_view* ui_overlay_renderer::find_temp_image(rsx::overlays::image_info_base* desc, vk::command_buffer& cmd, vk::data_heap& upload_heap, u32 owner_uid) { - u64 key = reinterpret_cast(desc); - auto found = temp_view_cache.find(key); - if (found != temp_view_cache.end()) - return found->second.get(); + const bool dirty = std::exchange(desc->dirty, false); + const u64 key = reinterpret_cast(desc); + + auto cached = temp_view_cache.find(key); + if (cached != temp_view_cache.end()) + { + vk::image_view* view = cached->second.get(); + + if (dirty) + { + upload_simple_texture(view->image(), cmd, upload_heap, desc->w, desc->h, 1, false, desc->get_data()); + } + + return view; + } return upload_simple_texture(cmd.get_command_pool().get_owner(), cmd, upload_heap, key, desc->w, desc->h, 1, false, true, desc->get_data(), owner_uid); @@ -693,7 +710,7 @@ namespace vk : rsx::overlays::texture_sampling_mode::font3D; break; case rsx::overlays::image_resource_id::raw_image: - src = find_temp_image(static_cast(command.config.external_data_ref), cmd, upload_heap, ui.uid); + src = find_temp_image(static_cast(command.config.external_data_ref), cmd, upload_heap, ui.uid); break; default: src = view_cache[command.config.texture_ref].get(); diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.h b/rpcs3/Emu/RSX/VK/VKOverlays.h index 2b11285653..7308a5c894 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.h +++ b/rpcs3/Emu/RSX/VK/VKOverlays.h @@ -154,6 +154,9 @@ namespace vk ui_overlay_renderer(); + void upload_simple_texture(vk::image* tex, vk::command_buffer& cmd, + vk::data_heap& upload_heap, u32 w, u32 h, u32 layers, bool font, const void* pixel_src); + vk::image_view* upload_simple_texture(vk::render_device& dev, vk::command_buffer& cmd, vk::data_heap& upload_heap, u64 key, u32 w, u32 h, u32 layers, bool font, bool temp, const void* pixel_src, u32 owner_uid); @@ -164,7 +167,7 @@ namespace vk void remove_temp_resources(u32 key); vk::image_view* find_font(rsx::overlays::font* font, vk::command_buffer& cmd, vk::data_heap& upload_heap); - vk::image_view* find_temp_image(rsx::overlays::image_info* desc, vk::command_buffer& cmd, vk::data_heap& upload_heap, u32 owner_uid); + vk::image_view* find_temp_image(rsx::overlays::image_info_base* desc, vk::command_buffer& cmd, vk::data_heap& upload_heap, u32 owner_uid); std::vector get_push_constants() override; diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 7a5234d01a..07414051ed 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -147,6 +147,7 @@ + @@ -682,6 +683,7 @@ + diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index 50e3e666a7..c0ef133d1a 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -1354,6 +1354,9 @@ Emu\GPU\RSX\Common + + Emu\GPU\RSX\Overlays + @@ -2719,6 +2722,9 @@ Utilities + + Emu\GPU\RSX\Overlays + From 40e8bc530cab6a06f807b50f5db4be601304e5f7 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 01:06:21 +0200 Subject: [PATCH 198/529] overlays: propagate item selection to children --- rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp b/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp index a0d7944036..093902dbe3 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp @@ -91,6 +91,15 @@ namespace rsx void list_view::update_selection() { const overlay_element* current_element = get_selected_entry(); + + for (auto& item : m_items) + { + if (item) + { + item->set_selected(item.get() == current_element); + } + } + if (!current_element) { return; // Ideally unreachable but it should still be possible to recover by user interaction. From e8166366763bd389030613d3befebf2fd93746aa Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 01:07:23 +0200 Subject: [PATCH 199/529] overlays: play ICON1.PAM in save data list if possible --- rpcs3/Emu/Cell/Modules/cellSaveData.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellSaveData.h | 2 +- .../Emu/RSX/Overlays/overlay_save_dialog.cpp | 37 ++++++++++--------- rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h | 11 +++--- rpcs3/rpcs3qt/save_data_dialog.cpp | 4 +- rpcs3/rpcs3qt/save_data_dialog.h | 2 +- rpcs3/rpcs3qt/save_manager_dialog.cpp | 2 +- rpcs3/rpcs3qt/save_manager_dialog.h | 2 +- 8 files changed, 33 insertions(+), 31 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp index 8afee44408..db57195a5c 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp @@ -307,7 +307,7 @@ static error_code select_and_delete(ppu_thread& ppu) // Display a blocking Save Data List asynchronously in the GUI thread. if (auto save_dialog = Emu.GetCallbacks().get_save_dialog()) { - selected = save_dialog->ShowSaveDataList(save_entries, focused, SAVEDATA_OP_LIST_DELETE, vm::null, g_fxo->get().enable_overlay); + selected = save_dialog->ShowSaveDataList(base_dir, save_entries, focused, SAVEDATA_OP_LIST_DELETE, vm::null, g_fxo->get().enable_overlay); } // Reschedule after a blocking dialog returns @@ -1183,7 +1183,7 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v // Display a blocking Save Data List asynchronously in the GUI thread. if (auto save_dialog = Emu.GetCallbacks().get_save_dialog()) { - selected = save_dialog->ShowSaveDataList(save_entries, focused, operation, listSet, g_fxo->get().enable_overlay); + selected = save_dialog->ShowSaveDataList(base_dir, save_entries, focused, operation, listSet, g_fxo->get().enable_overlay); } else { diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.h b/rpcs3/Emu/Cell/Modules/cellSaveData.h index 73b0af4f01..0632c2500b 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.h +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.h @@ -361,5 +361,5 @@ class SaveDialogBase public: virtual ~SaveDialogBase(); - virtual s32 ShowSaveDataList(std::vector& save_entries, s32 focused, u32 op, vm::ptr listSet, bool enable_overlay) = 0; + virtual s32 ShowSaveDataList(const std::string& base_dir, std::vector& save_entries, s32 focused, u32 op, vm::ptr listSet, bool enable_overlay) = 0; }; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp index 1754b3694c..86e9905f2f 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "overlay_save_dialog.h" +#include "overlay_video.h" #include "Utilities/date_time.h" #include "Emu/System.h" @@ -7,26 +8,18 @@ namespace rsx { namespace overlays { - save_dialog::save_dialog_entry::save_dialog_entry(const std::string& text1, const std::string& text2, const std::string& text3, u8 resource_id, const std::vector& icon_buf) + save_dialog::save_dialog_entry::save_dialog_entry(const std::string& text1, const std::string& text2, const std::string& text3, u8 resource_id, const std::vector& icon_buf, const std::string& video_path) { - std::unique_ptr image = std::make_unique(); + std::unique_ptr image = resource_id != image_resource_id::raw_image + ? std::make_unique(video_path, resource_id) + : !icon_buf.empty() ? std::make_unique(video_path, icon_buf) + : std::make_unique(video_path, resource_config::standard_image_resource::save); // Fallback image->set_size(160, 110); image->set_padding(36, 36, 11, 11); // Square image, 88x88 - if (resource_id != image_resource_id::raw_image) - { - static_cast(image.get())->set_image_resource(resource_id); - } - else if (!icon_buf.empty()) + if (resource_id == image_resource_id::raw_image && !icon_buf.empty()) { image->set_padding(0, 0, 11, 11); // Half sized icon, 320x176->160x88 - icon_data = std::make_unique(icon_buf); - static_cast(image.get())->set_raw_image(icon_data.get()); - } - else - { - // Fallback - static_cast(image.get())->set_image_resource(resource_config::standard_image_resource::save); } std::unique_ptr text_stack = std::make_unique(); @@ -74,10 +67,18 @@ namespace rsx // Pack this->pack_padding = 15; - add_element(image); + m_image = add_element(image); add_element(text_stack); } + void save_dialog::save_dialog_entry::set_selected(bool selected) + { + if (m_image) + { + static_cast(m_image)->set_active(selected); + } + } + save_dialog::save_dialog() { m_dim_background = std::make_unique(); @@ -197,7 +198,7 @@ namespace rsx return result; } - s32 save_dialog::show(std::vector& save_entries, u32 focused, u32 op, vm::ptr listSet, bool enable_overlay) + s32 save_dialog::show(const std::string& base_dir, std::vector& save_entries, u32 focused, u32 op, vm::ptr listSet, bool enable_overlay) { rsx_log.notice("Showing native UI save_dialog (save_entries=%d, focused=%d, op=0x%x, listSet=*0x%x, enable_overlay=%d)", save_entries.size(), focused, op, listSet, enable_overlay); @@ -218,7 +219,7 @@ namespace rsx { const std::string date_and_size = fmt::format("%s %s", entry.date(), entry.data_size()); std::unique_ptr e; - e = std::make_unique(entry.subtitle, date_and_size, entry.details, image_resource_id::raw_image, entry.iconBuf); + e = std::make_unique(entry.subtitle, date_and_size, entry.details, image_resource_id::raw_image, entry.iconBuf, base_dir + entry.dirName + "/ICON1.PAM"); entries.emplace_back(std::move(e)); } @@ -270,7 +271,7 @@ namespace rsx id = image_resource_id::raw_image; } - std::unique_ptr new_stub = std::make_unique(title, get_localized_string(localized_string_id::CELL_SAVEDATA_NEW_SAVED_DATA_SUB_TITLE), "", id, icon); + std::unique_ptr new_stub = std::make_unique(title, get_localized_string(localized_string_id::CELL_SAVEDATA_NEW_SAVED_DATA_SUB_TITLE), "", id, icon, ""); m_list->add_entry(new_stub); } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h index e33119cc72..0c65379153 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h @@ -13,11 +13,12 @@ namespace rsx private: struct save_dialog_entry : horizontal_layout { - private: - std::unique_ptr icon_data; - public: - save_dialog_entry(const std::string& text1, const std::string& text2, const std::string& text3, u8 resource_id, const std::vector& icon_buf); + save_dialog_entry(const std::string& text1, const std::string& text2, const std::string& text3, u8 resource_id, const std::vector& icon_buf, const std::string& video_path); + void set_selected(bool selected) override; + + private: + overlay_element* m_image = nullptr; }; std::unique_ptr m_dim_background; @@ -38,7 +39,7 @@ namespace rsx compiled_resource get_compiled() override; - s32 show(std::vector& save_entries, u32 focused, u32 op, vm::ptr listSet, bool enable_overlay); + s32 show(const std::string& base_dir, std::vector& save_entries, u32 focused, u32 op, vm::ptr listSet, bool enable_overlay); }; } } diff --git a/rpcs3/rpcs3qt/save_data_dialog.cpp b/rpcs3/rpcs3qt/save_data_dialog.cpp index 105fd7d27c..f98f615e54 100644 --- a/rpcs3/rpcs3qt/save_data_dialog.cpp +++ b/rpcs3/rpcs3qt/save_data_dialog.cpp @@ -12,7 +12,7 @@ LOG_CHANNEL(cellSaveData); -s32 save_data_dialog::ShowSaveDataList(std::vector& save_entries, s32 focused, u32 op, vm::ptr listSet, bool enable_overlay) +s32 save_data_dialog::ShowSaveDataList(const std::string& base_dir, std::vector& save_entries, s32 focused, u32 op, vm::ptr listSet, bool enable_overlay) { cellSaveData.notice("ShowSaveDataList(save_entries=%d, focused=%d, op=0x%x, listSet=*0x%x, enable_overlay=%d)", save_entries.size(), focused, op, listSet, enable_overlay); @@ -29,7 +29,7 @@ s32 save_data_dialog::ShowSaveDataList(std::vector& save_entries, { cellSaveData.notice("ShowSaveDataList: Showing native UI dialog"); - const s32 result = manager->create()->show(save_entries, focused, op, listSet, enable_overlay); + const s32 result = manager->create()->show(base_dir, save_entries, focused, op, listSet, enable_overlay); if (result != rsx::overlays::user_interface::selection_code::error) { cellSaveData.notice("ShowSaveDataList: Native UI dialog returned with selection %d", result); diff --git a/rpcs3/rpcs3qt/save_data_dialog.h b/rpcs3/rpcs3qt/save_data_dialog.h index b33b16b77f..e98ee8e4ac 100644 --- a/rpcs3/rpcs3qt/save_data_dialog.h +++ b/rpcs3/rpcs3qt/save_data_dialog.h @@ -6,5 +6,5 @@ class save_data_dialog : public SaveDialogBase { public: - s32 ShowSaveDataList(std::vector& save_entries, s32 focused, u32 op, vm::ptr listSet, bool enable_overlay) override; + s32 ShowSaveDataList(const std::string& base_dir, std::vector& save_entries, s32 focused, u32 op, vm::ptr listSet, bool enable_overlay) override; }; diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index d3cd03f4ec..ba52bed9ff 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -585,7 +585,7 @@ void save_manager_dialog::OnEntriesRemove() } // Pop-up a small context-menu, being a replacement for save_data_manage_dialog -void save_manager_dialog::ShowContextMenu(const QPoint &pos) +void save_manager_dialog::ShowContextMenu(const QPoint& pos) { const int idx = m_list->currentRow(); if (idx == -1) diff --git a/rpcs3/rpcs3qt/save_manager_dialog.h b/rpcs3/rpcs3qt/save_manager_dialog.h index e685b2b6d5..791ee9a814 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.h +++ b/rpcs3/rpcs3qt/save_manager_dialog.h @@ -42,7 +42,7 @@ private: void Init(); void UpdateList(); void UpdateIcons(); - void ShowContextMenu(const QPoint &pos); + void ShowContextMenu(const QPoint& pos); void WaitForRepaintThreads(bool abort); void closeEvent(QCloseEvent* event) override; From 5526c33d692697dcc70f9bb6b1f12c66948db631 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 31 Mar 2025 09:44:38 +0200 Subject: [PATCH 200/529] Review fixes + warning fixes --- rpcs3/Emu/Cell/Modules/cellAudio.h | 2 +- rpcs3/Emu/Cell/PPUThread.cpp | 8 ++++---- rpcs3/Emu/Cell/SPUThread.cpp | 4 ++-- rpcs3/Emu/RSX/Overlays/overlay_controls.h | 5 ++++- rpcs3/Emu/RSX/Overlays/overlay_video.h | 5 ++++- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 4 ---- rpcs3/Emu/RSX/VK/VKOverlays.cpp | 3 ++- rpcs3/rpcs3qt/qt_video_source.h | 2 +- rpcs3/util/types.hpp | 2 +- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.h b/rpcs3/Emu/Cell/Modules/cellAudio.h index 939b7f994c..a88ac6edad 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudio.h +++ b/rpcs3/Emu/Cell/Modules/cellAudio.h @@ -195,7 +195,7 @@ struct audio_port // Handle copy ctor of atomic var audio_port(const audio_port& r) { - std::memcpy(this, &r, sizeof(r)); + std::memcpy(static_cast(this), &r, sizeof(r)); } ENABLE_BITWISE_SERIALIZATION; diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index bdd6eeae84..47a4784104 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -4956,9 +4956,9 @@ bool ppu_initialize(const ppu_module& info, bool check_only, u64 file_s return +code_ptr; } - constexpr auto abs_diff = [](u64 a, u64 b) { return a <= b ? b - a : a - b; }; + [[maybe_unused]] constexpr auto abs_diff = [](u64 a, u64 b) { return a <= b ? b - a : a - b; }; - auto write_le = [](u8*& code, auto value) + [[maybe_unused]] auto write_le = [](u8*& code, auto value) { write_to_ptr>>(code, value); code += sizeof(value); @@ -5823,7 +5823,7 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module& module min_addr = std::min(min_addr, mod_func.addr); // Translate - if (const auto func = translator.Translate(mod_func)) + if ([[maybe_unused]] const auto func = translator.Translate(mod_func)) { #ifdef ARCH_X64 // TODO // Run optimization passes @@ -5841,7 +5841,7 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module& module // Run this only in one module for all functions compiled if (module_part.jit_bounds) { - if (const auto func = translator.GetSymbolResolver(module_part)) + if ([[maybe_unused]] const auto func = translator.GetSymbolResolver(module_part)) { #ifdef ARCH_X64 // TODO // Run optimization passes diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 6a8c3aeceb..db53a22f61 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -1237,7 +1237,7 @@ void spu_thread::dump_regs(std::string& ret, std::any& /*custom_data*/) const if (const_value != r) { - // Expectation of pretictable code path has not been met (such as a branch directly to the instruction) + // Expectation of predictable code path has not been met (such as a branch directly to the instruction) is_const = false; } @@ -1447,7 +1447,7 @@ std::vector> spu_thread::dump_callstack_list() const if (v != v128::from32r(addr)) { // 1) Non-zero lower words are invalid (because BRSL-like instructions generate only zeroes) - // 2) Bits normally masked out by indirect braches are considered invalid + // 2) Bits normally masked out by indirect branches are considered invalid return true; } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index b6dd2b84da..f39a25f2a4 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -36,6 +36,8 @@ namespace rsx int bpp = 0; bool dirty = false; + image_info_base() {} + virtual ~image_info_base() {} virtual const u8* get_data() const = 0; }; @@ -46,10 +48,11 @@ namespace rsx std::vector data_grey; public: + using image_info_base::image_info_base; image_info(image_info&) = delete; image_info(const std::string& filename, bool grayscaled = false); image_info(const std::vector& bytes, bool grayscaled = false); - ~image_info(); + virtual ~image_info(); void load_data(const std::vector& bytes, bool grayscaled = false); const u8* get_data() const override { return channels == 4 ? data : data_grey.empty() ? nullptr : data_grey.data(); } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_video.h b/rpcs3/Emu/RSX/Overlays/overlay_video.h index bdff580f0e..92297dee42 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_video.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_video.h @@ -9,8 +9,11 @@ namespace rsx { struct video_info : public image_info_base { - std::vector data; + using image_info_base::image_info_base; + virtual ~video_info() {} const u8* get_data() const override { return data.empty() ? nullptr : data.data(); } + + std::vector data; }; class video_view final : public image_view diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index 9d70212c2a..4baf47ac4d 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -23,10 +23,6 @@ #endif #endif -#ifdef ARCH_ARM64 -#define AVX512_ICL_FUNC -#endif - #ifdef _MSC_VER #define AVX512_ICL_FUNC #else diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.cpp b/rpcs3/Emu/RSX/VK/VKOverlays.cpp index f195ee6c15..f4e7d092f9 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.cpp +++ b/rpcs3/Emu/RSX/VK/VKOverlays.cpp @@ -402,7 +402,8 @@ namespace vk upload_heap.unmap(); const VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, layers }; - VkBufferImageCopy region { + VkBufferImageCopy region + { .bufferOffset = offset, .bufferRowLength = w, .bufferImageHeight = h, diff --git a/rpcs3/rpcs3qt/qt_video_source.h b/rpcs3/rpcs3qt/qt_video_source.h index aa6e61af94..27f716f0d4 100644 --- a/rpcs3/rpcs3qt/qt_video_source.h +++ b/rpcs3/rpcs3qt/qt_video_source.h @@ -23,7 +23,7 @@ public: void get_image(std::vector& data, int& w, int& h, int& ch, int& bpp) override; bool has_new() const override { return m_has_new; } - virtual void set_active(bool active); + void set_active(bool active) override; bool get_active() const override { return m_active; } void start_movie(); diff --git a/rpcs3/util/types.hpp b/rpcs3/util/types.hpp index 0bbf45074c..6979d9a887 100644 --- a/rpcs3/util/types.hpp +++ b/rpcs3/util/types.hpp @@ -1192,7 +1192,7 @@ constexpr void write_to_ptr(U&& array, usz pos, const T& value) { static_assert(sizeof(T) % sizeof(array[0]) == 0); if (!std::is_constant_evaluated()) - std::memcpy(&array[pos], &value, sizeof(value)); + std::memcpy(static_cast(&array[pos]), &value, sizeof(value)); else ensure(!"Unimplemented"); } From 89ae495c364a9b5ac61a25bf6555fa72c3a5034a Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Mon, 31 Mar 2025 20:03:28 -0700 Subject: [PATCH 201/529] Update docker cmake to 3.28 and update minimum to 3.28, as well as remove uneeded minimum --- .github/workflows/rpcs3.yml | 6 +++--- 3rdparty/MoltenVK/CMakeLists.txt | 1 - 3rdparty/discord-rpc/discord-rpc | 2 +- 3rdparty/libusb/CMakeLists.txt | 2 -- CMakeLists.txt | 2 +- azure-pipelines.yml | 4 ++-- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index d468496f76..e27952bea3 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -25,17 +25,17 @@ jobs: matrix: include: - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.3" + docker_img: "rpcs3/rpcs3-ci-jammy:1.4" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: clang UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.3" + docker_img: "rpcs3/rpcs3-ci-jammy:1.4" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: gcc - os: ubuntu-24.04-arm - docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.3" + docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.4" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" compiler: clang UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 diff --git a/3rdparty/MoltenVK/CMakeLists.txt b/3rdparty/MoltenVK/CMakeLists.txt index fc1b93074c..59959eecd5 100644 --- a/3rdparty/MoltenVK/CMakeLists.txt +++ b/3rdparty/MoltenVK/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 2.8.12) project(moltenvk NONE) include(ExternalProject) diff --git a/3rdparty/discord-rpc/discord-rpc b/3rdparty/discord-rpc/discord-rpc index 171b2142ac..3dc2c326cb 160000 --- a/3rdparty/discord-rpc/discord-rpc +++ b/3rdparty/discord-rpc/discord-rpc @@ -1 +1 @@ -Subproject commit 171b2142ac8acdf016c231e36dc7a8d48daff19c +Subproject commit 3dc2c326cb4dc5815c6069970c13154898f58d48 diff --git a/3rdparty/libusb/CMakeLists.txt b/3rdparty/libusb/CMakeLists.txt index 7d65aab0ad..0fc66f2429 100644 --- a/3rdparty/libusb/CMakeLists.txt +++ b/3rdparty/libusb/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.0) - project(libusb) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules") diff --git a/CMakeLists.txt b/CMakeLists.txt index 2208f2335e..40f48a6d5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16.9) +cmake_minimum_required(VERSION 3.28) project(rpcs3 LANGUAGES C CXX) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bc09a1524f..8e2ef1d8fb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,13 +40,13 @@ jobs: # displayName: ccache # - bash: | -# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.3 +# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.4 # docker run \ # -v $(pwd):/rpcs3 \ # --env-file .ci/docker.env \ # -v $CCACHE_DIR:/root/.ccache \ # -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -# rpcs3/rpcs3-ci-jammy:1.3 \ +# rpcs3/rpcs3-ci-jammy:1.4 \ # /rpcs3/.ci/build-linux.sh # displayName: Docker setup and build From c6170aa4c7330b22c1f1fda2736b6bbabadd13b2 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Mon, 31 Mar 2025 20:27:57 -0700 Subject: [PATCH 202/529] Update Windows ccache version --- .ci/setup-windows.sh | 2 +- .github/workflows/rpcs3.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh index f1073c9218..78ec4d2348 100755 --- a/.ci/setup-windows.sh +++ b/.ci/setup-windows.sh @@ -22,7 +22,7 @@ QT_SVG_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtsvg${QT_SUFFIX}" LLVMLIBS_URL="https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z" GLSLANG_URL='https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z' VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-${VULKAN_VER}-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1" -CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-windows-x86_64.zip" +CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.11.2/ccache-4.11.2-windows-x86_64.zip" DEP_URLS=" \ $QT_BASE_URL \ diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index e27952bea3..d28c13f6e2 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -111,7 +111,7 @@ jobs: LLVM_VER: '19.1.7' VULKAN_VER: '1.3.268.0' VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' - CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9' + CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c' CCACHE_BIN_DIR: 'C:\ccache_bin' CCACHE_DIR: 'C:\ccache' CCACHE_INODECACHE: 'true' From c86a25079518032d73395a79979970acb2581a91 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Mon, 31 Mar 2025 21:15:37 -0700 Subject: [PATCH 203/529] Fix mac build with cmake 4.0 --- .ci/build-mac-arm64.sh | 1 + .ci/build-mac.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index 74a2d39bb1..a9698a8880 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -145,6 +145,7 @@ export MACOSX_DEPLOYMENT_TARGET=14.0 -DCMAKE_SYSTEM_PROCESSOR=arm64 \ -DCMAKE_TOOLCHAIN_FILE=buildfiles/cmake/TCDarwinARM64.cmake \ -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -G Ninja "$BREW_PATH/bin/ninja"; build_status=$?; diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index b02417cbcb..287bd3949e 100644 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -108,6 +108,7 @@ export MACOSX_DEPLOYMENT_TARGET=14.0 -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \ -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -G Ninja "$BREW_PATH/bin/ninja"; build_status=$?; From 73f2aaf9d8ca10e97f5f730c03c1db1cd3d83767 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 1 Apr 2025 13:16:59 +0200 Subject: [PATCH 204/529] Windows: fix updating with unicode user name --- rpcs3/rpcs3qt/update_manager.cpp | 40 ++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp index d4cb457cf1..8b07693e34 100644 --- a/rpcs3/rpcs3qt/update_manager.cpp +++ b/rpcs3/rpcs3qt/update_manager.cpp @@ -504,11 +504,29 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept) ISzAlloc allocImp = g_Alloc; ISzAlloc allocTempImp = g_Alloc; - if (const WRes res = InFile_Open(&archiveStream.file, tmpfile_path.c_str())) + const auto WRes_to_string = [](WRes res) { - update_log.error("Failed to open temporary storage file: '%s' (error=%d)", tmpfile_path, static_cast(res)); +#ifdef _WIN32 + return fmt::format("0x%x='%s'", res, std::system_category().message(HRESULT_FROM_WIN32(res))); +#else + return fmt::format("0x%x='%s'", res, strerror(res)); +#endif + }; + +#ifdef _WIN32 + const std::wstring tmpfile_path_w = utf8_to_wchar(tmpfile_path); + if (const WRes res = InFile_OpenW(&archiveStream.file, tmpfile_path_w.c_str())) + { + update_log.error("Failed to open temporary storage file: '%s' (error=%s)", tmpfile_path_w.c_str(), WRes_to_string(res)); return false; } +#else + if (const WRes res = InFile_Open(&archiveStream.file, tmpfile_path.c_str())) + { + update_log.error("Failed to open temporary storage file: '%s' (error=%s)", tmpfile_path, WRes_to_string(res)); + return false; + } +#endif FileInStream_CreateVTable(&archiveStream); LookToRead2_CreateVTable(&lookStream, False); @@ -529,22 +547,14 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept) CrcGenerateTable(); SzArEx_Init(&db); - auto error_free7z = [&]() + const auto error_free7z = [&]() { SzArEx_Free(&db, &allocImp); ISzAlloc_Free(&allocImp, lookStream.buf); const WRes res2 = File_Close(&archiveStream.file); - if (res2) update_log.warning("7z failed to close file (error=%d)", static_cast(res2)); - - switch (res) - { - case SZ_OK: break; - case SZ_ERROR_UNSUPPORTED: update_log.error("7z decoder doesn't support this archive"); break; - case SZ_ERROR_MEM: update_log.error("7z decoder failed to allocate memory"); break; - case SZ_ERROR_CRC: update_log.error("7z decoder CRC error"); break; - default: update_log.error("7z decoder error: %d", static_cast(res)); break; - } + if (res2) update_log.warning("7z failed to close file (error=%s)", WRes_to_string(res2)); + if (res) update_log.error("7z decoder error: %s", WRes_to_string(res)); }; if (res != SZ_OK) @@ -588,7 +598,7 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept) const DWORD permissions = (attribs >> 16) & (S_IRWXU | S_IRWXG | S_IRWXO); const bool is_symlink = (attribs & FILE_ATTRIBUTE_UNIX_EXTENSION) != 0 && S_ISLNK(attribs >> 16); #endif - const usz len = SzArEx_GetFileNameUtf16(&db, i, nullptr); + const usz len = SzArEx_GetFileNameUtf16(&db, i, nullptr); if (len >= PATH_MAX) { @@ -598,7 +608,7 @@ bool update_manager::handle_rpcs3(const QByteArray& data, bool auto_accept) } SzArEx_GetFileNameUtf16(&db, i, temp_u16); - memset(temp_u8, 0, sizeof(temp_u8)); + std::memset(temp_u8, 0, sizeof(temp_u8)); // Simplistic conversion to UTF-8 for (usz index = 0; index < len; index++) { From 847f92956faa47fa9f7400bee8ef59864e62c615 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 2 Apr 2025 10:16:07 +0200 Subject: [PATCH 205/529] Qt: remove discontinued QWinTaskbar code Also remove some strange relics from the includes --- rpcs3/rpcs3.vcxproj | 450 +++++++++++++-------------- rpcs3/rpcs3qt/gs_frame.cpp | 3 - rpcs3/rpcs3qt/main_window.cpp | 98 +----- rpcs3/rpcs3qt/main_window.h | 16 - rpcs3/rpcs3qt/msg_dialog_frame.cpp | 3 - rpcs3/rpcs3qt/progress_dialog.cpp | 31 -- rpcs3/rpcs3qt/progress_dialog.h | 4 - rpcs3/rpcs3qt/progress_indicator.cpp | 57 +--- rpcs3/rpcs3qt/progress_indicator.h | 14 - 9 files changed, 230 insertions(+), 446 deletions(-) diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 60c49a60d7..b8f0a02209 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -79,7 +79,7 @@ 4577;4467;4281;%(DisableSpecificWarnings) $(IntDir) MaxSpeed - _WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;HAVE_SDL3;WITH_DISCORD_RPC;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;HAVE_SDL3;WITH_DISCORD_RPC;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;NDEBUG;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions) false $(IntDir)vc$(PlatformToolsetVersion).pdb true @@ -132,7 +132,7 @@ 4577;4467;4281;%(DisableSpecificWarnings) $(IntDir) Disabled - _WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_WINEXTRAS_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;WIN32;WIN64;WIN32_LEAN_AND_MEAN;HAVE_VULKAN;HAVE_OPENCV;CV_IGNORE_DEBUG_BUILD_GUARD;MINIUPNP_STATICLIB;ZLIB_CONST;AL_LIBTYPE_STATIC;WOLFSSL_USER_SETTINGS;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_CONCURRENT_LIB;QT_MULTIMEDIA_LIB;QT_MULTIMEDIAWIDGETS_LIB;QT_SVG_LIB;%(PreprocessorDefinitions) false true true @@ -882,12 +882,12 @@ Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) @@ -903,102 +903,102 @@ Moc%27ing gs_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing gs_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing log_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing log_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing main_window.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing main_window.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing pad_settings_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing pad_settings_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing settings_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing settings_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing auto_pause_settings_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing auto_pause_settings_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing debugger_add_bp_window.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing debugger_add_bp_window.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing debugger_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing debugger_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing game_list_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing game_list_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1013,52 +1013,52 @@ Moc%27ing cg_disasm_window.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing cg_disasm_window.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing gui_settings.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing gui_settings.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing kernel_explorer.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing kernel_explorer.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing emu_settings.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing emu_settings.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing game_list_grid.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing game_list_grid.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" @@ -1080,72 +1080,72 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing about_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing about_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" @@ -1153,11 +1153,11 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1165,89 +1165,89 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1255,80 +1255,80 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\rtmidi\rtmidi" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1336,10 +1336,10 @@ Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1361,32 +1361,32 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1394,51 +1394,51 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1446,10 +1446,10 @@ Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1457,31 +1457,31 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1490,31 +1490,31 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1522,61 +1522,61 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1584,39 +1584,39 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1624,52 +1624,52 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" @@ -1678,94 +1678,94 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing game_compatibility.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing game_compatibility.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing syntax_highlighter.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing syntax_highlighter.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing msg_dialog_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing msg_dialog_frame.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing rsx_debugger.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing rsx_debugger.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing save_data_list_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing save_data_list_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1774,39 +1774,39 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing register_editor_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing register_editor_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing save_data_info_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" - $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing save_data_info_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing save_manager_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing save_manager_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1814,10 +1814,10 @@ Moc%27ing welcome_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" Moc%27ing welcome_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) @@ -1825,51 +1825,51 @@ $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing vfs_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing vfs_dialog.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing vfs_dialog_tab.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing vfs_dialog_tab.h... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... .\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index 46469db968..8cd2a2bc9b 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -661,9 +661,6 @@ void gs_frame::show() } } }); - - // if we do this before show, the QWinTaskbarProgress won't show - m_progress_indicator->show(this); } display_handle_t gs_frame::handle() const diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 5e3d973ce8..c72d7f4c62 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -226,49 +226,6 @@ bool main_window::Init([[maybe_unused]] bool with_cli_boot) ui->sysPauseAct->setEnabled(enable_play_last); ui->toolbar_start->setEnabled(enable_play_last); - // create tool buttons for the taskbar thumbnail -#ifdef HAS_QT_WIN_STUFF - m_thumb_bar = new QWinThumbnailToolBar(this); - m_thumb_bar->setWindow(windowHandle()); - - m_thumb_playPause = new QWinThumbnailToolButton(m_thumb_bar); - m_thumb_playPause->setToolTip(start_tooltip); - m_thumb_playPause->setIcon(m_icon_thumb_play); - m_thumb_playPause->setEnabled(enable_play_last); - - m_thumb_stop = new QWinThumbnailToolButton(m_thumb_bar); - m_thumb_stop->setToolTip(tr("Stop")); - m_thumb_stop->setIcon(m_icon_thumb_stop); - m_thumb_stop->setEnabled(false); - - m_thumb_restart = new QWinThumbnailToolButton(m_thumb_bar); - m_thumb_restart->setToolTip(tr("Restart")); - m_thumb_restart->setIcon(m_icon_thumb_restart); - m_thumb_restart->setEnabled(false); - - m_thumb_bar->addButton(m_thumb_playPause); - m_thumb_bar->addButton(m_thumb_stop); - m_thumb_bar->addButton(m_thumb_restart); - - RepaintThumbnailIcons(); - - connect(m_thumb_stop, &QWinThumbnailToolButton::clicked, this, []() - { - gui_log.notice("User clicked the stop button on thumbnail toolbar"); - Emu.GracefulShutdown(false, true); - }); - connect(m_thumb_restart, &QWinThumbnailToolButton::clicked, this, []() - { - gui_log.notice("User clicked the restart button on thumbnail toolbar"); - Emu.Restart(); - }); - connect(m_thumb_playPause, &QWinThumbnailToolButton::clicked, this, [this]() - { - gui_log.notice("User clicked the playPause button on thumbnail toolbar"); - OnPlayOrPause(); - }); -#endif - // RPCS3 Updater QMenu* download_menu = new QMenu(tr("Update Available!")); @@ -1868,19 +1825,6 @@ void main_window::RepaintThumbnailIcons() { return gui::utils::get_colorized_icon(QPixmap::fromImage(gui::utils::get_opaque_image_area(path)), Qt::black, new_color); }; - -#ifdef HAS_QT_WIN_STUFF - if (!m_thumb_bar) return; - - m_icon_thumb_play = icon(":/Icons/play.png"); - m_icon_thumb_pause = icon(":/Icons/pause.png"); - m_icon_thumb_stop = icon(":/Icons/stop.png"); - m_icon_thumb_restart = icon(":/Icons/restart.png"); - - m_thumb_playPause->setIcon(Emu.IsRunning() || Emu.IsStarting() ? m_icon_thumb_pause : m_icon_thumb_play); - m_thumb_stop->setIcon(m_icon_thumb_stop); - m_thumb_restart->setIcon(m_icon_thumb_restart); -#endif } void main_window::RepaintToolBarIcons() @@ -1971,12 +1915,6 @@ void main_window::OnEmuRun(bool /*start_playtime*/) m_debugger_frame->EnableButtons(true); -#ifdef HAS_QT_WIN_STUFF - m_thumb_stop->setToolTip(stop_tooltip); - m_thumb_restart->setToolTip(restart_tooltip); - m_thumb_playPause->setToolTip(pause_tooltip); - m_thumb_playPause->setIcon(m_icon_thumb_pause); -#endif ui->sysPauseAct->setText(tr("&Pause")); ui->sysPauseAct->setIcon(m_icon_pause); ui->toolbar_start->setIcon(m_icon_pause); @@ -1996,12 +1934,6 @@ void main_window::OnEmuResume() const const QString pause_tooltip = tr("Pause %0").arg(title); const QString stop_tooltip = tr("Stop %0").arg(title); -#ifdef HAS_QT_WIN_STUFF - m_thumb_stop->setToolTip(stop_tooltip); - m_thumb_restart->setToolTip(restart_tooltip); - m_thumb_playPause->setToolTip(pause_tooltip); - m_thumb_playPause->setIcon(m_icon_thumb_pause); -#endif ui->sysPauseAct->setText(tr("&Pause")); ui->sysPauseAct->setIcon(m_icon_pause); ui->toolbar_start->setIcon(m_icon_pause); @@ -2015,10 +1947,6 @@ void main_window::OnEmuPause() const const QString title = GetCurrentTitle(); const QString resume_tooltip = tr("Resume %0").arg(title); -#ifdef HAS_QT_WIN_STUFF - m_thumb_playPause->setToolTip(resume_tooltip); - m_thumb_playPause->setIcon(m_icon_thumb_play); -#endif ui->sysPauseAct->setText(tr("&Resume")); ui->sysPauseAct->setIcon(m_icon_play); ui->toolbar_start->setIcon(m_icon_play); @@ -2039,10 +1967,6 @@ void main_window::OnEmuStop() ui->sysPauseAct->setText(tr("&Play")); ui->sysPauseAct->setIcon(m_icon_play); -#ifdef HAS_QT_WIN_STUFF - m_thumb_playPause->setToolTip(play_tooltip); - m_thumb_playPause->setIcon(m_icon_thumb_play); -#endif EnableMenus(false); @@ -2061,10 +1985,6 @@ void main_window::OnEmuStop() ui->toolbar_start->setText(tr("Restart")); ui->toolbar_start->setToolTip(restart_tooltip); ui->sysRebootAct->setEnabled(true); -#ifdef HAS_QT_WIN_STUFF - m_thumb_restart->setToolTip(restart_tooltip); - m_thumb_restart->setEnabled(true); -#endif } ui->batchRemoveShaderCachesAct->setEnabled(true); @@ -2106,10 +2026,7 @@ void main_window::OnEmuReady() const const QString play_tooltip = tr("Play %0").arg(title); m_debugger_frame->EnableButtons(true); -#ifdef HAS_QT_WIN_STUFF - m_thumb_playPause->setToolTip(play_tooltip); - m_thumb_playPause->setIcon(m_icon_thumb_play); -#endif + ui->sysPauseAct->setText(tr("&Play")); ui->sysPauseAct->setIcon(m_icon_play); ui->toolbar_start->setIcon(m_icon_play); @@ -2133,13 +2050,6 @@ void main_window::OnEmuReady() const void main_window::EnableMenus(bool enabled) const { - // Thumbnail Buttons -#ifdef HAS_QT_WIN_STUFF - m_thumb_playPause->setEnabled(enabled); - m_thumb_stop->setEnabled(enabled); - m_thumb_restart->setEnabled(enabled); -#endif - // Toolbar ui->toolbar_start->setEnabled(enabled); ui->toolbar_stop->setEnabled(enabled); @@ -3588,16 +3498,10 @@ void main_window::CreateDockWindows() ui->toolbar_start->setEnabled(enable_play_buttons); ui->sysPauseAct->setEnabled(enable_play_buttons); -#ifdef HAS_QT_WIN_STUFF - m_thumb_playPause->setEnabled(enable_play_buttons); -#endif if (!tooltip.isEmpty()) { ui->toolbar_start->setToolTip(tooltip); -#ifdef HAS_QT_WIN_STUFF - m_thumb_playPause->setToolTip(tooltip); -#endif } } diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h index 4cd7bc8498..c712d01fd3 100644 --- a/rpcs3/rpcs3qt/main_window.h +++ b/rpcs3/rpcs3qt/main_window.h @@ -1,10 +1,5 @@ #pragma once -#ifdef HAS_QT_WIN_STUFF -#include -#include -#endif - #include #include #include @@ -61,17 +56,6 @@ class main_window : public QMainWindow QIcon m_icon_fullscreen_on; QIcon m_icon_fullscreen_off; -#ifdef HAS_QT_WIN_STUFF - QIcon m_icon_thumb_play; - QIcon m_icon_thumb_pause; - QIcon m_icon_thumb_stop; - QIcon m_icon_thumb_restart; - QWinThumbnailToolBar *m_thumb_bar = nullptr; - QWinThumbnailToolButton *m_thumb_playPause = nullptr; - QWinThumbnailToolButton *m_thumb_stop = nullptr; - QWinThumbnailToolButton *m_thumb_restart = nullptr; -#endif - enum class drop_type { drop_error, diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.cpp b/rpcs3/rpcs3qt/msg_dialog_frame.cpp index 32bb19c6f8..59c3bd3491 100644 --- a/rpcs3/rpcs3qt/msg_dialog_frame.cpp +++ b/rpcs3/rpcs3qt/msg_dialog_frame.cpp @@ -131,9 +131,6 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title) // Fix size m_dialog->layout()->setSizeConstraint(QLayout::SetFixedSize); m_dialog->show(); - - // if we do this before, the QWinTaskbarProgress won't show - if (m_progress_indicator) m_progress_indicator->show(m_dialog->windowHandle()); } void msg_dialog_frame::Close(bool success) diff --git a/rpcs3/rpcs3qt/progress_dialog.cpp b/rpcs3/rpcs3qt/progress_dialog.cpp index 9ad405c71f..b5b89dd3b9 100644 --- a/rpcs3/rpcs3qt/progress_dialog.cpp +++ b/rpcs3/rpcs3qt/progress_dialog.cpp @@ -51,34 +51,3 @@ void progress_dialog::SignalFailure() const QApplication::beep(); } - -void progress_dialog::show_progress_indicator() -{ - // Try to find a window handle first - QWindow* handle = windowHandle(); - - for (QWidget* ancestor = this; !handle && ancestor;) - { - ancestor = static_cast(ancestor->parent()); - if (ancestor) handle = ancestor->windowHandle(); - } - - m_progress_indicator->show(handle); -} - -void progress_dialog::setVisible(bool visible) -{ - if (visible) - { - if (!isVisible()) - { - show_progress_indicator(); - } - } - else if (isVisible()) - { - m_progress_indicator->hide(); - } - - QProgressDialog::setVisible(visible); -} diff --git a/rpcs3/rpcs3qt/progress_dialog.h b/rpcs3/rpcs3qt/progress_dialog.h index a27c31784e..930ce2cb07 100644 --- a/rpcs3/rpcs3qt/progress_dialog.h +++ b/rpcs3/rpcs3qt/progress_dialog.h @@ -14,10 +14,6 @@ public: void SetDeleteOnClose(); void SignalFailure() const; - void show_progress_indicator(); - - void setVisible(bool visible) override; - private: std::unique_ptr m_progress_indicator; }; diff --git a/rpcs3/rpcs3qt/progress_indicator.cpp b/rpcs3/rpcs3qt/progress_indicator.cpp index 0baa65e725..148b304ad9 100644 --- a/rpcs3/rpcs3qt/progress_indicator.cpp +++ b/rpcs3/rpcs3qt/progress_indicator.cpp @@ -1,106 +1,57 @@ +#include "stdafx.h" #include "progress_indicator.h" -#ifdef HAS_QT_WIN_STUFF -#include -#include -#elif HAVE_QTDBUS +#if HAVE_QTDBUS #include #include #endif progress_indicator::progress_indicator(int minimum, int maximum) { -#ifdef HAS_QT_WIN_STUFF - m_tb_button = std::make_unique(); - m_tb_button->progress()->setRange(minimum, maximum); - m_tb_button->progress()->setVisible(false); -#else m_minimum = minimum; m_maximum = maximum; #if HAVE_QTDBUS update_progress(0, true, false); #endif -#endif } progress_indicator::~progress_indicator() { -#ifdef HAS_QT_WIN_STUFF - // QWinTaskbarProgress::hide() will crash if the application is already about to close, even if the object is not null. - if (!QCoreApplication::closingDown()) - { - m_tb_button->progress()->hide(); - } -#elif HAVE_QTDBUS +#if HAVE_QTDBUS update_progress(0, false, false); #endif } -void progress_indicator::show(QWindow* window) -{ -#ifdef HAS_QT_WIN_STUFF - m_tb_button->setWindow(window); - m_tb_button->progress()->show(); -#else - Q_UNUSED(window); -#endif -} - -void progress_indicator::hide() -{ -#ifdef HAS_QT_WIN_STUFF - m_tb_button->progress()->hide(); -#endif -} - int progress_indicator::value() const { -#ifdef HAS_QT_WIN_STUFF - return m_tb_button->progress()->value(); -#else return m_value; -#endif } void progress_indicator::set_value(int value) { -#ifdef HAS_QT_WIN_STUFF - m_tb_button->progress()->setValue(std::clamp(value, m_tb_button->progress()->minimum(), m_tb_button->progress()->maximum())); -#else m_value = std::clamp(value, m_minimum, m_maximum); #if HAVE_QTDBUS update_progress(m_value, true, false); #endif -#endif } void progress_indicator::set_range(int minimum, int maximum) { -#ifdef HAS_QT_WIN_STUFF - m_tb_button->progress()->setRange(minimum, maximum); -#else m_minimum = minimum; m_maximum = maximum; -#endif } void progress_indicator::reset() { -#ifdef HAS_QT_WIN_STUFF - m_tb_button->progress()->reset(); -#else m_value = m_minimum; #if HAVE_QTDBUS update_progress(m_value, false, false); #endif -#endif } void progress_indicator::signal_failure() { -#ifdef HAS_QT_WIN_STUFF - m_tb_button->progress()->stop(); -#elif HAVE_QTDBUS +#if HAVE_QTDBUS update_progress(0, false, true); #endif } diff --git a/rpcs3/rpcs3qt/progress_indicator.h b/rpcs3/rpcs3qt/progress_indicator.h index eff8dd1a68..224388801f 100644 --- a/rpcs3/rpcs3qt/progress_indicator.h +++ b/rpcs3/rpcs3qt/progress_indicator.h @@ -1,20 +1,11 @@ #pragma once -#include - -#ifdef HAS_QT_WIN_STUFF -#include -#endif - class progress_indicator { public: progress_indicator(int minimum, int maximum); ~progress_indicator(); - void show(QWindow* window); - void hide(); - int value() const; void set_value(int value); @@ -23,15 +14,10 @@ public: void signal_failure(); private: - -#ifdef HAS_QT_WIN_STUFF - std::unique_ptr m_tb_button; -#else int m_value = 0; int m_minimum = 0; int m_maximum = 100; #if HAVE_QTDBUS void update_progress(int progress, bool progress_visible, bool urgent); #endif -#endif }; From 733ceada5e455816e9a8b5f7d75574790e974c81 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 2 Apr 2025 19:53:50 +0200 Subject: [PATCH 206/529] Update SDL to 3.2.10 --- 3rdparty/libsdl-org/SDL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libsdl-org/SDL b/3rdparty/libsdl-org/SDL index f6864924f7..877399b2b2 160000 --- a/3rdparty/libsdl-org/SDL +++ b/3rdparty/libsdl-org/SDL @@ -1 +1 @@ -Subproject commit f6864924f76e1a0b4abaefc76ae2ed22b1a8916e +Subproject commit 877399b2b2cf21e67554ed9046410f268ce1d1b2 From 37dbd77628f44cdef3228bdfc03127365ec7383b Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 2 Apr 2025 19:56:41 +0200 Subject: [PATCH 207/529] Update FAudio to 25.04 --- 3rdparty/FAudio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/FAudio b/3rdparty/FAudio index 486e33eef3..091c6b4693 160000 --- a/3rdparty/FAudio +++ b/3rdparty/FAudio @@ -1 +1 @@ -Subproject commit 486e33eef3f282e4ce3d29f32ded3e67bacdbe5c +Subproject commit 091c6b4693ce507ac48037836a5a884e35cd2860 From 2ac2439c3355822bdea37e665998f6f2d8772f4f Mon Sep 17 00:00:00 2001 From: nastys Date: Thu, 3 Apr 2025 20:10:55 +0200 Subject: [PATCH 208/529] Fix macOS SDK path --- .ci/build-mac-arm64.sh | 1 + .ci/build-mac.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index a9698a8880..4db1e27e80 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -146,6 +146,7 @@ export MACOSX_DEPLOYMENT_TARGET=14.0 -DCMAKE_TOOLCHAIN_FILE=buildfiles/cmake/TCDarwinARM64.cmake \ -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \ -G Ninja "$BREW_PATH/bin/ninja"; build_status=$?; diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 287bd3949e..64583f31d2 100644 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -109,6 +109,7 @@ export MACOSX_DEPLOYMENT_TARGET=14.0 -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \ -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \ -G Ninja "$BREW_PATH/bin/ninja"; build_status=$?; From 822546bf7dcccf76dae21e3c41d1e92b8fb3f80c Mon Sep 17 00:00:00 2001 From: Ani Date: Fri, 4 Apr 2025 21:43:46 +0200 Subject: [PATCH 209/529] Discord: Use vanity URL --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE/1-regression-report.yml | 2 +- .github/ISSUE_TEMPLATE/2-bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/3-feature-request.yml | 2 +- .github/ISSUE_TEMPLATE/4-advanced.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- README.md | 2 +- rpcs3/rpcs3qt/about_dialog.cpp | 2 +- rpcs3/rpcs3qt/welcome_dialog.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a0453b46bc..d719944078 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,4 +16,4 @@ Submitting your test results for Commercial Games must be done on our forums. Pl # Contributing -Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.me/RPCS3) in the **#development** channel. +Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.gg/rpcs3) in the **#development** channel. diff --git a/.github/ISSUE_TEMPLATE/1-regression-report.yml b/.github/ISSUE_TEMPLATE/1-regression-report.yml index 865f96e92b..6ba8ac53a9 100644 --- a/.github/ISSUE_TEMPLATE/1-regression-report.yml +++ b/.github/ISSUE_TEMPLATE/1-regression-report.yml @@ -7,7 +7,7 @@ body: attributes: value: | # Summary - Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead. + Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead. - type: textarea id: quick-summary attributes: diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.yml b/.github/ISSUE_TEMPLATE/2-bug-report.yml index 00df05c66b..7c99d22f0f 100644 --- a/.github/ISSUE_TEMPLATE/2-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/2-bug-report.yml @@ -7,7 +7,7 @@ body: attributes: value: | # Summary - Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead. + Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead. - type: textarea id: quick-summary attributes: diff --git a/.github/ISSUE_TEMPLATE/3-feature-request.yml b/.github/ISSUE_TEMPLATE/3-feature-request.yml index 49a44b923c..bc164c8a6c 100644 --- a/.github/ISSUE_TEMPLATE/3-feature-request.yml +++ b/.github/ISSUE_TEMPLATE/3-feature-request.yml @@ -6,7 +6,7 @@ body: - type: markdown attributes: value: | - Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead. + Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead. - type: textarea id: quick-summary attributes: diff --git a/.github/ISSUE_TEMPLATE/4-advanced.md b/.github/ISSUE_TEMPLATE/4-advanced.md index f0ab236298..78a9d96178 100644 --- a/.github/ISSUE_TEMPLATE/4-advanced.md +++ b/.github/ISSUE_TEMPLATE/4-advanced.md @@ -7,7 +7,7 @@ assignees: '' --- -## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead. +## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead. You're using the advanced template. You're expected to know what to write in order to fill in all the required information for proper report. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 137afb75a2..1dd094e1dc 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,7 +4,7 @@ contact_links: url: https://rpcs3.net/quickstart about: Everything you need to know to install and configure emulator, and add games - name: Ask for help - url: https://discord.me/RPCS3 + url: https://discord.gg/rpcs3 about: If you have some questions or need help, please use our Discord server instead of GitHub - name: Report game compatibility url: https://forums.rpcs3.net/thread-196671.html diff --git a/README.md b/README.md index c6008a9384..d4af717924 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ RPCS3 [![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=8&_a=summary&repositoryFilter=4) [![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3/master?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3) [![GitHub Actions](https://img.shields.io/github/actions/workflow/status/RPCS3/rpcs3/rpcs3.yml?branch=master&logo=github&label=Actions)](https://github.com/RPCS3/rpcs3/actions/workflows/rpcs3.yml) -[![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.me/rpcs3) +[![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.gg/rpcs3) The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD. diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3qt/about_dialog.cpp index 095c65dc8d..95e1388ce9 100644 --- a/rpcs3/rpcs3qt/about_dialog.cpp +++ b/rpcs3/rpcs3qt/about_dialog.cpp @@ -28,7 +28,7 @@ about_dialog::about_dialog(QWidget* parent) : QDialog(parent), ui(new Ui::about_ connect(ui->website, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://rpcs3.net")); }); connect(ui->forum, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://forums.rpcs3.net")); }); connect(ui->patreon, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://rpcs3.net/patreon")); }); - connect(ui->discord, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://discord.me/RPCS3")); }); + connect(ui->discord, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://discord.gg/rpcs3")); }); connect(ui->wiki, &QPushButton::clicked, [] { QDesktopServices::openUrl(QUrl("https://wiki.rpcs3.net/index.php?title=Main_Page")); }); connect(ui->close, &QPushButton::clicked, this, &QWidget::close); } diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3qt/welcome_dialog.cpp index c3d344a650..cbe2433bfd 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.cpp +++ b/rpcs3/rpcs3qt/welcome_dialog.cpp @@ -40,7 +40,7 @@ welcome_dialog::welcome_dialog(std::shared_ptr gui_settings, bool .arg(gui::utils::make_link(tr("Quickstart"), "https://rpcs3.net/quickstart")) .arg(gui::utils::make_link(tr("FAQ"), "https://rpcs3.net/faq")) .arg(gui::utils::make_link(tr("Forums"), "https://forums.rpcs3.net")) - .arg(gui::utils::make_link(tr("Discord"), "https://discord.me/RPCS3")))); + .arg(gui::utils::make_link(tr("Discord"), "https://discord.gg/rpcs3")))); #ifdef __APPLE__ ui->create_applications_menu_shortcut->setText(tr("&Create Launchpad shortcut")); From 264af550d5b16ca9a1fd5732751f57e0c5a6981b Mon Sep 17 00:00:00 2001 From: Ani Date: Fri, 4 Apr 2025 21:46:14 +0200 Subject: [PATCH 210/529] .github: Update log path in issue templates --- .github/ISSUE_TEMPLATE/1-regression-report.yml | 2 +- .github/ISSUE_TEMPLATE/2-bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/3-feature-request.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1-regression-report.yml b/.github/ISSUE_TEMPLATE/1-regression-report.yml index 6ba8ac53a9..7c8659b62e 100644 --- a/.github/ISSUE_TEMPLATE/1-regression-report.yml +++ b/.github/ISSUE_TEMPLATE/1-regression-report.yml @@ -50,7 +50,7 @@ body: * Completely close RPCS3 and locate the log file. RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon). - * On Windows it will be in the RPCS3 directory near the executable + * On Windows it will be in the ```log``` folder inside your RPCS3 folder. * On Linux it will be in ```~/.cache/rpcs3/``` * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter. - type: textarea diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.yml b/.github/ISSUE_TEMPLATE/2-bug-report.yml index 7c99d22f0f..4a82a03008 100644 --- a/.github/ISSUE_TEMPLATE/2-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/2-bug-report.yml @@ -36,7 +36,7 @@ body: * Completely close RPCS3 and locate the log file. RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon). - * On Windows it will be in the RPCS3 directory near the executable + * On Windows it will be in the ```log``` folder inside your RPCS3 folder. * On Linux it will be in ```~/.cache/rpcs3/``` * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter. - type: textarea diff --git a/.github/ISSUE_TEMPLATE/3-feature-request.yml b/.github/ISSUE_TEMPLATE/3-feature-request.yml index bc164c8a6c..153c44c41c 100644 --- a/.github/ISSUE_TEMPLATE/3-feature-request.yml +++ b/.github/ISSUE_TEMPLATE/3-feature-request.yml @@ -31,6 +31,6 @@ body: * If this feature is something that a game is trying to use, upload a log file for it. RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon). - * On Windows it will be in the RPCS3 directory near the executable + * On Windows it will be in the ```log``` folder inside your RPCS3 folder. * On Linux it will be in ```~/.cache/rpcs3/``` * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter. From 4aff4a9c827722c0bef80f0a7c8a4fb043499b95 Mon Sep 17 00:00:00 2001 From: Ani Date: Fri, 4 Apr 2025 21:48:19 +0200 Subject: [PATCH 211/529] README: Update VC_redist from 2019 to 2022 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4af717924..669a0879a1 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ See [BUILDING.md](BUILDING.md) for more information about how to setup an enviro Check our friendly [quickstart](https://rpcs3.net/quickstart) guide to make sure your computer meets the minimum system requirements to run RPCS3. -Don't forget to have your graphics driver up to date and to install the [Visual C++ Redistributable Packages for Visual Studio 2019](https://aka.ms/vs/16/release/VC_redist.x64.exe) if you are a Windows user. +Don't forget to have your graphics driver up to date and to install the [Visual C++ Redistributable Packages for Visual Studio 2022](https://aka.ms/vs/17/release/VC_redist.x64.exe) if you are a Windows user. ## License From 613212f9e15f59825f7b81abc33add7624adedd7 Mon Sep 17 00:00:00 2001 From: Ani Date: Fri, 4 Apr 2025 21:51:28 +0200 Subject: [PATCH 212/529] .github: Remove outdated pull request template --- .github/PR-BUILD.md | 18 ------------------ .github/PULL_REQUEST_TEMPLATE/1-default.md | 3 --- 2 files changed, 21 deletions(-) delete mode 100644 .github/PR-BUILD.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE/1-default.md diff --git a/.github/PR-BUILD.md b/.github/PR-BUILD.md deleted file mode 100644 index fb9a0aeb17..0000000000 --- a/.github/PR-BUILD.md +++ /dev/null @@ -1,18 +0,0 @@ -## How to test a PR build - -Please take into account, that RPCS3 build usually takes some time (about 15 mins), so you can't access a build if a PR was just submitted. - -- Open a PR you want to test -- Scroll to the very bottom and locate the **Checks** section -- Click on **Show all checks** - You are supposed to see something like this - ![image](https://user-images.githubusercontent.com/10283761/116630952-2cd99e00-a94c-11eb-933e-986d6020ca92.png) -- Click on __Details__ on either **Cirrus Linux GCC** or **Cirrus Windows** -- Click **View more details on Cirrus CI** at the very bottom - ![image](https://user-images.githubusercontent.com/10283761/116631111-5e526980-a94c-11eb-95f7-751e6f15e1ea.png) -- Click on the download button for **Artifact** on the **Artifacts** block - ![image](https://user-images.githubusercontent.com/10283761/116631322-bee1a680-a94c-11eb-89a3-be365783582e.png) - -- Congratulations! You are now downloading an RPCS3 build for that specific PR. - -__Please note that PR builds are not supposed to be stable because they contain new changesets.__ diff --git a/.github/PULL_REQUEST_TEMPLATE/1-default.md b/.github/PULL_REQUEST_TEMPLATE/1-default.md deleted file mode 100644 index 710d07ae2a..0000000000 --- a/.github/PULL_REQUEST_TEMPLATE/1-default.md +++ /dev/null @@ -1,3 +0,0 @@ - - -[How to test this PR](.github/PR-BUILD.md) \ No newline at end of file From bd1f5ff194de08a37292b356288d21a5cac7f3e1 Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:54:56 +0300 Subject: [PATCH 213/529] PPU LLVM: Fix VMAXFP, VMINFP --- rpcs3/Emu/Cell/PPUTranslator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp index 8962cc284d..ac630f7582 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.cpp +++ b/rpcs3/Emu/Cell/PPUTranslator.cpp @@ -1290,7 +1290,7 @@ void PPUTranslator::VMADDFP(ppu_opcode_t op) void PPUTranslator::VMAXFP(ppu_opcode_t op) { const auto [a, b] = get_vrs(op.va, op.vb); - set_vr(op.vd, vec_handle_result(bitcast(bitcast(fmax(a, b)) & bitcast(fmax(b, a))))); + set_vr(op.vd, vec_handle_result(select(fcmp_ord(a < b) | fcmp_uno(b != b), b, a))); } void PPUTranslator::VMAXSB(ppu_opcode_t op) @@ -1352,7 +1352,7 @@ void PPUTranslator::VMHRADDSHS(ppu_opcode_t op) void PPUTranslator::VMINFP(ppu_opcode_t op) { const auto [a, b] = get_vrs(op.va, op.vb); - set_vr(op.vd, vec_handle_result(bitcast(bitcast(fmin(a, b)) | bitcast(fmin(b, a))))); + set_vr(op.vd, vec_handle_result(select(fcmp_ord(a > b) | fcmp_uno(b != b), b, a))); } void PPUTranslator::VMINSB(ppu_opcode_t op) From 2f872b37551579d54a61f01e9716518a50ae8670 Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Thu, 3 Apr 2025 19:11:39 +0300 Subject: [PATCH 214/529] vm.cpp: Remove redundant cache hint --- rpcs3/Emu/Memory/vm.cpp | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index 91bd965ee9..7ad9d54bf4 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -483,8 +483,6 @@ namespace vm } } - bool to_prepare_memory = true; - for (u64 i = 0;; i++) { auto& bits = get_range_lock_bits(true); @@ -512,22 +510,11 @@ namespace vm if (i < 100) { - if (to_prepare_memory) - { - // We have some spare time, prepare cache lines (todo: reservation tests here) - utils::prefetch_write(vm::get_super_ptr(addr)); - utils::prefetch_write(vm::get_super_ptr(addr) + 64); - to_prepare_memory = false; - } - busy_wait(200); } else { std::this_thread::yield(); - - // Thread may have been switched or the cache clue has been undermined, cache needs to be prapred again - to_prepare_memory = true; } } @@ -591,13 +578,6 @@ namespace vm break; } - if (to_prepare_memory) - { - utils::prefetch_write(vm::get_super_ptr(addr)); - utils::prefetch_write(vm::get_super_ptr(addr) + 64); - to_prepare_memory = false; - } - utils::pause(); } @@ -607,13 +587,6 @@ namespace vm { while (!(ptr->state & cpu_flag::wait)) { - if (to_prepare_memory) - { - utils::prefetch_write(vm::get_super_ptr(addr)); - utils::prefetch_write(vm::get_super_ptr(addr) + 64); - to_prepare_memory = false; - } - utils::pause(); } } From 04d833d3e67b5a60007eaccf37681a6f9e54b0df Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Sun, 6 Apr 2025 08:41:23 +0300 Subject: [PATCH 215/529] Fix #17000 --- rpcs3/rpcs3qt/game_list_frame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 5f9267abce..a294d69cc6 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -2363,7 +2363,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set connect(future_watcher, &QFutureWatcher::finished, this, [=, this]() { - pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size)); + pdlg->setLabelText(progressLabel.arg(+*index).arg(serials_size)); pdlg->setCancelButtonText(tr("OK")); QApplication::beep(); @@ -2396,7 +2396,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set return; } - pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size)); + pdlg->setLabelText(progressLabel.arg(+*index).arg(serials_size)); pdlg->setCancelButtonText(tr("OK")); connect(pdlg, &progress_dialog::canceled, this, [pdlg](){ pdlg->deleteLater(); }); QApplication::beep(); From 2438e975e730789db12b41452458f9ae0565922f Mon Sep 17 00:00:00 2001 From: Ani Date: Sun, 6 Apr 2025 11:46:27 +0200 Subject: [PATCH 216/529] appimage: Do not bundle unused Qt6 libraries --- .ci/deploy-linux.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh index 38a1d3e05c..a4e278ba63 100755 --- a/.ci/deploy-linux.sh +++ b/.ci/deploy-linux.sh @@ -25,6 +25,10 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then # Remove libvulkan because it causes issues with gamescope rm -f ./AppDir/usr/lib/libvulkan.so* + # Remove unused Qt6 libraries + rm -f ./AppDir/usr/lib/libQt6Qml*.so* + rm -f ./AppDir/usr/lib/libQt6Quick.so* + # Remove git directory containing local commit history file rm -rf ./AppDir/usr/share/rpcs3/git From cc84ebf8c2d94cb0aee85723ee70f0db57417973 Mon Sep 17 00:00:00 2001 From: Ani Date: Sun, 6 Apr 2025 12:10:13 +0200 Subject: [PATCH 217/529] appimage: Do not bundle Qt6VirtualKeyboard --- .ci/deploy-linux.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh index a4e278ba63..4627bad53d 100755 --- a/.ci/deploy-linux.sh +++ b/.ci/deploy-linux.sh @@ -28,6 +28,8 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then # Remove unused Qt6 libraries rm -f ./AppDir/usr/lib/libQt6Qml*.so* rm -f ./AppDir/usr/lib/libQt6Quick.so* + rm -f ./AppDir/usr/lib/libQt6VirtualKeyboard.so* + rm -f ./AppDir/usr/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so* # Remove git directory containing local commit history file rm -rf ./AppDir/usr/share/rpcs3/git From b3bbd939e3604eb9a259fc829270c4f0c3856f9d Mon Sep 17 00:00:00 2001 From: Ani Date: Sun, 6 Apr 2025 12:10:50 +0200 Subject: [PATCH 218/529] appimage: Do not bundle libQt6OpenGL --- .ci/deploy-linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/deploy-linux.sh b/.ci/deploy-linux.sh index 4627bad53d..aa41713cd7 100755 --- a/.ci/deploy-linux.sh +++ b/.ci/deploy-linux.sh @@ -26,6 +26,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then rm -f ./AppDir/usr/lib/libvulkan.so* # Remove unused Qt6 libraries + rm -f ./AppDir/usr/lib/libQt6OpenGL.so* rm -f ./AppDir/usr/lib/libQt6Qml*.so* rm -f ./AppDir/usr/lib/libQt6Quick.so* rm -f ./AppDir/usr/lib/libQt6VirtualKeyboard.so* From dad9a2b916f0b30a58ec207aeea9201d753af4c4 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Wed, 2 Apr 2025 00:01:02 +0300 Subject: [PATCH 219/529] vk: Add support for dynamic buffer offsets --- rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp | 13 ++++++++++++- rpcs3/Emu/RSX/VK/vkutils/descriptors.h | 8 ++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp index c96b5b145f..9b5f288141 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp @@ -430,6 +430,17 @@ namespace vk } } + void descriptor_set::push(const descriptor_set_dynamic_offset_t& offset) + { + ensure(offset.location >= 0 && offset.location <= 16); + while (m_dynamic_offsets.size() < (offset.location + 1)) + { + m_dynamic_offsets.push_back(0); + } + + m_dynamic_offsets[offset.location] = offset.value; + } + void descriptor_set::bind(const vk::command_buffer& cmd, VkPipelineBindPoint bind_point, VkPipelineLayout layout) { if ((m_push_type_mask & ~m_update_after_bind_mask) || (m_pending_writes.size() >= max_cache_size)) @@ -437,7 +448,7 @@ namespace vk flush(); } - vkCmdBindDescriptorSets(cmd, bind_point, layout, 0, 1, &m_handle, 0, nullptr); + vkCmdBindDescriptorSets(cmd, bind_point, layout, 0, 1, &m_handle, ::size32(m_dynamic_offsets), m_dynamic_offsets.data()); } void descriptor_set::flush() diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.h b/rpcs3/Emu/RSX/VK/vkutils/descriptors.h index 37798187b0..6c61488b6e 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/descriptors.h +++ b/rpcs3/Emu/RSX/VK/vkutils/descriptors.h @@ -27,6 +27,12 @@ namespace vk } }; + struct descriptor_set_dynamic_offset_t + { + int location; + u32 value; + }; + class descriptor_pool { public: @@ -95,6 +101,7 @@ namespace vk void push(const VkDescriptorImageInfo& image_info, VkDescriptorType type, u32 binding); void push(const VkDescriptorImageInfo* image_info, u32 count, VkDescriptorType type, u32 binding); void push(rsx::simple_array& copy_cmd, u32 type_mask = umax); + void push(const descriptor_set_dynamic_offset_t& offset); void bind(const vk::command_buffer& cmd, VkPipelineBindPoint bind_point, VkPipelineLayout layout); @@ -109,6 +116,7 @@ namespace vk rsx::simple_array m_buffer_view_pool; rsx::simple_array m_buffer_info_pool; rsx::simple_array m_image_info_pool; + rsx::simple_array m_dynamic_offsets; #ifdef __clang__ // Clang (pre 16.x) does not support LWG 2089, std::construct_at for POD types From 1816a1eb34a6163c684b6efe1a5955b5df0cb1ff Mon Sep 17 00:00:00 2001 From: kd-11 Date: Wed, 2 Apr 2025 01:06:23 +0300 Subject: [PATCH 220/529] vk: Switch transform constants from UBO to SSBO --- rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp | 26 ++++++++++++++++++--- rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h | 5 +++- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 22 +++++------------ rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp | 16 +------------ rpcs3/Emu/RSX/VK/VKVertexProgram.cpp | 6 ++--- 5 files changed, 37 insertions(+), 38 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp b/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp index 6773a4d78f..f4253e1d51 100644 --- a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp @@ -50,7 +50,7 @@ namespace vk idx++; - bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + bindings[idx].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; bindings[idx].descriptorCount = 1; bindings[idx].stageFlags = VK_SHADER_STAGE_VERTEX_BIT; bindings[idx].binding = binding_table.vertex_constant_buffers_bind_slot; @@ -101,7 +101,8 @@ namespace vk return bindings; } - std::tuple get_common_pipeline_layout(VkDevice dev) + std::tuple> + get_common_pipeline_layout(VkDevice dev) { const auto& binding_table = vk::get_current_renderer()->get_pipeline_binding_table(); auto bindings = get_common_binding_table(); @@ -155,6 +156,25 @@ namespace vk VkPipelineLayout result; CHECK_RESULT(vkCreatePipelineLayout(dev, &layout_info, nullptr, &result)); - return std::make_tuple(result, set_layout); + return std::make_tuple(result, set_layout, bindings); + } + + rsx::simple_array get_descriptor_pool_sizes(const rsx::simple_array& bindings) + { + // Compile descriptor pool sizes + const u32 num_ubo = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER ? y.descriptorCount : 0))); + const u32 num_texel_buffers = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER ? y.descriptorCount : 0))); + const u32 num_combined_image_sampler = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER ? y.descriptorCount : 0))); + const u32 num_ssbo = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER ? y.descriptorCount : 0))); + + ensure(num_ubo > 0 && num_texel_buffers > 0 && num_combined_image_sampler > 0 && num_ssbo > 0); + + return + { + { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER , num_ubo }, + { VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER , num_texel_buffers }, + { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER , num_combined_image_sampler }, + { VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, num_ssbo } + }; } } diff --git a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h b/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h index 7c64d67982..371d0ebf76 100644 --- a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h +++ b/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h @@ -7,8 +7,11 @@ namespace vk { // Grab standard layout for decompiled RSX programs. Also used by the interpreter. // FIXME: This generates a bloated monstrosity that needs to die. - std::tuple get_common_pipeline_layout(VkDevice dev); + std::tuple> get_common_pipeline_layout(VkDevice dev); // Returns the standard binding layout without texture slots. Those have special handling depending on the consumer. rsx::simple_array get_common_binding_table(); + + // Returns an array of pool sizes that can be used to generate a proper descriptor pool + rsx::simple_array get_descriptor_pool_sizes(const rsx::simple_array& bindings); } diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index dd9d080ecd..d58212a1aa 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -491,7 +491,8 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar) m_secondary_cb_list.create(m_secondary_command_buffer_pool, vk::command_buffer::access_type_hint::all); //Precalculated stuff - std::tie(m_pipeline_layout, m_descriptor_layouts) = vk::get_common_pipeline_layout(*m_device); + rsx::simple_array binding_layout; + std::tie(m_pipeline_layout, m_descriptor_layouts, binding_layout) = vk::get_common_pipeline_layout(*m_device); //Occlusion m_occlusion_query_manager = std::make_unique(*m_device, VK_QUERY_TYPE_OCCLUSION, OCCLUSION_MAX_POOL_SIZE); @@ -507,18 +508,7 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar) // Generate frame contexts const u32 max_draw_calls = m_device->get_descriptor_max_draw_calls(); - const auto& binding_table = m_device->get_pipeline_binding_table(); - const u32 num_fs_samplers = binding_table.vertex_textures_first_bind_slot - binding_table.textures_first_bind_slot; - - rsx::simple_array descriptor_type_sizes = - { - { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER , 6 }, - { VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER , 3 }, - { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER , (num_fs_samplers + 4) }, - - // Conditional rendering predicate slot; refactor to allow skipping this when not needed - { VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 3 } - }; + const auto descriptor_type_sizes = vk::get_descriptor_pool_sizes(binding_layout); m_descriptor_pool.create(*m_device, descriptor_type_sizes, max_draw_calls); VkSemaphoreCreateInfo semaphore_info = {}; @@ -531,7 +521,7 @@ VKGSRender::VKGSRender(utils::serial* ar) noexcept : GSRender(ar) m_fragment_texture_params_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "fragment texture params buffer"); m_vertex_layout_ring_info.create(VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "vertex layout buffer", 0x10000, VK_TRUE); m_fragment_constants_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "fragment constants buffer"); - m_transform_constants_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_TRANSFORM_CONSTANTS_BUFFER_SIZE_M * 0x100000, "transform constants buffer"); + m_transform_constants_ring_info.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_TRANSFORM_CONSTANTS_BUFFER_SIZE_M * 0x100000, "transform constants buffer"); m_index_buffer_ring_info.create(VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VK_INDEX_RING_BUFFER_SIZE_M * 0x100000, "index buffer"); m_texture_upload_buffer_ring_info.create(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_TEXTURE_UPLOAD_RING_BUFFER_SIZE_M * 0x100000, "texture upload buffer", 32 * 0x100000); m_raster_env_ring_info.create(VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_UBO_RING_BUFFER_SIZE_M * 0x100000, "raster env buffer"); @@ -2107,7 +2097,7 @@ void VKGSRender::load_program_env() usz mem_offset = 0; auto alloc_storage = [&](usz size) -> std::pair { - const auto alignment = m_device->gpu().get_limits().minUniformBufferOffsetAlignment; + const auto alignment = m_device->gpu().get_limits().minStorageBufferOffsetAlignment; mem_offset = m_transform_constants_ring_info.alloc<1>(utils::align(size, alignment)); return std::make_pair(m_transform_constants_ring_info.map(mem_offset, size), size); }; @@ -2225,7 +2215,7 @@ void VKGSRender::load_program_env() const auto& binding_table = m_device->get_pipeline_binding_table(); m_program->bind_uniform(m_vertex_env_buffer_info, binding_table.vertex_params_bind_slot, m_current_frame->descriptor_set); - m_program->bind_uniform(m_vertex_constants_buffer_info, binding_table.vertex_constant_buffers_bind_slot, m_current_frame->descriptor_set); + m_program->bind_buffer(m_vertex_constants_buffer_info, binding_table.vertex_constant_buffers_bind_slot, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, m_current_frame->descriptor_set); m_program->bind_uniform(m_fragment_env_buffer_info, binding_table.fragment_state_bind_slot, m_current_frame->descriptor_set); m_program->bind_uniform(m_fragment_texture_params_buffer_info, binding_table.fragment_texture_params_bind_slot, m_current_frame->descriptor_set); m_program->bind_uniform(m_raster_env_buffer_info, binding_table.rasterizer_env_bind_slot, m_current_frame->descriptor_set); diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp index c0a713ec00..3c9188fd60 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp @@ -330,21 +330,7 @@ namespace vk idx++; bindings.resize(idx); - // Compile descriptor pool sizes - const u32 num_ubo = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER ? y.descriptorCount : 0))); - const u32 num_texel_buffers = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER ? y.descriptorCount : 0))); - const u32 num_combined_image_sampler = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER ? y.descriptorCount : 0))); - const u32 num_ssbo = bindings.reduce(0, FN(x + (y.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER ? y.descriptorCount : 0))); - - ensure(num_ubo > 0 && num_texel_buffers > 0 && num_combined_image_sampler > 0 && num_ssbo > 0); - - m_descriptor_pool_sizes = - { - { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER , num_ubo }, - { VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER , num_texel_buffers }, - { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER , num_combined_image_sampler }, - { VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, num_ssbo } - }; + m_descriptor_pool_sizes = get_descriptor_pool_sizes(bindings); std::array push_constants; push_constants[0].offset = 0; diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp index 0e88dab75d..8dbb9c968a 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp @@ -115,15 +115,15 @@ void VKVertexDecompilerThread::insertConstants(std::stringstream & OS, const std { if (!(m_prog.ctrl & RSX_SHADER_CONTROL_INSTANCED_CONSTANTS)) { - OS << "layout(std140, set=0, binding=" << static_cast(m_binding_table.vertex_constant_buffers_bind_slot) << ") uniform VertexConstantsBuffer\n"; + OS << "layout(std430, set=0, binding=" << static_cast(m_binding_table.vertex_constant_buffers_bind_slot) << ") readonly buffer VertexConstantsBuffer\n"; OS << "{\n"; - OS << " vec4 " << PI.name << ";\n"; + OS << " vec4 vc[];\n"; OS << "};\n\n"; in.location = m_binding_table.vertex_constant_buffers_bind_slot; in.domain = glsl::glsl_vertex_program; in.name = "VertexConstantsBuffer"; - in.type = vk::glsl::input_type_uniform_buffer; + in.type = vk::glsl::input_type_storage_buffer; inputs.push_back(in); continue; From 38a1c8becb3607b269c7356916ac3f1d892c780b Mon Sep 17 00:00:00 2001 From: kd-11 Date: Wed, 2 Apr 2025 01:52:22 +0300 Subject: [PATCH 221/529] vk: Use dynamic constants offset for transform constants --- .../RSXProg/RSXVertexPrologue.glsl | 2 ++ rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp | 4 ++-- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 21 +++++++++---------- rpcs3/Emu/RSX/VK/VKGSRender.h | 2 ++ rpcs3/Emu/RSX/VK/VKVertexProgram.cpp | 8 ++++--- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl index b188b224ba..f43b03ee3a 100644 --- a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl +++ b/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl @@ -76,6 +76,8 @@ vec4 _fetch_constant(const in uint base_offset) // uint override return _fetch_constant(int(base_offset)); } +#elif defined(VULKAN) +#define _fetch_constant(x) vc[x + xform_constants_offset] #else #define _fetch_constant(x) vc[x] #endif diff --git a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp b/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp index f4253e1d51..602d855d76 100644 --- a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp @@ -136,13 +136,13 @@ namespace vk std::array push_constants; push_constants[0].offset = 0; - push_constants[0].size = 16; + push_constants[0].size = 20; push_constants[0].stageFlags = VK_SHADER_STAGE_VERTEX_BIT; if (vk::emulate_conditional_rendering()) { // Conditional render toggle - push_constants[0].size = 20; + push_constants[0].size = 24; } const auto set_layout = vk::descriptors::create_layout(bindings); diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index d58212a1aa..10c439b183 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -2108,7 +2108,8 @@ void VKGSRender::load_program_env() if (!io_buf.empty()) { m_transform_constants_ring_info.unmap(); - m_vertex_constants_buffer_info = { m_transform_constants_ring_info.heap->value, mem_offset, io_buf.size() }; + m_vertex_constants_buffer_info = { m_transform_constants_ring_info.heap->value, 0, VK_WHOLE_SIZE }; + m_xform_constants_dynamic_offset = mem_offset; } } @@ -2310,21 +2311,19 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_ base_offset = 0; } - u8 data_size = 16; - u32 draw_info[5]; - - draw_info[0] = vertex_info.vertex_index_base; - draw_info[1] = vertex_info.vertex_index_offset; - draw_info[2] = id; - draw_info[3] = (id * 16) + (base_offset / 8); + rsx::simple_array dynamic_constants; + dynamic_constants.push_back(vertex_info.vertex_index_base); // Vertex index base + dynamic_constants.push_back(vertex_info.vertex_index_offset); // Vertex index offset + dynamic_constants.push_back(id); // Draw id + dynamic_constants.push_back((id * 16) + (base_offset / 8)); // Vertex layout offset + dynamic_constants.push_back(m_xform_constants_dynamic_offset); // Vertex constants offset if (vk::emulate_conditional_rendering()) { - draw_info[4] = cond_render_ctrl.hw_cond_active ? 1 : 0; - data_size = 20; + dynamic_constants.push_back(cond_render_ctrl.hw_cond_active ? 1 : 0); } - vkCmdPushConstants(*m_current_command_buffer, m_pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT, 0, data_size, draw_info); + vkCmdPushConstants(*m_current_command_buffer, m_pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT, 0, dynamic_constants.size_bytes(), dynamic_constants.data()); const usz data_offset = (id * 128) + m_vertex_layout_stream_info.offset; auto dst = m_vertex_layout_ring_info.map(data_offset, 128); diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index 88e1e2b00c..35e9b76626 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -160,6 +160,8 @@ private: VkDescriptorBufferInfo m_vertex_instructions_buffer_info {}; VkDescriptorBufferInfo m_fragment_instructions_buffer_info {}; + u32 m_xform_constants_dynamic_offset = 0; // We manage transform_constants dynamic offset manually to alleviate performance penalty of doing a hot-patch of constants. + std::array frame_context_storage; //Temp frame context to use if the real frame queue is overburdened. Only used for storage vk::frame_context_t m_aux_frame_context; diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp index 8dbb9c968a..60f33f49c5 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp @@ -29,8 +29,9 @@ std::string VKVertexDecompilerThread::compareFunction(COMPARE f, const std::stri void VKVertexDecompilerThread::insertHeader(std::stringstream &OS) { - OS << "#version 450\n\n"; - OS << "#extension GL_ARB_separate_shader_objects : enable\n\n"; + OS << + "#version 450\n\n" + "#extension GL_ARB_separate_shader_objects : enable\n\n"; OS << "layout(std140, set = 0, binding = 0) uniform VertexContextBuffer\n" @@ -59,7 +60,8 @@ void VKVertexDecompilerThread::insertHeader(std::stringstream &OS) " uint vertex_base_index;\n" " uint vertex_index_offset;\n" " uint draw_id;\n" - " uint layout_ptr_offset;\n"; + " uint layout_ptr_offset;\n" + " uint xform_constants_offset;\n"; if (m_device_props.emulate_conditional_rendering) { From 66909168ac76e7ce9284701157c8bd6068c51cdf Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 5 Apr 2025 14:25:08 +0300 Subject: [PATCH 222/529] vk: Silence compiler warning --- rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp index 9b5f288141..2dc70d4070 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp @@ -433,7 +433,7 @@ namespace vk void descriptor_set::push(const descriptor_set_dynamic_offset_t& offset) { ensure(offset.location >= 0 && offset.location <= 16); - while (m_dynamic_offsets.size() < (offset.location + 1)) + while (m_dynamic_offsets.size() < (static_cast(offset.location) + 1u)) { m_dynamic_offsets.push_back(0); } From ed280cdbfedc44d67a0a58651eb2b7e6e112822c Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 5 Apr 2025 14:25:38 +0300 Subject: [PATCH 223/529] vk: Use dynamic constant buffer offset via push constant --- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 102 +++++++------------------------- rpcs3/Emu/RSX/VK/VKGSRender.h | 2 +- 2 files changed, 23 insertions(+), 81 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 10c439b183..7079d3a22b 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -2311,19 +2311,28 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_ base_offset = 0; } + const u32 vertex_layout_offset = (id * 16) + (base_offset / 8); + const u32 constant_id_offset = static_cast(m_xform_constants_dynamic_offset) / 16; + rsx::simple_array dynamic_constants; - dynamic_constants.push_back(vertex_info.vertex_index_base); // Vertex index base - dynamic_constants.push_back(vertex_info.vertex_index_offset); // Vertex index offset - dynamic_constants.push_back(id); // Draw id - dynamic_constants.push_back((id * 16) + (base_offset / 8)); // Vertex layout offset - dynamic_constants.push_back(m_xform_constants_dynamic_offset); // Vertex constants offset + dynamic_constants.push_back(vertex_info.vertex_index_base); // Vertex index base + dynamic_constants.push_back(vertex_info.vertex_index_offset); // Vertex index offset + dynamic_constants.push_back(id); // Draw id + dynamic_constants.push_back(vertex_layout_offset); // Vertex layout offset + dynamic_constants.push_back(constant_id_offset); // Vertex constants offset if (vk::emulate_conditional_rendering()) { dynamic_constants.push_back(cond_render_ctrl.hw_cond_active ? 1 : 0); } - vkCmdPushConstants(*m_current_command_buffer, m_pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT, 0, dynamic_constants.size_bytes(), dynamic_constants.data()); + vkCmdPushConstants( + *m_current_command_buffer, + m_pipeline_layout, + VK_SHADER_STAGE_VERTEX_BIT, + 0, + static_cast(dynamic_constants.size_bytes()), + dynamic_constants.data()); const usz data_offset = (id * 128) + m_vertex_layout_stream_info.offset; auto dst = m_vertex_layout_ring_info.map(data_offset, 128); @@ -2355,83 +2364,16 @@ void VKGSRender::patch_transform_constants(rsx::context* ctx, u32 index, u32 cou return; } - // Hot-patching transform constants mid-draw (instanced draw) - std::pair data_range; - void* data_source = nullptr; - - if (m_vertex_prog->has_indexed_constants) + // Buffer updates mid-pass violate the spec and destroy performance on NVIDIA + auto allocate_mem = [&](usz size) -> std::pair { - // We're working with a full range. We can do a direct patch in this case since no index translation is required. - const auto byte_count = count * 16; - const auto byte_offset = index * 16; - - data_range = { m_vertex_constants_buffer_info.offset + byte_offset, byte_count }; - data_source = ®S(ctx)->transform_constants[index]; - } - else if (auto xform_id = m_vertex_prog->translate_constants_range(index, count); xform_id >= 0) - { - const auto write_offset = xform_id * 16; - const auto byte_count = count * 16; - - data_range = { m_vertex_constants_buffer_info.offset + write_offset, byte_count }; - data_source = ®S(ctx)->transform_constants[index]; - } - else - { - // Indexed. This is a bit trickier. Use scratchpad to avoid UAF - auto allocate_mem = [&](usz size) -> std::pair - { - m_scratch_mem.resize(size); - return { m_scratch_mem.data(), size }; - }; - - rsx::io_buffer iobuf(allocate_mem); - upload_transform_constants(iobuf); - - ensure(iobuf.size() >= m_vertex_constants_buffer_info.range); - data_range = { m_vertex_constants_buffer_info.offset, m_vertex_constants_buffer_info.range }; - data_source = iobuf.data(); - } - - // Preserving an active renderpass across a transfer operation is illegal vulkan. However, splitting up the CB into thousands of renderpasses incurs an overhead. - // We cheat here for specific cases where we already know the driver can let us get away with this. - static const std::set s_allowed_vendors = - { - vk::driver_vendor::AMD, - vk::driver_vendor::RADV, - vk::driver_vendor::LAVAPIPE, - vk::driver_vendor::NVIDIA, - vk::driver_vendor::NVK + const usz alignment = m_device->gpu().get_limits().minStorageBufferOffsetAlignment; + m_xform_constants_dynamic_offset = m_transform_constants_ring_info.alloc<1>(utils::align(size, alignment)); + return std::make_pair(m_transform_constants_ring_info.map(m_xform_constants_dynamic_offset, size), size); }; - const auto driver_vendor = vk::get_driver_vendor(); - const bool preserve_renderpass = !g_cfg.video.strict_rendering_mode && s_allowed_vendors.contains(driver_vendor); - - vk::insert_buffer_memory_barrier( - *m_current_command_buffer, - m_vertex_constants_buffer_info.buffer, - data_range.first, - data_range.second, - VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, - VK_ACCESS_UNIFORM_READ_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, - preserve_renderpass); - - // FIXME: This is illegal during a renderpass - vkCmdUpdateBuffer( - *m_current_command_buffer, - m_vertex_constants_buffer_info.buffer, - data_range.first, - data_range.second, - data_source); - - vk::insert_buffer_memory_barrier( - *m_current_command_buffer, - m_vertex_constants_buffer_info.buffer, - data_range.first, - data_range.second, - VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, - VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_UNIFORM_READ_BIT, - preserve_renderpass); + rsx::io_buffer iobuf(allocate_mem); + upload_transform_constants(iobuf); } void VKGSRender::init_buffers(rsx::framebuffer_creation_context context, bool) diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index 35e9b76626..5c72528ecc 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -160,7 +160,7 @@ private: VkDescriptorBufferInfo m_vertex_instructions_buffer_info {}; VkDescriptorBufferInfo m_fragment_instructions_buffer_info {}; - u32 m_xform_constants_dynamic_offset = 0; // We manage transform_constants dynamic offset manually to alleviate performance penalty of doing a hot-patch of constants. + u64 m_xform_constants_dynamic_offset = 0; // We manage transform_constants dynamic offset manually to alleviate performance penalty of doing a hot-patch of constants. std::array frame_context_storage; //Temp frame context to use if the real frame queue is overburdened. Only used for storage From f38a61bdb3557b1c728a4cd8ae015686886e2494 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 6 Apr 2025 21:09:01 +0300 Subject: [PATCH 224/529] Try msvc workaround --- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 7079d3a22b..430f4a7563 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -2312,18 +2312,21 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_ } const u32 vertex_layout_offset = (id * 16) + (base_offset / 8); - const u32 constant_id_offset = static_cast(m_xform_constants_dynamic_offset) / 16; + const volatile u32 constant_id_offset = static_cast(m_xform_constants_dynamic_offset) / 16u; - rsx::simple_array dynamic_constants; - dynamic_constants.push_back(vertex_info.vertex_index_base); // Vertex index base - dynamic_constants.push_back(vertex_info.vertex_index_offset); // Vertex index offset - dynamic_constants.push_back(id); // Draw id - dynamic_constants.push_back(vertex_layout_offset); // Vertex layout offset - dynamic_constants.push_back(constant_id_offset); // Vertex constants offset + u32 push_constants[6]; + u32 data_length = 20; + + push_constants[0] = vertex_info.vertex_index_base; + push_constants[1] = vertex_info.vertex_index_offset; + push_constants[2] = id; + push_constants[3] = vertex_layout_offset; + push_constants[4] = constant_id_offset; if (vk::emulate_conditional_rendering()) { - dynamic_constants.push_back(cond_render_ctrl.hw_cond_active ? 1 : 0); + push_constants[5] = cond_render_ctrl.hw_cond_active ? 1 : 0; + data_length += 4; } vkCmdPushConstants( @@ -2331,8 +2334,8 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_ m_pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT, 0, - static_cast(dynamic_constants.size_bytes()), - dynamic_constants.data()); + data_length, + push_constants); const usz data_offset = (id * 128) + m_vertex_layout_stream_info.offset; auto dst = m_vertex_layout_ring_info.map(data_offset, 128); @@ -2349,7 +2352,7 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_ m_vertex_layout_ring_info.unmap(); } -void VKGSRender::patch_transform_constants(rsx::context* ctx, u32 index, u32 count) +void VKGSRender::patch_transform_constants(rsx::context* /*ctx*/, u32 index, u32 count) { if (!m_program || !m_vertex_prog) { From 19d01835d3cb853e488304269b946dab8dac0540 Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Sat, 29 Mar 2025 18:56:14 +0300 Subject: [PATCH 225/529] sys_spu: Fix HW schedular limits --- rpcs3/Emu/Cell/lv2/sys_spu.cpp | 106 ++++++++++++++++++++++++++++----- 1 file changed, 90 insertions(+), 16 deletions(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index 2c6bd6f3ad..d6856f5ee5 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -388,19 +388,43 @@ struct spu_limits_t SAVESTATE_INIT_POS(47); - bool check(const limits_data& init) const + bool check_valid(const limits_data& init) const + { + const u32 physical_spus_count = init.physical; + const u32 controllable_spu_count = init.controllable; + + const u32 spu_limit = init.spu_limit != umax ? init.spu_limit : max_spu; + const u32 raw_limit = init.raw_limit != umax ? init.raw_limit : max_raw; + + if (spu_limit + raw_limit > 6 || physical_spus_count > spu_limit || controllable_spu_count > spu_limit) + { + return false; + } + + return true; + } + + bool check_busy(const limits_data& init) const { u32 physical_spus_count = init.physical; u32 raw_spu_count = init.raw_spu; u32 controllable_spu_count = init.controllable; + u32 system_coop = init.controllable != 0 && init.physical != 0 ? 1 : 0; + const u32 spu_limit = init.spu_limit != umax ? init.spu_limit : max_spu; const u32 raw_limit = init.raw_limit != umax ? init.raw_limit : max_raw; idm::select([&](u32, lv2_spu_group& group) { - if (group.has_scheduler_context) + if (group.type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM) { - controllable_spu_count = std::max(controllable_spu_count, group.max_num); + system_coop++; + controllable_spu_count = std::max(controllable_spu_count, 1); + physical_spus_count += group.max_num - 1; + } + else if (group.has_scheduler_context) + { + controllable_spu_count = std::max(controllable_spu_count, group.max_num); } else { @@ -410,11 +434,18 @@ struct spu_limits_t raw_spu_count += spu_thread::g_raw_spu_ctr; - if (spu_limit + raw_limit > 6 || raw_spu_count > raw_limit || physical_spus_count >= spu_limit || physical_spus_count + controllable_spu_count > spu_limit) + // physical_spus_count >= spu_limit returns EBUSY, not EINVAL! + if (spu_limit + raw_limit > 6 || raw_spu_count > raw_limit || physical_spus_count >= spu_limit || physical_spus_count > spu_limit || controllable_spu_count > spu_limit) { return false; } + if (system_coop > 1) + { + // Cannot have more than one SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM group at a time + return false; + } + return true; } }; @@ -437,7 +468,7 @@ error_code sys_spu_initialize(ppu_thread& ppu, u32 max_usable_spu, u32 max_raw_s std::lock_guard lock(limits.mutex); - if (!limits.check(limits_data{.spu_limit = max_usable_spu - max_raw_spu, .raw_limit = max_raw_spu})) + if (!limits.check_busy(limits_data{.spu_limit = max_usable_spu - max_raw_spu, .raw_limit = max_raw_spu})) { return CELL_EBUSY; } @@ -845,23 +876,24 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr id, u32 num switch (type) { case 0x0: - case 0x4: - case 0x18: + case SYS_SPU_THREAD_GROUP_TYPE_MEMORY_FROM_CONTAINER: + case SYS_SPU_THREAD_GROUP_TYPE_EXCLUSIVE_NON_CONTEXT: { break; } - case 0x20: - case 0x22: - case 0x24: - case 0x26: + case SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM: + case (SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM | 0x2): + case (SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM | 0x4): + case (SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM | 0x6): { if (type == 0x22 || type == 0x26) { needs_root = true; } - min_threads = 2; // That's what appears from reversing + // For a single thread that is being shared with system (the cooperative victim) + min_threads = 2; break; } @@ -901,7 +933,7 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr id, u32 num if (is_system_coop) { - // Constant size, unknown what it means + // For a single thread that is being shared with system (the cooperative victim) mem_size = SPU_LS_SIZE; } else if (type & SYS_SPU_THREAD_GROUP_TYPE_NON_CONTEXT) @@ -952,7 +984,29 @@ error_code sys_spu_thread_group_create(ppu_thread& ppu, vm::ptr id, u32 num std::unique_lock lock(limits.mutex); - if (!limits.check(use_scheduler ? limits_data{.controllable = num} : limits_data{.physical = num})) + limits_data group_limits{}; + + if (is_system_coop) + { + group_limits.controllable = 1; + group_limits.physical = num - 1; + } + else if (use_scheduler) + { + group_limits.controllable = num; + } + else + { + group_limits.physical = num; + } + + if (!limits.check_valid(group_limits)) + { + ct->free(mem_size); + return CELL_EINVAL; + } + + if (!limits.check_busy(group_limits)) { ct->free(mem_size); return CELL_EBUSY; @@ -1135,6 +1189,11 @@ error_code sys_spu_thread_group_suspend(ppu_thread& ppu, u32 id) return CELL_EINVAL; } + if (group->type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM) + { + return CELL_EINVAL; + } + std::lock_guard lock(group->mutex); CellError error; @@ -1218,6 +1277,11 @@ error_code sys_spu_thread_group_resume(ppu_thread& ppu, u32 id) return CELL_EINVAL; } + if (group->type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM) + { + return CELL_EINVAL; + } + struct notify_on_exit { usz index = umax; @@ -1565,6 +1629,11 @@ error_code sys_spu_thread_group_set_priority(ppu_thread& ppu, u32 id, s32 priori return CELL_EINVAL; } + if (group->type & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM) + { + return CELL_EINVAL; + } + group->prio.atomic_op([&](std::common_type_t& prio) { prio.prio = priority; @@ -1592,6 +1661,11 @@ error_code sys_spu_thread_group_get_priority(ppu_thread& ppu, u32 id, vm::ptrtype & SYS_SPU_THREAD_GROUP_TYPE_COOPERATE_WITH_SYSTEM) + { + // Regardless of the value being set in group creation + *priority = 15; + } else { *priority = group->prio.load().prio; @@ -2275,7 +2349,7 @@ error_code sys_raw_spu_create(ppu_thread& ppu, vm::ptr id, vm::ptr at std::lock_guard lock(limits.mutex); - if (!limits.check(limits_data{.raw_spu = 1})) + if (!limits.check_busy(limits_data{.raw_spu = 1})) { return CELL_EAGAIN; } @@ -2331,7 +2405,7 @@ error_code sys_isolated_spu_create(ppu_thread& ppu, vm::ptr id, vm::ptr Date: Mon, 7 Apr 2025 14:34:12 +0300 Subject: [PATCH 226/529] Improve lwmutex_lock error logging --- rpcs3/Emu/Cell/lv2/sys_lwcond.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp index 75835ffa24..43bfb308ba 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp @@ -502,7 +502,7 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id if (!cond || !mutex) { - return CELL_ESRCH; + return { CELL_ESRCH, fmt::format("lwmutex_id: 0x%x, lwcond_id: 0x%x", lwmutex_id, lwcond_id) }; } if (ppu.state & cpu_flag::again) diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp index a56bffedca..ca8d7f1260 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp @@ -183,7 +183,12 @@ error_code _sys_lwmutex_lock(ppu_thread& ppu, u32 lwmutex_id, u64 timeout) if (!mutex) { - return CELL_ESRCH; + if (lwmutex_id >> 24 == lv2_lwmutex::id_base >> 24) + { + return { CELL_ESRCH, lwmutex_id }; + } + + return { CELL_ESRCH, "Invalid ID" }; } if (mutex.ret) @@ -313,7 +318,12 @@ error_code _sys_lwmutex_trylock(ppu_thread& ppu, u32 lwmutex_id) if (!mutex) { - return CELL_ESRCH; + if (lwmutex_id >> 24 == lv2_lwmutex::id_base >> 24) + { + return { CELL_ESRCH, lwmutex_id }; + } + + return { CELL_ESRCH, "Invalid ID" }; } if (!mutex.ret) From 6f98b8c5aea54b3ad3bab303fb1559882a269661 Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Mon, 7 Apr 2025 14:44:31 +0300 Subject: [PATCH 227/529] Silence sys_spu_thread_write_spu_mb --- rpcs3/Emu/Cell/lv2/sys_spu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index d6856f5ee5..7011475a2d 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -1825,7 +1825,7 @@ error_code sys_spu_thread_write_spu_mb(ppu_thread& ppu, u32 id, u32 value) { ppu.state += cpu_flag::wait; - sys_spu.warning("sys_spu_thread_write_spu_mb(id=0x%x, value=0x%x)", id, value); + sys_spu.trace("sys_spu_thread_write_spu_mb(id=0x%x, value=0x%x)", id, value); const auto [thread, group] = lv2_spu_group::get_thread(id); From 599d5c17a09a01afbaac26600a34dff8c1423e52 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 27 Mar 2025 01:02:34 +0100 Subject: [PATCH 228/529] cellMic: Try to open device with different sample rates --- rpcs3/Emu/Cell/Modules/cellMic.cpp | 91 +++++++++++++++------------- rpcs3/Emu/Cell/Modules/cellMic.h | 4 ++ rpcs3/rpcs3qt/microphone_creator.cpp | 5 +- 3 files changed, 57 insertions(+), 43 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index cb8724f965..864df5baa1 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -423,36 +423,40 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co break; } + ALCdevice* device = nullptr; + // Make sure we use a proper sampling rate - const auto fixup_samplingrate = [this](u32& rate) -> bool + // TODO: The used sample rate may vary for Sony's camera devices + const std::array samplingrates = { raw_samplingrate, 48000u, 32000u, 24000u, 16000u, 12000u, 8000u }; + + for (u32 samplingrate : samplingrates) { - // TODO: The used sample rate may vary for Sony's camera devices - const std::array samplingrates = { rate, 48000u, 32000u, 24000u, 16000u, 12000u, 8000u }; - - const auto test_samplingrate = [&samplingrates](const u32& rate) + if (!std::any_of(samplingrates.cbegin() + 1, samplingrates.cend(), [samplingrate](u32 r){ return r == samplingrate; })) { - // TODO: actually check if device supports sampling rates - return std::any_of(samplingrates.cbegin() + 1, samplingrates.cend(), [&rate](const u32& r){ return r == rate; }); - }; - - for (u32 samplingrate : samplingrates) - { - if (test_samplingrate(samplingrate)) - { - // Use this sampling rate - raw_samplingrate = samplingrate; - cellMic.notice("Using sampling rate %d.", samplingrate); - return true; - } - cellMic.warning("Requested sampling rate %d, but we do not support it. Trying next sampling rate...", samplingrate); + continue; } - return false; - }; + cellMic.notice("Trying sampling rate %d with %d channel(s)", samplingrate, num_channels); - if (!fixup_samplingrate(raw_samplingrate)) + device = open_device(devices[0].name, samplingrate, num_al_channels, inbuf_size); + if (!device) + { + continue; + } + + // Use this sampling rate + raw_samplingrate = samplingrate; + cellMic.notice("Using sampling rate %d and %d channel(s)", raw_samplingrate, num_channels); + break; + } + + if (!device) { + cellMic.error("Failed to open capture device '%s' (raw_samplingrate=%d, num_al_channels=0x%x, inbuf_size=%d)", devices[0].name, raw_samplingrate, num_al_channels, inbuf_size); +#ifdef _WIN32 + cellMic.error("Make sure microphone use is authorized under \"Microphone privacy settings\" in windows configuration"); +#endif return CELL_MICIN_ERROR_DEVICE_NOT_SUPPORT; } @@ -460,29 +464,19 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co ensure(!devices.empty()); - ALCdevice* device = alcCaptureOpenDevice(devices[0].name.c_str(), raw_samplingrate, num_al_channels, inbuf_size); - - if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device) - { - cellMic.error("Error opening capture device %s (error=%s, device=*0x%x)", devices[0].name, fmt::alc_error{device, err}, device); -#ifdef _WIN32 - cellMic.error("Make sure microphone use is authorized under \"Microphone privacy settings\" in windows configuration"); -#endif - return CELL_MICIN_ERROR_DEVICE_NOT_SUPPORT; - } - devices[0].device = device; devices[0].buf.resize(inbuf_size, 0); if (device_type == microphone_handler::singstar && devices.size() >= 2) { // Open a 2nd microphone into the same device - device = alcCaptureOpenDevice(devices[1].name.c_str(), raw_samplingrate, AL_FORMAT_MONO16, inbuf_size); + num_al_channels = AL_FORMAT_MONO16; + device = open_device(devices[1].name, raw_samplingrate, num_al_channels, inbuf_size); - if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device) + if (!device) { // Ignore it and move on - cellMic.error("Error opening 2nd SingStar capture device %s (error=%s, device=*0x%x)", devices[1].name, fmt::alc_error{device, err}, device); + cellMic.error("Failed to open 2nd SingStar capture device '%s' (raw_samplingrate=%d, num_al_channels=0x%x, inbuf_size=%d)", devices[1].name, raw_samplingrate, num_al_channels, inbuf_size); } else { @@ -517,7 +511,7 @@ error_code microphone_device::close_microphone() { if (alcCaptureCloseDevice(micdevice.device) != ALC_TRUE) { - cellMic.error("Error closing capture device %s", micdevice.name); + cellMic.error("Error closing capture device '%s'", micdevice.name); } micdevice.device = nullptr; @@ -539,7 +533,7 @@ error_code microphone_device::start_microphone() alcCaptureStart(micdevice.device); if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR) { - cellMic.error("Error starting capture of device %s (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); + cellMic.error("Error starting capture of device '%s' (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); stop_microphone(); return CELL_MICIN_ERROR_FATAL; } @@ -558,7 +552,7 @@ error_code microphone_device::stop_microphone() alcCaptureStop(micdevice.device); if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR) { - cellMic.error("Error stopping capture of device %s (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); + cellMic.error("Error stopping capture of device '%s' (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); } } #endif @@ -637,7 +631,7 @@ u32 microphone_device::capture_audio() if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR) { - cellMic.error("Error getting number of captured samples of device %s (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); + cellMic.error("Error getting number of captured samples of device '%s' (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); return CELL_MICIN_ERROR_FATAL; } @@ -655,7 +649,7 @@ u32 microphone_device::capture_audio() if (ALCenum err = alcGetError(micdevice.device); err != ALC_NO_ERROR) { - cellMic.error("Error capturing samples of device %s (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); + cellMic.error("Error capturing samples of device '%s' (error=%s)", micdevice.name, fmt::alc_error{micdevice.device, err}); } } @@ -667,6 +661,21 @@ u32 microphone_device::capture_audio() // Private functions +#ifndef WITHOUT_OPENAL +ALCdevice* microphone_device::open_device(std::string& name, u32 samplingrate, ALCenum num_al_channels, u32 buf_size) +{ + ALCdevice* device = alcCaptureOpenDevice(name.c_str(), samplingrate, num_al_channels, buf_size); + + if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device) + { + cellMic.warning("Failed to open capture device '%s' (error=%s, device=*0x%x, samplingrate=%d, num_al_channels=0x%x, buf_size=%d)", name, fmt::alc_error{device, err}, device, samplingrate, num_al_channels, buf_size); + device = nullptr; + } + + return device; +} +#endif + void microphone_device::get_data(const u32 num_samples) { if (num_samples == 0) diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h index f17b954278..e25488c19c 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.h +++ b/rpcs3/Emu/Cell/Modules/cellMic.h @@ -326,6 +326,10 @@ private: static inline void variable_byteswap(const void* src, void* dst); inline u32 convert_16_bit_pcm_to_float(const std::vector& buffer, u32 num_bytes); +#ifndef WITHOUT_OPENAL + ALCdevice* open_device(std::string& name, u32 samplingrate, ALCenum num_al_channels, u32 buf_size); +#endif + u32 capture_audio(); void get_data(const u32 num_samples); diff --git a/rpcs3/rpcs3qt/microphone_creator.cpp b/rpcs3/rpcs3qt/microphone_creator.cpp index a0e63a5d51..9ea04defde 100644 --- a/rpcs3/rpcs3qt/microphone_creator.cpp +++ b/rpcs3/rpcs3qt/microphone_creator.cpp @@ -28,9 +28,9 @@ void microphone_creator::refresh_list() { if (const char* devices = alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER)) { - while (*devices != 0) + while (devices && *devices != 0) { - cfg_log.notice("Found microphone: %s", devices); + cfg_log.notice("Found microphone: '%s'", devices); m_microphone_list.append(devices); devices += strlen(devices) + 1; } @@ -43,6 +43,7 @@ void microphone_creator::refresh_list() if (const char* device = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER)) { + cfg_log.notice("Found default microphone: '%s'", device); m_microphone_list.append(device); } } From e095904e1b55581e1e6884cc0759e54c4578ef92 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 27 Mar 2025 04:33:28 +0100 Subject: [PATCH 229/529] cellMic: Use full device name registration and comparison --- rpcs3/Emu/Cell/Modules/cellAudioIn.h | 2 +- rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp | 133 +++++++++++++---------- rpcs3/Emu/Cell/Modules/cellMic.cpp | 39 ++++++- rpcs3/Emu/Cell/Modules/cellMic.h | 6 +- 4 files changed, 118 insertions(+), 62 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellAudioIn.h b/rpcs3/Emu/Cell/Modules/cellAudioIn.h index dc2ca6d130..7ceaa2d2bd 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudioIn.h +++ b/rpcs3/Emu/Cell/Modules/cellAudioIn.h @@ -75,7 +75,7 @@ struct CellAudioInDeviceInfo u8 reserved[12]; be_t deviceId; be_t type; - char name[64]; + char name[64]; // Not necessarily null terminated! CellAudioInSoundMode availableModes[16]; }; diff --git a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp index ed0e3d7526..32b44ccd59 100644 --- a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp @@ -38,11 +38,17 @@ void fmt_class_string::format(std::string& out, u64 arg) struct avconf_manager { shared_mutex mutex; - std::vector devices; + + struct device_info + { + CellAudioInDeviceInfo info {}; + std::string full_device_name; // The device name may be too long for CellAudioInDeviceInfo, so we additionally save the full name. + }; + std::vector devices; CellAudioInDeviceMode inDeviceMode = CELL_AUDIO_IN_SINGLE_DEVICE_MODE; // TODO: use somewhere void copy_device_info(u32 num, vm::ptr info) const; - std::optional get_device_info(vm::cptr name) const; + std::optional get_device_info(vm::cptr name) const; avconf_manager(); @@ -62,78 +68,89 @@ avconf_manager::avconf_manager() switch (g_cfg.audio.microphone_type) { case microphone_handler::standard: + { for (u32 index = 0; index < mic_list.size(); index++) { - devices.emplace_back(); - - devices[curindex].portType = CELL_AUDIO_IN_PORT_USB; - devices[curindex].availableModeCount = 1; - devices[curindex].state = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE; - devices[curindex].deviceId = 0xE11CC0DE + curindex; - devices[curindex].type = 0xC0DEE11C; - devices[curindex].availableModes[0].type = CELL_AUDIO_IN_CODING_TYPE_LPCM; - devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2; - devices[curindex].availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; - devices[curindex].deviceNumber = curindex; - strcpy_trunc(devices[curindex].name, mic_list[index]); + device_info device {}; + device.info.portType = CELL_AUDIO_IN_PORT_USB; + device.info.availableModeCount = 1; + device.info.state = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE; + device.info.deviceId = 0xE11CC0DE + curindex; + device.info.type = 0xC0DEE11C; + device.info.availableModes[0].type = CELL_AUDIO_IN_CODING_TYPE_LPCM; + device.info.availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2; + device.info.availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; + device.info.deviceNumber = curindex; + device.full_device_name = mic_list[index]; + strcpy_trunc(device.info.name, device.full_device_name); + devices.push_back(std::move(device)); curindex++; } break; + } case microphone_handler::real_singstar: case microphone_handler::singstar: + { // Only one device for singstar device - devices.emplace_back(); - - devices[curindex].portType = CELL_AUDIO_IN_PORT_USB; - devices[curindex].availableModeCount = 1; - devices[curindex].state = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE; - devices[curindex].deviceId = 0x00000001; - devices[curindex].type = 0x14150000; - devices[curindex].availableModes[0].type = CELL_AUDIO_IN_CODING_TYPE_LPCM; - devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2; - devices[curindex].availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; - devices[curindex].deviceNumber = curindex; - strcpy_trunc(devices[curindex].name, mic_list[0]); + device_info device {}; + device.info.portType = CELL_AUDIO_IN_PORT_USB; + device.info.availableModeCount = 1; + device.info.state = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE; + device.info.deviceId = 0x00000001; + device.info.type = 0x14150000; + device.info.availableModes[0].type = CELL_AUDIO_IN_CODING_TYPE_LPCM; + device.info.availableModes[0].channel = CELL_AUDIO_IN_CHNUM_2; + device.info.availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; + device.info.deviceNumber = curindex; + device.full_device_name = mic_list[0]; + strcpy_trunc(device.info.name, device.full_device_name); + devices.push_back(std::move(device)); curindex++; break; + } case microphone_handler::rocksmith: - devices.emplace_back(); - - devices[curindex].portType = CELL_AUDIO_IN_PORT_USB; - devices[curindex].availableModeCount = 1; - devices[curindex].state = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE; - devices[curindex].deviceId = 0x12BA00FF; // Specific to rocksmith usb input - devices[curindex].type = 0xC0DE73C4; - devices[curindex].availableModes[0].type = CELL_AUDIO_IN_CODING_TYPE_LPCM; - devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_1; - devices[curindex].availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; - devices[curindex].deviceNumber = curindex; - strcpy_trunc(devices[curindex].name, mic_list[0]); + { + device_info device {}; + device.info.portType = CELL_AUDIO_IN_PORT_USB; + device.info.availableModeCount = 1; + device.info.state = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE; + device.info.deviceId = 0x12BA00FF; // Specific to rocksmith usb input + device.info.type = 0xC0DE73C4; + device.info.availableModes[0].type = CELL_AUDIO_IN_CODING_TYPE_LPCM; + device.info.availableModes[0].channel = CELL_AUDIO_IN_CHNUM_1; + device.info.availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; + device.info.deviceNumber = curindex; + device.full_device_name = mic_list[0]; + strcpy_trunc(device.info.name, device.full_device_name); + devices.push_back(std::move(device)); curindex++; break; + } case microphone_handler::null: - default: break; + default: + break; } } if (g_cfg.io.camera != camera_handler::null) { - devices.emplace_back(); - - devices[curindex].portType = CELL_AUDIO_IN_PORT_USB; - devices[curindex].availableModeCount = 1; - devices[curindex].state = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE; - devices[curindex].deviceId = 0xDEADBEEF; - devices[curindex].type = 0xBEEFDEAD; - devices[curindex].availableModes[0].type = CELL_AUDIO_IN_CODING_TYPE_LPCM; - devices[curindex].availableModes[0].channel = CELL_AUDIO_IN_CHNUM_NONE; - devices[curindex].availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; - devices[curindex].deviceNumber = curindex; - strcpy_trunc(devices[curindex].name, "USB Camera"); + device_info device {}; + device.info.portType = CELL_AUDIO_IN_PORT_USB; + device.info.availableModeCount = 1; + device.info.state = CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE; + device.info.deviceId = 0xDEADBEEF; + device.info.type = 0xBEEFDEAD; + device.info.availableModes[0].type = CELL_AUDIO_IN_CODING_TYPE_LPCM; + device.info.availableModes[0].channel = CELL_AUDIO_IN_CHNUM_NONE; + device.info.availableModes[0].fs = CELL_AUDIO_IN_FS_8KHZ | CELL_AUDIO_IN_FS_12KHZ | CELL_AUDIO_IN_FS_16KHZ | CELL_AUDIO_IN_FS_24KHZ | CELL_AUDIO_IN_FS_32KHZ | CELL_AUDIO_IN_FS_48KHZ; + device.info.deviceNumber = curindex; + device.full_device_name = "USB Camera"; + strcpy_trunc(device.info.name, device.full_device_name); + devices.push_back(std::move(device)); curindex++; } } @@ -142,14 +159,14 @@ void avconf_manager::copy_device_info(u32 num, vm::ptr in { memset(info.get_ptr(), 0, sizeof(CellAudioInDeviceInfo)); ensure(num < devices.size()); - *info = devices[num]; + *info = devices[num].info; } -std::optional avconf_manager::get_device_info(vm::cptr name) const +std::optional avconf_manager::get_device_info(vm::cptr name) const { - for (const CellAudioInDeviceInfo& device : devices) + for (const device_info& device : devices) { - if (strncmp(device.name, name.get_ptr(), sizeof(device.name)) == 0) + if (strncmp(device.info.name, name.get_ptr(), sizeof(device.info.name)) == 0) { return device; } @@ -398,8 +415,8 @@ error_code cellAudioInRegisterDevice(u64 deviceType, vm::cptr name, vm::pt auto& av_manager = g_fxo->get(); const std::lock_guard lock(av_manager.mutex); - std::optional info = av_manager.get_device_info(name); - if (!info || !memchr(info->name, '\0', sizeof(info->name))) + std::optional device = av_manager.get_device_info(name); + if (!device) { // TODO return CELL_AUDIO_IN_ERROR_DEVICE_NOT_FOUND; @@ -407,7 +424,7 @@ error_code cellAudioInRegisterDevice(u64 deviceType, vm::cptr name, vm::pt auto& mic_thr = g_fxo->get(); const std::lock_guard mic_lock(mic_thr.mutex); - const u32 device_number = mic_thr.register_device(info->name); + const u32 device_number = mic_thr.register_device(device->full_device_name); return not_an_error(device_number); } diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index 864df5baa1..a5ece1be59 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -322,6 +322,8 @@ error_code microphone_device::open_microphone(const u8 type, const u32 dsp_r, co num_channels = channels; #ifndef WITHOUT_OPENAL + enumerate_devices(); + // Adjust number of channels depending on microphone type switch (device_type) { @@ -662,8 +664,43 @@ u32 microphone_device::capture_audio() // Private functions #ifndef WITHOUT_OPENAL -ALCdevice* microphone_device::open_device(std::string& name, u32 samplingrate, ALCenum num_al_channels, u32 buf_size) +void microphone_device::enumerate_devices() { + cellMic.notice("Enumerating capture devices..."); + enumerated_devices.clear(); + + if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATION_EXT") == AL_TRUE) + { + if (const char* alc_devices = alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER)) + { + while (alc_devices && *alc_devices != 0) + { + cellMic.notice("Found capture device: '%s'", alc_devices); + enumerated_devices.push_back(alc_devices); + alc_devices += strlen(alc_devices) + 1; + } + } + } + else + { + // Without enumeration we can only use one device + cellMic.error("OpenAl extension ALC_ENUMERATION_EXT not supported. The enumerated capture devices will only contain the default capture device."); + + if (const char* alc_device = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER)) + { + cellMic.notice("Found default capture device: '%s'", alc_device); + enumerated_devices.push_back(alc_device); + } + } +} + +ALCdevice* microphone_device::open_device(const std::string& name, u32 samplingrate, ALCenum num_al_channels, u32 buf_size) +{ + if (std::none_of(enumerated_devices.cbegin(), enumerated_devices.cend(), [&name](const std::string& dev){ return dev == name; })) + { + cellMic.error("Capture device '%s' not in enumerated devices", name); + } + ALCdevice* device = alcCaptureOpenDevice(name.c_str(), samplingrate, num_al_channels, buf_size); if (ALCenum err = alcGetError(device); err != ALC_NO_ERROR || !device) diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h index e25488c19c..e4b416fa6a 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.h +++ b/rpcs3/Emu/Cell/Modules/cellMic.h @@ -327,7 +327,8 @@ private: inline u32 convert_16_bit_pcm_to_float(const std::vector& buffer, u32 num_bytes); #ifndef WITHOUT_OPENAL - ALCdevice* open_device(std::string& name, u32 samplingrate, ALCenum num_al_channels, u32 buf_size); + void enumerate_devices(); + ALCdevice* open_device(const std::string& name, u32 samplingrate, ALCenum num_al_channels, u32 buf_size); #endif u32 capture_audio(); @@ -349,6 +350,7 @@ private: std::vector buf; }; + std::vector enumerated_devices; std::vector devices; std::vector temp_buf; std::vector float_buf; @@ -380,7 +382,7 @@ public: void wake_up(); // Returns index of registered device - u32 register_device(const std::string& name); + u32 register_device(const std::string& device_name); void unregister_device(u32 dev_num); bool check_device(u32 dev_num); From 600e4604169464c64cbf548e7629e483ad2aad1e Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 7 Apr 2025 20:49:15 +0200 Subject: [PATCH 230/529] Fix compilation with newer Qt --- rpcs3/rpcs3qt/game_list_base.cpp | 2 +- rpcs3/rpcs3qt/game_list_frame.cpp | 4 ++-- rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp index 72b45d33bf..21640906ee 100644 --- a/rpcs3/rpcs3qt/game_list_base.cpp +++ b/rpcs3/rpcs3qt/game_list_base.cpp @@ -25,7 +25,7 @@ void game_list_base::repaint_icons(std::vector& game_data, const QCol for (game_info& game : game_data) { game->pxmap = placeholder; - + if (movie_item_base* item = game->item) { item->set_icon_load_func([this, game, device_pixel_ratio, cancel = item->icon_loading_aborted()](int) diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index a294d69cc6..4399137600 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -2363,7 +2363,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set connect(future_watcher, &QFutureWatcher::finished, this, [=, this]() { - pdlg->setLabelText(progressLabel.arg(+*index).arg(serials_size)); + pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size)); pdlg->setCancelButtonText(tr("OK")); QApplication::beep(); @@ -2396,7 +2396,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set return; } - pdlg->setLabelText(progressLabel.arg(+*index).arg(serials_size)); + pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size)); pdlg->setCancelButtonText(tr("OK")); connect(pdlg, &progress_dialog::canceled, this, [pdlg](){ pdlg->deleteLater(); }); QApplication::beep(); diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp index 45fbe6f59e..4b9bc5dd6e 100644 --- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp +++ b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp @@ -362,7 +362,7 @@ void ps_move_tracker_dialog::update_saturation_threshold(bool update_slider) } void ps_move_tracker_dialog::update_min_radius(bool update_slider) { - ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius)); + ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius.get())); if (update_slider) { @@ -372,7 +372,7 @@ void ps_move_tracker_dialog::update_min_radius(bool update_slider) void ps_move_tracker_dialog::update_max_radius(bool update_slider) { - ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius)); + ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius.get())); if (update_slider) { From daa76be77e01874c1f2ef12999a808505a123ad6 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 7 Apr 2025 20:30:53 +0200 Subject: [PATCH 231/529] Update soundtouch to 2.4.0 --- 3rdparty/SoundTouch/soundtouch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/SoundTouch/soundtouch b/3rdparty/SoundTouch/soundtouch index 394e1f58b2..3982730833 160000 --- a/3rdparty/SoundTouch/soundtouch +++ b/3rdparty/SoundTouch/soundtouch @@ -1 +1 @@ -Subproject commit 394e1f58b23dc80599214d2e9b6a5e0dfd0bbe07 +Subproject commit 3982730833b6daefe77dcfb32b5c282851640c17 From ddf684c4d2532f75c2e8ba98c973dda1b67ea8b8 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 7 Apr 2025 20:26:05 +0200 Subject: [PATCH 232/529] Update curl to 8.13.0 --- 3rdparty/curl/curl | 2 +- 3rdparty/curl/libcurl.vcxproj | 14 +++++++-- 3rdparty/curl/libcurl.vcxproj.filters | 42 +++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/3rdparty/curl/curl b/3rdparty/curl/curl index 57495c6487..1c31498817 160000 --- a/3rdparty/curl/curl +++ b/3rdparty/curl/curl @@ -1 +1 @@ -Subproject commit 57495c64871d18905a0941db9196ef90bafe9a29 +Subproject commit 1c3149881769e7bd79b072e48374e4c2b3678b2f diff --git a/3rdparty/curl/libcurl.vcxproj b/3rdparty/curl/libcurl.vcxproj index 710ea9b225..6c8cd23ffb 100644 --- a/3rdparty/curl/libcurl.vcxproj +++ b/3rdparty/curl/libcurl.vcxproj @@ -76,6 +76,7 @@ + @@ -94,7 +95,9 @@ + + @@ -112,6 +115,7 @@ + @@ -138,6 +142,7 @@ + @@ -145,6 +150,7 @@ + @@ -174,10 +180,9 @@ + - - @@ -260,6 +265,7 @@ + @@ -291,6 +297,7 @@ + @@ -309,6 +316,7 @@ + @@ -328,11 +336,13 @@ + + diff --git a/3rdparty/curl/libcurl.vcxproj.filters b/3rdparty/curl/libcurl.vcxproj.filters index 3592158a28..15fe93ce39 100644 --- a/3rdparty/curl/libcurl.vcxproj.filters +++ b/3rdparty/curl/libcurl.vcxproj.filters @@ -291,12 +291,6 @@ Source Files - - Source Files - - - Source Files - Source Files @@ -522,6 +516,27 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -1055,6 +1070,21 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + From 58714d8c6874ee87b0c0155d8ab1acc16d3ac0f9 Mon Sep 17 00:00:00 2001 From: Ani Date: Mon, 7 Apr 2025 12:38:53 +0200 Subject: [PATCH 233/529] docker: Update ffmpeg to 7.1.1 --- .cirrus.yml | 4 ++-- .github/workflows/rpcs3.yml | 6 +++--- azure-pipelines.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3b71413102..6041cc8702 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -58,7 +58,7 @@ env: # linux_task: # container: -# image: rpcs3/rpcs3-ci-jammy:1.2 +# image: rpcs3/rpcs3-ci-jammy:1.5 # cpu: 4 # memory: 16G # env: @@ -134,7 +134,7 @@ freebsd_task: # matrix: # - name: Cirrus Linux AArch64 Clang # arm_container: -# image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.2' +# image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.5' # cpu: 8 # memory: 8G # clang_script: diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index d28c13f6e2..683712cf69 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -25,17 +25,17 @@ jobs: matrix: include: - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.4" + docker_img: "rpcs3/rpcs3-ci-jammy:1.5" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: clang UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.4" + docker_img: "rpcs3/rpcs3-ci-jammy:1.5" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: gcc - os: ubuntu-24.04-arm - docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.4" + docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.5" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" compiler: clang UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8e2ef1d8fb..5e442bd01b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,13 +40,13 @@ jobs: # displayName: ccache # - bash: | -# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.4 +# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.5 # docker run \ # -v $(pwd):/rpcs3 \ # --env-file .ci/docker.env \ # -v $CCACHE_DIR:/root/.ccache \ # -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -# rpcs3/rpcs3-ci-jammy:1.4 \ +# rpcs3/rpcs3-ci-jammy:1.5 \ # /rpcs3/.ci/build-linux.sh # displayName: Docker setup and build From 16036e0419333082f49a2b777f52ad13c2bd9210 Mon Sep 17 00:00:00 2001 From: Ani Date: Tue, 8 Apr 2025 06:43:43 +0200 Subject: [PATCH 234/529] ppu: Remove redundant checks on MTFSF Closes #11176 --- rpcs3/Emu/Cell/PPUTranslator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp index ac630f7582..bc3667d7bf 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.cpp +++ b/rpcs3/Emu/Cell/PPUTranslator.cpp @@ -4653,7 +4653,7 @@ void PPUTranslator::MTFSF(ppu_opcode_t op) for (u32 i = 16; i < 20; i++) { - if (i != 1 && i != 2 && (op.flm & (128 >> (i / 4))) != 0) + if (op.flm & (128 >> (i / 4)) != 0) { SetFPSCRBit(i, Trunc(m_ir->CreateLShr(value, i ^ 31), GetType()), false); } From e4d84e2c1c8465a40642aa882cd6dc08273173d9 Mon Sep 17 00:00:00 2001 From: Ani Date: Tue, 8 Apr 2025 05:03:34 +0200 Subject: [PATCH 235/529] Qt: Fix multi package install dialog on Linux --- rpcs3/rpcs3qt/richtext_item_delegate.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/rpcs3/rpcs3qt/richtext_item_delegate.h b/rpcs3/rpcs3qt/richtext_item_delegate.h index 8e09413397..06686df6c6 100644 --- a/rpcs3/rpcs3qt/richtext_item_delegate.h +++ b/rpcs3/rpcs3qt/richtext_item_delegate.h @@ -38,12 +38,7 @@ public: // Adjust our painter parameters with some magic that looks good. // This is necessary so that we don't draw on top of the optional widget. - // If you're not happy with this code don't hesitate to contact Megamouse -#ifdef __linux__ - static constexpr int margin_adjustement = 12; -#else static constexpr int margin_adjustement = 4; -#endif const int margin = (option.rect.height() - opt.fontMetrics.height() - margin_adjustement); QRect text_rect = style->subElementRect(QStyle::SE_ItemViewItemText, &opt, nullptr); @@ -56,10 +51,7 @@ public: text_rect.setTop(text_rect.top() + margin); painter->translate(text_rect.topLeft()); - -#ifndef __linux__ painter->setClipRect(text_rect.translated(-text_rect.topLeft())); -#endif // Create a context for our painter QAbstractTextDocumentLayout::PaintContext context; From 87d8bebd0d1b5ef2e10bc14d5c4f64cdd4d1e1a3 Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Tue, 8 Apr 2025 11:10:44 +0300 Subject: [PATCH 236/529] PPU LLVM: Fixup MTFSF --- rpcs3/Emu/Cell/PPUTranslator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp index bc3667d7bf..e485eeecfb 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.cpp +++ b/rpcs3/Emu/Cell/PPUTranslator.cpp @@ -4653,7 +4653,7 @@ void PPUTranslator::MTFSF(ppu_opcode_t op) for (u32 i = 16; i < 20; i++) { - if (op.flm & (128 >> (i / 4)) != 0) + if ((op.flm & (128 >> (i / 4))) != 0) { SetFPSCRBit(i, Trunc(m_ir->CreateLShr(value, i ^ 31), GetType()), false); } From 21434c471bbe156246497d441be0707f7112ee8d Mon Sep 17 00:00:00 2001 From: kd-11 Date: Tue, 8 Apr 2025 01:53:01 +0300 Subject: [PATCH 237/529] rsx: Track command barrier types during recording for faster instancing compatibility checks --- rpcs3/Emu/RSX/NV47/FW/draw_call.cpp | 38 ++++++++++------------------- rpcs3/Emu/RSX/NV47/FW/draw_call.hpp | 3 +++ 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp b/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp index 640db9c762..96b1910ae9 100644 --- a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp +++ b/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp @@ -44,6 +44,8 @@ namespace rsx } }; + draw_command_barrier_mask |= (1u << type); + if (type == primitive_restart_barrier) { // Rasterization flow barrier @@ -97,16 +99,6 @@ namespace rsx return false; } - // For instancing all draw calls must be identical - const auto& ref = draw_command_ranges.front(); - for (const auto& range : draw_command_ranges) - { - if (range.first != ref.first || range.count != ref.count) - { - return false; - } - } - if (draw_command_barriers.empty()) { // Raise alarm here for investigation, we may be missing a corner case. @@ -115,30 +107,26 @@ namespace rsx } // Barriers must exist, but can only involve updating transform constants (for now) - for (const auto& barrier : draw_command_barriers) - { - if (barrier.type != rsx::transform_constant_load_modifier_barrier && - barrier.type != rsx::transform_constant_update_barrier) - { - ensure(barrier.draw_id < ::size32(draw_command_ranges)); - if (draw_command_ranges[barrier.draw_id].count == 0) - { - // Dangling command barriers are ignored. We're also at the end of the command, so abort. - break; - } + const u32 compatible_barrier_mask = + (1u << rsx::transform_constant_load_modifier_barrier) | + (1u << rsx::transform_constant_update_barrier); - // Fail. Only transform constant instancing is supported at the moment. - return false; - } + if (draw_command_barrier_mask & ~compatible_barrier_mask) + { + return false; } - return true; + // For instancing all draw calls must be identical + // FIXME: This requirement can be easily lifted by chunking contiguous chunks. + const auto& ref = draw_command_ranges.front(); + return !draw_command_ranges.any(FN(x.first != ref.first || x.count != ref.count)); } void draw_clause::reset(primitive_type type) { current_range_index = ~0u; last_execution_barrier_index = 0; + draw_command_barrier_mask = 0; command = draw_command::none; primitive = type; diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp b/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp index 4e350e985d..416a82fbae 100644 --- a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp +++ b/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp @@ -29,6 +29,9 @@ namespace rsx // Location of last execution barrier u32 last_execution_barrier_index{}; + // Mask of all active barriers + u32 draw_command_barrier_mask = 0; + // Draw-time iterator to the draw_command_barriers struct mutable simple_array::iterator current_barrier_it; From d08610882aa48559a3aa675c562ddad8757fd9fe Mon Sep 17 00:00:00 2001 From: kd-11 Date: Tue, 8 Apr 2025 23:45:32 +0300 Subject: [PATCH 238/529] rsx: Remove superfluous log - Back-to-back range with no barrier will already be logged in draw_call::append --- rpcs3/Emu/RSX/NV47/FW/draw_call.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp b/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp index 96b1910ae9..e4dcb5dad4 100644 --- a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp +++ b/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp @@ -101,8 +101,6 @@ namespace rsx if (draw_command_barriers.empty()) { - // Raise alarm here for investigation, we may be missing a corner case. - rsx_log.error("Instanced draw detected, but no command barriers found!"); return false; } From 15758171f0ea2f8a8dbe6c1b970a586b19ae7650 Mon Sep 17 00:00:00 2001 From: Ani Date: Tue, 8 Apr 2025 07:15:30 +0200 Subject: [PATCH 239/529] glext: Update from 2022.05.30 to 2025.02.03 --- 3rdparty/GL/glext.h | 51 ++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/3rdparty/GL/glext.h b/3rdparty/GL/glext.h index 61ff1b0708..276a962a96 100644 --- a/3rdparty/GL/glext.h +++ b/3rdparty/GL/glext.h @@ -32,7 +32,7 @@ extern "C" { #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20220530 +#define GL_GLEXT_VERSION 20250203 #include @@ -5397,12 +5397,12 @@ typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severi typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam); -typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); +typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message); #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, void *userParam); -GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); +GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message); #endif #endif /* GL_AMD_debug_output */ @@ -7370,6 +7370,16 @@ GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, #endif #endif /* GL_EXT_framebuffer_blit */ +#ifndef GL_EXT_framebuffer_blit_layers +#define GL_EXT_framebuffer_blit_layers 1 +typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYERSEXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlitFramebufferLayersEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +GLAPI void APIENTRY glBlitFramebufferLayerEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter); +#endif +#endif /* GL_EXT_framebuffer_blit_layers */ + #ifndef GL_EXT_framebuffer_multisample #define GL_EXT_framebuffer_multisample 1 #define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB @@ -9394,6 +9404,11 @@ GLAPI void APIENTRY glResizeBuffersMESA (void); #define GL_MESA_shader_integer_functions 1 #endif /* GL_MESA_shader_integer_functions */ +#ifndef GL_MESA_texture_const_bandwidth +#define GL_MESA_texture_const_bandwidth 1 +#define GL_CONST_BW_TILING_MESA 0x8BBE +#endif /* GL_MESA_texture_const_bandwidth */ + #ifndef GL_MESA_tile_raster_order #define GL_MESA_tile_raster_order 1 #define GL_TILE_RASTER_ORDER_FIXED_MESA 0x8BB8 @@ -10248,12 +10263,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v); typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog); -typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x); typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v); typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y); @@ -10266,6 +10275,12 @@ typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, c typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog); +typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight); +typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y); GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v); @@ -10295,12 +10310,6 @@ GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v); GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog); -GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog); -GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight); -GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight); GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x); GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v); GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y); @@ -10313,6 +10322,12 @@ GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfN GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v); GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v); GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v); +GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog); +GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog); +GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue); +GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v); +GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight); +GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight); #endif #endif /* GL_NV_half_float */ @@ -11449,6 +11464,10 @@ GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id); #endif #endif /* GL_NV_transform_feedback2 */ +#ifndef GL_NV_uniform_buffer_std430_layout +#define GL_NV_uniform_buffer_std430_layout 1 +#endif /* GL_NV_uniform_buffer_std430_layout */ + #ifndef GL_NV_uniform_buffer_unified_memory #define GL_NV_uniform_buffer_unified_memory 1 #define GL_UNIFORM_BUFFER_UNIFIED_NV 0x936E @@ -11964,8 +11983,10 @@ GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum s #define GL_MAX_VIEWS_OVR 0x9631 #define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633 typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); +GLAPI void APIENTRY glNamedFramebufferTextureMultiviewOVR (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); #endif #endif /* GL_OVR_multiview */ From db85595124d486792b6efaef1f0ef46384514a99 Mon Sep 17 00:00:00 2001 From: Ani Date: Tue, 8 Apr 2025 07:29:17 +0200 Subject: [PATCH 240/529] rsx: Replace robin_hood with ankerl::unordered_dense --- 3rdparty/robin_hood/include/robin_hood.h | 2551 ----------------- .../unordered_dense/include/unordered_dense.h | 2101 ++++++++++++++ rpcs3/Emu/RSX/Common/unordered_map.hpp | 4 +- 3 files changed, 2103 insertions(+), 2553 deletions(-) delete mode 100644 3rdparty/robin_hood/include/robin_hood.h create mode 100644 3rdparty/unordered_dense/include/unordered_dense.h diff --git a/3rdparty/robin_hood/include/robin_hood.h b/3rdparty/robin_hood/include/robin_hood.h deleted file mode 100644 index 12b230defb..0000000000 --- a/3rdparty/robin_hood/include/robin_hood.h +++ /dev/null @@ -1,2551 +0,0 @@ -// ______ _____ ______ _________ -// ______________ ___ /_ ___(_)_______ ___ /_ ______ ______ ______ / -// __ ___/_ __ \__ __ \__ / __ __ \ __ __ \_ __ \_ __ \_ __ / -// _ / / /_/ /_ /_/ /_ / _ / / / _ / / // /_/ // /_/ // /_/ / -// /_/ \____/ /_.___/ /_/ /_/ /_/ ________/_/ /_/ \____/ \____/ \__,_/ -// _/_____/ -// -// Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20 -// https://github.com/martinus/robin-hood-hashing -// -// Licensed under the MIT License . -// SPDX-License-Identifier: MIT -// Copyright (c) 2018-2021 Martin Ankerl -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#ifndef ROBIN_HOOD_H_INCLUDED -#define ROBIN_HOOD_H_INCLUDED - -// see https://semver.org/ -#define ROBIN_HOOD_VERSION_MAJOR 3 // for incompatible API changes -#define ROBIN_HOOD_VERSION_MINOR 11 // for adding functionality in a backwards-compatible manner -#define ROBIN_HOOD_VERSION_PATCH 5 // for backwards-compatible bug fixes - -#include -#include -#include -#include -#include -#include // only to support hash of smart pointers -#include -#include -#include -#include -#if __cplusplus >= 201703L -# include -#endif - -// #define ROBIN_HOOD_LOG_ENABLED -#ifdef ROBIN_HOOD_LOG_ENABLED -# include -# define ROBIN_HOOD_LOG(...) \ - std::cout << __FUNCTION__ << "@" << __LINE__ << ": " << __VA_ARGS__ << std::endl; -#else -# define ROBIN_HOOD_LOG(x) -#endif - -// #define ROBIN_HOOD_TRACE_ENABLED -#ifdef ROBIN_HOOD_TRACE_ENABLED -# include -# define ROBIN_HOOD_TRACE(...) \ - std::cout << __FUNCTION__ << "@" << __LINE__ << ": " << __VA_ARGS__ << std::endl; -#else -# define ROBIN_HOOD_TRACE(x) -#endif - -// #define ROBIN_HOOD_COUNT_ENABLED -#ifdef ROBIN_HOOD_COUNT_ENABLED -# include -# define ROBIN_HOOD_COUNT(x) ++counts().x; -namespace robin_hood { - struct Counts { - uint64_t shiftUp{}; - uint64_t shiftDown{}; - }; - inline std::ostream& operator<<(std::ostream& os, Counts const& c) { - return os << c.shiftUp << " shiftUp" << std::endl << c.shiftDown << " shiftDown" << std::endl; - } - - static Counts& counts() { - static Counts counts{}; - return counts; - } -} // namespace robin_hood -#else -# define ROBIN_HOOD_COUNT(x) -#endif - -// all non-argument macros should use this facility. See -// https://www.fluentcpp.com/2019/05/28/better-macros-better-flags/ -#define ROBIN_HOOD(x) ROBIN_HOOD_PRIVATE_DEFINITION_##x() - -// mark unused members with this macro -#define ROBIN_HOOD_UNUSED(identifier) - -// bitness -#if SIZE_MAX == UINT32_MAX -# define ROBIN_HOOD_PRIVATE_DEFINITION_BITNESS() 32 -#elif SIZE_MAX == UINT64_MAX -# define ROBIN_HOOD_PRIVATE_DEFINITION_BITNESS() 64 -#else -# error Unsupported bitness -#endif - -// endianess -#ifdef _MSC_VER -# define ROBIN_HOOD_PRIVATE_DEFINITION_LITTLE_ENDIAN() 1 -# define ROBIN_HOOD_PRIVATE_DEFINITION_BIG_ENDIAN() 0 -#else -# define ROBIN_HOOD_PRIVATE_DEFINITION_LITTLE_ENDIAN() \ - (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) -# define ROBIN_HOOD_PRIVATE_DEFINITION_BIG_ENDIAN() (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) -#endif - -// inline -#ifdef _MSC_VER -# define ROBIN_HOOD_PRIVATE_DEFINITION_NOINLINE() __declspec(noinline) -#else -# define ROBIN_HOOD_PRIVATE_DEFINITION_NOINLINE() __attribute__((noinline)) -#endif - -// exceptions -#if !defined(__cpp_exceptions) && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND) -# define ROBIN_HOOD_PRIVATE_DEFINITION_HAS_EXCEPTIONS() 0 -#else -# define ROBIN_HOOD_PRIVATE_DEFINITION_HAS_EXCEPTIONS() 1 -#endif - -// count leading/trailing bits -#if !defined(ROBIN_HOOD_DISABLE_INTRINSICS) -# ifdef _MSC_VER -# if ROBIN_HOOD(BITNESS) == 32 -# define ROBIN_HOOD_PRIVATE_DEFINITION_BITSCANFORWARD() _BitScanForward -# else -# define ROBIN_HOOD_PRIVATE_DEFINITION_BITSCANFORWARD() _BitScanForward64 -# endif -# include -# pragma intrinsic(ROBIN_HOOD(BITSCANFORWARD)) -# define ROBIN_HOOD_COUNT_TRAILING_ZEROES(x) \ - [](size_t mask) noexcept -> int { \ - unsigned long index; \ - return ROBIN_HOOD(BITSCANFORWARD)(&index, mask) ? static_cast(index) \ - : ROBIN_HOOD(BITNESS); \ - }(x) -# else -# if ROBIN_HOOD(BITNESS) == 32 -# define ROBIN_HOOD_PRIVATE_DEFINITION_CTZ() __builtin_ctzl -# define ROBIN_HOOD_PRIVATE_DEFINITION_CLZ() __builtin_clzl -# else -# define ROBIN_HOOD_PRIVATE_DEFINITION_CTZ() __builtin_ctzll -# define ROBIN_HOOD_PRIVATE_DEFINITION_CLZ() __builtin_clzll -# endif -# define ROBIN_HOOD_COUNT_LEADING_ZEROES(x) ((x) ? ROBIN_HOOD(CLZ)(x) : ROBIN_HOOD(BITNESS)) -# define ROBIN_HOOD_COUNT_TRAILING_ZEROES(x) ((x) ? ROBIN_HOOD(CTZ)(x) : ROBIN_HOOD(BITNESS)) -# endif -#endif - -// fallthrough -#ifndef __has_cpp_attribute // For backwards compatibility -# define __has_cpp_attribute(x) 0 -#endif -#if __has_cpp_attribute(clang::fallthrough) -# define ROBIN_HOOD_PRIVATE_DEFINITION_FALLTHROUGH() [[clang::fallthrough]] -#elif __has_cpp_attribute(gnu::fallthrough) -# define ROBIN_HOOD_PRIVATE_DEFINITION_FALLTHROUGH() [[gnu::fallthrough]] -#else -# define ROBIN_HOOD_PRIVATE_DEFINITION_FALLTHROUGH() -#endif - -// likely/unlikely -#ifdef _MSC_VER -# define ROBIN_HOOD_LIKELY(condition) condition -# define ROBIN_HOOD_UNLIKELY(condition) condition -#else -# define ROBIN_HOOD_LIKELY(condition) __builtin_expect(condition, 1) -# define ROBIN_HOOD_UNLIKELY(condition) __builtin_expect(condition, 0) -#endif - -// detect if native wchar_t type is availiable in MSVC -#ifdef _MSC_VER -# ifdef _NATIVE_WCHAR_T_DEFINED -# define ROBIN_HOOD_PRIVATE_DEFINITION_HAS_NATIVE_WCHART() 1 -# else -# define ROBIN_HOOD_PRIVATE_DEFINITION_HAS_NATIVE_WCHART() 0 -# endif -#else -# define ROBIN_HOOD_PRIVATE_DEFINITION_HAS_NATIVE_WCHART() 1 -#endif - -// detect if MSVC supports the pair(std::piecewise_construct_t,...) consructor being constexpr -#ifdef _MSC_VER -# if _MSC_VER <= 1900 -# define ROBIN_HOOD_PRIVATE_DEFINITION_BROKEN_CONSTEXPR() 1 -# else -# define ROBIN_HOOD_PRIVATE_DEFINITION_BROKEN_CONSTEXPR() 0 -# endif -#else -# define ROBIN_HOOD_PRIVATE_DEFINITION_BROKEN_CONSTEXPR() 0 -#endif - -// workaround missing "is_trivially_copyable" in g++ < 5.0 -// See https://stackoverflow.com/a/31798726/48181 -#if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__) -# define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) __has_trivial_copy(__VA_ARGS__) -#else -# define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) std::is_trivially_copyable<__VA_ARGS__>::value -#endif - -// helpers for C++ versions, see https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html -#define ROBIN_HOOD_PRIVATE_DEFINITION_CXX() __cplusplus -#define ROBIN_HOOD_PRIVATE_DEFINITION_CXX98() 199711L -#define ROBIN_HOOD_PRIVATE_DEFINITION_CXX11() 201103L -#define ROBIN_HOOD_PRIVATE_DEFINITION_CXX14() 201402L -#define ROBIN_HOOD_PRIVATE_DEFINITION_CXX17() 201703L - -#if ROBIN_HOOD(CXX) >= ROBIN_HOOD(CXX17) -# define ROBIN_HOOD_PRIVATE_DEFINITION_NODISCARD() [[nodiscard]] -#else -# define ROBIN_HOOD_PRIVATE_DEFINITION_NODISCARD() -#endif - -namespace robin_hood { - -#if ROBIN_HOOD(CXX) >= ROBIN_HOOD(CXX14) -# define ROBIN_HOOD_STD std -#else - - // c++11 compatibility layer - namespace ROBIN_HOOD_STD { - template - struct alignment_of - : std::integral_constant::type)> {}; - - template - class integer_sequence { - public: - using value_type = T; - static_assert(std::is_integral::value, "not integral type"); - static constexpr std::size_t size() noexcept { - return sizeof...(Ints); - } - }; - template - using index_sequence = integer_sequence; - - namespace detail_ { - template - struct IntSeqImpl { - using TValue = T; - static_assert(std::is_integral::value, "not integral type"); - static_assert(Begin >= 0 && Begin < End, "unexpected argument (Begin<0 || Begin<=End)"); - - template - struct IntSeqCombiner; - - template - struct IntSeqCombiner, integer_sequence> { - using TResult = integer_sequence; - }; - - using TResult = - typename IntSeqCombiner::TResult, - typename IntSeqImpl::TResult>::TResult; - }; - - template - struct IntSeqImpl { - using TValue = T; - static_assert(std::is_integral::value, "not integral type"); - static_assert(Begin >= 0, "unexpected argument (Begin<0)"); - using TResult = integer_sequence; - }; - - template - struct IntSeqImpl { - using TValue = T; - static_assert(std::is_integral::value, "not integral type"); - static_assert(Begin >= 0, "unexpected argument (Begin<0)"); - using TResult = integer_sequence; - }; - } // namespace detail_ - - template - using make_integer_sequence = typename detail_::IntSeqImpl::TResult; - - template - using make_index_sequence = make_integer_sequence; - - template - using index_sequence_for = make_index_sequence; - - } // namespace ROBIN_HOOD_STD - -#endif - - namespace detail { - - // make sure we static_cast to the correct type for hash_int -#if ROBIN_HOOD(BITNESS) == 64 - using SizeT = uint64_t; -#else - using SizeT = uint32_t; -#endif - - template - T rotr(T x, unsigned k) { - return (x >> k) | (x << (8U * sizeof(T) - k)); - } - - // This cast gets rid of warnings like "cast from 'uint8_t*' {aka 'unsigned char*'} to - // 'uint64_t*' {aka 'long unsigned int*'} increases required alignment of target type". Use with - // care! - template - inline T reinterpret_cast_no_cast_align_warning(void* ptr) noexcept { - return reinterpret_cast(ptr); - } - - template - inline T reinterpret_cast_no_cast_align_warning(void const* ptr) noexcept { - return reinterpret_cast(ptr); - } - - // make sure this is not inlined as it is slow and dramatically enlarges code, thus making other - // inlinings more difficult. Throws are also generally the slow path. - template - [[noreturn]] ROBIN_HOOD(NOINLINE) -#if ROBIN_HOOD(HAS_EXCEPTIONS) - void doThrow(Args&&... args) { - // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-array-to-pointer-decay) - throw E(std::forward(args)...); - } -#else - void doThrow(Args&&... ROBIN_HOOD_UNUSED(args) /*unused*/) { - abort(); - } -#endif - - template - T* assertNotNull(T* t, Args&&... args) { - if (ROBIN_HOOD_UNLIKELY(nullptr == t)) { - doThrow(std::forward(args)...); - } - return t; - } - - template - inline T unaligned_load(void const* ptr) noexcept { - // using memcpy so we don't get into unaligned load problems. - // compiler should optimize this very well anyways. - T t; - std::memcpy(&t, ptr, sizeof(T)); - return t; - } - - // Allocates bulks of memory for objects of type T. This deallocates the memory in the destructor, - // and keeps a linked list of the allocated memory around. Overhead per allocation is the size of a - // pointer. - template - class BulkPoolAllocator { - public: - BulkPoolAllocator() noexcept = default; - - // does not copy anything, just creates a new allocator. - BulkPoolAllocator(const BulkPoolAllocator& ROBIN_HOOD_UNUSED(o) /*unused*/) noexcept - : mHead(nullptr) - , mListForFree(nullptr) {} - - BulkPoolAllocator(BulkPoolAllocator&& o) noexcept - : mHead(o.mHead) - , mListForFree(o.mListForFree) { - o.mListForFree = nullptr; - o.mHead = nullptr; - } - - BulkPoolAllocator& operator=(BulkPoolAllocator&& o) noexcept { - reset(); - mHead = o.mHead; - mListForFree = o.mListForFree; - o.mListForFree = nullptr; - o.mHead = nullptr; - return *this; - } - - BulkPoolAllocator& - // NOLINTNEXTLINE(bugprone-unhandled-self-assignment,cert-oop54-cpp) - operator=(const BulkPoolAllocator& ROBIN_HOOD_UNUSED(o) /*unused*/) noexcept { - // does not do anything - return *this; - } - - ~BulkPoolAllocator() noexcept { - reset(); - } - - // Deallocates all allocated memory. - void reset() noexcept { - while (mListForFree) { - T* tmp = *mListForFree; - ROBIN_HOOD_LOG("std::free") - std::free(mListForFree); - mListForFree = reinterpret_cast_no_cast_align_warning(tmp); - } - mHead = nullptr; - } - - // allocates, but does NOT initialize. Use in-place new constructor, e.g. - // T* obj = pool.allocate(); - // ::new (static_cast(obj)) T(); - T* allocate() { - T* tmp = mHead; - if (!tmp) { - tmp = performAllocation(); - } - - mHead = *reinterpret_cast_no_cast_align_warning(tmp); - return tmp; - } - - // does not actually deallocate but puts it in store. - // make sure you have already called the destructor! e.g. with - // obj->~T(); - // pool.deallocate(obj); - void deallocate(T* obj) noexcept { - *reinterpret_cast_no_cast_align_warning(obj) = mHead; - mHead = obj; - } - - // Adds an already allocated block of memory to the allocator. This allocator is from now on - // responsible for freeing the data (with free()). If the provided data is not large enough to - // make use of, it is immediately freed. Otherwise it is reused and freed in the destructor. - void addOrFree(void* ptr, const size_t numBytes) noexcept { - // calculate number of available elements in ptr - if (numBytes < ALIGNMENT + ALIGNED_SIZE) { - // not enough data for at least one element. Free and return. - ROBIN_HOOD_LOG("std::free") - std::free(ptr); - } - else { - ROBIN_HOOD_LOG("add to buffer") - add(ptr, numBytes); - } - } - - void swap(BulkPoolAllocator& other) noexcept { - using std::swap; - swap(mHead, other.mHead); - swap(mListForFree, other.mListForFree); - } - - private: - // iterates the list of allocated memory to calculate how many to alloc next. - // Recalculating this each time saves us a size_t member. - // This ignores the fact that memory blocks might have been added manually with addOrFree. In - // practice, this should not matter much. - ROBIN_HOOD(NODISCARD) size_t calcNumElementsToAlloc() const noexcept { - auto tmp = mListForFree; - size_t numAllocs = MinNumAllocs; - - while (numAllocs * 2 <= MaxNumAllocs && tmp) { - auto x = reinterpret_cast(tmp); - tmp = *x; - numAllocs *= 2; - } - - return numAllocs; - } - - // WARNING: Underflow if numBytes < ALIGNMENT! This is guarded in addOrFree(). - void add(void* ptr, const size_t numBytes) noexcept { - const size_t numElements = (numBytes - ALIGNMENT) / ALIGNED_SIZE; - - auto data = reinterpret_cast(ptr); - - // link free list - auto x = reinterpret_cast(data); - *x = mListForFree; - mListForFree = data; - - // create linked list for newly allocated data - auto* const headT = - reinterpret_cast_no_cast_align_warning(reinterpret_cast(ptr) + ALIGNMENT); - - auto* const head = reinterpret_cast(headT); - - // Visual Studio compiler automatically unrolls this loop, which is pretty cool - for (size_t i = 0; i < numElements; ++i) { - *reinterpret_cast_no_cast_align_warning(head + i * ALIGNED_SIZE) = - head + (i + 1) * ALIGNED_SIZE; - } - - // last one points to 0 - *reinterpret_cast_no_cast_align_warning(head + (numElements - 1) * ALIGNED_SIZE) = - mHead; - mHead = headT; - } - - // Called when no memory is available (mHead == 0). - // Don't inline this slow path. - ROBIN_HOOD(NOINLINE) T* performAllocation() { - size_t const numElementsToAlloc = calcNumElementsToAlloc(); - - // alloc new memory: [prev |T, T, ... T] - size_t const bytes = ALIGNMENT + ALIGNED_SIZE * numElementsToAlloc; - ROBIN_HOOD_LOG("std::malloc " << bytes << " = " << ALIGNMENT << " + " << ALIGNED_SIZE - << " * " << numElementsToAlloc) - add(assertNotNull(std::malloc(bytes)), bytes); - return mHead; - } - - // enforce byte alignment of the T's -#if ROBIN_HOOD(CXX) >= ROBIN_HOOD(CXX14) - static constexpr size_t ALIGNMENT = - (std::max)(std::alignment_of::value, std::alignment_of::value); -#else - static const size_t ALIGNMENT = - (ROBIN_HOOD_STD::alignment_of::value > ROBIN_HOOD_STD::alignment_of::value) - ? ROBIN_HOOD_STD::alignment_of::value - : +ROBIN_HOOD_STD::alignment_of::value; // the + is for walkarround -#endif - - static constexpr size_t ALIGNED_SIZE = ((sizeof(T) - 1) / ALIGNMENT + 1) * ALIGNMENT; - - static_assert(MinNumAllocs >= 1, "MinNumAllocs"); - static_assert(MaxNumAllocs >= MinNumAllocs, "MaxNumAllocs"); - static_assert(ALIGNED_SIZE >= sizeof(T*), "ALIGNED_SIZE"); - static_assert(0 == (ALIGNED_SIZE % sizeof(T*)), "ALIGNED_SIZE mod"); - static_assert(ALIGNMENT >= sizeof(T*), "ALIGNMENT"); - - T* mHead{ nullptr }; - T** mListForFree{ nullptr }; - }; - - template - struct NodeAllocator; - - // dummy allocator that does nothing - template - struct NodeAllocator { - - // we are not using the data, so just free it. - void addOrFree(void* ptr, size_t ROBIN_HOOD_UNUSED(numBytes) /*unused*/) noexcept { - ROBIN_HOOD_LOG("std::free") - std::free(ptr); - } - }; - - template - struct NodeAllocator : public BulkPoolAllocator {}; - - // c++14 doesn't have is_nothrow_swappable, and clang++ 6.0.1 doesn't like it either, so I'm making - // my own here. - namespace swappable { -#if ROBIN_HOOD(CXX) < ROBIN_HOOD(CXX17) - using std::swap; - template - struct nothrow { - static const bool value = noexcept(swap(std::declval(), std::declval())); - }; -#else - template - struct nothrow { - static const bool value = std::is_nothrow_swappable::value; - }; -#endif - } // namespace swappable - - } // namespace detail - - struct is_transparent_tag {}; - - // A custom pair implementation is used in the map because std::pair is not is_trivially_copyable, - // which means it would not be allowed to be used in std::memcpy. This struct is copyable, which is - // also tested. - template - struct pair { - using first_type = T1; - using second_type = T2; - - template ::value&& - std::is_default_constructible::value>::type> - constexpr pair() noexcept(noexcept(U1()) && noexcept(U2())) - : first() - , second() {} - - // pair constructors are explicit so we don't accidentally call this ctor when we don't have to. - explicit constexpr pair(std::pair const& o) noexcept( - noexcept(T1(std::declval())) && noexcept(T2(std::declval()))) - : first(o.first) - , second(o.second) {} - - // pair constructors are explicit so we don't accidentally call this ctor when we don't have to. - explicit constexpr pair(std::pair&& o) noexcept(noexcept( - T1(std::move(std::declval()))) && noexcept(T2(std::move(std::declval())))) - : first(std::move(o.first)) - , second(std::move(o.second)) {} - - constexpr pair(T1&& a, T2&& b) noexcept(noexcept( - T1(std::move(std::declval()))) && noexcept(T2(std::move(std::declval())))) - : first(std::move(a)) - , second(std::move(b)) {} - - template - constexpr pair(U1&& a, U2&& b) noexcept(noexcept(T1(std::forward( - std::declval()))) && noexcept(T2(std::forward(std::declval())))) - : first(std::forward(a)) - , second(std::forward(b)) {} - - template - // MSVC 2015 produces error "C2476: ‘constexpr’ constructor does not initialize all members" - // if this constructor is constexpr -#if !ROBIN_HOOD(BROKEN_CONSTEXPR) - constexpr -#endif - pair(std::piecewise_construct_t /*unused*/, std::tuple a, - std::tuple - b) noexcept(noexcept(pair(std::declval&>(), - std::declval&>(), - ROBIN_HOOD_STD::index_sequence_for(), - ROBIN_HOOD_STD::index_sequence_for()))) - : pair(a, b, ROBIN_HOOD_STD::index_sequence_for(), - ROBIN_HOOD_STD::index_sequence_for()) { - } - - // constructor called from the std::piecewise_construct_t ctor - template - pair(std::tuple& a, std::tuple& b, ROBIN_HOOD_STD::index_sequence /*unused*/, ROBIN_HOOD_STD::index_sequence /*unused*/) noexcept( - noexcept(T1(std::forward(std::get( - std::declval&>()))...)) && noexcept(T2(std:: - forward(std::get( - std::declval&>()))...))) - : first(std::forward(std::get(a))...) - , second(std::forward(std::get(b))...) { - // make visual studio compiler happy about warning about unused a & b. - // Visual studio's pair implementation disables warning 4100. - (void)a; - (void)b; - } - - void swap(pair& o) noexcept((detail::swappable::nothrow::value) && - (detail::swappable::nothrow::value)) { - using std::swap; - swap(first, o.first); - swap(second, o.second); - } - - T1 first; // NOLINT(misc-non-private-member-variables-in-classes) - T2 second; // NOLINT(misc-non-private-member-variables-in-classes) - }; - - template - inline void swap(pair& a, pair& b) noexcept( - noexcept(std::declval&>().swap(std::declval&>()))) { - a.swap(b); - } - - template - inline constexpr bool operator==(pair const& x, pair const& y) { - return (x.first == y.first) && (x.second == y.second); - } - template - inline constexpr bool operator!=(pair const& x, pair const& y) { - return !(x == y); - } - template - inline constexpr bool operator<(pair const& x, pair const& y) noexcept(noexcept( - std::declval() < std::declval()) && noexcept(std::declval() < - std::declval())) { - return x.first < y.first || (!(y.first < x.first) && x.second < y.second); - } - template - inline constexpr bool operator>(pair const& x, pair const& y) { - return y < x; - } - template - inline constexpr bool operator<=(pair const& x, pair const& y) { - return !(x > y); - } - template - inline constexpr bool operator>=(pair const& x, pair const& y) { - return !(x < y); - } - - inline size_t hash_bytes(void const* ptr, size_t len) noexcept { - static constexpr uint64_t m = UINT64_C(0xc6a4a7935bd1e995); - static constexpr uint64_t seed = UINT64_C(0xe17a1465); - static constexpr unsigned int r = 47; - - auto const* const data64 = static_cast(ptr); - uint64_t h = seed ^ (len * m); - - size_t const n_blocks = len / 8; - for (size_t i = 0; i < n_blocks; ++i) { - auto k = detail::unaligned_load(data64 + i); - - k *= m; - k ^= k >> r; - k *= m; - - h ^= k; - h *= m; - } - - auto const* const data8 = reinterpret_cast(data64 + n_blocks); - switch (len & 7U) { - case 7: - h ^= static_cast(data8[6]) << 48U; - ROBIN_HOOD(FALLTHROUGH); // FALLTHROUGH - case 6: - h ^= static_cast(data8[5]) << 40U; - ROBIN_HOOD(FALLTHROUGH); // FALLTHROUGH - case 5: - h ^= static_cast(data8[4]) << 32U; - ROBIN_HOOD(FALLTHROUGH); // FALLTHROUGH - case 4: - h ^= static_cast(data8[3]) << 24U; - ROBIN_HOOD(FALLTHROUGH); // FALLTHROUGH - case 3: - h ^= static_cast(data8[2]) << 16U; - ROBIN_HOOD(FALLTHROUGH); // FALLTHROUGH - case 2: - h ^= static_cast(data8[1]) << 8U; - ROBIN_HOOD(FALLTHROUGH); // FALLTHROUGH - case 1: - h ^= static_cast(data8[0]); - h *= m; - ROBIN_HOOD(FALLTHROUGH); // FALLTHROUGH - default: - break; - } - - h ^= h >> r; - - // not doing the final step here, because this will be done by keyToIdx anyways - // h *= m; - // h ^= h >> r; - return static_cast(h); - } - - inline size_t hash_int(uint64_t x) noexcept { - // tried lots of different hashes, let's stick with murmurhash3. It's simple, fast, well tested, - // and doesn't need any special 128bit operations. - x ^= x >> 33U; - x *= UINT64_C(0xff51afd7ed558ccd); - x ^= x >> 33U; - - // not doing the final step here, because this will be done by keyToIdx anyways - // x *= UINT64_C(0xc4ceb9fe1a85ec53); - // x ^= x >> 33U; - return static_cast(x); - } - - // A thin wrapper around std::hash, performing an additional simple mixing step of the result. - template - struct hash : public std::hash { - size_t operator()(T const& obj) const - noexcept(noexcept(std::declval>().operator()(std::declval()))) { - // call base hash - auto result = std::hash::operator()(obj); - // return mixed of that, to be save against identity has - return hash_int(static_cast(result)); - } - }; - - template - struct hash> { - size_t operator()(std::basic_string const& str) const noexcept { - return hash_bytes(str.data(), sizeof(CharT) * str.size()); - } - }; - -#if ROBIN_HOOD(CXX) >= ROBIN_HOOD(CXX17) - template - struct hash> { - size_t operator()(std::basic_string_view const& sv) const noexcept { - return hash_bytes(sv.data(), sizeof(CharT) * sv.size()); - } - }; -#endif - - template - struct hash { - size_t operator()(T* ptr) const noexcept { - return hash_int(reinterpret_cast(ptr)); - } - }; - - template - struct hash> { - size_t operator()(std::unique_ptr const& ptr) const noexcept { - return hash_int(reinterpret_cast(ptr.get())); - } - }; - - template - struct hash> { - size_t operator()(std::shared_ptr const& ptr) const noexcept { - return hash_int(reinterpret_cast(ptr.get())); - } - }; - - template - struct hash::value>::type> { - size_t operator()(Enum e) const noexcept { - using Underlying = typename std::underlying_type::type; - return hash{}(static_cast(e)); - } - }; - -#define ROBIN_HOOD_HASH_INT(T) \ - template <> \ - struct hash { \ - size_t operator()(T const& obj) const noexcept { \ - return hash_int(static_cast(obj)); \ - } \ - } - -#if defined(__GNUC__) && !defined(__clang__) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wuseless-cast" -#endif - // see https://en.cppreference.com/w/cpp/utility/hash - ROBIN_HOOD_HASH_INT(bool); - ROBIN_HOOD_HASH_INT(char); - ROBIN_HOOD_HASH_INT(signed char); - ROBIN_HOOD_HASH_INT(unsigned char); - ROBIN_HOOD_HASH_INT(char16_t); - ROBIN_HOOD_HASH_INT(char32_t); -#if ROBIN_HOOD(HAS_NATIVE_WCHART) - ROBIN_HOOD_HASH_INT(wchar_t); -#endif - ROBIN_HOOD_HASH_INT(short); - ROBIN_HOOD_HASH_INT(unsigned short); - ROBIN_HOOD_HASH_INT(int); - ROBIN_HOOD_HASH_INT(unsigned int); - ROBIN_HOOD_HASH_INT(long); - ROBIN_HOOD_HASH_INT(long long); - ROBIN_HOOD_HASH_INT(unsigned long); - ROBIN_HOOD_HASH_INT(unsigned long long); -#if defined(__GNUC__) && !defined(__clang__) -# pragma GCC diagnostic pop -#endif - namespace detail { - - template - struct void_type { - using type = void; - }; - - template - struct has_is_transparent : public std::false_type {}; - - template - struct has_is_transparent::type> - : public std::true_type {}; - - // using wrapper classes for hash and key_equal prevents the diamond problem when the same type - // is used. see https://stackoverflow.com/a/28771920/48181 - template - struct WrapHash : public T { - WrapHash() = default; - explicit WrapHash(T const& o) noexcept(noexcept(T(std::declval()))) - : T(o) {} - }; - - template - struct WrapKeyEqual : public T { - WrapKeyEqual() = default; - explicit WrapKeyEqual(T const& o) noexcept(noexcept(T(std::declval()))) - : T(o) {} - }; - - // A highly optimized hashmap implementation, using the Robin Hood algorithm. - // - // In most cases, this map should be usable as a drop-in replacement for std::unordered_map, but - // be about 2x faster in most cases and require much less allocations. - // - // This implementation uses the following memory layout: - // - // [Node, Node, ... Node | info, info, ... infoSentinel ] - // - // * Node: either a DataNode that directly has the std::pair as member, - // or a DataNode with a pointer to std::pair. Which DataNode representation to use - // depends on how fast the swap() operation is. Heuristically, this is automatically choosen - // based on sizeof(). there are always 2^n Nodes. - // - // * info: Each Node in the map has a corresponding info byte, so there are 2^n info bytes. - // Each byte is initialized to 0, meaning the corresponding Node is empty. Set to 1 means the - // corresponding node contains data. Set to 2 means the corresponding Node is filled, but it - // actually belongs to the previous position and was pushed out because that place is already - // taken. - // - // * infoSentinel: Sentinel byte set to 1, so that iterator's ++ can stop at end() without the - // need for a idx variable. - // - // According to STL, order of templates has effect on throughput. That's why I've moved the - // boolean to the front. - // https://www.reddit.com/r/cpp/comments/ahp6iu/compile_time_binary_size_reductions_and_cs_future/eeguck4/ - template - class Table - : public WrapHash, - public WrapKeyEqual, - detail::NodeAllocator< - typename std::conditional< - std::is_void::value, Key, - robin_hood::pair::type, T>>::type, - 4, 16384, IsFlat> { - public: - static constexpr bool is_flat = IsFlat; - static constexpr bool is_map = !std::is_void::value; - static constexpr bool is_set = !is_map; - static constexpr bool is_transparent = - has_is_transparent::value && has_is_transparent::value; - - using key_type = Key; - using mapped_type = T; - using value_type = typename std::conditional< - is_set, Key, - robin_hood::pair::type, T>>::type; - using size_type = size_t; - using hasher = Hash; - using key_equal = KeyEqual; - using Self = Table; - - private: - static_assert(MaxLoadFactor100 > 10 && MaxLoadFactor100 < 100, - "MaxLoadFactor100 needs to be >10 && < 100"); - - using WHash = WrapHash; - using WKeyEqual = WrapKeyEqual; - - // configuration defaults - - // make sure we have 8 elements, needed to quickly rehash mInfo - static constexpr size_t InitialNumElements = sizeof(uint64_t); - static constexpr uint32_t InitialInfoNumBits = 5; - static constexpr uint8_t InitialInfoInc = 1U << InitialInfoNumBits; - static constexpr size_t InfoMask = InitialInfoInc - 1U; - static constexpr uint8_t InitialInfoHashShift = 0; - using DataPool = detail::NodeAllocator; - - // type needs to be wider than uint8_t. - using InfoType = uint32_t; - - // DataNode //////////////////////////////////////////////////////// - - // Primary template for the data node. We have special implementations for small and big - // objects. For large objects it is assumed that swap() is fairly slow, so we allocate these - // on the heap so swap merely swaps a pointer. - template - class DataNode {}; - - // Small: just allocate on the stack. - template - class DataNode final { - public: - template - explicit DataNode(M& ROBIN_HOOD_UNUSED(map) /*unused*/, Args&&... args) noexcept( - noexcept(value_type(std::forward(args)...))) - : mData(std::forward(args)...) {} - - DataNode(M& ROBIN_HOOD_UNUSED(map) /*unused*/, DataNode&& n) noexcept( - std::is_nothrow_move_constructible::value) - : mData(std::move(n.mData)) {} - - // doesn't do anything - void destroy(M& ROBIN_HOOD_UNUSED(map) /*unused*/) noexcept {} - void destroyDoNotDeallocate() noexcept {} - - value_type const* operator->() const noexcept { - return &mData; - } - value_type* operator->() noexcept { - return &mData; - } - - const value_type& operator*() const noexcept { - return mData; - } - - value_type& operator*() noexcept { - return mData; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getFirst() noexcept { - return mData.first; - } - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getFirst() noexcept { - return mData; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type - getFirst() const noexcept { - return mData.first; - } - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getFirst() const noexcept { - return mData; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getSecond() noexcept { - return mData.second; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getSecond() const noexcept { - return mData.second; - } - - void swap(DataNode& o) noexcept( - noexcept(std::declval().swap(std::declval()))) { - mData.swap(o.mData); - } - - private: - value_type mData; - }; - - // big object: allocate on heap. - template - class DataNode { - public: - template - explicit DataNode(M& map, Args&&... args) - : mData(map.allocate()) { - ::new (static_cast(mData)) value_type(std::forward(args)...); - } - - DataNode(M& ROBIN_HOOD_UNUSED(map) /*unused*/, DataNode&& n) noexcept - : mData(std::move(n.mData)) {} - - void destroy(M& map) noexcept { - // don't deallocate, just put it into list of datapool. - mData->~value_type(); - map.deallocate(mData); - } - - void destroyDoNotDeallocate() noexcept { - mData->~value_type(); - } - - value_type const* operator->() const noexcept { - return mData; - } - - value_type* operator->() noexcept { - return mData; - } - - const value_type& operator*() const { - return *mData; - } - - value_type& operator*() { - return *mData; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getFirst() noexcept { - return mData->first; - } - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getFirst() noexcept { - return *mData; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type - getFirst() const noexcept { - return mData->first; - } - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getFirst() const noexcept { - return *mData; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getSecond() noexcept { - return mData->second; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::type getSecond() const noexcept { - return mData->second; - } - - void swap(DataNode& o) noexcept { - using std::swap; - swap(mData, o.mData); - } - - private: - value_type* mData; - }; - - using Node = DataNode; - - // helpers for insertKeyPrepareEmptySpot: extract first entry (only const required) - ROBIN_HOOD(NODISCARD) key_type const& getFirstConst(Node const& n) const noexcept { - return n.getFirst(); - } - - // in case we have void mapped_type, we are not using a pair, thus we just route k through. - // No need to disable this because it's just not used if not applicable. - ROBIN_HOOD(NODISCARD) key_type const& getFirstConst(key_type const& k) const noexcept { - return k; - } - - // in case we have non-void mapped_type, we have a standard robin_hood::pair - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::value, key_type const&>::type - getFirstConst(value_type const& vt) const noexcept { - return vt.first; - } - - // Cloner ////////////////////////////////////////////////////////// - - template - struct Cloner; - - // fast path: Just copy data, without allocating anything. - template - struct Cloner { - void operator()(M const& source, M& target) const { - auto const* const src = reinterpret_cast(source.mKeyVals); - auto* tgt = reinterpret_cast(target.mKeyVals); - auto const numElementsWithBuffer = target.calcNumElementsWithBuffer(target.mMask + 1); - std::copy(src, src + target.calcNumBytesTotal(numElementsWithBuffer), tgt); - } - }; - - template - struct Cloner { - void operator()(M const& s, M& t) const { - auto const numElementsWithBuffer = t.calcNumElementsWithBuffer(t.mMask + 1); - std::copy(s.mInfo, s.mInfo + t.calcNumBytesInfo(numElementsWithBuffer), t.mInfo); - - for (size_t i = 0; i < numElementsWithBuffer; ++i) { - if (t.mInfo[i]) { - ::new (static_cast(t.mKeyVals + i)) Node(t, *s.mKeyVals[i]); - } - } - } - }; - - // Destroyer /////////////////////////////////////////////////////// - - template - struct Destroyer {}; - - template - struct Destroyer { - void nodes(M& m) const noexcept { - m.mNumElements = 0; - } - - void nodesDoNotDeallocate(M& m) const noexcept { - m.mNumElements = 0; - } - }; - - template - struct Destroyer { - void nodes(M& m) const noexcept { - m.mNumElements = 0; - // clear also resets mInfo to 0, that's sometimes not necessary. - auto const numElementsWithBuffer = m.calcNumElementsWithBuffer(m.mMask + 1); - - for (size_t idx = 0; idx < numElementsWithBuffer; ++idx) { - if (0 != m.mInfo[idx]) { - Node& n = m.mKeyVals[idx]; - n.destroy(m); - n.~Node(); - } - } - } - - void nodesDoNotDeallocate(M& m) const noexcept { - m.mNumElements = 0; - // clear also resets mInfo to 0, that's sometimes not necessary. - auto const numElementsWithBuffer = m.calcNumElementsWithBuffer(m.mMask + 1); - for (size_t idx = 0; idx < numElementsWithBuffer; ++idx) { - if (0 != m.mInfo[idx]) { - Node& n = m.mKeyVals[idx]; - n.destroyDoNotDeallocate(); - n.~Node(); - } - } - } - }; - - // Iter //////////////////////////////////////////////////////////// - - struct fast_forward_tag {}; - - // generic iterator for both const_iterator and iterator. - template - // NOLINTNEXTLINE(hicpp-special-member-functions,cppcoreguidelines-special-member-functions) - class Iter { - private: - using NodePtr = typename std::conditional::type; - - public: - using difference_type = std::ptrdiff_t; - using value_type = typename Self::value_type; - using reference = typename std::conditional::type; - using pointer = typename std::conditional::type; - using iterator_category = std::forward_iterator_tag; - - // default constructed iterator can be compared to itself, but WON'T return true when - // compared to end(). - Iter() = default; - - // Rule of zero: nothing specified. The conversion constructor is only enabled for - // iterator to const_iterator, so it doesn't accidentally work as a copy ctor. - - // Conversion constructor from iterator to const_iterator. - template ::type> - // NOLINTNEXTLINE(hicpp-explicit-conversions) - Iter(Iter const& other) noexcept - : mKeyVals(other.mKeyVals) - , mInfo(other.mInfo) {} - - Iter(NodePtr valPtr, uint8_t const* infoPtr) noexcept - : mKeyVals(valPtr) - , mInfo(infoPtr) {} - - Iter(NodePtr valPtr, uint8_t const* infoPtr, - fast_forward_tag ROBIN_HOOD_UNUSED(tag) /*unused*/) noexcept - : mKeyVals(valPtr) - , mInfo(infoPtr) { - fastForward(); - } - - template ::type> - Iter& operator=(Iter const& other) noexcept { - mKeyVals = other.mKeyVals; - mInfo = other.mInfo; - return *this; - } - - // prefix increment. Undefined behavior if we are at end()! - Iter& operator++() noexcept { - mInfo++; - mKeyVals++; - fastForward(); - return *this; - } - - Iter operator++(int) noexcept { - Iter tmp = *this; - ++(*this); - return tmp; - } - - reference operator*() const { - return **mKeyVals; - } - - pointer operator->() const { - return &**mKeyVals; - } - - template - bool operator==(Iter const& o) const noexcept { - return mKeyVals == o.mKeyVals; - } - - template - bool operator!=(Iter const& o) const noexcept { - return mKeyVals != o.mKeyVals; - } - - private: - // fast forward to the next non-free info byte - // I've tried a few variants that don't depend on intrinsics, but unfortunately they are - // quite a bit slower than this one. So I've reverted that change again. See map_benchmark. - void fastForward() noexcept { - size_t n = 0; - while (0U == (n = detail::unaligned_load(mInfo))) { - mInfo += sizeof(size_t); - mKeyVals += sizeof(size_t); - } -#if defined(ROBIN_HOOD_DISABLE_INTRINSICS) - // we know for certain that within the next 8 bytes we'll find a non-zero one. - if (ROBIN_HOOD_UNLIKELY(0U == detail::unaligned_load(mInfo))) { - mInfo += 4; - mKeyVals += 4; - } - if (ROBIN_HOOD_UNLIKELY(0U == detail::unaligned_load(mInfo))) { - mInfo += 2; - mKeyVals += 2; - } - if (ROBIN_HOOD_UNLIKELY(0U == *mInfo)) { - mInfo += 1; - mKeyVals += 1; - } -#else -# if ROBIN_HOOD(LITTLE_ENDIAN) - auto inc = ROBIN_HOOD_COUNT_TRAILING_ZEROES(n) / 8; -# else - auto inc = ROBIN_HOOD_COUNT_LEADING_ZEROES(n) / 8; -# endif - mInfo += inc; - mKeyVals += inc; -#endif - } - - friend class Table; - NodePtr mKeyVals{ nullptr }; - uint8_t const* mInfo{ nullptr }; - }; - - //////////////////////////////////////////////////////////////////// - - // highly performance relevant code. - // Lower bits are used for indexing into the array (2^n size) - // The upper 1-5 bits need to be a reasonable good hash, to save comparisons. - template - void keyToIdx(HashKey&& key, size_t* idx, InfoType* info) const { - // In addition to whatever hash is used, add another mul & shift so we get better hashing. - // This serves as a bad hash prevention, if the given data is - // badly mixed. - auto h = static_cast(WHash::operator()(key)); - - h *= mHashMultiplier; - h ^= h >> 33U; - - // the lower InitialInfoNumBits are reserved for info. - *info = mInfoInc + static_cast((h & InfoMask) >> mInfoHashShift); - *idx = (static_cast(h) >> InitialInfoNumBits) & mMask; - } - - // forwards the index by one, wrapping around at the end - void next(InfoType* info, size_t* idx) const noexcept { - *idx = *idx + 1; - *info += mInfoInc; - } - - void nextWhileLess(InfoType* info, size_t* idx) const noexcept { - // unrolling this by hand did not bring any speedups. - while (*info < mInfo[*idx]) { - next(info, idx); - } - } - - // Shift everything up by one element. Tries to move stuff around. - void - shiftUp(size_t startIdx, - size_t const insertion_idx) noexcept(std::is_nothrow_move_assignable::value) { - auto idx = startIdx; - ::new (static_cast(mKeyVals + idx)) Node(std::move(mKeyVals[idx - 1])); - while (--idx != insertion_idx) { - mKeyVals[idx] = std::move(mKeyVals[idx - 1]); - } - - idx = startIdx; - while (idx != insertion_idx) { - ROBIN_HOOD_COUNT(shiftUp) - mInfo[idx] = static_cast(mInfo[idx - 1] + mInfoInc); - if (ROBIN_HOOD_UNLIKELY(mInfo[idx] + mInfoInc > 0xFF)) { - mMaxNumElementsAllowed = 0; - } - --idx; - } - } - - void shiftDown(size_t idx) noexcept(std::is_nothrow_move_assignable::value) { - // until we find one that is either empty or has zero offset. - // TODO(martinus) we don't need to move everything, just the last one for the same - // bucket. - mKeyVals[idx].destroy(*this); - - // until we find one that is either empty or has zero offset. - while (mInfo[idx + 1] >= 2 * mInfoInc) { - ROBIN_HOOD_COUNT(shiftDown) - mInfo[idx] = static_cast(mInfo[idx + 1] - mInfoInc); - mKeyVals[idx] = std::move(mKeyVals[idx + 1]); - ++idx; - } - - mInfo[idx] = 0; - // don't destroy, we've moved it - // mKeyVals[idx].destroy(*this); - mKeyVals[idx].~Node(); - } - - // copy of find(), except that it returns iterator instead of const_iterator. - template - ROBIN_HOOD(NODISCARD) - size_t findIdx(Other const& key) const { - size_t idx{}; - InfoType info{}; - keyToIdx(key, &idx, &info); - - do { - // unrolling this twice gives a bit of a speedup. More unrolling did not help. - if (info == mInfo[idx] && - ROBIN_HOOD_LIKELY(WKeyEqual::operator()(key, mKeyVals[idx].getFirst()))) { - return idx; - } - next(&info, &idx); - if (info == mInfo[idx] && - ROBIN_HOOD_LIKELY(WKeyEqual::operator()(key, mKeyVals[idx].getFirst()))) { - return idx; - } - next(&info, &idx); - } while (info <= mInfo[idx]); - - // nothing found! - return mMask == 0 ? 0 - : static_cast(std::distance( - mKeyVals, reinterpret_cast_no_cast_align_warning(mInfo))); - } - - void cloneData(const Table& o) { - Cloner()(o, *this); - } - - // inserts a keyval that is guaranteed to be new, e.g. when the hashmap is resized. - // @return True on success, false if something went wrong - void insert_move(Node&& keyval) { - // we don't retry, fail if overflowing - // don't need to check max num elements - if (0 == mMaxNumElementsAllowed && !try_increase_info()) { - throwOverflowError(); - } - - size_t idx{}; - InfoType info{}; - keyToIdx(keyval.getFirst(), &idx, &info); - - // skip forward. Use <= because we are certain that the element is not there. - while (info <= mInfo[idx]) { - idx = idx + 1; - info += mInfoInc; - } - - // key not found, so we are now exactly where we want to insert it. - auto const insertion_idx = idx; - auto const insertion_info = static_cast(info); - if (ROBIN_HOOD_UNLIKELY(insertion_info + mInfoInc > 0xFF)) { - mMaxNumElementsAllowed = 0; - } - - // find an empty spot - while (0 != mInfo[idx]) { - next(&info, &idx); - } - - auto& l = mKeyVals[insertion_idx]; - if (idx == insertion_idx) { - ::new (static_cast(&l)) Node(std::move(keyval)); - } - else { - shiftUp(idx, insertion_idx); - l = std::move(keyval); - } - - // put at empty spot - mInfo[insertion_idx] = insertion_info; - - ++mNumElements; - } - - public: - using iterator = Iter; - using const_iterator = Iter; - - Table() noexcept(noexcept(Hash()) && noexcept(KeyEqual())) - : WHash() - , WKeyEqual() { - ROBIN_HOOD_TRACE(this) - } - - // Creates an empty hash map. Nothing is allocated yet, this happens at the first insert. - // This tremendously speeds up ctor & dtor of a map that never receives an element. The - // penalty is payed at the first insert, and not before. Lookup of this empty map works - // because everybody points to DummyInfoByte::b. parameter bucket_count is dictated by the - // standard, but we can ignore it. - explicit Table( - size_t ROBIN_HOOD_UNUSED(bucket_count) /*unused*/, const Hash& h = Hash{}, - const KeyEqual& equal = KeyEqual{}) noexcept(noexcept(Hash(h)) && noexcept(KeyEqual(equal))) - : WHash(h) - , WKeyEqual(equal) { - ROBIN_HOOD_TRACE(this) - } - - template - Table(Iter first, Iter last, size_t ROBIN_HOOD_UNUSED(bucket_count) /*unused*/ = 0, - const Hash& h = Hash{}, const KeyEqual& equal = KeyEqual{}) - : WHash(h) - , WKeyEqual(equal) { - ROBIN_HOOD_TRACE(this) - insert(first, last); - } - - Table(std::initializer_list initlist, - size_t ROBIN_HOOD_UNUSED(bucket_count) /*unused*/ = 0, const Hash& h = Hash{}, - const KeyEqual& equal = KeyEqual{}) - : WHash(h) - , WKeyEqual(equal) { - ROBIN_HOOD_TRACE(this) - insert(initlist.begin(), initlist.end()); - } - - Table(Table&& o) noexcept - : WHash(std::move(static_cast(o))) - , WKeyEqual(std::move(static_cast(o))) - , DataPool(std::move(static_cast(o))) { - ROBIN_HOOD_TRACE(this) - if (o.mMask) { - mHashMultiplier = std::move(o.mHashMultiplier); - mKeyVals = std::move(o.mKeyVals); - mInfo = std::move(o.mInfo); - mNumElements = std::move(o.mNumElements); - mMask = std::move(o.mMask); - mMaxNumElementsAllowed = std::move(o.mMaxNumElementsAllowed); - mInfoInc = std::move(o.mInfoInc); - mInfoHashShift = std::move(o.mInfoHashShift); - // set other's mask to 0 so its destructor won't do anything - o.init(); - } - } - - Table& operator=(Table&& o) noexcept { - ROBIN_HOOD_TRACE(this) - if (&o != this) { - if (o.mMask) { - // only move stuff if the other map actually has some data - destroy(); - mHashMultiplier = std::move(o.mHashMultiplier); - mKeyVals = std::move(o.mKeyVals); - mInfo = std::move(o.mInfo); - mNumElements = std::move(o.mNumElements); - mMask = std::move(o.mMask); - mMaxNumElementsAllowed = std::move(o.mMaxNumElementsAllowed); - mInfoInc = std::move(o.mInfoInc); - mInfoHashShift = std::move(o.mInfoHashShift); - WHash::operator=(std::move(static_cast(o))); - WKeyEqual::operator=(std::move(static_cast(o))); - DataPool::operator=(std::move(static_cast(o))); - - o.init(); - - } - else { - // nothing in the other map => just clear us. - clear(); - } - } - return *this; - } - - Table(const Table& o) - : WHash(static_cast(o)) - , WKeyEqual(static_cast(o)) - , DataPool(static_cast(o)) { - ROBIN_HOOD_TRACE(this) - if (!o.empty()) { - // not empty: create an exact copy. it is also possible to just iterate through all - // elements and insert them, but copying is probably faster. - - auto const numElementsWithBuffer = calcNumElementsWithBuffer(o.mMask + 1); - auto const numBytesTotal = calcNumBytesTotal(numElementsWithBuffer); - - ROBIN_HOOD_LOG("std::malloc " << numBytesTotal << " = calcNumBytesTotal(" - << numElementsWithBuffer << ")") - mHashMultiplier = o.mHashMultiplier; - mKeyVals = static_cast( - detail::assertNotNull(std::malloc(numBytesTotal))); - // no need for calloc because clonData does memcpy - mInfo = reinterpret_cast(mKeyVals + numElementsWithBuffer); - mNumElements = o.mNumElements; - mMask = o.mMask; - mMaxNumElementsAllowed = o.mMaxNumElementsAllowed; - mInfoInc = o.mInfoInc; - mInfoHashShift = o.mInfoHashShift; - cloneData(o); - } - } - - // Creates a copy of the given map. Copy constructor of each entry is used. - // Not sure why clang-tidy thinks this doesn't handle self assignment, it does - // NOLINTNEXTLINE(bugprone-unhandled-self-assignment,cert-oop54-cpp) - Table& operator=(Table const& o) { - ROBIN_HOOD_TRACE(this) - if (&o == this) { - // prevent assigning of itself - return *this; - } - - // we keep using the old allocator and not assign the new one, because we want to keep - // the memory available. when it is the same size. - if (o.empty()) { - if (0 == mMask) { - // nothing to do, we are empty too - return *this; - } - - // not empty: destroy what we have there - // clear also resets mInfo to 0, that's sometimes not necessary. - destroy(); - init(); - WHash::operator=(static_cast(o)); - WKeyEqual::operator=(static_cast(o)); - DataPool::operator=(static_cast(o)); - - return *this; - } - - // clean up old stuff - Destroyer::value>{}.nodes(*this); - - if (mMask != o.mMask) { - // no luck: we don't have the same array size allocated, so we need to realloc. - if (0 != mMask) { - // only deallocate if we actually have data! - ROBIN_HOOD_LOG("std::free") - std::free(mKeyVals); - } - - auto const numElementsWithBuffer = calcNumElementsWithBuffer(o.mMask + 1); - auto const numBytesTotal = calcNumBytesTotal(numElementsWithBuffer); - ROBIN_HOOD_LOG("std::malloc " << numBytesTotal << " = calcNumBytesTotal(" - << numElementsWithBuffer << ")") - mKeyVals = static_cast( - detail::assertNotNull(std::malloc(numBytesTotal))); - - // no need for calloc here because cloneData performs a memcpy. - mInfo = reinterpret_cast(mKeyVals + numElementsWithBuffer); - // sentinel is set in cloneData - } - WHash::operator=(static_cast(o)); - WKeyEqual::operator=(static_cast(o)); - DataPool::operator=(static_cast(o)); - mHashMultiplier = o.mHashMultiplier; - mNumElements = o.mNumElements; - mMask = o.mMask; - mMaxNumElementsAllowed = o.mMaxNumElementsAllowed; - mInfoInc = o.mInfoInc; - mInfoHashShift = o.mInfoHashShift; - cloneData(o); - - return *this; - } - - // Swaps everything between the two maps. - void swap(Table& o) { - ROBIN_HOOD_TRACE(this) - using std::swap; - swap(o, *this); - } - - // Clears all data, without resizing. - void clear() { - ROBIN_HOOD_TRACE(this) - if (empty()) { - // don't do anything! also important because we don't want to write to - // DummyInfoByte::b, even though we would just write 0 to it. - return; - } - - Destroyer::value>{}.nodes(*this); - - auto const numElementsWithBuffer = calcNumElementsWithBuffer(mMask + 1); - // clear everything, then set the sentinel again - uint8_t const z = 0; - std::fill(mInfo, mInfo + calcNumBytesInfo(numElementsWithBuffer), z); - mInfo[numElementsWithBuffer] = 1; - - mInfoInc = InitialInfoInc; - mInfoHashShift = InitialInfoHashShift; - } - - // Destroys the map and all it's contents. - ~Table() { - ROBIN_HOOD_TRACE(this) - destroy(); - } - - // Checks if both tables contain the same entries. Order is irrelevant. - bool operator==(const Table& other) const { - ROBIN_HOOD_TRACE(this) - if (other.size() != size()) { - return false; - } - for (auto const& otherEntry : other) { - if (!has(otherEntry)) { - return false; - } - } - - return true; - } - - bool operator!=(const Table& other) const { - ROBIN_HOOD_TRACE(this) - return !operator==(other); - } - - template - typename std::enable_if::value, Q&>::type operator[](const key_type& key) { - ROBIN_HOOD_TRACE(this) - auto idxAndState = insertKeyPrepareEmptySpot(key); - switch (idxAndState.second) { - case InsertionState::key_found: - break; - - case InsertionState::new_node: - ::new (static_cast(&mKeyVals[idxAndState.first])) - Node(*this, std::piecewise_construct, std::forward_as_tuple(key), - std::forward_as_tuple()); - break; - - case InsertionState::overwrite_node: - mKeyVals[idxAndState.first] = Node(*this, std::piecewise_construct, - std::forward_as_tuple(key), std::forward_as_tuple()); - break; - - case InsertionState::overflow_error: - throwOverflowError(); - } - - return mKeyVals[idxAndState.first].getSecond(); - } - - template - typename std::enable_if::value, Q&>::type operator[](key_type&& key) { - ROBIN_HOOD_TRACE(this) - auto idxAndState = insertKeyPrepareEmptySpot(key); - switch (idxAndState.second) { - case InsertionState::key_found: - break; - - case InsertionState::new_node: - ::new (static_cast(&mKeyVals[idxAndState.first])) - Node(*this, std::piecewise_construct, std::forward_as_tuple(std::move(key)), - std::forward_as_tuple()); - break; - - case InsertionState::overwrite_node: - mKeyVals[idxAndState.first] = - Node(*this, std::piecewise_construct, std::forward_as_tuple(std::move(key)), - std::forward_as_tuple()); - break; - - case InsertionState::overflow_error: - throwOverflowError(); - } - - return mKeyVals[idxAndState.first].getSecond(); - } - - template - void insert(Iter first, Iter last) { - for (; first != last; ++first) { - // value_type ctor needed because this might be called with std::pair's - insert(value_type(*first)); - } - } - - void insert(std::initializer_list ilist) { - for (auto&& vt : ilist) { - insert(std::move(vt)); - } - } - - template - std::pair emplace(Args&&... args) { - ROBIN_HOOD_TRACE(this) - Node n { - *this, std::forward(args)... - }; - auto idxAndState = insertKeyPrepareEmptySpot(getFirstConst(n)); - switch (idxAndState.second) { - case InsertionState::key_found: - n.destroy(*this); - break; - - case InsertionState::new_node: - ::new (static_cast(&mKeyVals[idxAndState.first])) Node(*this, std::move(n)); - break; - - case InsertionState::overwrite_node: - mKeyVals[idxAndState.first] = std::move(n); - break; - - case InsertionState::overflow_error: - n.destroy(*this); - throwOverflowError(); - break; - } - - return std::make_pair(iterator(mKeyVals + idxAndState.first, mInfo + idxAndState.first), - InsertionState::key_found != idxAndState.second); - } - - template - iterator emplace_hint(const_iterator position, Args&&... args) { - (void)position; - return emplace(std::forward(args)...).first; - } - - template - std::pair try_emplace(const key_type& key, Args&&... args) { - return try_emplace_impl(key, std::forward(args)...); - } - - template - std::pair try_emplace(key_type&& key, Args&&... args) { - return try_emplace_impl(std::move(key), std::forward(args)...); - } - - template - iterator try_emplace(const_iterator hint, const key_type& key, Args&&... args) { - (void)hint; - return try_emplace_impl(key, std::forward(args)...).first; - } - - template - iterator try_emplace(const_iterator hint, key_type&& key, Args&&... args) { - (void)hint; - return try_emplace_impl(std::move(key), std::forward(args)...).first; - } - - template - std::pair insert_or_assign(const key_type& key, Mapped&& obj) { - return insertOrAssignImpl(key, std::forward(obj)); - } - - template - std::pair insert_or_assign(key_type&& key, Mapped&& obj) { - return insertOrAssignImpl(std::move(key), std::forward(obj)); - } - - template - iterator insert_or_assign(const_iterator hint, const key_type& key, Mapped&& obj) { - (void)hint; - return insertOrAssignImpl(key, std::forward(obj)).first; - } - - template - iterator insert_or_assign(const_iterator hint, key_type&& key, Mapped&& obj) { - (void)hint; - return insertOrAssignImpl(std::move(key), std::forward(obj)).first; - } - - std::pair insert(const value_type& keyval) { - ROBIN_HOOD_TRACE(this) - return emplace(keyval); - } - - iterator insert(const_iterator hint, const value_type& keyval) { - (void)hint; - return emplace(keyval).first; - } - - std::pair insert(value_type&& keyval) { - return emplace(std::move(keyval)); - } - - iterator insert(const_iterator hint, value_type&& keyval) { - (void)hint; - return emplace(std::move(keyval)).first; - } - - // Returns 1 if key is found, 0 otherwise. - size_t count(const key_type& key) const { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - auto kv = mKeyVals + findIdx(key); - if (kv != reinterpret_cast_no_cast_align_warning(mInfo)) { - return 1; - } - return 0; - } - - template - // NOLINTNEXTLINE(modernize-use-nodiscard) - typename std::enable_if::type count(const OtherKey& key) const { - ROBIN_HOOD_TRACE(this) - auto kv = mKeyVals + findIdx(key); - if (kv != reinterpret_cast_no_cast_align_warning(mInfo)) { - return 1; - } - return 0; - } - - bool contains(const key_type& key) const { // NOLINT(modernize-use-nodiscard) - return 1U == count(key); - } - - template - // NOLINTNEXTLINE(modernize-use-nodiscard) - typename std::enable_if::type contains(const OtherKey& key) const { - return 1U == count(key); - } - - // Returns a reference to the value found for key. - // Throws std::out_of_range if element cannot be found - template - // NOLINTNEXTLINE(modernize-use-nodiscard) - typename std::enable_if::value, Q&>::type at(key_type const& key) { - ROBIN_HOOD_TRACE(this) - auto kv = mKeyVals + findIdx(key); - if (kv == reinterpret_cast_no_cast_align_warning(mInfo)) { - doThrow("key not found"); - } - return kv->getSecond(); - } - - // Returns a reference to the value found for key. - // Throws std::out_of_range if element cannot be found - template - // NOLINTNEXTLINE(modernize-use-nodiscard) - typename std::enable_if::value, Q const&>::type at(key_type const& key) const { - ROBIN_HOOD_TRACE(this) - auto kv = mKeyVals + findIdx(key); - if (kv == reinterpret_cast_no_cast_align_warning(mInfo)) { - doThrow("key not found"); - } - return kv->getSecond(); - } - - const_iterator find(const key_type& key) const { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - const size_t idx = findIdx(key); - return const_iterator{ mKeyVals + idx, mInfo + idx }; - } - - template - const_iterator find(const OtherKey& key, is_transparent_tag /*unused*/) const { - ROBIN_HOOD_TRACE(this) - const size_t idx = findIdx(key); - return const_iterator{ mKeyVals + idx, mInfo + idx }; - } - - template - typename std::enable_if::type // NOLINT(modernize-use-nodiscard) - find(const OtherKey& key) const { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - const size_t idx = findIdx(key); - return const_iterator{ mKeyVals + idx, mInfo + idx }; - } - - iterator find(const key_type& key) { - ROBIN_HOOD_TRACE(this) - const size_t idx = findIdx(key); - return iterator{ mKeyVals + idx, mInfo + idx }; - } - - template - iterator find(const OtherKey& key, is_transparent_tag /*unused*/) { - ROBIN_HOOD_TRACE(this) - const size_t idx = findIdx(key); - return iterator{ mKeyVals + idx, mInfo + idx }; - } - - template - typename std::enable_if::type find(const OtherKey& key) { - ROBIN_HOOD_TRACE(this) - const size_t idx = findIdx(key); - return iterator{ mKeyVals + idx, mInfo + idx }; - } - - iterator begin() { - ROBIN_HOOD_TRACE(this) - if (empty()) { - return end(); - } - return iterator(mKeyVals, mInfo, fast_forward_tag{}); - } - const_iterator begin() const { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - return cbegin(); - } - const_iterator cbegin() const { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - if (empty()) { - return cend(); - } - return const_iterator(mKeyVals, mInfo, fast_forward_tag{}); - } - - iterator end() { - ROBIN_HOOD_TRACE(this) - // no need to supply valid info pointer: end() must not be dereferenced, and only node - // pointer is compared. - return iterator{ reinterpret_cast_no_cast_align_warning(mInfo), nullptr }; - } - const_iterator end() const { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - return cend(); - } - const_iterator cend() const { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - return const_iterator{ reinterpret_cast_no_cast_align_warning(mInfo), nullptr }; - } - - iterator erase(const_iterator pos) { - ROBIN_HOOD_TRACE(this) - // its safe to perform const cast here - // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast) - return erase(iterator{ const_cast(pos.mKeyVals), const_cast(pos.mInfo) }); - } - - // Erases element at pos, returns iterator to the next element. - iterator erase(iterator pos) { - ROBIN_HOOD_TRACE(this) - // we assume that pos always points to a valid entry, and not end(). - auto const idx = static_cast(pos.mKeyVals - mKeyVals); - - shiftDown(idx); - --mNumElements; - - if (*pos.mInfo) { - // we've backward shifted, return this again - return pos; - } - - // no backward shift, return next element - return ++pos; - } - - size_t erase(const key_type& key) { - ROBIN_HOOD_TRACE(this) - size_t idx {}; - InfoType info{}; - keyToIdx(key, &idx, &info); - - // check while info matches with the source idx - do { - if (info == mInfo[idx] && WKeyEqual::operator()(key, mKeyVals[idx].getFirst())) { - shiftDown(idx); - --mNumElements; - return 1; - } - next(&info, &idx); - } while (info <= mInfo[idx]); - - // nothing found to delete - return 0; - } - - // reserves space for the specified number of elements. Makes sure the old data fits. - // exactly the same as reserve(c). - void rehash(size_t c) { - // forces a reserve - reserve(c, true); - } - - // reserves space for the specified number of elements. Makes sure the old data fits. - // Exactly the same as rehash(c). Use rehash(0) to shrink to fit. - void reserve(size_t c) { - // reserve, but don't force rehash - reserve(c, false); - } - - // If possible reallocates the map to a smaller one. This frees the underlying table. - // Does not do anything if load_factor is too large for decreasing the table's size. - void compact() { - ROBIN_HOOD_TRACE(this) - auto newSize = InitialNumElements; - while (calcMaxNumElementsAllowed(newSize) < mNumElements && newSize != 0) { - newSize *= 2; - } - if (ROBIN_HOOD_UNLIKELY(newSize == 0)) { - throwOverflowError(); - } - - ROBIN_HOOD_LOG("newSize > mMask + 1: " << newSize << " > " << mMask << " + 1") - - // only actually do anything when the new size is bigger than the old one. This prevents to - // continuously allocate for each reserve() call. - if (newSize < mMask + 1) { - rehashPowerOfTwo(newSize, true); - } - } - - size_type size() const noexcept { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - return mNumElements; - } - - size_type max_size() const noexcept { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - return static_cast(-1); - } - - ROBIN_HOOD(NODISCARD) bool empty() const noexcept { - ROBIN_HOOD_TRACE(this) - return 0 == mNumElements; - } - - float max_load_factor() const noexcept { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - return MaxLoadFactor100 / 100.0F; - } - - // Average number of elements per bucket. Since we allow only 1 per bucket - float load_factor() const noexcept { // NOLINT(modernize-use-nodiscard) - ROBIN_HOOD_TRACE(this) - return static_cast(size()) / static_cast(mMask + 1); - } - - ROBIN_HOOD(NODISCARD) size_t mask() const noexcept { - ROBIN_HOOD_TRACE(this) - return mMask; - } - - ROBIN_HOOD(NODISCARD) size_t calcMaxNumElementsAllowed(size_t maxElements) const noexcept { - if (ROBIN_HOOD_LIKELY(maxElements <= (std::numeric_limits::max)() / 100)) { - return maxElements * MaxLoadFactor100 / 100; - } - - // we might be a bit inprecise, but since maxElements is quite large that doesn't matter - return (maxElements / 100) * MaxLoadFactor100; - } - - ROBIN_HOOD(NODISCARD) size_t calcNumBytesInfo(size_t numElements) const noexcept { - // we add a uint64_t, which houses the sentinel (first byte) and padding so we can load - // 64bit types. - return numElements + sizeof(uint64_t); - } - - ROBIN_HOOD(NODISCARD) - size_t calcNumElementsWithBuffer(size_t numElements) const noexcept { - auto maxNumElementsAllowed = calcMaxNumElementsAllowed(numElements); - return numElements + (std::min)(maxNumElementsAllowed, (static_cast(0xFF))); - } - - // calculation only allowed for 2^n values - ROBIN_HOOD(NODISCARD) size_t calcNumBytesTotal(size_t numElements) const { -#if ROBIN_HOOD(BITNESS) == 64 - return numElements * sizeof(Node) + calcNumBytesInfo(numElements); -#else - // make sure we're doing 64bit operations, so we are at least safe against 32bit overflows. - auto const ne = static_cast(numElements); - auto const s = static_cast(sizeof(Node)); - auto const infos = static_cast(calcNumBytesInfo(numElements)); - - auto const total64 = ne * s + infos; - auto const total = static_cast(total64); - - if (ROBIN_HOOD_UNLIKELY(static_cast(total) != total64)) { - throwOverflowError(); - } - return total; -#endif - } - - private: - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::value, bool>::type has(const value_type& e) const { - ROBIN_HOOD_TRACE(this) - auto it = find(e.first); - return it != end() && it->second == e.second; - } - - template - ROBIN_HOOD(NODISCARD) - typename std::enable_if::value, bool>::type has(const value_type& e) const { - ROBIN_HOOD_TRACE(this) - return find(e) != end(); - } - - void reserve(size_t c, bool forceRehash) { - ROBIN_HOOD_TRACE(this) - auto const minElementsAllowed = (std::max)(c, mNumElements); - auto newSize = InitialNumElements; - while (calcMaxNumElementsAllowed(newSize) < minElementsAllowed && newSize != 0) { - newSize *= 2; - } - if (ROBIN_HOOD_UNLIKELY(newSize == 0)) { - throwOverflowError(); - } - - ROBIN_HOOD_LOG("newSize > mMask + 1: " << newSize << " > " << mMask << " + 1") - - // only actually do anything when the new size is bigger than the old one. This prevents to - // continuously allocate for each reserve() call. - if (forceRehash || newSize > mMask + 1) { - rehashPowerOfTwo(newSize, false); - } - } - - // reserves space for at least the specified number of elements. - // only works if numBuckets if power of two - // True on success, false otherwise - void rehashPowerOfTwo(size_t numBuckets, bool forceFree) { - ROBIN_HOOD_TRACE(this) - - Node* const oldKeyVals = mKeyVals; - uint8_t const* const oldInfo = mInfo; - - const size_t oldMaxElementsWithBuffer = calcNumElementsWithBuffer(mMask + 1); - - // resize operation: move stuff - initData(numBuckets); - if (oldMaxElementsWithBuffer > 1) { - for (size_t i = 0; i < oldMaxElementsWithBuffer; ++i) { - if (oldInfo[i] != 0) { - // might throw an exception, which is really bad since we are in the middle of - // moving stuff. - insert_move(std::move(oldKeyVals[i])); - // destroy the node but DON'T destroy the data. - oldKeyVals[i].~Node(); - } - } - - // this check is not necessary as it's guarded by the previous if, but it helps - // silence g++'s overeager "attempt to free a non-heap object 'map' - // [-Werror=free-nonheap-object]" warning. - if (oldKeyVals != reinterpret_cast_no_cast_align_warning(&mMask)) { - // don't destroy old data: put it into the pool instead - if (forceFree) { - std::free(oldKeyVals); - } - else { - DataPool::addOrFree(oldKeyVals, calcNumBytesTotal(oldMaxElementsWithBuffer)); - } - } - } - } - - ROBIN_HOOD(NOINLINE) void throwOverflowError() const { -#if ROBIN_HOOD(HAS_EXCEPTIONS) - throw std::overflow_error("robin_hood::map overflow"); -#else - abort(); -#endif - } - - template - std::pair try_emplace_impl(OtherKey&& key, Args&&... args) { - ROBIN_HOOD_TRACE(this) - auto idxAndState = insertKeyPrepareEmptySpot(key); - switch (idxAndState.second) { - case InsertionState::key_found: - break; - - case InsertionState::new_node: - ::new (static_cast(&mKeyVals[idxAndState.first])) Node( - *this, std::piecewise_construct, std::forward_as_tuple(std::forward(key)), - std::forward_as_tuple(std::forward(args)...)); - break; - - case InsertionState::overwrite_node: - mKeyVals[idxAndState.first] = Node(*this, std::piecewise_construct, - std::forward_as_tuple(std::forward(key)), - std::forward_as_tuple(std::forward(args)...)); - break; - - case InsertionState::overflow_error: - throwOverflowError(); - break; - } - - return std::make_pair(iterator(mKeyVals + idxAndState.first, mInfo + idxAndState.first), - InsertionState::key_found != idxAndState.second); - } - - template - std::pair insertOrAssignImpl(OtherKey&& key, Mapped&& obj) { - ROBIN_HOOD_TRACE(this) - auto idxAndState = insertKeyPrepareEmptySpot(key); - switch (idxAndState.second) { - case InsertionState::key_found: - mKeyVals[idxAndState.first].getSecond() = std::forward(obj); - break; - - case InsertionState::new_node: - ::new (static_cast(&mKeyVals[idxAndState.first])) Node( - *this, std::piecewise_construct, std::forward_as_tuple(std::forward(key)), - std::forward_as_tuple(std::forward(obj))); - break; - - case InsertionState::overwrite_node: - mKeyVals[idxAndState.first] = Node(*this, std::piecewise_construct, - std::forward_as_tuple(std::forward(key)), - std::forward_as_tuple(std::forward(obj))); - break; - - case InsertionState::overflow_error: - throwOverflowError(); - break; - } - - return std::make_pair(iterator(mKeyVals + idxAndState.first, mInfo + idxAndState.first), - InsertionState::key_found != idxAndState.second); - } - - void initData(size_t max_elements) { - mNumElements = 0; - mMask = max_elements - 1; - mMaxNumElementsAllowed = calcMaxNumElementsAllowed(max_elements); - - auto const numElementsWithBuffer = calcNumElementsWithBuffer(max_elements); - - // malloc & zero mInfo. Faster than calloc everything. - auto const numBytesTotal = calcNumBytesTotal(numElementsWithBuffer); - ROBIN_HOOD_LOG("std::calloc " << numBytesTotal << " = calcNumBytesTotal(" - << numElementsWithBuffer << ")") - mKeyVals = reinterpret_cast( - detail::assertNotNull(std::malloc(numBytesTotal))); - mInfo = reinterpret_cast(mKeyVals + numElementsWithBuffer); - std::memset(mInfo, 0, numBytesTotal - numElementsWithBuffer * sizeof(Node)); - - // set sentinel - mInfo[numElementsWithBuffer] = 1; - - mInfoInc = InitialInfoInc; - mInfoHashShift = InitialInfoHashShift; - } - - enum class InsertionState { overflow_error, key_found, new_node, overwrite_node }; - - // Finds key, and if not already present prepares a spot where to pot the key & value. - // This potentially shifts nodes out of the way, updates mInfo and number of inserted - // elements, so the only operation left to do is create/assign a new node at that spot. - template - std::pair insertKeyPrepareEmptySpot(OtherKey&& key) { - for (int i = 0; i < 256; ++i) { - size_t idx{}; - InfoType info{}; - keyToIdx(key, &idx, &info); - nextWhileLess(&info, &idx); - - // while we potentially have a match - while (info == mInfo[idx]) { - if (WKeyEqual::operator()(key, mKeyVals[idx].getFirst())) { - // key already exists, do NOT insert. - // see http://en.cppreference.com/w/cpp/container/unordered_map/insert - return std::make_pair(idx, InsertionState::key_found); - } - next(&info, &idx); - } - - // unlikely that this evaluates to true - if (ROBIN_HOOD_UNLIKELY(mNumElements >= mMaxNumElementsAllowed)) { - if (!increase_size()) { - return std::make_pair(size_t(0), InsertionState::overflow_error); - } - continue; - } - - // key not found, so we are now exactly where we want to insert it. - auto const insertion_idx = idx; - auto const insertion_info = info; - if (ROBIN_HOOD_UNLIKELY(insertion_info + mInfoInc > 0xFF)) { - mMaxNumElementsAllowed = 0; - } - - // find an empty spot - while (0 != mInfo[idx]) { - next(&info, &idx); - } - - if (idx != insertion_idx) { - shiftUp(idx, insertion_idx); - } - // put at empty spot - mInfo[insertion_idx] = static_cast(insertion_info); - ++mNumElements; - return std::make_pair(insertion_idx, idx == insertion_idx - ? InsertionState::new_node - : InsertionState::overwrite_node); - } - - // enough attempts failed, so finally give up. - return std::make_pair(size_t(0), InsertionState::overflow_error); - } - - bool try_increase_info() { - ROBIN_HOOD_LOG("mInfoInc=" << mInfoInc << ", numElements=" << mNumElements - << ", maxNumElementsAllowed=" - << calcMaxNumElementsAllowed(mMask + 1)) - if (mInfoInc <= 2) { - // need to be > 2 so that shift works (otherwise undefined behavior!) - return false; - } - // we got space left, try to make info smaller - mInfoInc = static_cast(mInfoInc >> 1U); - - // remove one bit of the hash, leaving more space for the distance info. - // This is extremely fast because we can operate on 8 bytes at once. - ++mInfoHashShift; - auto const numElementsWithBuffer = calcNumElementsWithBuffer(mMask + 1); - - for (size_t i = 0; i < numElementsWithBuffer; i += 8) { - auto val = unaligned_load(mInfo + i); - val = (val >> 1U) & UINT64_C(0x7f7f7f7f7f7f7f7f); - std::memcpy(mInfo + i, &val, sizeof(val)); - } - // update sentinel, which might have been cleared out! - mInfo[numElementsWithBuffer] = 1; - - mMaxNumElementsAllowed = calcMaxNumElementsAllowed(mMask + 1); - return true; - } - - // True if resize was possible, false otherwise - bool increase_size() { - // nothing allocated yet? just allocate InitialNumElements - if (0 == mMask) { - initData(InitialNumElements); - return true; - } - - auto const maxNumElementsAllowed = calcMaxNumElementsAllowed(mMask + 1); - if (mNumElements < maxNumElementsAllowed && try_increase_info()) { - return true; - } - - ROBIN_HOOD_LOG("mNumElements=" << mNumElements << ", maxNumElementsAllowed=" - << maxNumElementsAllowed << ", load=" - << (static_cast(mNumElements) * 100.0 / - (static_cast(mMask) + 1))) - - if (mNumElements * 2 < calcMaxNumElementsAllowed(mMask + 1)) { - // we have to resize, even though there would still be plenty of space left! - // Try to rehash instead. Delete freed memory so we don't steadyily increase mem in case - // we have to rehash a few times - nextHashMultiplier(); - rehashPowerOfTwo(mMask + 1, true); - } - else { - // we've reached the capacity of the map, so the hash seems to work nice. Keep using it. - rehashPowerOfTwo((mMask + 1) * 2, false); - } - return true; - } - - void nextHashMultiplier() { - // adding an *even* number, so that the multiplier will always stay odd. This is necessary - // so that the hash stays a mixing function (and thus doesn't have any information loss). - mHashMultiplier += UINT64_C(0xc4ceb9fe1a85ec54); - } - - void destroy() { - if (0 == mMask) { - // don't deallocate! - return; - } - - Destroyer::value>{} - .nodesDoNotDeallocate(*this); - - // This protection against not deleting mMask shouldn't be needed as it's sufficiently - // protected with the 0==mMask check, but I have this anyways because g++ 7 otherwise - // reports a compile error: attempt to free a non-heap object 'fm' - // [-Werror=free-nonheap-object] - if (mKeyVals != reinterpret_cast_no_cast_align_warning(&mMask)) { - ROBIN_HOOD_LOG("std::free") - std::free(mKeyVals); - } - } - - void init() noexcept { - mKeyVals = reinterpret_cast_no_cast_align_warning(&mMask); - mInfo = reinterpret_cast(&mMask); - mNumElements = 0; - mMask = 0; - mMaxNumElementsAllowed = 0; - mInfoInc = InitialInfoInc; - mInfoHashShift = InitialInfoHashShift; - } - - // members are sorted so no padding occurs - uint64_t mHashMultiplier = UINT64_C(0xc4ceb9fe1a85ec53); // 8 byte 8 - Node* mKeyVals = reinterpret_cast_no_cast_align_warning(&mMask); // 8 byte 16 - uint8_t* mInfo = reinterpret_cast(&mMask); // 8 byte 24 - size_t mNumElements = 0; // 8 byte 32 - size_t mMask = 0; // 8 byte 40 - size_t mMaxNumElementsAllowed = 0; // 8 byte 48 - InfoType mInfoInc = InitialInfoInc; // 4 byte 52 - InfoType mInfoHashShift = InitialInfoHashShift; // 4 byte 56 - // 16 byte 56 if NodeAllocator - }; - - } // namespace detail - - // map - - template , - typename KeyEqual = std::equal_to, size_t MaxLoadFactor100 = 80> - using unordered_flat_map = detail::Table; - - template , - typename KeyEqual = std::equal_to, size_t MaxLoadFactor100 = 80> - using unordered_node_map = detail::Table; - - template , - typename KeyEqual = std::equal_to, size_t MaxLoadFactor100 = 80> - using unordered_map = - detail::Table) <= sizeof(size_t) * 6 && - std::is_nothrow_move_constructible>::value && - std::is_nothrow_move_assignable>::value, - MaxLoadFactor100, Key, T, Hash, KeyEqual>; - - // set - - template , typename KeyEqual = std::equal_to, - size_t MaxLoadFactor100 = 80> - using unordered_flat_set = detail::Table; - - template , typename KeyEqual = std::equal_to, - size_t MaxLoadFactor100 = 80> - using unordered_node_set = detail::Table; - - template , typename KeyEqual = std::equal_to, - size_t MaxLoadFactor100 = 80> - using unordered_set = detail::Table::value && - std::is_nothrow_move_assignable::value, - MaxLoadFactor100, Key, void, Hash, KeyEqual>; - -} // namespace robin_hood - -#endif diff --git a/3rdparty/unordered_dense/include/unordered_dense.h b/3rdparty/unordered_dense/include/unordered_dense.h new file mode 100644 index 0000000000..13484a9817 --- /dev/null +++ b/3rdparty/unordered_dense/include/unordered_dense.h @@ -0,0 +1,2101 @@ +///////////////////////// ankerl::unordered_dense::{map, set} ///////////////////////// + +// A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion. +// Version 4.5.0 +// https://github.com/martinus/unordered_dense +// +// Licensed under the MIT License . +// SPDX-License-Identifier: MIT +// Copyright (c) 2022-2024 Martin Leitner-Ankerl +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#ifndef ANKERL_UNORDERED_DENSE_H +#define ANKERL_UNORDERED_DENSE_H + +// see https://semver.org/spec/v2.0.0.html +#define ANKERL_UNORDERED_DENSE_VERSION_MAJOR 4 // NOLINT(cppcoreguidelines-macro-usage) incompatible API changes +#define ANKERL_UNORDERED_DENSE_VERSION_MINOR 5 // NOLINT(cppcoreguidelines-macro-usage) backwards compatible functionality +#define ANKERL_UNORDERED_DENSE_VERSION_PATCH 0 // NOLINT(cppcoreguidelines-macro-usage) backwards compatible bug fixes + +// API versioning with inline namespace, see https://www.foonathan.net/2018/11/inline-namespaces/ + +// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) +#define ANKERL_UNORDERED_DENSE_VERSION_CONCAT1(major, minor, patch) v##major##_##minor##_##patch +// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) +#define ANKERL_UNORDERED_DENSE_VERSION_CONCAT(major, minor, patch) ANKERL_UNORDERED_DENSE_VERSION_CONCAT1(major, minor, patch) +#define ANKERL_UNORDERED_DENSE_NAMESPACE \ + ANKERL_UNORDERED_DENSE_VERSION_CONCAT( \ + ANKERL_UNORDERED_DENSE_VERSION_MAJOR, ANKERL_UNORDERED_DENSE_VERSION_MINOR, ANKERL_UNORDERED_DENSE_VERSION_PATCH) + +#if defined(_MSVC_LANG) +# define ANKERL_UNORDERED_DENSE_CPP_VERSION _MSVC_LANG +#else +# define ANKERL_UNORDERED_DENSE_CPP_VERSION __cplusplus +#endif + +#if defined(__GNUC__) +// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) +# define ANKERL_UNORDERED_DENSE_PACK(decl) decl __attribute__((__packed__)) +#elif defined(_MSC_VER) +// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) +# define ANKERL_UNORDERED_DENSE_PACK(decl) __pragma(pack(push, 1)) decl __pragma(pack(pop)) +#endif + +// exceptions +#if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND) +# define ANKERL_UNORDERED_DENSE_HAS_EXCEPTIONS() 1 // NOLINT(cppcoreguidelines-macro-usage) +#else +# define ANKERL_UNORDERED_DENSE_HAS_EXCEPTIONS() 0 // NOLINT(cppcoreguidelines-macro-usage) +#endif +#ifdef _MSC_VER +# define ANKERL_UNORDERED_DENSE_NOINLINE __declspec(noinline) +#else +# define ANKERL_UNORDERED_DENSE_NOINLINE __attribute__((noinline)) +#endif + +// defined in unordered_dense.cpp +#if !defined(ANKERL_UNORDERED_DENSE_EXPORT) +# define ANKERL_UNORDERED_DENSE_EXPORT +#endif + +#if ANKERL_UNORDERED_DENSE_CPP_VERSION < 201703L +# error ankerl::unordered_dense requires C++17 or higher +#else +# include // for array +# include // for uint64_t, uint32_t, uint8_t, UINT64_C +# include // for size_t, memcpy, memset +# include // for equal_to, hash +# include // for initializer_list +# include // for pair, distance +# include // for numeric_limits +# include // for allocator, allocator_traits, shared_ptr +# include // for optional +# include // for out_of_range +# include // for basic_string +# include // for basic_string_view, hash +# include // for forward_as_tuple +# include // for enable_if_t, declval, conditional_t, ena... +# include // for forward, exchange, pair, as_const, piece... +# include // for vector +# if ANKERL_UNORDERED_DENSE_HAS_EXCEPTIONS() == 0 +# include // for abort +# endif + +# if defined(__has_include) && !defined(ANKERL_UNORDERED_DENSE_DISABLE_PMR) +# if __has_include() +# define ANKERL_UNORDERED_DENSE_PMR std::pmr // NOLINT(cppcoreguidelines-macro-usage) +# include // for polymorphic_allocator +# elif __has_include() +# define ANKERL_UNORDERED_DENSE_PMR std::experimental::pmr // NOLINT(cppcoreguidelines-macro-usage) +# include // for polymorphic_allocator +# endif +# endif + +# if defined(_MSC_VER) && defined(_M_X64) +# include +# pragma intrinsic(_umul128) +# endif + +# if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__clang__) +# define ANKERL_UNORDERED_DENSE_LIKELY(x) __builtin_expect(x, 1) // NOLINT(cppcoreguidelines-macro-usage) +# define ANKERL_UNORDERED_DENSE_UNLIKELY(x) __builtin_expect(x, 0) // NOLINT(cppcoreguidelines-macro-usage) +# else +# define ANKERL_UNORDERED_DENSE_LIKELY(x) (x) // NOLINT(cppcoreguidelines-macro-usage) +# define ANKERL_UNORDERED_DENSE_UNLIKELY(x) (x) // NOLINT(cppcoreguidelines-macro-usage) +# endif + +namespace ankerl::unordered_dense { +inline namespace ANKERL_UNORDERED_DENSE_NAMESPACE { + +namespace detail { + +# if ANKERL_UNORDERED_DENSE_HAS_EXCEPTIONS() + +// make sure this is not inlined as it is slow and dramatically enlarges code, thus making other +// inlinings more difficult. Throws are also generally the slow path. +[[noreturn]] inline ANKERL_UNORDERED_DENSE_NOINLINE void on_error_key_not_found() { + throw std::out_of_range("ankerl::unordered_dense::map::at(): key not found"); +} +[[noreturn]] inline ANKERL_UNORDERED_DENSE_NOINLINE void on_error_bucket_overflow() { + throw std::overflow_error("ankerl::unordered_dense: reached max bucket size, cannot increase size"); +} +[[noreturn]] inline ANKERL_UNORDERED_DENSE_NOINLINE void on_error_too_many_elements() { + throw std::out_of_range("ankerl::unordered_dense::map::replace(): too many elements"); +} + +# else + +[[noreturn]] inline void on_error_key_not_found() { + abort(); +} +[[noreturn]] inline void on_error_bucket_overflow() { + abort(); +} +[[noreturn]] inline void on_error_too_many_elements() { + abort(); +} + +# endif + +} // namespace detail + +// hash /////////////////////////////////////////////////////////////////////// + +// This is a stripped-down implementation of wyhash: https://github.com/wangyi-fudan/wyhash +// No big-endian support (because different values on different machines don't matter), +// hardcodes seed and the secret, reformats the code, and clang-tidy fixes. +namespace detail::wyhash { + +inline void mum(uint64_t* a, uint64_t* b) { +# if defined(__SIZEOF_INT128__) + __uint128_t r = *a; + r *= *b; + *a = static_cast(r); + *b = static_cast(r >> 64U); +# elif defined(_MSC_VER) && defined(_M_X64) + *a = _umul128(*a, *b, b); +# else + uint64_t ha = *a >> 32U; + uint64_t hb = *b >> 32U; + uint64_t la = static_cast(*a); + uint64_t lb = static_cast(*b); + uint64_t hi{}; + uint64_t lo{}; + uint64_t rh = ha * hb; + uint64_t rm0 = ha * lb; + uint64_t rm1 = hb * la; + uint64_t rl = la * lb; + uint64_t t = rl + (rm0 << 32U); + auto c = static_cast(t < rl); + lo = t + (rm1 << 32U); + c += static_cast(lo < t); + hi = rh + (rm0 >> 32U) + (rm1 >> 32U) + c; + *a = lo; + *b = hi; +# endif +} + +// multiply and xor mix function, aka MUM +[[nodiscard]] inline auto mix(uint64_t a, uint64_t b) -> uint64_t { + mum(&a, &b); + return a ^ b; +} + +// read functions. WARNING: we don't care about endianness, so results are different on big endian! +[[nodiscard]] inline auto r8(const uint8_t* p) -> uint64_t { + uint64_t v{}; + std::memcpy(&v, p, 8U); + return v; +} + +[[nodiscard]] inline auto r4(const uint8_t* p) -> uint64_t { + uint32_t v{}; + std::memcpy(&v, p, 4); + return v; +} + +// reads 1, 2, or 3 bytes +[[nodiscard]] inline auto r3(const uint8_t* p, size_t k) -> uint64_t { + return (static_cast(p[0]) << 16U) | (static_cast(p[k >> 1U]) << 8U) | p[k - 1]; +} + +[[maybe_unused]] [[nodiscard]] inline auto hash(void const* key, size_t len) -> uint64_t { + static constexpr auto secret = std::array{UINT64_C(0xa0761d6478bd642f), + UINT64_C(0xe7037ed1a0b428db), + UINT64_C(0x8ebc6af09c88c6e3), + UINT64_C(0x589965cc75374cc3)}; + + auto const* p = static_cast(key); + uint64_t seed = secret[0]; + uint64_t a{}; + uint64_t b{}; + if (ANKERL_UNORDERED_DENSE_LIKELY(len <= 16)) { + if (ANKERL_UNORDERED_DENSE_LIKELY(len >= 4)) { + a = (r4(p) << 32U) | r4(p + ((len >> 3U) << 2U)); + b = (r4(p + len - 4) << 32U) | r4(p + len - 4 - ((len >> 3U) << 2U)); + } else if (ANKERL_UNORDERED_DENSE_LIKELY(len > 0)) { + a = r3(p, len); + b = 0; + } else { + a = 0; + b = 0; + } + } else { + size_t i = len; + if (ANKERL_UNORDERED_DENSE_UNLIKELY(i > 48)) { + uint64_t see1 = seed; + uint64_t see2 = seed; + do { + seed = mix(r8(p) ^ secret[1], r8(p + 8) ^ seed); + see1 = mix(r8(p + 16) ^ secret[2], r8(p + 24) ^ see1); + see2 = mix(r8(p + 32) ^ secret[3], r8(p + 40) ^ see2); + p += 48; + i -= 48; + } while (ANKERL_UNORDERED_DENSE_LIKELY(i > 48)); + seed ^= see1 ^ see2; + } + while (ANKERL_UNORDERED_DENSE_UNLIKELY(i > 16)) { + seed = mix(r8(p) ^ secret[1], r8(p + 8) ^ seed); + i -= 16; + p += 16; + } + a = r8(p + i - 16); + b = r8(p + i - 8); + } + + return mix(secret[1] ^ len, mix(a ^ secret[1], b ^ seed)); +} + +[[nodiscard]] inline auto hash(uint64_t x) -> uint64_t { + return detail::wyhash::mix(x, UINT64_C(0x9E3779B97F4A7C15)); +} + +} // namespace detail::wyhash + +ANKERL_UNORDERED_DENSE_EXPORT template +struct hash { + auto operator()(T const& obj) const noexcept(noexcept(std::declval>().operator()(std::declval()))) + -> uint64_t { + return std::hash{}(obj); + } +}; + +template +struct hash::is_avalanching> { + using is_avalanching = void; + auto operator()(T const& obj) const noexcept(noexcept(std::declval>().operator()(std::declval()))) + -> uint64_t { + return std::hash{}(obj); + } +}; + +template +struct hash> { + using is_avalanching = void; + auto operator()(std::basic_string const& str) const noexcept -> uint64_t { + return detail::wyhash::hash(str.data(), sizeof(CharT) * str.size()); + } +}; + +template +struct hash> { + using is_avalanching = void; + auto operator()(std::basic_string_view const& sv) const noexcept -> uint64_t { + return detail::wyhash::hash(sv.data(), sizeof(CharT) * sv.size()); + } +}; + +template +struct hash { + using is_avalanching = void; + auto operator()(T* ptr) const noexcept -> uint64_t { + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) + return detail::wyhash::hash(reinterpret_cast(ptr)); + } +}; + +template +struct hash> { + using is_avalanching = void; + auto operator()(std::unique_ptr const& ptr) const noexcept -> uint64_t { + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) + return detail::wyhash::hash(reinterpret_cast(ptr.get())); + } +}; + +template +struct hash> { + using is_avalanching = void; + auto operator()(std::shared_ptr const& ptr) const noexcept -> uint64_t { + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) + return detail::wyhash::hash(reinterpret_cast(ptr.get())); + } +}; + +template +struct hash::value>::type> { + using is_avalanching = void; + auto operator()(Enum e) const noexcept -> uint64_t { + using underlying = typename std::underlying_type_t; + return detail::wyhash::hash(static_cast(e)); + } +}; + +template +struct tuple_hash_helper { + // Converts the value into 64bit. If it is an integral type, just cast it. Mixing is doing the rest. + // If it isn't an integral we need to hash it. + template + [[nodiscard]] constexpr static auto to64(Arg const& arg) -> uint64_t { + if constexpr (std::is_integral_v || std::is_enum_v) { + return static_cast(arg); + } else { + return hash{}(arg); + } + } + + [[nodiscard]] static auto mix64(uint64_t state, uint64_t v) -> uint64_t { + return detail::wyhash::mix(state + v, uint64_t{0x9ddfea08eb382d69}); + } + + // Creates a buffer that holds all the data from each element of the tuple. If possible we memcpy the data directly. If + // not, we hash the object and use this for the array. Size of the array is known at compile time, and memcpy is optimized + // away, so filling the buffer is highly efficient. Finally, call wyhash with this buffer. + template + [[nodiscard]] static auto calc_hash(T const& t, std::index_sequence) noexcept -> uint64_t { + auto h = uint64_t{}; + ((h = mix64(h, to64(std::get(t)))), ...); + return h; + } +}; + +template +struct hash> : tuple_hash_helper { + using is_avalanching = void; + auto operator()(std::tuple const& t) const noexcept -> uint64_t { + return tuple_hash_helper::calc_hash(t, std::index_sequence_for{}); + } +}; + +template +struct hash> : tuple_hash_helper { + using is_avalanching = void; + auto operator()(std::pair const& t) const noexcept -> uint64_t { + return tuple_hash_helper::calc_hash(t, std::index_sequence_for{}); + } +}; + +// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) +# define ANKERL_UNORDERED_DENSE_HASH_STATICCAST(T) \ + template <> \ + struct hash { \ + using is_avalanching = void; \ + auto operator()(T const& obj) const noexcept -> uint64_t { \ + return detail::wyhash::hash(static_cast(obj)); \ + } \ + } + +# if defined(__GNUC__) && !defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wuseless-cast" +# endif +// see https://en.cppreference.com/w/cpp/utility/hash +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(bool); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(char); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(signed char); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned char); +# if ANKERL_UNORDERED_DENSE_CPP_VERSION >= 202002L && defined(__cpp_char8_t) +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(char8_t); +# endif +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(char16_t); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(char32_t); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(wchar_t); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(short); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned short); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(int); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned int); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(long); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(long long); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned long); +ANKERL_UNORDERED_DENSE_HASH_STATICCAST(unsigned long long); + +# if defined(__GNUC__) && !defined(__clang__) +# pragma GCC diagnostic pop +# endif + +// bucket_type ////////////////////////////////////////////////////////// + +namespace bucket_type { + +struct standard { + static constexpr uint32_t dist_inc = 1U << 8U; // skip 1 byte fingerprint + static constexpr uint32_t fingerprint_mask = dist_inc - 1; // mask for 1 byte of fingerprint + + uint32_t m_dist_and_fingerprint; // upper 3 byte: distance to original bucket. lower byte: fingerprint from hash + uint32_t m_value_idx; // index into the m_values vector. +}; + +ANKERL_UNORDERED_DENSE_PACK(struct big { + static constexpr uint32_t dist_inc = 1U << 8U; // skip 1 byte fingerprint + static constexpr uint32_t fingerprint_mask = dist_inc - 1; // mask for 1 byte of fingerprint + + uint32_t m_dist_and_fingerprint; // upper 3 byte: distance to original bucket. lower byte: fingerprint from hash + size_t m_value_idx; // index into the m_values vector. +}); + +} // namespace bucket_type + +namespace detail { + +struct nonesuch {}; +struct default_container_t {}; + +template class Op, class... Args> +struct detector { + using value_t = std::false_type; + using type = Default; +}; + +template class Op, class... Args> +struct detector>, Op, Args...> { + using value_t = std::true_type; + using type = Op; +}; + +template