diff options
Diffstat (limited to 'intern/cycles/device/device.cpp')
-rw-r--r-- | intern/cycles/device/device.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 81574e8b184..69e959b6f7b 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -20,7 +20,7 @@ #include "bvh/bvh2.h" #include "device/device.h" -#include "device/device_queue.h" +#include "device/queue.h" #include "device/cpu/device.h" #include "device/cuda/device.h" @@ -29,15 +29,15 @@ #include "device/multi/device.h" #include "device/optix/device.h" -#include "util/util_foreach.h" -#include "util/util_half.h" -#include "util/util_logging.h" -#include "util/util_math.h" -#include "util/util_string.h" -#include "util/util_system.h" -#include "util/util_time.h" -#include "util/util_types.h" -#include "util/util_vector.h" +#include "util/foreach.h" +#include "util/half.h" +#include "util/log.h" +#include "util/math.h" +#include "util/string.h" +#include "util/system.h" +#include "util/time.h" +#include "util/types.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN @@ -71,14 +71,12 @@ void Device::build_bvh(BVH *bvh, Progress &progress, bool refit) Device *Device::create(const DeviceInfo &info, Stats &stats, Profiler &profiler) { -#ifdef WITH_MULTI if (!info.multi_devices.empty()) { /* Always create a multi device when info contains multiple devices. * This is done so that the type can still be e.g. DEVICE_CPU to indicate * that it is a homogeneous collection of devices, which simplifies checks. */ return device_multi_create(info, stats, profiler); } -#endif Device *device = NULL; |