From ab24128049fd19e5ac719a651937c49bc97e445b Mon Sep 17 00:00:00 2001
From: drfrag <drfrag666@hotmail.com>
Date: Thu, 9 May 2019 23:23:25 +0200
Subject: [PATCH] - Missed some things regarding software threads. (with help
 from dpJudas)

---
 src/polyrenderer/poly_renderthread.cpp | 2 +-
 src/swrenderer/drawers/r_thread.cpp    | 5 +++--
 src/swrenderer/scene/r_scene.cpp       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/polyrenderer/poly_renderthread.cpp b/src/polyrenderer/poly_renderthread.cpp
index 22900c17a..de687a7e6 100644
--- a/src/polyrenderer/poly_renderthread.cpp
+++ b/src/polyrenderer/poly_renderthread.cpp
@@ -147,7 +147,7 @@ void PolyRenderThreads::RenderThreadSlices(int totalcount, std::function<void(Po
 
 	int numThreads = std::thread::hardware_concurrency();
 	if (numThreads == 0)
-		numThreads = 4;
+		numThreads = 2;
 
 	if (r_scene_multithreaded == 0 || r_multithreaded == 0)
 		numThreads = 1;
diff --git a/src/swrenderer/drawers/r_thread.cpp b/src/swrenderer/drawers/r_thread.cpp
index e63197d4e..5e8e2cfc1 100644
--- a/src/swrenderer/drawers/r_thread.cpp
+++ b/src/swrenderer/drawers/r_thread.cpp
@@ -174,11 +174,12 @@ void DrawerThreads::StartThreads()
 {
 	std::unique_lock<std::mutex> lock(threads_mutex);
 
-	int num_threads = std::thread::hardware_concurrency();
+	static int num_threads = std::thread::hardware_concurrency();
 	if (num_threads == 0)
 	{
 		num_threads = 2;
-		Printf ("Could not determine number of CPU cores (assuming 2). Set r_multithreaded.\n");
+		if (r_multithreaded == 1)
+			Printf ("Could not determine number of CPU cores (assuming 2). Set r_multithreaded.\n");
 	}
 
 	if (r_multithreaded == 0)
diff --git a/src/swrenderer/scene/r_scene.cpp b/src/swrenderer/scene/r_scene.cpp
index 00441b018..69fa92f1c 100644
--- a/src/swrenderer/scene/r_scene.cpp
+++ b/src/swrenderer/scene/r_scene.cpp
@@ -211,7 +211,7 @@ namespace swrenderer
 	{
 		int numThreads = std::thread::hardware_concurrency();
 		if (numThreads == 0)
-			numThreads = 4;
+			numThreads = 2;
 
 		if (r_scene_multithreaded == 0 || r_multithreaded == 0)
 			numThreads = 1;