Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions Source/Core/DolphinLibretro/Boot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,19 @@ bool retro_load_game(const struct retro_game_info* game)
bool yes_no, Common::MsgType style) -> bool
{
// Log the message instead of showing a popup
INFO_LOG_FMT(COMMON, "Suppressed popup: {} - {}", caption, text);
WARN_LOG_FMT(COMMON, "Suppressed popup: {} - {}", caption, text);
return true; // Always "continue"
});

INFO_LOG_FMT(COMMON, "SCM Git revision: {}", Common::GetScmRevGitStr());
INFO_LOG_FMT(COMMON, "User Directory set to '{}'", user_dir);
INFO_LOG_FMT(COMMON, "System Directory set to '{}'", sys_dir);
NOTICE_LOG_FMT(BOOT, "SCM Git revision: {}", Common::GetScmRevGitStr());
NOTICE_LOG_FMT(BOOT, "User Directory set to '{}'", user_dir);
NOTICE_LOG_FMT(BOOT, "System Directory set to '{}'", sys_dir);

const std::string codehandler = std::string(sys_dir) + DIR_SEP GECKO_CODE_HANDLER;

if (!File::Exists(codehandler))
ERROR_LOG_FMT(BOOT, "Core file {} missing! Go to Online Updater -> Core System Files Downloader -> Install Dolphin.zip",
GECKO_CODE_HANDLER);

// Main.Core
Config::SetBase(Config::MAIN_CPU_CORE,
Expand Down Expand Up @@ -599,9 +605,9 @@ bool retro_load_game(const struct retro_game_info* game)
OSD::AddMessage("CPU: Just in time compiler disabled as unavailable on your system", OSD::Duration::NORMAL);
}
#endif
INFO_LOG_FMT(BOOT, "CPU Core: {}", Libretro::Options::CPUCoreToString(Config::Get(Config::MAIN_CPU_CORE)));
INFO_LOG_FMT(BOOT, "Fastmem enabled = {}", (Config::Get(Config::MAIN_FASTMEM)) ? "Yes" : "No");
INFO_LOG_FMT(BOOT, "JIT debug enabled = {}", Config::IsDebuggingEnabled() ? "Yes" : "No");
NOTICE_LOG_FMT(BOOT, "CPU Core: {}", Libretro::Options::CPUCoreToString(Config::Get(Config::MAIN_CPU_CORE)));
NOTICE_LOG_FMT(BOOT, "Fastmem enabled = {}", (Config::Get(Config::MAIN_FASTMEM)) ? "Yes" : "No");
NOTICE_LOG_FMT(BOOT, "JIT debug enabled = {}", Config::IsDebuggingEnabled() ? "Yes" : "No");

Libretro::FrameTiming::Init();
Libretro::Audio::Init();
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinLibretro/Common/Options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ static struct retro_core_option_v2_definition option_defs[] = {
#endif
{ nullptr, nullptr }
},
"Info"
"4"
},
{
Libretro::Options::main_interface::LOG_BOOT,
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/DolphinLibretro/Input.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -465,12 +465,12 @@ void Init(const WindowSystemInfo& wsi)
{
if (!environ_cb(RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE, &rumble))
{
WARN_LOG_FMT(COMMON, "RetroArch does not support RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE.");
WARN_LOG_FMT(BOOT, "RetroArch does not support RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE.");
}

if (!environ_cb(RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE, &sensor_interface))
{
WARN_LOG_FMT(COMMON, "RetroArch does not support RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE.");
WARN_LOG_FMT(BOOT, "RetroArch does not support RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE.");
}

retro_microphone_interface mic_iface{RETRO_MICROPHONE_INTERFACE_VERSION};
Expand All @@ -489,7 +489,7 @@ void Init(const WindowSystemInfo& wsi)
}
else
{
WARN_LOG_FMT(IOS_USB, "Microphone interface NOT available");
WARN_LOG_FMT(BOOT, "Microphone interface NOT available");
}

g_controller_interface.Initialize(wsi);
Expand Down Expand Up @@ -545,7 +545,7 @@ void InitStage2()
};

if (!environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports))
WARN_LOG_FMT(COMMON, "RetroArch does not support RETRO_ENVIRONMENT_SET_CONTROLLER_INFO.");
WARN_LOG_FMT(BOOT, "RetroArch does not support RETRO_ENVIRONMENT_SET_CONTROLLER_INFO.");
}
else // Both Wii devices and GC controllers listed in ports 1-4, ports 5-8 are unused
{
Expand All @@ -568,7 +568,7 @@ void InitStage2()
};

if (!environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports))
WARN_LOG_FMT(COMMON, "RetroArch does not support RETRO_ENVIRONMENT_SET_CONTROLLER_INFO.");
WARN_LOG_FMT(BOOT, "RetroArch does not support RETRO_ENVIRONMENT_SET_CONTROLLER_INFO.");
}
}
else
Expand All @@ -582,7 +582,7 @@ void InitStage2()
};

if (!environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports))
WARN_LOG_FMT(COMMON, "RetroArch does not support RETRO_ENVIRONMENT_SET_CONTROLLER_INFO.");
WARN_LOG_FMT(BOOT, "RetroArch does not support RETRO_ENVIRONMENT_SET_CONTROLLER_INFO.");
}
}

Expand Down Expand Up @@ -615,7 +615,7 @@ void InitSensors()
g_controller_interface.AddDevice(sensor);
}

INFO_LOG_FMT(COMMON, "Sensor interface: Port: {} ACCELEROMETER: {} GYROSCOPE: {}", i,
INFO_LOG_FMT(BOOT, "Sensor interface: Port: {} ACCELEROMETER: {} GYROSCOPE: {}", i,
sensor_enabled[i][SENSOR_ACCELEROMETER], sensor_enabled[i][SENSOR_GYRO]);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinLibretro/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ void retro_run(void)

if(!Libretro::g_emuthread_launched)
{
DEBUG_LOG_FMT(COMMON, "retro_run() - waiting for g_emuthread_launched");
DEBUG_LOG_FMT(BOOT, "retro_run() - waiting for g_emuthread_launched");
return;
}

Expand Down
Loading