Fixed cascade settings initialization

Author: Przemog1

31_HLSLPathTracer/app_resources/hlsl/RWMCCascadeAccumulator.hlsl

@@ -28,11 +28,12 @@ template<typename CascadeLayerType, uint32_t CascadeSize>
 struct RWMCCascadeAccumulator
 {
     using output_storage_type = CascadeEntry<CascadeLayerType, CascadeSize>;
+    using initialization_data = RWMCCascadeSettings;
     output_storage_type accumulation;
     uint32_t cascadeSampleCounter[CascadeSize];
     RWMCCascadeSettings cascadeSettings;
 
-    void initialize()
+    void initialize(in RWMCCascadeSettings settings)
     {
         for (int i = 0; i < CascadeSize; ++i)
         {
@@ -41,9 +42,9 @@ struct RWMCCascadeAccumulator
         }
 
         // TODO: pass these values to this function
-        cascadeSettings.size = 6;
-        cascadeSettings.start = 1.0f;
-        cascadeSettings.base = 1.0f;
+        cascadeSettings.size = settings.size;
+        cascadeSettings.start = settings.start;
+        cascadeSettings.base = settings.base;
     }
 
     typename vector_traits<CascadeLayerType>::scalar_type getLuma(NBL_CONST_REF_ARG(CascadeLayerType) col)

31_HLSLPathTracer/app_resources/hlsl/pathtracer.hlsl

@@ -45,10 +45,13 @@ struct PathTracerCreationParams
 template<typename OutputTypeVec>
 struct DefaultAccumulator
 {
+    struct DefaultAccumulatorInitializationSettings {};
+
     using output_storage_type = OutputTypeVec;
+    using initialization_data = DefaultAccumulatorInitializationSettings;
     output_storage_type accumulation;
 
-    void initialize()
+    void initialize(in initialization_data initializationData)
     {
         accumulation = (output_storage_type)0.0f;
     }
@@ -288,10 +291,10 @@ struct Unidirectional
     }
 
     // Li
-    output_storage_type getMeasure(uint32_t numSamples, uint32_t depth, NBL_CONST_REF_ARG(scene_type) scene)
+    output_storage_type getMeasure(uint32_t numSamples, uint32_t depth, NBL_CONST_REF_ARG(scene_type) scene, NBL_REF_ARG(typename Accumulator::initialization_data) accumulatorInitData)
     {
         Accumulator accumulator;
-        accumulator.initialize();
+        accumulator.initialize(accumulatorInitData);
         //scalar_type meanLumaSq = 0.0;
         for (uint32_t i = 0; i < numSamples; i++)
         {

31_HLSLPathTracer/app_resources/hlsl/render.comp.hlsl

@@ -124,8 +124,7 @@ using material_system_type = ext::MaterialSystem::System<diffuse_bxdf_type, cond
 using nee_type = ext::NextEventEstimator::Estimator<scene_type, ray_type, sample_t, aniso_interaction, ext::IntersectMode::IM_PROCEDURAL, LIGHT_TYPE, POLYGON_METHOD>;
 
 #ifdef RWMC_ENABLED
-// TODO: get cascade size from a shared include file
-using accumulator_type = rwmc::RWMCCascadeAccumulator<float32_t3, 6u>;
+using accumulator_type = rwmc::RWMCCascadeAccumulator<float32_t3, CascadeSize>;
 #else
 using accumulator_type = ext::PathTracer::DefaultAccumulator<float32_t3>;
 #endif
@@ -252,14 +251,19 @@ void main(uint32_t3 threadID : SV_DispatchThreadID)
     pathtracer_type pathtracer = pathtracer_type::create(ptCreateParams);
 
 #ifdef RWMC_ENABLED
-    accumulator_type::output_storage_type cascadeEntry = pathtracer.getMeasure(pc.sampleCount, pc.depth, scene);
+    accumulator_type::initialization_data accumulatorInitData;
+    accumulatorInitData.size = CascadeSize;
+    accumulatorInitData.start = pc.start;
+    accumulatorInitData.base = pc.base;
+    accumulator_type::output_storage_type cascadeEntry = pathtracer.getMeasure(pc.sampleCount, pc.depth, scene, accumulatorInitData);
     for (uint32_t i = 0; i < CascadeSize; ++i)
     {
         float32_t4 cascadeLayerEntry = float32_t4(cascadeEntry.data[i], 1.0f);
         cascade[uint3(coords.x, coords.y, i)] = cascadeLayerEntry;
     }
 #else
-    float32_t3 color = pathtracer.getMeasure(pc.sampleCount, pc.depth, scene);
+    accumulator_type::initialization_data accumulatorInitData;
+    float32_t3 color = pathtracer.getMeasure(pc.sampleCount, pc.depth, scene, accumulatorInitData);
     outImage[coords] = float32_t4(color, 1.0);
 #endif
 

31_HLSLPathTracer/app_resources/hlsl/render_rwmc_common.hlsl

@@ -17,7 +17,6 @@ struct RenderRWMCPushConstants
 	int depth;
 	float start;
 	float base;
-	float minReliableLuma;
 	float kappa;
 };
 

31_HLSLPathTracer/main.cpp

@@ -1523,7 +1523,7 @@ class HLSLComputePathtracer final : public examples::SimpleWindowedApplication,
 			rwmcPushConstants.depth = depth;
 			rwmcPushConstants.sampleCount = resolvePushConstants.sampleCount = spp;
 			rwmcPushConstants.base = resolvePushConstants.base = rwmcCascadeBase;
-			rwmcPushConstants.minReliableLuma = resolvePushConstants.minReliableLuma = rwmcMinReliableLuma;
+			resolvePushConstants.minReliableLuma = rwmcMinReliableLuma;
 			rwmcPushConstants.kappa = resolvePushConstants.kappa = rwmcKappa;
 
 			// safe to proceed