[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13775] trunk/blender/source/blender: added win32 check for number of processors, but cant test.

Campbell Barton ideasman42 at gmail.com
Tue Feb 19 23:59:53 CET 2008


Revision: 13775
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13775
Author:   campbellbarton
Date:     2008-02-19 23:59:52 +0100 (Tue, 19 Feb 2008)

Log Message:
-----------
added win32 check for number of processors, but cant test.
could somebody running win32 see if headers need to be added to threads.c?

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/threads.c
    trunk/blender/source/blender/src/buttons_scene.c

Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c	2008-02-19 22:23:21 UTC (rev 13774)
+++ trunk/blender/source/blender/blenlib/intern/threads.c	2008-02-19 22:59:52 UTC (rev 13775)
@@ -228,7 +228,15 @@
 /* how many threads are native on this system? */
 int BLI_system_thread_count( void )
 {
-	int t = (int)sysconf(_SC_NPROCESSORS_ONLN);
+	int t;
+#ifdef WIN32
+	SYSTEM_INFO info;
+	GetSystemInfo(&info);
+	t = (int) info.dwNumberOfProcessors;
+#else
+	t = (int)sysconf(_SC_NPROCESSORS_ONLN);
+#endif
+	
 	if (t>RE_MAX_THREAD)
 		return RE_MAX_THREAD;
 	if (t<1)

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c	2008-02-19 22:23:21 UTC (rev 13774)
+++ trunk/blender/source/blender/src/buttons_scene.c	2008-02-19 22:59:52 UTC (rev 13775)
@@ -2025,11 +2025,11 @@
 	uiBlockBeginAlign(block);
 	uiDefIconButBitI(block, TOG, R_THREADS, B_REDR, ICON_AUTO,	10, 63, 20, 20, &G.scene->r.mode, 0.0, 0.0, 0, 0, "Automatic threads from system");
 	if (G.scene->r.mode & R_THREADS) {
-		char thread_str[32];
-		sprintf(thread_str, "Threads: %d", BLI_system_thread_count());
+		char thread_str[16];
+		sprintf(thread_str, " Threads: %d", BLI_system_thread_count());
 		uiDefBut(block, LABEL, 0, thread_str, 30, 63,80,20, 0, 0, 0, 0, 0, "");
 	} else {
-		uiDefButS(block, NUM, B_NOP, "Threads:", 35, 63, 80, 20, &G.scene->r.threads, 1, BLENDER_MAX_THREADS, 0, 0, "Amount of threads for render (takes advantage of multi-core and multi-processor computers)");
+		uiDefButS(block, NUM, B_NOP, "Threads:", 30, 63, 80, 20, &G.scene->r.threads, 1, BLENDER_MAX_THREADS, 0, 0, "Amount of threads for render (takes advantage of multi-core and multi-processor computers)");
 	}
 	uiBlockEndAlign(block);
 	





More information about the Bf-blender-cvs mailing list