early-access version 2728

src/core/arm/dynarmic/arm_dynarmic_cp15.cpp

@@ -20,7 +20,7 @@ struct fmt::formatter<Dynarmic::A32::CoprocReg> {
     }
     template <typename FormatContext>
     auto format(const Dynarmic::A32::CoprocReg& reg, FormatContext& ctx) {
-        return format_to(ctx.out(), "cp{}", static_cast<size_t>(reg));
+        return fmt::format_to(ctx.out(), "cp{}", static_cast<size_t>(reg));
     }
 };
 

src/core/hid/emulated_controller.cpp

@@ -631,11 +631,14 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
 
     lock.unlock();
 
-    // Reconnect controller if input is detected
     if (!is_connected) {
-        TryReconnectController(index);
+        if (npad_id_type == NpadIdType::Player1 && npad_type != NpadStyleIndex::Handheld) {
+            Connect();
+        }
+        if (npad_id_type == NpadIdType::Handheld && npad_type == NpadStyleIndex::Handheld) {
+            Connect();
+        }
     }
-
     TriggerOnChange(ControllerTriggerType::Button, true);
 }
 
@@ -987,33 +990,6 @@ bool EmulatedController::IsControllerSupported(bool use_temporary_value) const {
         return false;
     }
 }
-void EmulatedController::TryReconnectController(std::size_t button_index) {
-    if (button_index >= button_params.size()) {
-        return;
-    }
-
-    const auto engine = button_params[button_index].Get("engine", "");
-    bool reconnect_controller = false;
-
-    // TAS is not allowed to turn on controllers
-    if (engine == "tas") {
-        return;
-    }
-    // Only connect the controller if button config is custom
-    if (engine != "keyboard") {
-        reconnect_controller = true;
-    }
-    if (npad_id_type == NpadIdType::Player1 && npad_type != NpadStyleIndex::Handheld) {
-        reconnect_controller = true;
-    }
-    if (npad_id_type == NpadIdType::Handheld && npad_type == NpadStyleIndex::Handheld) {
-        reconnect_controller = true;
-    }
-
-    if (reconnect_controller) {
-        Connect();
-    }
-}
 
 void EmulatedController::Connect(bool use_temporary_value) {
     if (!IsControllerSupported(use_temporary_value)) {

src/core/hid/emulated_controller.h

@@ -166,12 +166,6 @@ public:
      */
     void SetSupportedNpadStyleTag(NpadStyleTag supported_styles);
 
-    /**
-     * Tries to turn on the controller if a button is pressed
-     * @param button_index index to verify if controller should be connected
-     */
-    void TryReconnectController(std::size_t button_index);
-
     /**
      * Sets the connected status to true
      * @param use_temporary_value If true tmp_npad_type will be used

src/shader_recompiler/frontend/ir/opcodes.h

@@ -103,6 +103,6 @@ struct fmt::formatter<Shader::IR::Opcode> {
     }
     template <typename FormatContext>
     auto format(const Shader::IR::Opcode& op, FormatContext& ctx) {
-        return format_to(ctx.out(), "{}", Shader::IR::NameOf(op));
+        return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(op));
     }
 };

src/shader_recompiler/frontend/maxwell/opcodes.h

@@ -24,6 +24,6 @@ struct fmt::formatter<Shader::Maxwell::Opcode> {
     }
     template <typename FormatContext>
     auto format(const Shader::Maxwell::Opcode& opcode, FormatContext& ctx) {
-        return format_to(ctx.out(), "{}", NameOf(opcode));
+        return fmt::format_to(ctx.out(), "{}", NameOf(opcode));
     }
 };