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

Fix #30140: cycles multi GPU rendering with one device supporting full

Browse Source 
shading and the other not can't work correct, disabled that now.
This commit is contained in:
Brecht Van Lommel
2012-02-23 20:27:17 +00:00
parent c4b64343d0
commit 0cf38faea4
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,7 +293,7 @@ Device *device_multi_create(DeviceInfo& info, bool background)
return new MultiDevice(info, background); return new MultiDevice(info, background);
} }
static void device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool with_display, const char *id_fmt, int num) static bool device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool with_display, bool with_advanced_shading, const char *id_fmt, int num)
{ {
DeviceInfo info; DeviceInfo info;
@@ -302,10 +302,12 @@ static void device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool
map<string, int>::iterator dt; map<string, int>::iterator dt;
int num_added = 0, num_display = 0; int num_added = 0, num_display = 0;
info.advanced_shading = true; info.advanced_shading = with_advanced_shading;
foreach(DeviceInfo& subinfo, devices) { foreach(DeviceInfo& subinfo, devices) {
if(subinfo.type == type) { if(subinfo.type == type) {
if(subinfo.advanced_shading != info.advanced_shading)
continue;
if(subinfo.display_device) { if(subinfo.display_device) {
if(with_display) if(with_display)
num_display++; num_display++;
@@ -323,14 +325,12 @@ static void device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool
info.multi_devices.push_back(subinfo); info.multi_devices.push_back(subinfo);
if(subinfo.display_device) if(subinfo.display_device)
info.display_device = true; info.display_device = true;
if(!subinfo.advanced_shading)
info.advanced_shading = false;
num_added++; num_added++;
} }
} }
if(num_added <= 1 || (with_display && num_display == 0)) if(num_added <= 1 || (with_display && num_display == 0))
return; return false;
/* generate string */ /* generate string */
stringstream desc; stringstream desc;
@@ -384,17 +384,24 @@ static void device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool
devices.push_back(info); devices.push_back(info);
else else
devices.insert(devices.begin(), info); devices.insert(devices.begin(), info);
return true;
} }
void device_multi_info(vector<DeviceInfo>& devices) void device_multi_info(vector<DeviceInfo>& devices)
{ {
int num = 0; int num = 0;
device_multi_add(devices, DEVICE_CUDA, false, "CUDA_MULTI_%d", num++);
device_multi_add(devices, DEVICE_CUDA, true, "CUDA_MULTI_%d", num++); if(!device_multi_add(devices, DEVICE_CUDA, false, true, "CUDA_MULTI_%d", num++))
device_multi_add(devices, DEVICE_CUDA, false, false, "CUDA_MULTI_%d", num++);
if(!device_multi_add(devices, DEVICE_CUDA, true, true, "CUDA_MULTI_%d", num++))
device_multi_add(devices, DEVICE_CUDA, true, false, "CUDA_MULTI_%d", num++);
num = 0; num = 0;
device_multi_add(devices, DEVICE_OPENCL, false, "OPENCL_MULTI_%d", num++); if(!device_multi_add(devices, DEVICE_OPENCL, false, true, "OPENCL_MULTI_%d", num++))
device_multi_add(devices, DEVICE_OPENCL, true, "OPENCL_MULTI_%d", num++); device_multi_add(devices, DEVICE_OPENCL, false, false, "OPENCL_MULTI_%d", num++);
if(!device_multi_add(devices, DEVICE_OPENCL, true, true, "OPENCL_MULTI_%d", num++))
device_multi_add(devices, DEVICE_OPENCL, true, false, "OPENCL_MULTI_%d", num++);
} }
CCL_NAMESPACE_END CCL_NAMESPACE_END