From c96f949832455065015a0fc633464a78fb1f2e78 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Sat, 23 Apr 2022 23:32:37 +0200 Subject: [PATCH] early-access version 2696 --- CMakeLists.txt | 20 +------------------- README.md | 2 +- src/core/arm/dynarmic/arm_dynarmic_32.cpp | 2 +- src/core/arm/dynarmic/arm_dynarmic_64.cpp | 2 +- src/input_common/input_engine.h | 2 +- src/yuzu/main.cpp | 8 +++++--- 6 files changed, 10 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11a459813..caeb2ab8e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,6 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSV option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) -option(YUZU_USE_BUNDLED_BOOST "Download bundled Boost" OFF) - option(YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF) option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") @@ -208,9 +206,7 @@ macro(yuzu_find_packages) unset(FN_FORCE_REQUIRED) endmacro() -if (NOT YUZU_USE_BUNDLED_BOOST) - find_package(Boost 1.73.0 CONFIG COMPONENTS context headers QUIET) -endif() +find_package(Boost 1.73.0 COMPONENTS context headers) if (Boost_FOUND) set(Boost_LIBRARIES Boost::boost) # Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it @@ -221,20 +217,6 @@ if (Boost_FOUND) if (TARGET Boost::context) list(APPEND Boost_LIBRARIES Boost::context) endif() -elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST) - message(STATUS "Boost 1.73.0 or newer not found, falling back to externals") - set(YUZU_USE_BUNDLED_BOOST ON CACHE BOOL "Download bundled Boost" FORCE) - - # Use yuzu Boost binaries - set(Boost_EXT_NAME "boost_1_75_0") - set(Boost_PATH "${CMAKE_BINARY_DIR}/externals/${Boost_EXT_NAME}") - download_bundled_external("boost/" ${Boost_EXT_NAME} "") - set(Boost_USE_DEBUG_RUNTIME FALSE) - set(Boost_USE_STATIC_LIBS ON) - find_package(Boost 1.75.0 CONFIG REQUIRED COMPONENTS context headers PATHS ${Boost_PATH} NO_DEFAULT_PATH) - # Manually set the include dirs since the find_package sets it incorrectly - set(Boost_INCLUDE_DIRS ${Boost_PATH}/include CACHE PATH "Path to Boost headers" FORCE) - include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") else() message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan") list(APPEND CONAN_REQUIRED_LIBS "boost/1.78.0") diff --git a/README.md b/README.md index 675bdd9ed..755670ffd 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2695. +This is the source code for early-access 2696. ## Legal Notice diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 5490d2e9b..e95ace5f0 100755 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -123,7 +123,7 @@ public: ARM_Dynarmic_32& parent; Core::Memory::Memory& memory; std::size_t num_interpreted_instructions{}; - static constexpr u64 minimum_run_cycles = 1000U; + static constexpr u64 minimum_run_cycles = 10000U; }; std::shared_ptr ARM_Dynarmic_32::MakeJit(Common::PageTable* page_table) const { diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 3b57617ef..fb0094dfe 100755 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -168,7 +168,7 @@ public: Core::Memory::Memory& memory; u64 tpidrro_el0 = 0; u64 tpidr_el0 = 0; - static constexpr u64 minimum_run_cycles = 1000U; + static constexpr u64 minimum_run_cycles = 10000U; }; std::shared_ptr ARM_Dynarmic_64::MakeJit(Common::PageTable* page_table, diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index 5ae690ec1..13295bd49 100755 --- a/src/input_common/input_engine.h +++ b/src/input_common/input_engine.h @@ -211,7 +211,7 @@ private: int index) const; mutable std::mutex mutex; - mutable std::recursive_mutex mutex_callback; + mutable std::mutex mutex_callback; bool configuring{false}; const std::string input_engine; int last_callback_key = 0; diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 5e26aad29..f607f464a 100755 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -933,8 +933,9 @@ void GMainWindow::LinkActionShortcut(QAction* action, const QString& action_name auto* controller = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); const auto* controller_hotkey = hotkey_registry.GetControllerHotkey(main_window, action_name, controller); - connect(controller_hotkey, &ControllerShortcut::Activated, this, - [action] { action->trigger(); }); + connect( + controller_hotkey, &ControllerShortcut::Activated, this, [action] { action->trigger(); }, + Qt::QueuedConnection); } void GMainWindow::InitializeHotkeys() { @@ -961,7 +962,8 @@ void GMainWindow::InitializeHotkeys() { const auto* controller_hotkey = hotkey_registry.GetControllerHotkey(main_window, action_name, controller); connect(hotkey, &QShortcut::activated, this, function); - connect(controller_hotkey, &ControllerShortcut::Activated, this, function); + connect(controller_hotkey, &ControllerShortcut::Activated, this, function, + Qt::QueuedConnection); }; connect_shortcut(QStringLiteral("Exit Fullscreen"), [&] {