ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use g_want_determinism more

This commit is contained in:
JosJuice 2016-07-05 18:50:06 +02:00
parent 69bf05b302
commit 6951228abd
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Core.cpp
View File

@ -976,8 +976,7 @@ void UpdateWantDeterminism(bool initial)
// For now, this value is not itself configurable. Instead, individual // For now, this value is not itself configurable. Instead, individual
// settings that depend on it, such as GPU determinism mode. should have // settings that depend on it, such as GPU determinism mode. should have
// override options for testing, // override options for testing,
bool new_want_determinism = bool new_want_determinism = Movie::IsMovieActive() || NetPlay::IsNetPlayRunning();
Movie::IsPlayingInput() || Movie::IsRecordingInput() || NetPlay::IsNetPlayRunning();
if (new_want_determinism != g_want_determinism || initial) if (new_want_determinism != g_want_determinism || initial)
{ {
WARN_LOG(COMMON, "Want determinism <- %s", new_want_determinism ? "true" : "false"); WARN_LOG(COMMON, "Want determinism <- %s", new_want_determinism ? "true" : "false");

9
Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
View File

@ -166,11 +166,9 @@ bool DSPLLE::Initialize(bool bWii, bool bDSPThread)
return false; return false;
// needs to be after DSPCore_Init for the dspjit ptr // needs to be after DSPCore_Init for the dspjit ptr
if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive() || Core::g_want_determinism || if (Core::g_want_determinism || !g_dsp_jit)
!g_dsp_jit)
{
bDSPThread = false; bDSPThread = false;
}
m_bWii = bWii; m_bWii = bWii;
m_bDSPThread = bDSPThread; m_bDSPThread = bDSPThread;
@ -310,8 +308,7 @@ void DSPLLE::DSP_Update(int cycles)
*/ */
if (m_bDSPThread) if (m_bDSPThread)
{ {
if (requestDisableThread || NetPlay::IsNetPlayRunning() || Movie::IsMovieActive() || if (requestDisableThread || Core::g_want_determinism)
Core::g_want_determinism)
{ {
DSP_StopSoundStream(); DSP_StopSoundStream();
m_bDSPThread = false; m_bDSPThread = false;

3
Source/Core/Core/HW/EXI_DeviceIPL.cpp
View File

@ -4,6 +4,7 @@
#include <cstring> #include <cstring>
#include "Common/Assert.h"
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -12,6 +13,7 @@
#include "Common/MemoryUtil.h" #include "Common/MemoryUtil.h"
#include "Common/Timer.h" #include "Common/Timer.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/HW/EXI_DeviceIPL.h" #include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/Sram.h" #include "Core/HW/Sram.h"
@ -421,6 +423,7 @@ u32 CEXIIPL::GetGCTime()
} }
else else
{ {
_assert_(!Core::g_want_determinism);
ltime = Common::Timer::GetLocalTimeSinceJan1970(); ltime = Common::Timer::GetLocalTimeSinceJan1970();
} }

3
Source/Core/DolphinWX/Config/ConfigMain.cpp
View File

@ -9,6 +9,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "DolphinWX/Config/AdvancedConfigPane.h" #include "DolphinWX/Config/AdvancedConfigPane.h"
@ -74,7 +75,7 @@ void CConfigMain::CreateGUIControls()
Notebook->AddPage(wii_pane, _("Wii")); Notebook->AddPage(wii_pane, _("Wii"));
Notebook->AddPage(path_pane, _("Paths")); Notebook->AddPage(path_pane, _("Paths"));
Notebook->AddPage(advanced_pane, _("Advanced")); Notebook->AddPage(advanced_pane, _("Advanced"));
if (Movie::IsMovieActive() || NetPlay::IsNetPlayRunning()) if (Core::g_want_determinism)
advanced_pane->Disable(); advanced_pane->Disable();
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);

4
Source/Core/DolphinWX/ControllerConfigDiag.cpp
View File

@ -98,7 +98,7 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateGamecubeSizer()
pad_type_choices[i]->Bind(wxEVT_CHOICE, &ControllerConfigDiag::OnGameCubePortChanged, this); pad_type_choices[i]->Bind(wxEVT_CHOICE, &ControllerConfigDiag::OnGameCubePortChanged, this);
// Disable controller type selection for certain circumstances. // Disable controller type selection for certain circumstances.
if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive()) if (Core::g_want_determinism)
pad_type_choices[i]->Disable(); pad_type_choices[i]->Disable();
// Set the saved pad type as the default choice. // Set the saved pad type as the default choice.
@ -179,7 +179,7 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateWiimoteConfigSizer()
// Disable controller type selection for certain circumstances. // Disable controller type selection for certain circumstances.
bool wii_game_started = bool wii_game_started =
SConfig::GetInstance().bWii || Core::GetState() == Core::CORE_UNINITIALIZED; SConfig::GetInstance().bWii || Core::GetState() == Core::CORE_UNINITIALIZED;
if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive() || !wii_game_started) if (Core::g_want_determinism || !wii_game_started)
wiimote_source_ch[i]->Disable(); wiimote_source_ch[i]->Disable();
m_orig_wiimote_sources[i] = g_wiimote_sources[i]; m_orig_wiimote_sources[i] = g_wiimote_sources[i];