3 files changed, 221 insertions, 231 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 8989213baa0..ed1e3c24029 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -44,7 +44,7 @@ extern GlobalsUboStorage ts;
 
 /* *********** FUNCTIONS *********** */
 
-static void EEVEE_engine_init(void *ved)
+static void eevee_engine_init(void *ved)
 {
 	EEVEE_Data *vedata = (EEVEE_Data *)ved;
 	EEVEE_TextureList *txl = vedata->txl;
@@ -82,7 +82,7 @@ static void EEVEE_engine_init(void *ved)
 	}
 }
 
-static void EEVEE_cache_init(void *vedata)
+static void eevee_cache_init(void *vedata)
 {
 	EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl;
 	EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure();
@@ -101,7 +101,7 @@ static void EEVEE_cache_init(void *vedata)
 	EEVEE_volumes_cache_init(sldata, vedata);
 }
 
-static void EEVEE_cache_populate(void *vedata, Object *ob)
+static void eevee_cache_populate(void *vedata, Object *ob)
 {
 	EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure();
 
@@ -149,7 +149,7 @@ static void EEVEE_cache_populate(void *vedata, Object *ob)
 	}
 }
 
-static void EEVEE_cache_finish(void *vedata)
+static void eevee_cache_finish(void *vedata)
 {
 	EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure();
 
@@ -158,7 +158,7 @@ static void EEVEE_cache_finish(void *vedata)
 	EEVEE_lightprobes_cache_finish(sldata, vedata);
 }
 
-static void EEVEE_draw_scene(void *vedata)
+static void eevee_draw_scene(void *vedata)
 {
 	EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl;
 	EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl;
@@ -277,7 +277,7 @@ static void EEVEE_draw_scene(void *vedata)
 	stl->g_data->view_updated = false;
 }
 
-static void EEVEE_view_update(void *vedata)
+static void eevee_view_update(void *vedata)
 {
 	EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl;
 	if (stl->g_data) {
@@ -285,7 +285,7 @@ static void EEVEE_view_update(void *vedata)
 	}
 }
 
-static void EEVEE_id_update(void *UNUSED(vedata), ID *id)
+static void eevee_id_update(void *UNUSED(vedata), ID *id)
 {
 	const ID_Type id_type = GS(id->name);
 	if (id_type == ID_OB) {
@@ -305,7 +305,7 @@ static void EEVEE_id_update(void *UNUSED(vedata), ID *id)
 	}
 }
 
-static void EEVEE_engine_free(void)
+static void eevee_engine_free(void)
 {
 	EEVEE_bloom_free();
 	EEVEE_depth_of_field_free();
@@ -321,7 +321,7 @@ static void EEVEE_engine_free(void)
 	EEVEE_volumes_free();
 }
 
