diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-31 03:09:22 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-31 03:09:22 +0400 |
commit | 6785874e7adf5ef15e7a28b134b2bd4e8b3a8988 (patch) | |
tree | 12adcc0c7313c9376919cf748f3310f02b67a9c7 /intern/cycles/device | |
parent | f477c0e535168b22509514e7421e6fc5ed5bf1ac (diff) |
Fix #36137: cycles render not using all GPU's when the number of GPU's is larger
than the number of CPU threads
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device_cuda.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/device/device_opencl.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index a60512577cf..c1b5a8bfcea 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -37,7 +37,7 @@ CCL_NAMESPACE_BEGIN class CUDADevice : public Device { public: - TaskPool task_pool; + DedicatedTaskPool task_pool; CUdevice cuDevice; CUcontext cuContext; CUmodule cuModule; @@ -976,7 +976,7 @@ public: void task_wait() { - task_pool.wait_work(); + task_pool.wait(); } void task_cancel() diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 01c6f0e3ff7..e800b3f6442 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -314,7 +314,7 @@ public: class OpenCLDevice : public Device { public: - TaskPool task_pool; + DedicatedTaskPool task_pool; cl_context cxContext; cl_command_queue cqCommandQueue; cl_platform_id cpPlatform; @@ -1100,7 +1100,7 @@ public: void task_wait() { - task_pool.wait_work(); + task_pool.wait(); } void task_cancel() |