diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-05 12:04:41 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-05 12:04:41 +0400 |
| commit | d71004ea692179310d316305f3a0c9c688812da6 (patch) | |
| tree | f33d5d77b244eeddb7327d111577272629f594cd /intern | |
| parent | 0ef0eddeb26d71152453693d2b2de1820592ed61 (diff) | |
Cycles: multi-gpu rendering doesn't know for sure which sample is being sampled,
so only report tile number is being processed
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/session.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index bf8d8ade37d..5dabd058cb9 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -711,10 +711,13 @@ void Session::update_status_time(bool show_pause, bool show_done) string status, substatus; if(!params.progressive) { + bool is_gpu = params.device.type == DEVICE_CUDA || params.device.type == DEVICE_OPENCL; + bool is_multidevice = params.device.multi_devices.size() > 1; + bool is_cpu = params.device.type == DEVICE_CPU; + substatus = string_printf("Path Tracing Tile %d/%d", tile, num_tiles); - if(params.device.type == DEVICE_CUDA || params.device.type == DEVICE_OPENCL || - (params.device.type == DEVICE_CPU && num_tiles == 1)) { + if((is_gpu && !is_multidevice) || (is_cpu && num_tiles == 1)) { /* when rendering on GPU multithreading happens within single tile, as in * tiles are handling sequentially and in this case we could display * currently rendering sample number |