Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T40306: cycles baking not distributing work among CPU cores well.

Browse Source
This commit is contained in:
Brecht van Lommel
2014-05-26 13:40:16 +02:00
parent 3b4f792ce1
commit 0075efc4d2
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
intern/cycles/device/device_task.cpp
View File

@@ -35,23 +35,22 @@ DeviceTask::DeviceTask(Type type_)
last_update_time = time_dt();
}
void DeviceTask::split_max_size(list<DeviceTask>& tasks, int max_size)
void DeviceTask::split(list<DeviceTask>& tasks, int num, int max_size)
{
int num;
if(max_size != 0) {
int max_size_num;
if(type == SHADER) {
num = (shader_w + max_size - 1)/max_size;
}
else {
max_size = max(1, max_size/w);
num = (h + max_size - 1)/max_size;
if(type == SHADER) {
max_size_num = (shader_w + max_size - 1)/max_size;
}
else {
max_size = max(1, max_size/w);
max_size_num = (h + max_size - 1)/max_size;
}
num = max(max_size_num, num);
}
split(tasks, num);
}
void DeviceTask::split(list<DeviceTask>& tasks, int num)
{
if(type == SHADER) {
num = min(shader_w, num);