Emulator-Archive/mandarine
1
0
Fork 0
mirror of https://github.com/mandarine3ds/mandarine.git synced 2024-11-27 00:10:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PC: Fix SDL2 linking library, minimun GLES is 3.2 and add more options to QT

Browse Source
This commit is contained in:
OpenSauce04 2024-10-13 22:27:45 +02:00 committed by Gamer64
parent 9c8593a84b
commit f438fbfae3
5 changed files with 188 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mandarine_qt/CMakeLists.txt
View File

@ -283,6 +283,11 @@ elseif (WIN32)
endif()
endif()
if (ENABLE_SDL2)
target_link_libraries(mandarine-qt PRIVATE SDL2::SDL2)
target_compile_definitions(mandarine-qt PRIVATE HAVE_SDL2)
endif()
create_target_directory_groups(mandarine-qt)
target_link_libraries(mandarine-qt PRIVATE audio_core mandarine_common mandarine_core input_common network video_core)

241
src/mandarine_qt/main.cpp
View File

@ -4,6 +4,7 @@
#include <clocale>
#include <memory>
#include <optional>
#include <thread>
#include <QFileDialog>
#include <QFutureWatcher>
@ -22,6 +23,9 @@
#ifdef _WIN32
#include <shlobj.h>
#include <windows.h>
#else
#include <iostream>
#include <getopt.h>
#endif
#ifdef __unix__
#include <QVariant>
@ -154,6 +158,14 @@ static QString PrettyProductName() {
return QSysInfo::prettyProductName();
}
void GMainWindow::ShowCommandOutput(std::string title, std::string message) {
#ifdef _WIN32
QMessageBox::information(this, QString::fromStdString(title), QString::fromStdString(message));
#else
std::cout << message << std::endl;
#endif
}
GMainWindow::GMainWindow(Core::System& system_)
: ui{std::make_unique<Ui::MainWindow>()}, system{system_}, movie{system.Movie()},
emu_thread{nullptr} {
@ -162,10 +174,138 @@ GMainWindow::GMainWindow(Core::System& system_)
Debugger::ToggleConsole();
CheckForMigration();
this->config = std::make_unique<Config>();
QStringList args = QApplication::arguments();
QString game_path;
std::optional<bool> fullscreen_override;
for (int i = 1; i < args.size(); ++i) {
// Preserves drag/drop functionality
if (args.size() == 2 && !args[1].startsWith(QChar::fromLatin1('-'))) {
game_path = args[1];
break;
}
// Dump video
if (args[i] == QStringLiteral("-d")) {
if (i >= args.size() - 1 || args[i + 1].startsWith(QChar::fromLatin1('-'))) {
continue;
}
if (!DynamicLibrary::FFmpeg::LoadFFmpeg()) {
ShowFFmpegErrorMessage();
continue;
}
video_dumping_path = args[++i];
video_dumping_on_start = true;
continue;
}
// Launch game in fullscreen mode
if (args[i] == QStringLiteral("-f")) {
fullscreen_override = true;
continue;
}
// Enable GDB stub
if (args[i] == QStringLiteral("-g")) {
if (i >= args.size() - 1 || args[i + 1].startsWith(QChar::fromLatin1('-'))) {
continue;
}
Settings::values.use_gdbstub = true;
Settings::values.gdbstub_port = strtoul(args[++i].toLatin1(), NULL, 0);
continue;
}
if (args[i] == QStringLiteral("-h")) {
const std::string help_string =
std::string("Usage: ") + args[0].toStdString() +
" [options] <file path>\n"
"-d [path] Dump video recording of emulator playback to the given file path\n"
"-g [port] Enable gdb stub on the given port\n"
"-f Start in fullscreen mode\n"
"-h Display this help and exit\n"
"-i [path] Install a CIA file at the given path\n"
"-p [path] Play a TAS movie located at the given path\n"
"-r [path] Record a TAS movie to the given file path\n"
"-v Output version information and exit";
ShowCommandOutput("Help", help_string);
exit(0);
}
if (args[i] == QStringLiteral("-i")) {
if (i >= args.size() - 1 || args[i + 1].startsWith(QChar::fromLatin1('-'))) {
continue;
}
Service::AM::InstallStatus result = Service::AM::InstallCIA(args[++i].toStdString());
if (result != Service::AM::InstallStatus::Success) {
std::string failure_reason;
if (result == Service::AM::InstallStatus::ErrorFailedToOpenFile)
failure_reason = "Unable to open file.";
if (result == Service::AM::InstallStatus::ErrorFileNotFound)
failure_reason = "File not found.";
if (result == Service::AM::InstallStatus::ErrorAborted)
failure_reason = "Install was aborted.";
if (result == Service::AM::InstallStatus::ErrorInvalid)
failure_reason = "CIA is invalid.";
if (result == Service::AM::InstallStatus::ErrorEncrypted)
failure_reason = "CIA is encrypted.";
std::string failure_string = "Failed to install CIA: " + failure_reason;
ShowCommandOutput("Failure", failure_string);
exit((int)result +
2); // 2 is added here to avoid stepping on the toes of
// exit codes 1 and 2 which have pre-established conventional meanings
}
ShowCommandOutput("Success", "Installed CIA successfully.");
exit(0);
}
if (args[i] == QStringLiteral("-p")) {
if (i >= args.size() - 1 || args[i + 1].startsWith(QChar::fromLatin1('-'))) {
continue;
}
movie_playback_path = args[++i];
movie_playback_on_start = true;
continue;
}
if (args[i] == QStringLiteral("-r")) {
if (i >= args.size() - 1 || args[i + 1].startsWith(QChar::fromLatin1('-'))) {
continue;
}
movie_record_path = args[++i];
movie_record_on_start = true;
continue;
}
if (args[i] == QStringLiteral("-v")) {
const std::string version_string =
std::string("Mandarine ") + Common::g_scm_branch + " " + Common::g_scm_desc;
ShowCommandOutput("Version", version_string);
exit(0);
}
// Launch game in windowed mode
if (args[i] == QStringLiteral("-w")) {
fullscreen_override = false;
continue;
}
// Launch game at path
if (i == args.size() - 1 && !args[i].startsWith(QChar::fromLatin1('-'))) {
game_path = args[i];
continue;
}
}
CheckForMigration();
#ifdef __unix__
SetGamemodeEnabled(Settings::values.enable_gamemode.GetValue());
#endif
@ -215,6 +355,12 @@ GMainWindow::GMainWindow(Core::System& system_)
SetDefaultUIGeometry();
RestoreUIState();
ui->action_Dump_Video->setChecked(video_dumping_on_start);
if (fullscreen_override) {
ui->action_Fullscreen->setChecked(*fullscreen_override);
}
ui->action_Close_Movie->setEnabled(movie_playback_on_start || movie_record_on_start);
ConnectAppEvents();
ConnectMenuEvents();
ConnectWidgetEvents();
@ -281,45 +427,6 @@ GMainWindow::GMainWindow(Core::System& system_)
}
#endif
QStringList args = QApplication::arguments();
if (args.size() < 2) {
return;
}
QString game_path;
for (int i = 1; i < args.size(); ++i) {
// Preserves drag/drop functionality
if (args.size() == 2 && !args[1].startsWith(QChar::fromLatin1('-'))) {
game_path = args[1];
break;
}
// Launch game in fullscreen mode
if (args[i] == QStringLiteral("-f")) {
ui->action_Fullscreen->setChecked(true);
continue;
}
// Launch game in windowed mode
if (args[i] == QStringLiteral("-w")) {
ui->action_Fullscreen->setChecked(false);
continue;
}
// Launch game at path
if (args[i] == QStringLiteral("-g")) {
if (i >= args.size() - 1) {
continue;
}
if (args[i + 1].startsWith(QChar::fromLatin1('-'))) {
continue;
}
game_path = args[++i];
}
}
if (!game_path.isEmpty()) {
BootGame(game_path);
}
@ -2767,6 +2874,31 @@ void GMainWindow::OnCaptureScreenshot() {
}
}
void GMainWindow::ShowFFmpegErrorMessage() {
QMessageBox message_box;
message_box.setWindowTitle(tr("Could not load video dumper"));
message_box.setText(
tr("FFmpeg could not be loaded. Make sure you have a compatible version installed."
#ifdef _WIN32
"\n\nTo install FFmpeg to Mandarine, press Open and select your FFmpeg directory."
#endif
"\n\nTo view a guide on how to install FFmpeg, press Help."));
message_box.setStandardButtons(QMessageBox::Ok | QMessageBox::Help
#ifdef _WIN32
| QMessageBox::Open
#endif
);
auto result = message_box.exec();
if (result == QMessageBox::Help) {
QDesktopServices::openUrl(QUrl(
QStringLiteral("https://citra-emu.org/wiki/installing-ffmpeg-for-the-video-dumper/")));
#ifdef _WIN32
} else if (result == QMessageBox::Open) {
OnOpenFFmpeg();
#endif
}
}
void GMainWindow::OnDumpVideo() {
if (DynamicLibrary::FFmpeg::LoadFFmpeg()) {
if (ui->action_Dump_Video->isChecked()) {
@ -2776,29 +2908,7 @@ void GMainWindow::OnDumpVideo() {
}
} else {
ui->action_Dump_Video->setChecked(false);
QMessageBox message_box;
message_box.setWindowTitle(tr("Could not load video dumper"));
message_box.setText(
tr("FFmpeg could not be loaded. Make sure you have a compatible version installed."
#ifdef _WIN32
"\n\nTo install FFmpeg to Mandarine, press Open and select your FFmpeg directory."
#endif
"\n\nTo view a guide on how to install FFmpeg, press Help."));
message_box.setStandardButtons(QMessageBox::Ok | QMessageBox::Help
#ifdef _WIN32
| QMessageBox::Open
#endif
);
auto result = message_box.exec();
if (result == QMessageBox::Help) {
QDesktopServices::openUrl(QUrl(QStringLiteral(
"https://citra-emu.org/wiki/installing-ffmpeg-for-the-video-dumper/")));
#ifdef _WIN32
} else if (result == QMessageBox::Open) {
OnOpenFFmpeg();
#endif
}
ShowFFmpegErrorMessage();
}
}
@ -2884,7 +2994,8 @@ void GMainWindow::StartVideoDumping(const QString& path) {
} else {
QMessageBox::critical(
this, tr("Mandarine"),
tr("Could not start video dumping.<br>Refer to the log for details."));
tr("Could not start video dumping.<br>Please ensure that the video encoder is "
"configured correctly.<br>Refer to the log for details."));
ui->action_Dump_Video->setChecked(false);
}
}

