griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

EEVEE-Next: Fix Updating Reflection Probes

Browse Source 
Due to missing logic reflection probe updates where not always
performed. There were multiple artifacts:

* Lookdev Worlds where Black Until the Scene world was rendered.
  Issue was that the lookdev world didn't initialized its atlas
  coordinates.
* Lookdev world should only retrigger reflection probe update when
  material is compiled
* When world is updated, reflection probes should be updated; this
  might require a redraw when reflection probe draw passes aren't
  updated this sample.

Pull Request: https://projects.blender.org/blender/blender/pulls/114064
This commit is contained in:
Jeroen Bakker
2023-10-24 13:43:10 +02:00
parent 4ce55752ae
commit b0b46b1c59
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/draw/engines/eevee_next/eevee_lookdev.cc
View File

@@ -128,7 +128,7 @@ bool LookdevModule::sync_world()
}
parameters_ = new_parameters;
inst_.reflection_probes.sync_world_lookdev();
inst_.sampling.reset();
}
if (parameters_.show_scene_world) {
@@ -142,6 +142,15 @@ bool LookdevModule::sync_world()
MAT_PIPE_DEFERRED,
MAT_GEOM_WORLD,
true);
if (GPU_material_status(gpu_material_) == GPU_MAT_SUCCESS) {
inst_.reflection_probes.sync_world_lookdev();
}
else {
inst_.sampling.reset();
DRW_viewport_request_redraw();
}
inst_.pipelines.world.sync(gpu_material_);
inst_.pipelines.background.sync(gpu_material_, parameters_.background_opacity);

25
source/blender/draw/engines/eevee_next/eevee_reflection_probes.cc
View File

@@ -251,11 +251,15 @@ void ReflectionProbeModule::sync_world(::World *world, WorldHandle & /*ob_handle
void ReflectionProbeModule::sync_world_lookdev()
{
do_world_update_set(true);
if (!update_probes_this_sample_) {
update_probes_next_sample_ = true;
ReflectionProbe &probe = probes_.lookup(world_object_key_);
const eLightProbeResolution resolution = reflection_probe_resolution();
int layer_subdivision = layer_subdivision_for(max_resolution_, resolution);
if (layer_subdivision != probe.atlas_coord.layer_subdivision) {
probe.atlas_coord = find_empty_atlas_region(layer_subdivision);
}
world_probe_coord_ = probe.atlas_coord;
do_world_update_set(true);
}
void ReflectionProbeModule::sync_object(Object *ob, ObjectHandle &ob_handle)
@@ -343,6 +347,10 @@ void ReflectionProbeModule::end_sync()
const bool do_update = instance_.do_reflection_probe_sync() || (only_world && world_updated);
if (!do_update) {
/* World has changed this sample, but probe update isn't initialized this sample. */
if (world_updated && !only_world) {
update_probes_next_sample_ = true;
}
if (update_probes_next_sample_ && !update_probes_this_sample_) {
DRW_viewport_request_redraw();
}
@@ -364,6 +372,10 @@ void ReflectionProbeModule::end_sync()
probes_tx_.clear(float4(0.0f));
}
/* Check reset probe updating as we will rendering probes. */
if (update_probes_this_sample_ || only_world) {
update_probes_next_sample_ = false;
}
data_buf_.push_update();
}
@@ -445,11 +457,6 @@ std::optional<ReflectionProbeUpdateInfo> ReflectionProbeModule::update_info_pop(
return info;
}
/* Check reset probe updating as we completed rendering all Probes. */
if (probe_type == ReflectionProbe::Type::PROBE && update_probes_this_sample_) {
update_probes_next_sample_ = false;
}
return std::nullopt;
}