Merge pull request #8216 from unknownbrackets/sas-thread

Move SAS mixing to a thread
hrydgard · Dec 6, 2015 · a2e09ea · a2e09ea
2 parents 4bb36b0 + f759a2a
commit a2e09ea
Show file tree

Hide file tree

Showing 6 changed files with 217 additions and 19 deletions.
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -330,9 +330,14 @@ static ConfigSetting generalSettings[] = {
 	ConfigSetting(false),
 };
 
+static bool DefaultSasThread() {
+	return cpu_info.num_cores > 1;
+}
+
 static ConfigSetting cpuSettings[] = {
 	ReportedConfigSetting("Jit", &g_Config.bJit, &DefaultJit, true, true),
 	ReportedConfigSetting("SeparateCPUThread", &g_Config.bSeparateCPUThread, false, true, true),
+	ReportedConfigSetting("SeparateSASThread", &g_Config.bSeparateSASThread, &DefaultSasThread, true, true),
 	ReportedConfigSetting("SeparateIOThread", &g_Config.bSeparateIOThread, true, true, true),
 	ReportedConfigSetting("IOTimingMethod", &g_Config.iIOTimingMethod, IOTIMING_FAST, true, true),
 	ConfigSetting("FastMemoryAccess", &g_Config.bFastMemory, true, true, true),

diff --git a/Core/Config.h b/Core/Config.h
@@ -119,8 +119,9 @@ struct Config {
 
 	// Definitely cannot be changed while game is running.
 	bool bSeparateCPUThread;
-	int iIOTimingMethod;
+	bool bSeparateSASThread;
 	bool bSeparateIOThread;
+	int iIOTimingMethod;
 	int iLockedCPUSpeed;
 	bool bAutoSaveSymbolMap;
 	bool bCacheFullIsoInRam;