engine, vstdlib: Leave threadpool affinity only for consoles (newer c…

…sgo had it removed)
tyabus · Sep 3, 2023 · 0e22916 · 0e22916
1 parent 4dff8b6
commit 0e22916
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/engine/host.cpp b/engine/host.cpp
@@ -642,6 +642,9 @@ enum HostThreadMode
 ConVar host_thread_mode( "host_thread_mode", ( IsPlatformX360() || IsPlatformPS3() ) ? "1" : "0", FCVAR_DEVELOPMENTONLY, "Run the host in threaded mode, (0 == off, 1 == if multicore, 2 == force)" );
 ConVar host_threaded_sound( "host_threaded_sound", ( IsPlatformX360() || IsPlatformPS3()) ? "1" : "0", 0, "Run the sound on a thread (independent of mix)" );
 ConVar host_threaded_sound_simplethread( "host_threaded_sound_simplethread", ( IsPlatformPS3()) ? "1" : "0", 0, "Run the sound on a simple thread not a jobthread" );
+
+// Threadpool affinity is no more in newer csgo
+#if defined( _X360 ) || defined( _PS3 )
 extern ConVar threadpool_affinity;
 void OnChangeThreadAffinity( IConVar *var, const char *pOldValue, float flOldValue )
 {
@@ -652,6 +655,7 @@ void OnChangeThreadAffinity( IConVar *var, const char *pOldValue, float flOldVal
 }
 
 ConVar threadpool_affinity( "threadpool_affinity", "1", 0, "Enable setting affinity", 0, 0, 0, 0, &OnChangeThreadAffinity );
+#endif
 
 extern ConVar threadpool_reserve;
 CThreadEvent g_ReleaseThreadReservation( true );

diff --git a/vstdlib/jobthread.cpp b/vstdlib/jobthread.cpp
@@ -1097,7 +1097,10 @@ bool CThreadPool::Start( const ThreadPoolStartParams_t &startParams, const char
 		ThreadSetPriority( (ThreadHandle_t)m_Threads[iThread]->GetThreadHandle(), priority );
 	}
 
+	// Threadpool affinity is no more in newer csgo
+#if defined( _X360 ) || defined( _PS3 )
 	Distribute( bDistribute, startParams.bUseAffinityTable ? (int *)startParams.iAffinityTable : NULL );
+#endif
 
 	return true;
 }
@@ -1106,6 +1109,8 @@ bool CThreadPool::Start( const ThreadPoolStartParams_t &startParams, const char
 
 void CThreadPool::Distribute( bool bDistribute, int *pAffinityTable )
 {
+// Threadpool affinity is no more in newer csgo
+#if defined( _X360 ) || defined( _PS3 )
 	if ( bDistribute )
 	{
 		const CPUInformation &ci = GetCPUInformation();
@@ -1183,6 +1188,7 @@ void CThreadPool::Distribute( bool bDistribute, int *pAffinityTable )
 		}
 #endif
 	}
+#endif // _X360 || _PS3
 }
 
 //---------------------------------------------------------