diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-06-05 15:18:02 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-22 14:06:47 +0300 |
commit | b10b7cdb43b07e67905ffdeba3639dd5f9806169 (patch) | |
tree | 23a9f1e23dfd5d2fadde7b89930334384a73970a /intern/cycles/device/opencl | |
parent | d8c2092b15de61a69bddbc082998a1dc786d73af (diff) |
Cleanup: use lambdas instead of functors for task pools, remove threadid
Diffstat (limited to 'intern/cycles/device/opencl')
-rw-r--r-- | intern/cycles/device/opencl/device_opencl.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/intern/cycles/device/opencl/device_opencl.h b/intern/cycles/device/opencl/device_opencl.h index 49104cf7c3d..ec091d12114 100644 --- a/intern/cycles/device/opencl/device_opencl.h +++ b/intern/cycles/device/opencl/device_opencl.h @@ -456,16 +456,6 @@ class OpenCLDevice : public Device { void denoise(RenderTile &tile, DenoisingTask &denoising); - class OpenCLDeviceTask : public Task { - public: - OpenCLDeviceTask(OpenCLDevice *device, DeviceTask &task) : task(task) - { - run = function_bind(&OpenCLDevice::thread_run, device, task); - } - - DeviceTask task; - }; - int get_split_task_count(DeviceTask & /*task*/) { return 1; @@ -473,7 +463,10 @@ class OpenCLDevice : public Device { void task_add(DeviceTask &task) { - task_pool.push(new OpenCLDeviceTask(this, task)); + task_pool.push([=] { + DeviceTask task_copy = task; + thread_run(task_copy); + }); } void task_wait() |