3
src/mandarine_qt/main.h
View File

@ -221,6 +221,9 @@ private:
const std::string& keywords, const std::string& name,
const bool& skip_tryexec);
void ShowCommandOutput(std::string title, std::string message);
void ShowFFmpegErrorMessage();
private slots:
void OnStartGame();
void OnRestartGame();

3
src/mandarine_qt/main.ui
View File

@ -377,6 +377,9 @@
<property name="text">
<string>Close</string>
</property>
<property name="enabled">
<bool>false</bool>
</property>
</action>
<action name="action_Save_Movie">
<property name="enabled">

2
src/video_core/renderer_opengl/gl_driver.cpp
View File

@ -177,7 +177,7 @@ void Driver::CheckExtensionSupport() {
nv_fragment_shader_interlock = GLAD_GL_NV_fragment_shader_interlock;
intel_fragment_shader_ordering = GLAD_GL_INTEL_fragment_shader_ordering;
blend_minmax_factor = GLAD_GL_AMD_blend_minmax_factor || GLAD_GL_NV_blend_minmax_factor;
is_suitable = GLAD_GL_VERSION_4_3 || GLAD_GL_ES_VERSION_3_1;
is_suitable = GLAD_GL_VERSION_4_3 || GLAD_GL_ES_VERSION_3_2;
}
void Driver::FindBugs() {