Revert r50528: "Performance fix for Cycles: Don't wait in the main UI thread when resetting devices."

This commit leads to random freezes in Cycles rendering:
https://projects.blender.org/tracker/index.php?func=detail&aid=32545&group_id=9&atid=498

The goal of this commit was to remove UI lag for OSL, but since that is not officially supported yet, better revert it until a proper fix can be implemented in 2.65.

5 files changed, 0 insertions, 24 deletions

diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 8e3bc408399..2ee2e044618 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -115,7 +115,6 @@ public:
 	virtual void task_add(DeviceTask& task) = 0;
 	virtual void task_wait() = 0;
 	virtual void task_cancel() = 0;
-	virtual bool task_cancelled() = 0;
 	
 	/* opengl drawing */
 	virtual void draw_pixels(device_memory& mem, int y, int w, int h,
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index e2f612ee233..4c54671b0d0 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -273,11 +273,6 @@ public:
 	{
 		task_pool.cancel();
 	}
-
-	bool task_cancelled()
-	{
-		return task_pool.cancelled();
-	}
 };
 
 Device *device_cpu_create(DeviceInfo& info, int threads)
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index acc1086cc35..c8dcfdc2f3d 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -892,11 +892,6 @@ public:
 	{
 		task_pool.cancel();
 	}
-
-	bool task_cancelled()
-	{
-		return task_pool.cancelled();
-	}
 };
 
 Device *device_cuda_create(DeviceInfo& info, bool background)
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index 4923e5c9e66..546ffe5e4b9 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -312,14 +312,6 @@ public:
 		foreach(SubDevice& sub, devices)
 			sub.device->task_cancel();
 	}
-
-	bool task_cancelled()
-	{
-		foreach(SubDevice& sub, devices)
-			if (sub.device->task_cancelled())
-				return true;
-		return false;
-	}
 };
 
 Device *device_multi_create(DeviceInfo& info, bool background)
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index ed7229d49da..673ffdf79fd 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -724,11 +724,6 @@ public:
 	{
 		task_pool.cancel();
 	}
-
-	bool task_cancelled()
-	{
-		return task_pool.cancelled();
-	}
 };
 
 Device *device_opencl_create(DeviceInfo& info, bool background)