b803d7fabb
Since #118841 there are more cases where Cycles would check for the graphics interop support. This could lead to a crash when graphics interop functions are called without having active graphics context. This change makes it so there is no graphics interop calls when doing headless render. In order to achieve this the device creation is now aware of the headless mode. Pull Request: https://projects.blender.org/blender/blender/pulls/122844
58 lines
1.5 KiB
C++
58 lines
1.5 KiB
C++
/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 */
|
|
|
|
#include "device/cpu/device.h"
|
|
#include "device/cpu/device_impl.h"
|
|
#include "integrator/denoiser_oidn.h"
|
|
|
|
/* Used for `info.denoisers`. */
|
|
/* TODO(sergey): The denoisers are probably to be moved completely out of the device into their
|
|
* own class. But until then keep API consistent with how it used to work before. */
|
|
#include "util/guiding.h"
|
|
#include "util/openimagedenoise.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
Device *device_cpu_create(const DeviceInfo &info, Stats &stats, Profiler &profiler, bool headless)
|
|
{
|
|
return new CPUDevice(info, stats, profiler, headless);
|
|
}
|
|
|
|
void device_cpu_info(vector<DeviceInfo> &devices)
|
|
{
|
|
DeviceInfo info;
|
|
|
|
info.type = DEVICE_CPU;
|
|
info.description = system_cpu_brand_string();
|
|
info.id = "CPU";
|
|
info.num = 0;
|
|
info.has_osl = true;
|
|
info.has_nanovdb = true;
|
|
info.has_profiling = true;
|
|
if (guiding_supported()) {
|
|
info.has_guiding = true;
|
|
}
|
|
else {
|
|
info.has_guiding = false;
|
|
}
|
|
if (openimagedenoise_supported()) {
|
|
info.denoisers |= DENOISER_OPENIMAGEDENOISE;
|
|
}
|
|
|
|
devices.insert(devices.begin(), info);
|
|
}
|
|
|
|
string device_cpu_capabilities()
|
|
{
|
|
string capabilities = "";
|
|
capabilities += system_cpu_support_sse42() ? "SSE42 " : "";
|
|
capabilities += system_cpu_support_avx2() ? "AVX2" : "";
|
|
if (capabilities[capabilities.size() - 1] == ' ') {
|
|
capabilities.resize(capabilities.size() - 1);
|
|
}
|
|
return capabilities;
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|