[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58433] trunk/blender/intern/cycles: Cycles / CPU Rendering:

[Thomas Dinges]

Revision: 58433
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58433
Author:   dingto
Date:     2013-07-20 00:40:03 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
Cycles / CPU Rendering:
* "Auto Detect" now again uses the umber of cores, instead number of cores + 1.

This was added before we had Tile rendering and benchmarks on several systems showed that there is no gain with this now. There might be some slight difference (0.5% or so) slower/faster depending on the scene, but this is negligible.

Modified Paths:
--------------
    trunk/blender/intern/cycles/device/device_cpu.cpp
    trunk/blender/intern/cycles/util/util_task.cpp
    trunk/blender/intern/cycles/util/util_task.h

Modified: trunk/blender/intern/cycles/device/device_cpu.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_cpu.cpp	2013-07-20 00:35:41 UTC (rev 58432)
+++ trunk/blender/intern/cycles/device/device_cpu.cpp	2013-07-20 00:40:03 UTC (rev 58433)
@@ -307,8 +307,7 @@
 
 	void task_add(DeviceTask& task)
 	{
-		/* split task into smaller ones, more than number of threads for uneven
-		 * workloads where some parts of the image render slower than others */
+		/* split task into smaller ones */
 		list<DeviceTask> tasks;
 		task.split(tasks, TaskScheduler::num_threads());
 

Modified: trunk/blender/intern/cycles/util/util_task.cpp
===================================================================
--- trunk/blender/intern/cycles/util/util_task.cpp	2013-07-20 00:35:41 UTC (rev 58432)
+++ trunk/blender/intern/cycles/util/util_task.cpp	2013-07-20 00:40:03 UTC (rev 58433)
@@ -186,12 +186,12 @@
 		do_exit = false;
 
 		if(num_threads == 0) {
-			/* automatic number of threads will be main thread + num cores */
+			/* automatic number of threads */
 			num_threads = system_cpu_thread_count();
 		}
 		else {
-			/* main thread will also work, for fixed threads we count it too */
-			num_threads -= 1;
+			/* manual number of threads */
+			num_threads;
 		}
 
 		/* launch threads that will be waiting for work */

Modified: trunk/blender/intern/cycles/util/util_task.h
===================================================================
--- trunk/blender/intern/cycles/util/util_task.h	2013-07-20 00:35:41 UTC (rev 58432)
+++ trunk/blender/intern/cycles/util/util_task.h	2013-07-20 00:40:03 UTC (rev 58433)
@@ -94,8 +94,8 @@
 	static void init(int num_threads = 0);
 	static void exit();
 
-	/* number of threads that can work on tasks, main thread counts too */
-	static int num_threads() { return threads.size() + 1; }
+	/* number of threads that can work on task */
+	static int num_threads() { return threads.size(); }
 
 	/* test if any session is using the scheduler */
 	static bool active() { return users != 0; }