sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: multi-gpu rendering doesn't know for sure which sample is being sampled,

Browse Source 
so only report tile number is being processed
This commit is contained in:
Sergey Sharybin 2012-11-05 08:04:41 +00:00
parent 0ef0eddeb2
commit d71004ea69
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/render/session.cpp
View File

@ -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