Consume motion in ReSTIR

kvark · Nov 21, 2023 · a538edb · a538edb
1 parent ce0eefc
commit a538edb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/blade-render/code/gbuf.inc.wgsl b/blade-render/code/gbuf.inc.wgsl
@@ -1 +1 @@
-const MOTION_SCALE: f32 = 0.05;
+const MOTION_SCALE: f32 = 0.02;
diff --git a/blade-render/code/ray-trace.wgsl b/blade-render/code/ray-trace.wgsl
@@ -5,6 +5,7 @@
 #include "debug-param.inc.wgsl"
 #include "camera.inc.wgsl"
 #include "surface.inc.wgsl"
+#include "gbuf.inc.wgsl"
 
 //TODO: use proper WGSL
 const RAY_FLAG_CULL_NO_OPAQUE: u32 = 0x80u;
@@ -141,6 +142,7 @@ var t_basis: texture_2d<f32>;
 var t_prev_basis: texture_2d<f32>;
 var t_flat_normal: texture_2d<f32>;
 var t_prev_flat_normal: texture_2d<f32>;
+var t_motion: texture_2d<f32>;
 var out_diffuse: texture_storage_2d<rgba16float, write>;
 var out_debug: texture_storage_2d<rgba8unorm, write>;
 
@@ -362,7 +364,9 @@ fn compute_restir(surface: Surface, pixel: vec2<i32>, rng: ptr<function, RandomS
         }
     }
 
-    let prev_pixel = get_projected_pixel(prev_camera, position);
+    let motion = textureLoad(t_motion, pixel, 0).xy / MOTION_SCALE;
+    //TODO: find best match in a 2x2 grid
+    let prev_pixel = pixel + vec2<i32>(motion + vec2<f32>(0.5));
 
     // First, gather the list of reservoirs to merge with
     var accepted_reservoir_indices = array<i32, MAX_RESERVOIRS>();

diff --git a/blade-render/src/render/mod.rs b/blade-render/src/render/mod.rs
@@ -396,6 +396,7 @@ struct MainData {
     t_prev_basis: blade_graphics::TextureView,
     t_flat_normal: blade_graphics::TextureView,
     t_prev_flat_normal: blade_graphics::TextureView,
+    t_motion: blade_graphics::TextureView,
     debug_buf: blade_graphics::BufferPiece,
     reservoirs: blade_graphics::BufferPiece,
     prev_reservoirs: blade_graphics::BufferPiece,
@@ -1134,6 +1135,7 @@ impl Renderer {
                     t_prev_basis: self.targets.basis.views[prev],
                     t_flat_normal: self.targets.flat_normal.views[cur],
                     t_prev_flat_normal: self.targets.flat_normal.views[prev],
+                    t_motion: self.targets.motion.views[0],
                     debug_buf: self.debug.buffer_resource(),
                     reservoirs: self.targets.reservoir_buf[cur].into(),
                     prev_reservoirs: self.targets.reservoir_buf[prev].into(),

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,8 @@
 Changelog for Blade
 
+## (TBD)
+- support object motion
+
 ## blade-graphics-0.3, blade-render-0.2 (17 Nov 2023)
 - tangent space generation
 - spatio-temporal resampling
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		const MOTION_SCALE: f32 = 0.05;
		const MOTION_SCALE: f32 = 0.02;