Skip to content

Commit

Permalink
Ensure previous light diffuse isn't used if not initialized
Browse files Browse the repository at this point in the history
  • Loading branch information
@kvark
kvark committed Oct 8, 2024
1 parent bbfd435 commit a06391e
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 35 deletions.
39 changes: 20 additions & 19 deletions blade-render/code/a-trous.wgsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ var t_flat_normal: texture_2d<f32>;
var t_prev_flat_normal: texture_2d<f32>;
var t_motion: texture_2d<f32>;
var input: texture_2d<f32>;
var prev_input: texture_2d<f32>;
var output: texture_storage_2d<rgba16float, write>;
var output: texture_storage_2d<rgba16float, read_write>;

const LUMA: vec3<f32> = vec3<f32>(0.2126, 0.7152, 0.0722);
const MIN_WEIGHT: f32 = 0.01;
Expand Down Expand Up @@ -80,27 +79,29 @@ fn temporal_accum(@builtin(global_invocation_id) global_id: vec3<u32>) {

var sum_weight = 0.0;
var sum_ilm = vec4<f32>(0.0);
//TODO: optimize depth load with a gather operation
for (var i = 0; i < 4; i += 1) {
let prev_pixel = prev_pixels[i];
if (all(prev_pixel >= vec2<i32>(0)) && all(prev_pixel < params.extent)) {
let prev_surface = read_prev_surface(prev_pixel);
if (compare_flat_normals(surface.flat_normal, prev_surface.flat_normal) < 0.5) {
continue;
}
let projected_distance = length(pos_world - prev_camera.position);
if (compare_depths(prev_surface.depth, projected_distance) < 0.5) {
continue;
if (params.temporal_weight != 1.0) {
//TODO: optimize depth load with a gather operation
for (var i = 0; i < 4; i += 1) {
let prev_pixel = prev_pixels[i];
if (all(prev_pixel >= vec2<i32>(0)) && all(prev_pixel < params.extent)) {
let prev_surface = read_prev_surface(prev_pixel);
if (compare_flat_normals(surface.flat_normal, prev_surface.flat_normal) < 0.5) {
continue;
}
let projected_distance = length(pos_world - prev_camera.position);
if (compare_depths(prev_surface.depth, projected_distance) < 0.5) {
continue;
}
let w = prev_weights[i];
sum_weight += w;
let illumination = w * textureLoad(input, prev_pixel, 0).xyz;
let luminocity = dot(illumination, LUMA);
sum_ilm += vec4<f32>(illumination, luminocity * luminocity);
}
let w = prev_weights[i];
sum_weight += w;
let illumination = w * textureLoad(prev_input, prev_pixel, 0).xyz;
let luminocity = dot(illumination, LUMA);
sum_ilm += vec4<f32>(illumination, luminocity * luminocity);
}
}

let cur_illumination = textureLoad(input, pixel, 0).xyz;
let cur_illumination = textureLoad(output, pixel).xyz;
let cur_luminocity = dot(cur_illumination, LUMA);
var mixed_ilm = vec4<f32>(cur_illumination, cur_luminocity * cur_luminocity);
if (sum_weight > MIN_WEIGHT) {
Expand Down
44 changes: 28 additions & 16 deletions blade-render/src/render/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ pub struct Renderer {
surface_info: blade_graphics::SurfaceInfo,
frame_index: usize,
frame_scene_built: usize,
frame_resize: usize,
is_frozen: bool,
//TODO: refactor `ResourceArray` to not carry the freelist logic
// This way we can embed user info into the allocator.
Expand Down Expand Up @@ -448,7 +449,6 @@ struct TemporalAccumData {
prev_camera: CameraParams,
params: BlurParams,
input: blade_graphics::TextureView,
prev_input: blade_graphics::TextureView,
t_depth: blade_graphics::TextureView,
t_prev_depth: blade_graphics::TextureView,
t_flat_normal: blade_graphics::TextureView,
Expand Down Expand Up @@ -753,6 +753,7 @@ impl Renderer {
surface_info: config.surface_info,
frame_index: 0,
frame_scene_built: 0,
frame_resize: 0,
is_frozen: false,
texture_resource_lookup: HashMap::default(),
}
Expand Down Expand Up @@ -878,6 +879,7 @@ impl Renderer {
self.surface_size = size;
self.targets.destroy(gpu);
self.targets = RestirTargets::new(size, self.reservoir_size, encoder, gpu);
self.frame_resize = self.frame_index + 1;
}

#[profiling::function]
Expand Down Expand Up @@ -1118,7 +1120,7 @@ impl Renderer {
}
self.debug.update_entry(&mut transfer);

if config.reset_reservoirs {
if config.reset_reservoirs || self.frame_resize == self.frame_index {
if !config.debug_draw {
self.debug.reset_lines(&mut transfer);
}
Expand All @@ -1144,7 +1146,7 @@ impl Renderer {
/// The result is stored internally in an HDR render target.
#[profiling::function]
pub fn ray_trace(
&self,
&mut self,
command_encoder: &mut blade_graphics::CommandEncoder,
debug_config: DebugConfig,
ray_config: RayConfig,
Expand Down Expand Up @@ -1235,8 +1237,8 @@ impl Renderer {
pc.dispatch(groups);
}

//TODO: control by `ray_config.spatial_pass`
if let mut pass = command_encoder.compute("ray-trace-spatial") {
if ray_config.spatial_pass {
let mut pass = command_encoder.compute("ray-trace-spatial");
let mut pc = pass.with(&self.spatial_pipeline);
let groups = self.spatial_pipeline.get_dispatch_for(self.surface_size);
pc.bind(
Expand Down Expand Up @@ -1268,19 +1270,25 @@ impl Renderer {
},
);
pc.dispatch(groups);
// Make sure the output is still in [0]
self.targets.light_diffuse.views.swap(0, 1);
}
}

/// Perform noise reduction using SVGF.
#[profiling::function]
pub fn denoise(
&mut self, //TODO: borrow immutably
&mut self,
command_encoder: &mut blade_graphics::CommandEncoder,
denoiser_config: DenoiserConfig,
) {
let mut params = BlurParams {
extent: [self.surface_size.width, self.surface_size.height],
temporal_weight: denoiser_config.temporal_weight,
temporal_weight: if self.frame_resize < self.frame_index {
denoiser_config.temporal_weight
} else {
1.0
},
iteration: 0,
use_motion_vectors: (self.frame_scene_built >= self.frame_index) as u32,
pad: 0,
Expand All @@ -1300,23 +1308,24 @@ impl Renderer {
camera: self.targets.camera_params[cur],
prev_camera: self.targets.camera_params[prev],
params,
input: self.targets.light_diffuse.views[0],
prev_input: self.targets.light_diffuse.views[2],
input: self.targets.light_diffuse.views[2],
t_depth: self.targets.depth.views[cur],
t_prev_depth: self.targets.depth.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],
output: self.targets.light_diffuse.views[1],
output: self.targets.light_diffuse.views[0],
},
);
pc.dispatch(groups);
//Note: making `2` contain the latest reprojection output
self.targets.light_diffuse.views.swap(1, 2);
}

// Make sure the accumulated result is in [2]
self.targets.light_diffuse.views.swap(0, 2);

let mut input_index = 2;
for _ in 0..denoiser_config.num_passes {
self.targets.light_diffuse.views.swap(0, 1);
let output_index = if input_index == 0 { 1 } else { 0 };
let mut pass = command_encoder.compute("a-trous");
let mut pc = pass.with(&self.blur.a_trous_pipeline);
let groups = self
Expand All @@ -1327,15 +1336,18 @@ impl Renderer {
0,
&ATrousData {
params,
input: self.targets.light_diffuse.views
[if params.iteration == 0 { 2 } else { 1 }],
input: self.targets.light_diffuse.views[input_index],
t_depth: self.targets.depth.views[cur],
t_flat_normal: self.targets.flat_normal.views[cur],
output: self.targets.light_diffuse.views[0],
output: self.targets.light_diffuse.views[output_index],
},
);
pc.dispatch(groups);
params.iteration += 1;
input_index = output_index;
}
if input_index != 0 {
self.targets.light_diffuse.views.swap(0, input_index);
}
}

Expand Down

0 comments on commit a06391e

Please sign in to comment.