- oops, patched the wrong file

ZDoom · May 14, 2019 · 46e07d5 · 46e07d5
1 parent d3abc71
commit 46e07d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/rendering/swrenderer/drawers/r_thread.cpp b/src/rendering/swrenderer/drawers/r_thread.cpp
@@ -187,7 +187,17 @@ void DrawerThreads::StartThreads()
 
 	int num_threads = num_numathreads;
 	if (num_threads == 0)
-		num_threads = 4;
+	{
+		static bool firstCall = true;
+		if (firstCall)
+		{
+			firstCall = false;
+			if (r_multithreaded == 1)
+				Printf("Warning: Unable to determine number of CPU cores/threads for this computer. To improve performance, please type 'r_multithreaded x' in the console, where x is the number of threads to use.\n");
+		}
+
+		num_threads = 1;
+	}
 
 	if (r_multithreaded == 0)
 		num_threads = 1;

diff --git a/src/rendering/swrenderer/scene/r_scene.cpp b/src/rendering/swrenderer/scene/r_scene.cpp
@@ -200,17 +200,7 @@ namespace swrenderer
 	{
 		int numThreads = std::thread::hardware_concurrency();
 		if (numThreads == 0)
-		{
-			static bool firstCall = true;
-			if (firstCall)
-			{
-				firstCall = false;
-				if (r_multithreaded == 1)
-					Printf("Warning: Unable to determine number of CPU cores/threads for this computer. To improve performance, please type 'r_multithreaded x' in the console, where x is the number of threads to use.\n");
-			}
-
 			numThreads = 1;
-		}
 
 		if (r_scene_multithreaded == 0 || r_multithreaded == 0)
 			numThreads = 1;