diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-10-26 16:37:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-26 16:37:59 +0300 |
commit | 949dbb08d2693a899da19d3540d939ad5fb4fe24 (patch) | |
tree | 423f3ff50c56209ccb6bf186effb7981209902b7 /intern | |
parent | fd25e883e2807a151f673b87c152a59701a0df80 (diff) |
Cleanup: remove useless WITH_CYCLES_DEVICE_MULTI
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 7 | ||||
-rw-r--r-- | intern/cycles/device/CMakeLists.txt | 3 | ||||
-rw-r--r-- | intern/cycles/device/device.cpp | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index b6f3926f329..1500743763b 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -295,13 +295,6 @@ if(WITH_OPENIMAGEDENOISE) ) endif() -if(WITH_CYCLES_STANDALONE) - set(WITH_CYCLES_DEVICE_CUDA TRUE) - set(WITH_CYCLES_DEVICE_HIP TRUE) -endif() -# TODO(sergey): Consider removing it, only causes confusion in interface. -set(WITH_CYCLES_DEVICE_MULTI TRUE) - # Logging capabilities using GLog library. if(WITH_CYCLES_LOGGING) add_definitions(-DWITH_CYCLES_LOGGING) diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 39de4bec799..99b1fc8135d 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -158,9 +158,6 @@ endif() if(WITH_CYCLES_DEVICE_OPTIX) add_definitions(-DWITH_OPTIX) endif() -if(WITH_CYCLES_DEVICE_MULTI) - add_definitions(-DWITH_MULTI) -endif() if(WITH_OPENIMAGEDENOISE) list(APPEND LIB diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 5179f3bacdb..69e959b6f7b 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -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; |