-static void EEVEE_layer_collection_settings_create(RenderEngine *UNUSED(engine), IDProperty *props)
+static void eevee_layer_collection_settings_create(RenderEngine *UNUSED(engine), IDProperty *props)
 {
 	BLI_assert(props &&
 	           props->type == IDP_GROUP &&
@@ -330,7 +330,7 @@ static void EEVEE_layer_collection_settings_create(RenderEngine *UNUSED(engine),
 	UNUSED_VARS_NDEBUG(props);
 }
 
-static void EEVEE_view_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props)
+static void eevee_view_layer_settings_create(RenderEngine *UNUSED(engine), IDProperty *props)
 {
 	BLI_assert(props &&
 	           props->type == IDP_GROUP &&
@@ -399,28 +399,29 @@ static void EEVEE_view_layer_settings_create(RenderEngine *UNUSED(engine), IDPro
 	BKE_collection_engine_property_add_bool(props, "shadow_high_bitdepth", false);
 }
 
-static const DrawEngineDataSize EEVEE_data_size = DRW_VIEWPORT_DATA_SIZE(EEVEE_Data);
+static const DrawEngineDataSize eevee_data_size = DRW_VIEWPORT_DATA_SIZE(EEVEE_Data);
 
 DrawEngineType draw_engine_eevee_type = {
 	NULL, NULL,
 	N_("Eevee"),
-	&EEVEE_data_size,
-	&EEVEE_engine_init,
-	&EEVEE_engine_free,
-	&EEVEE_cache_init,
-	&EEVEE_cache_populate,
-	&EEVEE_cache_finish,
-	&EEVEE_draw_scene,
+	&eevee_data_size,
+	&eevee_engine_init,
+	&eevee_engine_free,
+	&eevee_cache_init,
+	&eevee_cache_populate,
+	&eevee_cache_finish,
+	&eevee_draw_scene,
 	NULL, //&EEVEE_draw_scene
-	&EEVEE_view_update,
-	&EEVEE_id_update,
+	&eevee_view_update,
+	&eevee_id_update,
 };
 
 RenderEngineType DRW_engine_viewport_eevee_type = {
 	NULL, NULL,
 	EEVEE_ENGINE, N_("Eevee"), RE_INTERNAL | RE_USE_SHADING_NODES,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-	&EEVEE_layer_collection_settings_create, &EEVEE_view_layer_settings_create,
+	&eevee_layer_collection_settings_create,
+	&eevee_view_layer_settings_create,
 	&draw_engine_eevee_type,
 	{NULL, NULL, NULL}
 };
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index d2e65cbdbe3..e1b78602507 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -1260,266 +1260,255 @@ static void lightprobe_cell_world_location_get(EEVEE_LightGrid *egrid, float loc
 	add_v3_v3(r_pos, tmp);
 }
 
-void EEVEE_lightprobes_refresh(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
+static void lightprobes_refresh_world(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 {
-	EEVEE_TextureList *txl = vedata->txl;
 	EEVEE_PassList *psl = vedata->psl;
-	EEVEE_StorageList *stl = vedata->stl;
 	EEVEE_LightProbesInfo *pinfo = sldata->probes;
-	Object *ob;
-	const DRWContextState *draw_ctx = DRW_context_state_get();
-	RegionView3D *rv3d = draw_ctx->rv3d;
+	render_world_to_probe(sldata, psl);
+	if (e_data.update_world & PROBE_UPDATE_CUBE) {
+		glossy_filter_probe(sldata, vedata, psl, 0);
+	}
+	if (e_data.update_world & PROBE_UPDATE_GRID) {
+		diffuse_filter_probe(sldata, vedata, psl, 0);
+		SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
+		DRW_framebuffer_texture_detach(sldata->probe_pool);
+		DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->irradiance_rt, 0, 0);
+		DRW_draw_pass(psl->probe_grid_fill);
+		DRW_framebuffer_texture_detach(sldata->irradiance_rt);
+		DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->probe_pool, 0, 0);
+	}
+	e_data.update_world = 0;
+	if (!e_data.world_ready_to_shade) {
+		e_data.world_ready_to_shade = true;
+		pinfo->num_render_cube = 1;
+		pinfo->num_render_grid = 1;
+	}
+	DRW_viewport_request_redraw();
+}
 
-	/* Render world in priority */
-	if (e_data.update_world) {
-		render_world_to_probe(sldata, psl);
+static void lightprobes_refresh_initialize_grid(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
+{
+	EEVEE_LightProbesInfo *pinfo = sldata->probes;
+	EEVEE_PassList *psl = vedata->psl;
+	if (pinfo->grid_initialized) {
+		/* Gris is already initialized, nothing to do. */
+		return;
+	}
+	DRW_framebuffer_texture_detach(sldata->probe_pool);
+	/* Flood fill with world irradiance. */
+	DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->irradiance_rt, 0, 0);
+	DRW_draw_pass(psl->probe_grid_fill);
+	DRW_framebuffer_texture_detach(sldata->irradiance_rt);
+	SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
+	DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->irradiance_rt, 0, 0);
+	DRW_draw_pass(psl->probe_grid_fill);
+	DRW_framebuffer_texture_detach(sldata->irradiance_rt);
+	SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
+	/* Reattach to have a valid framebuffer. */
+	DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->probe_pool, 0, 0);
+	pinfo->grid_initialized = true;
+}
 
-		if (e_data.update_world & PROBE_UPDATE_CUBE) {
-			glossy_filter_probe(sldata, vedata, psl, 0);
+static void lightprobes_refresh_planar(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
+{
+	EEVEE_TextureList *txl = vedata->txl;
+	Object *ob;
+	EEVEE_LightProbesInfo *pinfo = sldata->probes;
+	for (int i = 0; (ob = pinfo->probes_planar_ref[i]) && (i < MAX_PLANAR); i++) {
+		EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_ensure(ob);
+		if (!ped->need_update) {
+			continue;
 		}
+		/* Temporary Remove all planar reflections (avoid lag effect). */
+		int tmp_num_planar = pinfo->num_planar;
+		pinfo->num_planar = 0;
+		render_scene_to_planar(sldata, vedata, i, ped->viewmat, ped->persmat, ped->planer_eq_offset);
+		/* Restore */
+		pinfo->num_planar = tmp_num_planar;
+		ped->need_update = false;
+		ped->probe_id = i;
+	}
+	/* If there is at least one planar probe */
+	if (pinfo->num_planar > 0 && (vedata->stl->effects->enabled_effects & EFFECT_SSR) != 0) {
+		const int max_lod = 9;
+		DRW_stats_group_start("Planar Probe Downsample");
+		DRW_framebuffer_recursive_downsample(vedata->fbl->downsample_fb, txl->planar_pool, max_lod, &downsample_planar, vedata);
+		/* For shading, save max level of the planar map */
+		pinfo->lod_planar_max = (float)(max_lod);
+		DRW_stats_group_end();
+	}
+}
 
-		if (e_data.update_world & PROBE_UPDATE_GRID) {
-			diffuse_filter_probe(sldata, vedata, psl, 0);
-
-			SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
-
-			DRW_framebuffer_texture_detach(sldata->probe_pool);
-
-			DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->irradiance_rt, 0, 0);
-			DRW_draw_pass(psl->probe_grid_fill);
-			DRW_framebuffer_texture_detach(sldata->irradiance_rt);
-
-			DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->probe_pool, 0, 0);
+static void lightprobes_refresh_cube(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
+{
+	EEVEE_PassList *psl = vedata->psl;
+	EEVEE_StorageList *stl = vedata->stl;
+	EEVEE_LightProbesInfo *pinfo = sldata->probes;
+	Object *ob;
+	for (int i = 1; (ob = pinfo->probes_cube_ref[i]) && (i < MAX_PROBE); i++) {
+		EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_ensure(ob);
+		if (!ped->need_update) {
+			continue;
 		}
-
-		e_data.update_world = 0;
-
-		if (!e_data.world_ready_to_shade) {
-			e_data.world_ready_to_shade = true;
-			pinfo->num_render_cube = 1;
-			pinfo->num_render_grid = 1;
+		LightProbe *prb = (LightProbe *)ob->data;
+		render_scene_to_probe(sldata, vedata, ob->obmat[3], prb->clipsta, prb->clipend);
+		glossy_filter_probe(sldata, vedata, psl, i);
+		ped->need_update = false;
+		ped->probe_id = i;
+		if (!ped->ready_to_shade) {
+			pinfo->num_render_cube++;
+			ped->ready_to_shade = true;
 		}
-
+#if 0
+		printf("Update Cubemap %d\n", i);
+#endif
 		DRW_viewport_request_redraw();
-	}
-	else if (true) { /* TODO if at least one probe needs refresh */
-
-		if (draw_ctx->evil_C != NULL) {
-			/* Only compute probes if not navigating or in playback */
-			struct wmWindowManager *wm = CTX_wm_manager(draw_ctx->evil_C);
-			if (((rv3d->rflag & RV3D_NAVIGATING) != 0) || ED_screen_animation_no_scrub(wm) != NULL) {
-				goto update_planar;
-			}
-		}
-
-		if (!pinfo->grid_initialized) {
-			DRW_framebuffer_texture_detach(sldata->probe_pool);
-
-			/* Flood fill with world irradiance. */
-			DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->irradiance_rt, 0, 0);
-			DRW_draw_pass(psl->probe_grid_fill);
-			DRW_framebuffer_texture_detach(sldata->irradiance_rt);
+		/* Do not let this frame accumulate. */
+		stl->effects->taa_current_sample = 1;
 
-			SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
-
-			DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->irradiance_rt, 0, 0);
-			DRW_draw_pass(psl->probe_grid_fill);
-			DRW_framebuffer_texture_detach(sldata->irradiance_rt);
-
-			SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
+		/* Only do one probe per frame */
+		lightprobes_refresh_planar(sldata, vedata);
+		return;
+	}
+}
 
-			/* reattach to have a valid framebuffer. */
-			DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->probe_pool, 0, 0);
+static void lightprobes_refresh_all_no_world(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
+{
+	EEVEE_PassList *psl = vedata->psl;
+	EEVEE_StorageList *stl = vedata->stl;
+	EEVEE_LightProbesInfo *pinfo = sldata->probes;
+	Object *ob;
+	const DRWContextState *draw_ctx = DRW_context_state_get();
+	RegionView3D *rv3d = draw_ctx->rv3d;
 
-			pinfo->grid_initialized = true;
+	if (draw_ctx->evil_C != NULL) {
+		/* Only compute probes if not navigating or in playback */
+		struct wmWindowManager *wm = CTX_wm_manager(draw_ctx->evil_C);
+		if (((rv3d->rflag & RV3D_NAVIGATING) != 0) || ED_screen_animation_no_scrub(wm) != NULL) {
+			lightprobes_refresh_planar(sldata, vedata);
+			return;
 		}
-
-		/* Reflection probes depend on diffuse lighting thus on irradiance grid,
-		 * so update them first. */
-		while (pinfo->updated_bounce < pinfo->num_bounce) {
-			pinfo->num_render_grid = pinfo->num_grid;
-
-			for (int i = 1; (ob = pinfo->probes_grid_ref[i]) && (i < MAX_GRID); i++) {
-				EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_ensure(ob);
-
-				if (!ped->need_update) {
+	}
+	/* Make sure grid is initialized. */
+	lightprobes_refresh_initialize_grid(sldata, vedata);
+	/* Reflection probes depend on diffuse lighting thus on irradiance grid,
+	 * so update them first. */
+	while (pinfo->updated_bounce < pinfo->num_bounce) {
+		pinfo->num_render_grid = pinfo->num_grid;
+		/* TODO(sergey): This logic can be split into smaller functions. */
+		for (int i = 1; (ob = pinfo->probes_grid_ref[i]) && (i < MAX_GRID); i++) {
+			EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_ensure(ob);
+			if (!ped->need_update) {
+				continue;
+			}
+			EEVEE_LightGrid *egrid = &pinfo->grid_data[i];
+			LightProbe *prb = (LightProbe *)ob->data;
+			/* Find the next cell corresponding to the current level. */
+			bool valid_cell = false;
+			int cell_id = ped->updated_cells;
+			float pos[3], grid_loc[3];
+			/* Other levels */
+			int current_stride = 1 << max_ii(0, ped->max_lvl - ped->updated_lvl);
+			int prev_stride = current_stride << 1;
+			bool do_rendering = true;
+			while (!valid_cell) {
+				cell_id = ped->updated_cells;
+				lightprobe_cell_grid_location_get(egrid, cell_id, grid_loc);
+				if (ped->updated_lvl == 0 && cell_id == 0) {
+					valid_cell = true;
+					ped->updated_cells = ped->num_cell;
 					continue;
 				}
-				EEVEE_LightGrid *egrid = &pinfo->grid_data[i];
-				LightProbe *prb = (LightProbe *)ob->data;
-
-				/* Find the next cell corresponding to the current level. */
-				bool valid_cell = false;
-				int cell_id = ped->updated_cells;
-				float pos[3], grid_loc[3];
-
-				/* Other levels */
-				int current_stride = 1 << max_ii(0, ped->max_lvl - ped->updated_lvl);
-				int prev_stride = current_stride << 1;
-
-				while (!valid_cell) {
-					cell_id = ped->updated_cells;
-					lightprobe_cell_grid_location_get(egrid, cell_id, grid_loc);
-
-					if (ped->updated_lvl == 0 && cell_id == 0) {
-						valid_cell = true;
-						ped->updated_cells = ped->num_cell;
-						continue;
-					}
-					else if (((((int)grid_loc[0] % current_stride) == 0) &&
-					          (((int)grid_loc[1] % current_stride) == 0) &&
-					          (((int)grid_loc[2] % current_stride) == 0)) &&
-					         !((((int)grid_loc[0] % prev_stride) == 0) &&
-					           (((int)grid_loc[1] % prev_stride) == 0) &&
-					           (((int)grid_loc[2] % prev_stride) == 0)))
-					{
-						valid_cell = true;
-					}
-
-					ped->updated_cells++;
-
-					if (ped->updated_cells > ped->num_cell) {
-						goto skip_rendering;
-					}
+				else if (((((int)grid_loc[0] % current_stride) == 0) &&
+				          (((int)grid_loc[1] % current_stride) == 0) &&
+				          (((int)grid_loc[2] % current_stride) == 0)) &&
+				         !((((int)grid_loc[0] % prev_stride) == 0) &&
+				           (((int)grid_loc[1] % prev_stride) == 0) &&
+				           (((int)grid_loc[2] % prev_stride) == 0)))
+				{
+					valid_cell = true;
 				}
-
+				ped->updated_cells++;
+				if (ped->updated_cells > ped->num_cell) {
+					do_rendering = false;
+					break;
+				}
+			}
+			if (do_rendering) {
 				lightprobe_cell_world_location_get(egrid, grid_loc, pos);
-
 				SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
-
 				/* Temporary Remove all probes. */
 				int tmp_num_render_grid = pinfo->num_render_grid;
 				int tmp_num_render_cube = pinfo->num_render_cube;
 				int tmp_num_planar = pinfo->num_planar;
 				pinfo->num_render_cube = 0;
 				pinfo->num_planar = 0;
-
 				/* Use light from previous bounce when capturing radiance. */
 				if (pinfo->updated_bounce == 0) {
 					pinfo->num_render_grid = 0;
 				}
-
 				render_scene_to_probe(sldata, vedata, pos, prb->clipsta, prb->clipend);
 				diffuse_filter_probe(sldata, vedata, psl, egrid->offset + cell_id);
-
 				/* To see what is going on. */
 				SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
-
 				/* Restore */
 				pinfo->num_render_grid = tmp_num_render_grid;
 				pinfo->num_render_cube = tmp_num_render_cube;
 				pinfo->num_planar = tmp_num_planar;
-
-skip_rendering:
-
-				if (ped->updated_cells >= ped->num_cell) {
-					ped->updated_lvl++;
-					ped->updated_cells = 0;
-
-					if (ped->updated_lvl > ped->max_lvl) {
-						ped->need_update = false;
-					}
-
-					egrid->level_bias = (float)(1 << max_ii(0, ped->max_lvl - ped->updated_lvl + 1));
-					DRW_uniformbuffer_update(sldata->grid_ubo, &sldata->probes->grid_data);
-				}
-#if 0
-				printf("Updated Grid %d : cell %d / %d, bounce %d / %d\n",
-				       i, ped->updated_cells, ped->num_cell, pinfo->updated_bounce + 1, pinfo->num_bounce);
-#endif
-				/* Only do one probe per frame */
-				DRW_viewport_request_redraw();
-				/* Do not let this frame accumulate. */
-				stl->effects->taa_current_sample = 1;
-
-				goto update_planar;
 			}
-
-			pinfo->updated_bounce++;
-			pinfo->num_render_grid = pinfo->num_grid;
-
-			if (pinfo->updated_bounce < pinfo->num_bounce) {
-				/* Retag all grids to update for next bounce */
-				for (int i = 1; (ob = pinfo->probes_grid_ref[i]) && (i < MAX_GRID); i++) {
-					EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_ensure(ob);
-					ped->need_update = true;
-					ped->updated_cells = 0;
-					ped->updated_lvl = 0;
+			if (ped->updated_cells >= ped->num_cell) {
+				ped->updated_lvl++;
+				ped->updated_cells = 0;
+				if (ped->updated_lvl > ped->max_lvl) {
+					ped->need_update = false;
 				}
-
-				SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
-
-				/* Reset the next buffer so we can see the progress. */
-				DRW_framebuffer_texture_detach(sldata->probe_pool);
-
-				DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->irradiance_rt, 0, 0);
-				DRW_draw_pass(psl->probe_grid_fill);
-				DRW_framebuffer_texture_detach(sldata->irradiance_rt);
-
-				DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->probe_pool, 0, 0);
-			}
-		}
-
-		for (int i = 1; (ob = pinfo->probes_cube_ref[i]) && (i < MAX_PROBE); i++) {
-			EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_ensure(ob);
-
-			if (!ped->need_update) {
-				continue;
-			}
-			LightProbe *prb = (LightProbe *)ob->data;
-
-			render_scene_to_probe(sldata, vedata, ob->obmat[3], prb->clipsta, prb->clipend);
-			glossy_filter_probe(sldata, vedata, psl, i);
-
-			ped->need_update = false;
-			ped->probe_id = i;
-
-			if (!ped->ready_to_shade) {
-				pinfo->num_render_cube++;
-				ped->ready_to_shade = true;
+				egrid->level_bias = (float)(1 << max_ii(0, ped->max_lvl - ped->updated_lvl + 1));
+				DRW_uniformbuffer_update(sldata->grid_ubo, &sldata->probes->grid_data);
 			}
 #if 0
-			printf("Update Cubemap %d\n", i);
+			printf("Updated Grid %d : cell %d / %d, bounce %d / %d\n",
+			       i, ped->updated_cells, ped->num_cell, pinfo->updated_bounce + 1, pinfo->num_bounce);
 #endif
+			/* Only do one probe per frame */
 			DRW_viewport_request_redraw();
 			/* Do not let this frame accumulate. */
 			stl->effects->taa_current_sample = 1;
-
-			/* Only do one probe per frame */
-			goto update_planar;
+			lightprobes_refresh_planar(sldata, vedata);
+			return;
 		}
-	}
-
-update_planar:
 
-	for (int i = 0; (ob = pinfo->probes_planar_ref[i]) && (i < MAX_PLANAR); i++) {
-		EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_ensure(ob);
+		pinfo->updated_bounce++;
+		pinfo->num_render_grid = pinfo->num_grid;
 
-		if (!ped->need_update) {
-			continue;
+		if (pinfo->updated_bounce < pinfo->num_bounce) {
+			/* Retag all grids to update for next bounce */
+			for (int i = 1; (ob = pinfo->probes_grid_ref[i]) && (i < MAX_GRID); i++) {
+				EEVEE_LightProbeEngineData *ped = EEVEE_lightprobe_data_ensure(ob);
+				ped->need_update = true;
+				ped->updated_cells = 0;
+				ped->updated_lvl = 0;
+			}
+			SWAP(GPUTexture *, sldata->irradiance_pool, sldata->irradiance_rt);
+			/* Reset the next buffer so we can see the progress. */
+			DRW_framebuffer_texture_detach(sldata->probe_pool);
+			DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->irradiance_rt, 0, 0);
+			DRW_draw_pass(psl->probe_grid_fill);
+			DRW_framebuffer_texture_detach(sldata->irradiance_rt);
+			DRW_framebuffer_texture_attach(sldata->probe_filter_fb, sldata->probe_pool, 0, 0);
 		}
-
-		/* Temporary Remove all planar reflections (avoid lag effect). */
-		int tmp_num_planar = pinfo->num_planar;
-		pinfo->num_planar = 0;
-
-		render_scene_to_planar(sldata, vedata, i, ped->viewmat, ped->persmat, ped->planer_eq_offset);
-
-		/* Restore */
-		pinfo->num_planar = tmp_num_planar;
-
-		ped->need_update = false;
-		ped->probe_id = i;
 	}
+	/* Refresh cube probe when needed. */
+	lightprobes_refresh_cube(sldata, vedata);
+}
 
-	/* If there is at least one planar probe */
-	if (pinfo->num_planar > 0 && (vedata->stl->effects->enabled_effects & EFFECT_SSR) != 0) {
-		const int max_lod = 9;
-		DRW_stats_group_start("Planar Probe Downsample");
-		DRW_framebuffer_recursive_downsample(vedata->fbl->downsample_fb, txl->planar_pool, max_lod, &downsample_planar, vedata);
-		/* For shading, save max level of the planar map */
-		pinfo->lod_planar_max = (float)(max_lod);
-		DRW_stats_group_end();
+void EEVEE_lightprobes_refresh(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
+{
+	/* Render world in priority */
+	if (e_data.update_world) {
+		lightprobes_refresh_world(sldata, vedata);
+	}
+	else if (true) { /* TODO if at least one probe needs refresh */
+		lightprobes_refresh_all_no_world(sldata, vedata);
 	}
 }
 
diff --git a/source/blender/draw/engines/eevee/shaders/default_frag.glsl b/source/blender/draw/engines/eevee/shaders/default_frag.glsl
index 91746a6f082..45c5c88e763 100644
--- a/source/blender/draw/engines/eevee/shaders/default_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/default_frag.glsl
@@ -13,7 +13,7 @@ Closure nodetree_exec(void)
 	vec3 out_diff, out_spec, ssr_spec;
 	eevee_closure_default(N, albedo, f0, 0, roughness, 1.0, out_diff, out_spec, ssr_spec);
 
-	Closure result = Closure(out_spec + out_diff, 1.0, vec4(ssr_spec, roughness), normal_encode(normalize(viewNormal), viewCameraVec), 0);
+	Closure result = Closure(out_spec + out_diff * albedo, 1.0, vec4(ssr_spec, roughness), normal_encode(normalize(viewNormal), viewCameraVec), 0);
 
 	return result;
 }