- Write out a warning if std::thread::hardware_concurrency returns zero.

- If the number of cores cannot be determined, turn of multithreading in the software renderer as it is most likely a low end system
ZDoom · May 14, 2019 · e2fc3f2 · e2fc3f2
1 parent 9a1dab5
commit e2fc3f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/rendering/polyrenderer/poly_renderthread.cpp b/src/rendering/polyrenderer/poly_renderthread.cpp
@@ -151,7 +151,7 @@ void PolyRenderThreads::RenderThreadSlices(int totalcount, std::function<void(Po
 
 	int numThreads = std::thread::hardware_concurrency();
 	if (numThreads == 0)
-		numThreads = 4;
+		numThreads = 1;
 
 	if (r_scene_multithreaded == 0 || r_multithreaded == 0)
 		numThreads = 1;

diff --git a/src/rendering/swrenderer/scene/r_scene.cpp b/src/rendering/swrenderer/scene/r_scene.cpp
@@ -200,7 +200,16 @@ namespace swrenderer
 	{
 		int numThreads = std::thread::hardware_concurrency();
 		if (numThreads == 0)
-			numThreads = 4;
+		{
+			static bool firstCall = true;
+			if (firstCall)
+			{
+				firstCall = false;
+				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;