llvmpipe: Use number of CPUs as default number of threads.

Also bump MAX_THREADS to 8.

diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c
index 01685b79d85d60e611ba9bedff6d2a4a2bc58815..7cd046cc39024be20becb2ec7514c1d452eb3687 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_rast.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast.c
@@ -27,6 +27,7 @@
 
 #include "util/u_memory.h"
 #include "util/u_math.h"
+#include "util/u_cpu_detect.h"
 
 #include "lp_debug.h"
 #include "lp_state.h"
@@ -639,7 +640,8 @@ create_rast_threads(struct lp_rasterizer *rast)
 {
    unsigned i;
 
-   rast->num_threads = debug_get_num_option("LP_NUM_THREADS", MAX_THREADS);
+   rast->num_threads = util_cpu_caps.nr_cpus;
+   rast->num_threads = debug_get_num_option("LP_NUM_THREADS", rast->num_threads);
    rast->num_threads = MIN2(rast->num_threads, MAX_THREADS);
 
    /* NOTE: if num_threads is zero, we won't use any threads */

diff --git a/src/gallium/drivers/llvmpipe/lp_rast_priv.h b/src/gallium/drivers/llvmpipe/lp_rast_priv.h
index 62f3c877da58af6783722d9b1d052629116e024f..5502419a9282682ef6b2aa8b0a4d558f4b3b007d 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_rast_priv.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast_priv.h
@@ -32,7 +32,7 @@
 #include "lp_rast.h"
 
 
-#define MAX_THREADS 4  /* XXX probably temporary here */
+#define MAX_THREADS 8  /* XXX probably temporary here */
 
 
 struct pipe_transfer;