diff --git a/Core/CoreParameter.h b/Core/CoreParameter.h index 5abc25631b..0ff37be9ed 100644 --- a/Core/CoreParameter.h +++ b/Core/CoreParameter.h @@ -45,6 +45,7 @@ struct CoreParameter std::string mountIso; // If non-empty, and fileToStart is an ELF or PBP, will mount this ISO in the background. bool startPaused; + bool disableG3Dlog; bool enableDebugging; // enables breakpoints and other time-consuming debugger features bool printfEmuLog; // writes "emulator:" logging to stdout bool headLess; // Try to avoid messageboxes etc diff --git a/Core/System.cpp b/Core/System.cpp index 27b9da4553..86917745ea 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -38,6 +38,7 @@ #include "FileSystems/MetaFileSystem.h" #include "Loaders.h" #include "ELF/ParamSFO.h" +#include "../Common/LogManager.h" MetaFileSystem pspFileSystem; ParamSFOData g_paramSFO; @@ -59,6 +60,11 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string) host->InitSound(mixer); } + if (coreParameter.disableG3Dlog) + { + LogManager::GetInstance()->SetEnable(LogTypes::G3D, false); + } + // Init all the HLE modules HLEInit(); diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp index 9cd506f70c..9d629d6220 100644 --- a/Windows/EmuThread.cpp +++ b/Windows/EmuThread.cpp @@ -79,6 +79,7 @@ DWORD TheThread(LPVOID x) coreParameter.pixelWidth = 480 * g_Config.iWindowZoom; coreParameter.pixelHeight = 272 * g_Config.iWindowZoom; coreParameter.startPaused = !g_Config.bAutoRun; + coreParameter.disableG3Dlog = g_Config.bDisableG3DLog; coreParameter.useMediaEngine = false; std::string error_string;