dd921238d9
Previously, it was only possible to choose a single GPU or all of that type (CUDA or OpenCL). Now, a toggle button is displayed for every device. These settings are tied to the PCI Bus ID of the devices, so they're consistent across hardware addition and removal (but not when swapping/moving cards). From the code perspective, the more important change is that now, the compute device properties are stored in the Addon preferences of the Cycles addon, instead of directly in the User Preferences. This allows for a cleaner implementation, removing the Cycles C API functions that were called by the RNA code to specify the enum items. Note that this change is neither backwards- nor forwards-compatible, but since it's only a User Preference no existing files are broken. Reviewers: #cycles, brecht Reviewed By: #cycles, brecht Subscribers: brecht, juicyfruit, mib2berlin, Blendify Differential Revision: https://developer.blender.org/D2338
45 lines
1.5 KiB
C++
45 lines
1.5 KiB
C++
/*
|
|
* Copyright 2011-2013 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef __DEVICE_INTERN_H__
|
|
#define __DEVICE_INTERN_H__
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
class Device;
|
|
|
|
Device *device_cpu_create(DeviceInfo& info, Stats &stats, bool background);
|
|
bool device_opencl_init(void);
|
|
Device *device_opencl_create(DeviceInfo& info, Stats &stats, bool background);
|
|
bool device_cuda_init(void);
|
|
Device *device_cuda_create(DeviceInfo& info, Stats &stats, bool background);
|
|
Device *device_network_create(DeviceInfo& info, Stats &stats, const char *address);
|
|
Device *device_multi_create(DeviceInfo& info, Stats &stats, bool background);
|
|
|
|
void device_cpu_info(vector<DeviceInfo>& devices);
|
|
void device_opencl_info(vector<DeviceInfo>& devices);
|
|
void device_cuda_info(vector<DeviceInfo>& devices);
|
|
void device_network_info(vector<DeviceInfo>& devices);
|
|
|
|
string device_cpu_capabilities(void);
|
|
string device_opencl_capabilities(void);
|
|
string device_cuda_capabilities(void);
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif /* __DEVICE_INTERN_H__ */
|
|
|