Patrick Mours
a859837cde
Cycles already treats denoising fairly separate in its code, with a dedicated `Denoiser` base class used to describe denoising behavior. That class has been fully implemented for OIDN (`denoiser_oidn.cpp`), but for OptiX was mostly empty (`denoiser_optix.cpp`) and denoising was instead implemented in the OptiX device. That meant denoising code was split over various files and directories, making it a bit awkward to work with. This patch moves the OptiX denoising implementation into the existing `OptiXDenoiser` class, so that everything is in one place. There are no functional changes, code has been mostly moved as-is. To retain support for potential other denoiser implementations based on a GPU device in the future, the `DeviceDenoiser` base class was kept and slightly extended (and its file renamed to `denoiser_gpu.cpp` to follow similar naming rules as `path_trace_work_*.cpp`). Differential Revision: https://developer.blender.org/D16502
82 lines
2.2 KiB
C++
82 lines
2.2 KiB
C++
/* SPDX-License-Identifier: Apache-2.0
|
|
* Copyright 2011-2022 Blender Foundation */
|
|
|
|
#pragma once
|
|
|
|
#include "device/memory.h"
|
|
#include "graph/node.h"
|
|
#include "session/buffers.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
enum DenoiserType {
|
|
DENOISER_OPTIX = 2,
|
|
DENOISER_OPENIMAGEDENOISE = 4,
|
|
DENOISER_NUM,
|
|
|
|
DENOISER_NONE = 0,
|
|
DENOISER_ALL = ~0,
|
|
};
|
|
|
|
/* COnstruct human-readable string which denotes the denoiser type. */
|
|
const char *denoiserTypeToHumanReadable(DenoiserType type);
|
|
|
|
typedef int DenoiserTypeMask;
|
|
|
|
enum DenoiserPrefilter {
|
|
/* Best quality of the result without extra processing time, but requires guiding passes to be
|
|
* noise-free. */
|
|
DENOISER_PREFILTER_NONE = 1,
|
|
|
|
/* Denoise color and guiding passes together.
|
|
* Improves quality when guiding passes are noisy using least amount of extra processing time. */
|
|
DENOISER_PREFILTER_FAST = 2,
|
|
|
|
/* Prefilter noisy guiding passes before denoising color.
|
|
* Improves quality when guiding passes are noisy using extra processing time. */
|
|
DENOISER_PREFILTER_ACCURATE = 3,
|
|
|
|
DENOISER_PREFILTER_NUM,
|
|
};
|
|
|
|
/* NOTE: Is not a real scene node. Using Node API for ease of (de)serialization.
|
|
* The default values here do not really matter as they are always initialized from the
|
|
* Integrator node. */
|
|
class DenoiseParams : public Node {
|
|
public:
|
|
NODE_DECLARE
|
|
|
|
/* Apply denoiser to image. */
|
|
bool use = false;
|
|
|
|
/* Denoiser type. */
|
|
DenoiserType type = DENOISER_OPENIMAGEDENOISE;
|
|
|
|
/* Viewport start sample. */
|
|
int start_sample = 0;
|
|
|
|
/* Auxiliary passes. */
|
|
bool use_pass_albedo = true;
|
|
bool use_pass_normal = true;
|
|
|
|
/* Configure the denoiser to use motion vectors, previous image and a temporally stable model. */
|
|
bool temporally_stable = false;
|
|
|
|
DenoiserPrefilter prefilter = DENOISER_PREFILTER_FAST;
|
|
|
|
static const NodeEnum *get_type_enum();
|
|
static const NodeEnum *get_prefilter_enum();
|
|
|
|
DenoiseParams();
|
|
|
|
bool modified(const DenoiseParams &other) const
|
|
{
|
|
return !(use == other.use && type == other.type && start_sample == other.start_sample &&
|
|
use_pass_albedo == other.use_pass_albedo &&
|
|
use_pass_normal == other.use_pass_normal &&
|
|
temporally_stable == other.temporally_stable && prefilter == other.prefilter);
|
|
}
|
|
};
|
|
|
|
CCL_NAMESPACE_END
|