From ceb25cbeba5348921acb73680a7b9cab2d6488f8 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 23 Nov 2021 15:31:47 +0100 Subject: Fix compilation warnings when building without OpenImageDenoiser Reported by Sybren, thanks! --- intern/cycles/integrator/denoiser_oidn.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'intern/cycles/integrator') diff --git a/intern/cycles/integrator/denoiser_oidn.cpp b/intern/cycles/integrator/denoiser_oidn.cpp index b09b95a11b0..a08aec513fc 100644 --- a/intern/cycles/integrator/denoiser_oidn.cpp +++ b/intern/cycles/integrator/denoiser_oidn.cpp @@ -47,9 +47,6 @@ static bool oidn_progress_monitor_function(void *user_ptr, double /*n*/) OIDNDenoiser *oidn_denoiser = reinterpret_cast(user_ptr); return !oidn_denoiser->is_cancelled(); } -#endif - -#ifdef WITH_OPENIMAGEDENOISE class OIDNPass { public: @@ -547,7 +544,6 @@ class OIDNDenoiseContext { * the fake values and denoising of passes which do need albedo can no longer happen. */ bool albedo_replaced_with_fake_ = false; }; -#endif static unique_ptr create_device_queue(const RenderBuffers *render_buffers) { @@ -582,18 +578,20 @@ static void copy_render_buffers_to_device(unique_ptr &queue, } } +#endif + bool OIDNDenoiser::denoise_buffer(const BufferParams &buffer_params, RenderBuffers *render_buffers, const int num_samples, bool allow_inplace_modification) { +#ifdef WITH_OPENIMAGEDENOISE thread_scoped_lock lock(mutex_); /* Make sure the host-side data is available for denoising. */ unique_ptr queue = create_device_queue(render_buffers); copy_render_buffers_from_device(queue, render_buffers); -#ifdef WITH_OPENIMAGEDENOISE OIDNDenoiseContext context( this, params_, buffer_params, render_buffers, num_samples, allow_inplace_modification); @@ -620,6 +618,11 @@ bool OIDNDenoiser::denoise_buffer(const BufferParams &buffer_params, * copies data from the device it doesn't overwrite the denoiser buffers. */ copy_render_buffers_to_device(queue, render_buffers); } +#else + (void)buffer_params; + (void)render_buffers; + (void)num_samples; + (void)allow_inplace_modification; #endif /* This code is not supposed to run when compiled without OIDN support, so can assume if we made -- cgit v1.2.3