Changed some settings

Author: PearCoding

src/backend/runtime/CMakeLists.txt

@@ -14,6 +14,8 @@ set(SRC
   Runtime.h
   RuntimeInfo.cpp
   RuntimeInfo.h
+  RuntimeSettings.h
+  RuntimeStructs.h
   SceneObject.h
   SHA256.cpp
   SHA256.h

src/backend/runtime/Runtime.cpp

@@ -206,13 +206,14 @@ bool Runtime::load(const std::filesystem::path& path, Parser::Scene&& scene)
     lopts.IsTracer            = mOptions.IsTracer;
     lopts.Scene               = std::move(scene);
     lopts.ForceSpecialization = mOptions.ForceSpecialization;
-    lopts.UseDenoiser         = !mOptions.IsTracer && mOptions.UseDenoiser && hasDenoiser();
+    lopts.Denoiser            = mOptions.Denoiser;
+    lopts.Denoiser.Enabled    = !mOptions.IsTracer && mOptions.Denoiser.Enabled && hasDenoiser();
 
     // Print a warning if denoiser was requested but none is available
-    if (mOptions.UseDenoiser && !lopts.UseDenoiser && !mOptions.IsTracer && hasDenoiser())
+    if (mOptions.Denoiser.Enabled && !lopts.Denoiser.Enabled && !mOptions.IsTracer && hasDenoiser())
         IG_LOG(L_WARNING) << "Trying to use denoiser but no denoiser is available" << std::endl;
 
-    if (lopts.UseDenoiser)
+    if (lopts.Denoiser.Enabled)
         IG_LOG(L_INFO) << "Using denoiser" << std::endl;
 
     // Extract technique
@@ -249,7 +250,7 @@ bool Runtime::load(const std::filesystem::path& path, Parser::Scene&& scene)
     mTechniqueVariants        = std::move(result.TechniqueVariants);
     mResourceMap              = std::move(result.ResourceMap);
 
-    if (lopts.UseDenoiser)
+    if (lopts.Denoiser.Enabled)
         mTechniqueInfo.EnabledAOVs.emplace_back("Denoised");
 
     return setup();
@@ -296,7 +297,7 @@ void Runtime::stepVariant(bool ignoreDenoiser, size_t variant, bool lastVariant)
     DriverRenderSettings settings;
     settings.rays           = nullptr; // No artificial ray streams
     settings.device         = mDevice;
-    settings.apply_denoiser = mOptions.UseDenoiser && !ignoreDenoiser;
+    settings.apply_denoiser = mOptions.Denoiser.Enabled && !ignoreDenoiser;
     settings.spi            = info.GetSPI(mSamplesPerIteration);
     settings.work_width     = info.GetWidth(mFilmWidth);
     settings.work_height    = info.GetHeight(mFilmHeight);

src/backend/runtime/Runtime.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "RuntimeSettings.h"
 #include "RuntimeStructs.h"
 #include "Statistics.h"
 #include "driver/DriverManager.h"
@@ -14,29 +15,6 @@ class Scene;
 
 struct LoaderOptions;
 
-struct RuntimeOptions {
-    bool IsTracer        = false;
-    bool IsInteractive   = false;
-    bool DumpShader      = false;
-    bool DumpShaderFull  = false;
-    bool AcquireStats    = false;
-    Target DesiredTarget = Target::INVALID;
-    bool RecommendCPU    = true;
-    bool RecommendGPU    = true;
-    bool UseDenoiser         = false;
-    uint32 Device        = 0;
-    uint32 SPI           = 0; // Detect automatically
-    std::string OverrideTechnique;
-    std::string OverrideCamera;
-    std::pair<uint32, uint32> OverrideFilmSize = { 0, 0 };
-
-    bool AddExtraEnvLight            = false;                           // User option to add a constant environment light (just to see something)
-    std::filesystem::path ModulePath = std::filesystem::current_path(); // Optional path to modules
-    std::filesystem::path ScriptDir  = {};                              // Path to a new script directory, replacing the internal standard library
-
-    bool ForceSpecialization = false; // Enforce specialization of generated shader for all parameters. This will increase compile time
-};
-
 struct AOVAccessor {
     const float* Data;
     size_t IterationCount;

src/backend/runtime/RuntimeSettings.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include "Target.h"
+
+namespace IG {
+struct DenoiserSettings {
+    bool Enabled            = false; // Enables the denoiser
+    bool FollowSpecular     = false; // Follow specular paths instead of only using the first bounce for AOV information
+    bool OnlyFirstIteration = true;  // Acquire AOV information only at the first iteration, or refine every iteration
+};
+
+struct RuntimeOptions {
+    bool IsTracer        = false;
+    bool IsInteractive   = false;
+    bool DumpShader      = false;
+    bool DumpShaderFull  = false;
+    bool AcquireStats    = false;
+    Target DesiredTarget = Target::INVALID;
+    bool RecommendCPU    = true;
+    bool RecommendGPU    = true;
+    uint32 Device        = 0;
+    uint32 SPI           = 0; // Detect automatically
+    std::string OverrideTechnique;
+    std::string OverrideCamera;
+    std::pair<uint32, uint32> OverrideFilmSize = { 0, 0 };
+
+    bool AddExtraEnvLight            = false;                           // User option to add a constant environment light (just to see something)
+    std::filesystem::path ModulePath = std::filesystem::current_path(); // Optional path to modules
+    std::filesystem::path ScriptDir  = {};                              // Path to a new script directory, replacing the internal standard library
+
+    bool ForceSpecialization = false; // Enforce specialization of generated shader for all parameters. This will increase compile time
+
+    DenoiserSettings Denoiser;
+};
+} // namespace IG

src/backend/runtime/RuntimeStructs.h

@@ -35,11 +35,6 @@ struct ParameterSet {
     std::unordered_map<std::string, Vector4f> ColorParameters;
 };
 
-struct RuntimeRenderSettings {
-    size_t FilmWidth  = 800;
-    size_t FilmHeight = 600;
-};
-
 struct Ray {
     Vector3f Origin;
     Vector3f Direction;

src/backend/runtime/loader/Loader.cpp

@@ -27,7 +27,7 @@ bool Loader::load(const LoaderOptions& opts, LoaderResult& result)
     ctx.PixelSamplerType    = opts.PixelSamplerType;
     ctx.SamplesPerIteration = opts.SamplesPerIteration;
     ctx.IsTracer            = opts.IsTracer;
-    ctx.UseDenoiser         = opts.UseDenoiser;
+    ctx.Denoiser            = opts.Denoiser;
     ctx.FilmWidth           = opts.FilmWidth;
     ctx.FilmHeight          = opts.FilmHeight;
     ctx.Lights              = std::make_unique<LoaderLight>();

src/backend/runtime/loader/Loader.h

@@ -2,6 +2,7 @@
 
 #include "CameraOrientation.h"
 #include "Parser.h"
+#include "RuntimeSettings.h"
 #include "Target.h"
 #include "TechniqueInfo.h"
 #include "table/SceneDatabase.h"
@@ -21,7 +22,7 @@ struct LoaderOptions {
     size_t SamplesPerIteration; // Only a recommendation!
     bool IsTracer;
     bool ForceSpecialization;
-    bool UseDenoiser;
+    DenoiserSettings Denoiser;
 };
 
 struct LoaderResult {

src/backend/runtime/loader/LoaderContext.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "LoaderEnvironment.h"
+#include "RuntimeSettings.h"
 #include "Target.h"
 #include "TechniqueInfo.h"
 
@@ -27,7 +28,7 @@ struct LoaderContext {
     std::string PixelSamplerType;
     IG::TechniqueInfo TechniqueInfo;
 
-    bool UseDenoiser = false; // TODO: Make use of this
+    DenoiserSettings Denoiser;
     bool IsTracer = false;
 
     size_t CurrentTechniqueVariant;

src/backend/runtime/loader/LoaderTechnique.cpp

@@ -73,7 +73,7 @@ static TechniqueInfo wireframe_get_info(const std::string&, const std::shared_pt
 
 /////////////////////////
 
-static void enable_ib(TechniqueInfo& info, bool extend = true)
+static void enable_ib(TechniqueInfo& info, bool always = false, bool extend = true)
 {
     info.EnabledAOVs.emplace_back("Normals");
     info.EnabledAOVs.emplace_back("Albedo");
@@ -90,7 +90,7 @@ static void enable_ib(TechniqueInfo& info, bool extend = true)
         if (info.VariantSelector) {
             const auto prevSelector = info.VariantSelector;
             info.VariantSelector    = [=](size_t iter) {
-                if (iter == 0) {
+                if (always || iter == 0) {
                     std::vector<size_t> pass_with_ib = prevSelector(iter);
                     pass_with_ib.emplace_back(variantCount - 1);
                     return pass_with_ib;
@@ -100,7 +100,7 @@ static void enable_ib(TechniqueInfo& info, bool extend = true)
             };
         } else {
             info.VariantSelector = [=](size_t iter) {
-                if (iter == 0) {
+                if (always || iter == 0) {
                     std::vector<size_t> pass_with_ib(variantCount);
                     std::iota(std::begin(pass_with_ib), std::end(pass_with_ib), 0);
                     return pass_with_ib;
@@ -126,7 +126,7 @@ static bool handle_ib_body(std::ostream& stream, const std::shared_ptr<Parser::O
         return false;
 
     const int max_depth        = technique ? technique->property("max_depth").getInteger(64) : 64;
-    const bool handle_specular = technique ? technique->property("denoiser_handle_specular").getBool(false) : false;
+    const bool handle_specular = ctx.Denoiser.FollowSpecular || (technique ? technique->property("denoiser_handle_specular").getBool(false) : false);
 
     stream << "  let aov_normals = device.load_aov_image(\"Normals\", spi); aov_normals.mark_as_used();" << std::endl;
     stream << "  let aov_albedo = device.load_aov_image(\"Albedo\", spi); aov_albedo.mark_as_used();" << std::endl;
@@ -164,10 +164,12 @@ static bool handle_ib_header(std::ostream& stream, const LoaderContext& ctx)
     return true;
 }
 
-static TechniqueInfo ib_get_info(const std::string&, const std::shared_ptr<Parser::Object>&, const LoaderContext&)
+static TechniqueInfo ib_get_info(const std::string&, const std::shared_ptr<Parser::Object>& technique, const LoaderContext& ctx)
 {
+    const bool apply_always = !ctx.Denoiser.OnlyFirstIteration || (technique ? technique->property("denoiser_ib_all_iterations").getBool(false) : false);
+
     TechniqueInfo info;
-    enable_ib(info, false);
+    enable_ib(info, apply_always, false);
     return info;
 }
 
@@ -199,8 +201,8 @@ static TechniqueInfo path_get_info(const std::string&, const std::shared_ptr<Par
 
     info.Variants[0].UsesLights = true;
 
-    if (ctx.UseDenoiser)
-        enable_ib(info);
+    if (ctx.Denoiser.Enabled)
+        enable_ib(info, !ctx.Denoiser.OnlyFirstIteration);
 
     return info;
 }
@@ -256,8 +258,8 @@ static TechniqueInfo volpath_get_info(const std::string&, const std::shared_ptr<
     info.Variants[0].UsesLights = true;
     info.Variants[0].UsesMedia  = true;
 
-    if (ctx.UseDenoiser)
-        enable_ib(info);
+    if (ctx.Denoiser.Enabled)
+        enable_ib(info, !ctx.Denoiser.OnlyFirstIteration);
 
     return info;
 }
@@ -355,8 +357,8 @@ static TechniqueInfo ppm_get_info(const std::string&, const std::shared_ptr<Pars
         }
     }
 
-    if (ctx.UseDenoiser)
-        enable_ib(info);
+    if (ctx.Denoiser.Enabled)
+        enable_ib(info, !ctx.Denoiser.OnlyFirstIteration);
 
     return info;
 }

src/frontend/common/ProgramOptions.cpp

@@ -137,8 +137,21 @@ ProgramOptions::ProgramOptions(int argc, char** argv, ApplicationType type, cons
     app.add_flag("--add-env-light", AddExtraEnvLight, "Add additional constant environment light. This is automatically done for glTF scenes without any lights");
     app.add_flag("--force-specialization", ForceSpecialization, "Enforce specialization for parameters in shading tree. This will increase compile time drastically for potential runtime optimization");
 
-    if (type != ApplicationType::Trace)
+    if (type != ApplicationType::Trace) {
+        if (type == ApplicationType::CLI) {
+            // Focus on quality
+            DenoiserFollowSpecular     = true;
+            DenoiserOnlyFirstIteration = false;
+        } else {
+            // Focus on interactivity
+            DenoiserFollowSpecular     = false;
+            DenoiserOnlyFirstIteration = true;
+        }
+
         app.add_flag("--denoise", Denoise, "Apply denoiser if available");
+        app.add_flag("--denoiser-follow-specular,!--denoiser-skip-specular", DenoiserFollowSpecular, "Follow specular paths or terminate at them");
+        app.add_flag("--denoiser-aov-first-iteration,!--denoiser-aov-every-iteration", DenoiserOnlyFirstIteration, "Acquire scene normal, albedo and depth information every iteration or only at the first");
+    }
 
     if (type == ApplicationType::Trace) {
         app.add_option("-i,--input", InputRay, "Read list of rays from file instead of the standard input");
@@ -181,7 +194,9 @@ void ProgramOptions::populate(RuntimeOptions& options) const
     options.AddExtraEnvLight    = AddExtraEnvLight;
     options.ForceSpecialization = ForceSpecialization;
 
-    options.UseDenoiser = Denoise;
+    options.Denoiser.Enabled            = Denoise;
+    options.Denoiser.FollowSpecular     = DenoiserFollowSpecular;
+    options.Denoiser.OnlyFirstIteration = DenoiserOnlyFirstIteration;
 
     options.ScriptDir = ScriptDir;
 }