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

Cleanup: remove useless WITH_CYCLES_DEVICE_MULTI

Browse Source
This commit is contained in:
Brecht Van Lommel
2021-10-26 15:37:59 +02:00
parent fd25e883e2
commit 949dbb08d2
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/CMakeLists.txt
View File

@@ -295,13 +295,6 @@ if(WITH_OPENIMAGEDENOISE)
) )
endif() 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. # Logging capabilities using GLog library.
if(WITH_CYCLES_LOGGING) if(WITH_CYCLES_LOGGING)
add_definitions(-DWITH_CYCLES_LOGGING) add_definitions(-DWITH_CYCLES_LOGGING)

3
intern/cycles/device/CMakeLists.txt
View File

@@ -158,9 +158,6 @@ endif()
if(WITH_CYCLES_DEVICE_OPTIX) if(WITH_CYCLES_DEVICE_OPTIX)
add_definitions(-DWITH_OPTIX) add_definitions(-DWITH_OPTIX)
endif() endif()
if(WITH_CYCLES_DEVICE_MULTI)
add_definitions(-DWITH_MULTI)
endif()
if(WITH_OPENIMAGEDENOISE) if(WITH_OPENIMAGEDENOISE)
list(APPEND LIB list(APPEND LIB

2
intern/cycles/device/device.cpp
View File

@@ -71,14 +71,12 @@ void Device::build_bvh(BVH *bvh, Progress &progress, bool refit)
Device *Device::create(const DeviceInfo &info, Stats &stats, Profiler &profiler) Device *Device::create(const DeviceInfo &info, Stats &stats, Profiler &profiler)
{ {
#ifdef WITH_MULTI
if (!info.multi_devices.empty()) { if (!info.multi_devices.empty()) {
/* Always create a multi device when info contains multiple devices. /* 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 * 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. */ * that it is a homogeneous collection of devices, which simplifies checks. */
return device_multi_create(info, stats, profiler); return device_multi_create(info, stats, profiler);
} }
#endif
Device *device = NULL; Device *device = NULL;