From 8148d7b1df54f103eec60fcae12fb5000e225c7b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 10 May 2012 22:31:16 +0000 Subject: Cycles: reviewed the task scheduler code and fixed (hopefully all) windows threading problems. --- intern/cycles/util/util_task.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'intern/cycles/util/util_task.h') diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index 6b7562c2267..401a503f540 100644 --- a/intern/cycles/util/util_task.h +++ b/intern/cycles/util/util_task.h @@ -73,12 +73,13 @@ public: protected: friend class TaskScheduler; - void done_increase(int done); + void num_decrease(int done); + void num_increase(); - thread_mutex done_mutex; - thread_condition_variable done_cond; + thread_mutex num_mutex; + thread_condition_variable num_cond; - volatile int num, num_done; + volatile int num; volatile bool do_cancel; }; -- cgit v1.2.3