Cycles: restore Denoising Depth pass, when enabling Denoising Data passes

This is still useful in some cases even if not used by OpenImageDenoise. In
the future this may be replaced with a more generic system to control render
passes and filtering, but for now this just does what it did before.

2 files changed, 11 insertions, 1 deletions

diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h
index ab8d7a26f44..8ff7750c7d5 100644
--- a/intern/cycles/kernel/kernel_passes.h
+++ b/intern/cycles/kernel/kernel_passes.h
@@ -52,6 +52,14 @@ ccl_device_forceinline void kernel_write_denoising_features_surface(
 
   ccl_global float *buffer = kernel_pass_pixel_render_buffer(kg, state, render_buffer);
 
+  if (kernel_data.film.pass_denoising_depth != PASS_UNUSED) {
+    const float3 denoising_feature_throughput = INTEGRATOR_STATE(
+        state, path, denoising_feature_throughput);
+    const float denoising_depth = ensure_finite(average(denoising_feature_throughput) *
+                                                sd->ray_length);
+    kernel_write_pass_float(buffer + kernel_data.film.pass_denoising_depth, denoising_depth);
+  }
+
   float3 normal = zero_float3();
   float3 diffuse_albedo = zero_float3();
   float3 specular_albedo = zero_float3();
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 5cbe2939dfc..df6b6b5be20 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -384,6 +384,7 @@ typedef enum PassType {
   PASS_MIST,
   PASS_DENOISING_NORMAL,
   PASS_DENOISING_ALBEDO,
+  PASS_DENOISING_DEPTH,
 
   /* PASS_SHADOW_CATCHER accumulates contribution of shadow catcher object which is not affected by
    * any other object. The pass accessor will divide the combined pass by the shadow catcher. The
@@ -1031,6 +1032,7 @@ typedef struct KernelFilm {
 
   int pass_denoising_normal;
   int pass_denoising_albedo;
+  int pass_denoising_depth;
 
   int pass_aov_color;
   int pass_aov_value;
@@ -1047,7 +1049,7 @@ typedef struct KernelFilm {
 
   int use_approximate_shadow_catcher;
 
-  int pad1, pad2, pad3;
+  int pad1, pad2;
 } KernelFilm;
 static_assert_align(KernelFilm, 16);