griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Cycles: Unify error reporting code from denoiser's classes

Browse Source 
There are no functional changes expected.
This commit is contained in:
Nikita Sirgienko
2024-06-03 11:08:24 +02:00
parent cb8d2bf4ad
commit 1465076a0a
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ bool Denoiser::load_kernels(Progress *progress)
const Device *denoiser_device = ensure_denoiser_device(progress);
if (!denoiser_device) {
path_trace_device_->set_error("No device available to denoise on");
set_error("No device available to denoise on");
return false;
}

7
intern/cycles/integrator/denoiser_oidn.cpp
View File

@@ -183,7 +183,7 @@ class OIDNDenoiseContext {
const char *error_message;
const oidn::Error error = oidn_device.getError(error_message);
if (error != oidn::Error::None && error != oidn::Error::Cancelled) {
denoiser_->set_error("OpenImageDenoise error: " + string(error_message));
set_error("OpenImageDenoise error: " + string(error_message));
}
postprocess_output(oidn_color_pass, oidn_output_pass);
@@ -653,12 +653,11 @@ Device *OIDNDenoiser::ensure_denoiser_device(Progress *progress)
{
#ifndef WITH_OPENIMAGEDENOISE
(void)progress;
path_trace_device_->set_error("Failed to denoise, build has no OpenImageDenoise support");
set_error("Failed to denoise, build has no OpenImageDenoise support");
return nullptr;
#else
if (!openimagedenoise_supported()) {
path_trace_device_->set_error(
"OpenImageDenoiser is not supported on this CPU: missing SSE 4.1 support");
set_error("OpenImageDenoiser is not supported on this CPU: missing SSE 4.1 support");
return nullptr;
}

6
intern/cycles/integrator/denoiser_oidn_gpu.cpp
View File

@@ -206,7 +206,7 @@ OIDNFilter OIDNDenoiserGPU::create_filter()
OIDNError err = oidnGetDeviceError(oidn_device_, (const char **)&error_message);
if (OIDN_ERROR_NONE != err) {
LOG(ERROR) << "OIDN error: " << error_message;
denoiser_device_->set_error(error_message);
set_error(error_message);
}
}
@@ -257,7 +257,7 @@ bool OIDNDenoiserGPU::commit_and_execute_filter(OIDNFilter filter, ExecMode mode
error_message = "Unspecified OIDN error";
}
LOG(ERROR) << "OIDN error: " << error_message;
denoiser_device_->set_error(error_message);
set_error(error_message);
return false;
}
return true;
@@ -312,7 +312,7 @@ bool OIDNDenoiserGPU::denoise_create_if_needed(DenoiseContext &context)
}
if (!oidn_device_) {
denoiser_device_->set_error("Failed to create OIDN device");
set_error("Failed to create OIDN device");
return false;
}

4
intern/cycles/integrator/denoiser_optix.cpp
View File

@@ -260,7 +260,7 @@ bool OptiXDenoiser::denoise_create_if_needed(DenoiseContext &context)
&optix_denoiser_);
if (result != OPTIX_SUCCESS) {
denoiser_device_->set_error("Failed to create OptiX denoiser");
set_error("Failed to create OptiX denoiser");
return false;
}
@@ -305,7 +305,7 @@ bool OptiXDenoiser::denoise_configure_if_needed(DenoiseContext &context)
state_.device_pointer + sizes_.stateSizeInBytes,
sizes_.withOverlapScratchSizeInBytes);
if (result != OPTIX_SUCCESS) {
denoiser_device_->set_error("Failed to set up OptiX denoiser");
set_error("Failed to set up OptiX denoiser");
return false;
}