bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix: Build failing when WITH_OPENIMAGEDENOISE is OFF

Browse Source
This commit is contained in:
Brecht Van Lommel 2024-03-11 12:58:46 +01:00
parent 989e9ef890
commit f7a071bd60
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
intern/cycles/integrator/denoiser.cpp
View File

@ -48,20 +48,27 @@ unique_ptr<Denoiser> Denoiser::create(Device *path_trace_device, const DenoisePa
DenoiserType Denoiser::automatic_viewport_denoiser_type(const DeviceInfo &path_trace_device_info) DenoiserType Denoiser::automatic_viewport_denoiser_type(const DeviceInfo &path_trace_device_info)
{ {
#ifdef WITH_OPENIMAGEDENOISE
if (path_trace_device_info.type != DEVICE_CPU && if (path_trace_device_info.type != DEVICE_CPU &&
OIDNDenoiserGPU::is_device_supported(path_trace_device_info)) OIDNDenoiserGPU::is_device_supported(path_trace_device_info))
{ {
return DENOISER_OPENIMAGEDENOISE; return DENOISER_OPENIMAGEDENOISE;
} }
else if (!Device::available_devices(DEVICE_MASK_OPTIX).empty()) { #endif
#ifdef WITH_OPTIX
if (!Device::available_devices(DEVICE_MASK_OPTIX).empty()) {
return DENOISER_OPTIX; return DENOISER_OPTIX;
} }
else if (openimagedenoise_supported()) { #endif
#ifdef WITH_OPENIMAGEDENOISE
if (openimagedenoise_supported()) {
return DENOISER_OPENIMAGEDENOISE; return DENOISER_OPENIMAGEDENOISE;
} }
else { #endif
return DENOISER_NONE; return DENOISER_NONE;
}
} }
Denoiser::Denoiser(Device *path_trace_device, const DenoiseParams &params) Denoiser::Denoiser(Device *path_trace_device, const DenoiseParams &params)