Allow setting dsp on thread via game ini.

Also force TWW to LLE and no dsp on thread.
dolphin-emu · Aug 1, 2013 · 8c5bc2b · 8c5bc2b
1 parent 44d17b5
commit 8c5bc2b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/Data/User/GameConfig/GZLE01.ini b/Data/User/GameConfig/GZLE01.ini
@@ -345,6 +345,8 @@ $Unrestricted Camera
 04356D34 45000000
 04356D48 42B00000
 [Core]
+DSPThread = False
+DSPHLE = False
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0

diff --git a/Data/User/GameConfig/GZLJ01.ini b/Data/User/GameConfig/GZLJ01.ini
@@ -21,6 +21,8 @@ $Snow test room
 0x803C9D4C:dword:0x74363200
 [ActionReplay]
 [Core]
+DSPThread = False
+DSPHLE = False
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0

diff --git a/Data/User/GameConfig/GZLP01.ini b/Data/User/GameConfig/GZLP01.ini
@@ -224,6 +224,9 @@ $Test Room 14 (Hold L+R+B)
 043D166C 000000FF
 043D1670 4B5F5465
 043D1674 73746500
+[Core]
+DSPThread = False
+DSPHLE = False
 [Video]
 ProjectionHack = 0
 PH_SZNear = 0

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
@@ -43,7 +43,7 @@ namespace BootManager
 // Apply fire liberally
 struct ConfigCache
 {
-	bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, m_EnableJIT,
+	bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, m_EnableJIT, bDSPThread,
 		bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2;
 	int iTLBHack, iCPUCore;
 	std::string strBackend;
@@ -106,6 +106,7 @@ bool BootCore(const std::string& _rFilename)
 		game_ini.Get("Core", "FastDiscSpeed",		&StartUp.bFastDiscSpeed, StartUp.bFastDiscSpeed);
 		game_ini.Get("Core", "BlockMerging",		&StartUp.bMergeBlocks, StartUp.bMergeBlocks);
 		game_ini.Get("Core", "DSPHLE",				&StartUp.bDSPHLE, StartUp.bDSPHLE);
+		game_ini.Get("Core", "DSPThread",			&StartUp.bCPUThread, StartUp.bDSPThread);
 		game_ini.Get("Core", "GFXBackend", &StartUp.m_strVideoBackend, StartUp.m_strVideoBackend.c_str());
 		game_ini.Get("Core", "CPUCore",				&StartUp.iCPUCore, StartUp.iCPUCore);
 		game_ini.Get("Core", "HLE_BS2",				&StartUp.bHLE_BS2, StartUp.bHLE_BS2);
@@ -176,6 +177,7 @@ void Stop()
 		StartUp.bFastDiscSpeed = config_cache.bFastDiscSpeed;
 		StartUp.bMergeBlocks = config_cache.bMergeBlocks;
 		StartUp.bDSPHLE = config_cache.bDSPHLE;
+		StartUp.bDSPThread = config_cache.bDSPThread;
 		StartUp.m_strVideoBackend = config_cache.strBackend;
 		VideoBackend::ActivateBackend(StartUp.m_strVideoBackend);
 		StartUp.bHLE_BS2 = config_cache.bHLE_BS2;