[Bf-blender-cvs] [0de33fb8831] temp-eeveelightcache: Eevee: LightCache: Make render work with no lightcache

[Clément Foucault]

Commit: 0de33fb8831fd5c9de681618f93779eafde75bf6
Author: Clément Foucault
Date:   Tue Jun 26 12:36:54 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rB0de33fb8831fd5c9de681618f93779eafde75bf6

Eevee: LightCache: Make render work with no lightcache

This will only show the same thing as the viewport. It will not compute the
actual cache on the fly.

===================================================================

M	source/blender/draw/engines/eevee/eevee_lightprobes.c
M	source/blender/draw/engines/eevee/eevee_private.h
M	source/blender/draw/engines/eevee/eevee_render.c

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 638a9709a58..c31f3e8f0fd 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -783,11 +783,6 @@ static void eevee_lightprobes_extract_from_cache(EEVEE_LightProbesInfo *pinfo, E
 	memcpy(pinfo->grid_data, lcache->grid_data, sizeof(EEVEE_LightGrid) * max_ii(1, min_ii(lcache->grid_count, MAX_GRID)));
 }
 
-bool EEVEE_lightprobes_all_probes_ready(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
-{
-	return true;
-}
-
 void EEVEE_lightprobes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 {
 	EEVEE_StorageList *stl = vedata->stl;
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 0b760932418..9fa2198a0c3 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -891,7 +891,6 @@ void EEVEE_lights_free(void);
 
 /* eevee_lightprobes.c */
 bool EEVEE_lightprobes_obj_visibility_cb(bool vis_in, void *user_data);
-bool EEVEE_lightprobes_all_probes_ready(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
 void EEVEE_lightprobes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
 void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
 void EEVEE_lightprobes_cache_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, Object *ob);
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c
index b485bb9d737..bc1bd97bdde 100644
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@ -491,14 +491,8 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl
 		DRW_viewport_matrix_override_set(g_data->viewinv, DRW_MAT_VIEWINV);
 
 		/* Refresh Probes */
-		while (EEVEE_lightprobes_all_probes_ready(sldata, vedata) == false) {
-			RE_engine_update_stats(engine, NULL, "Updating Probes");
-			EEVEE_lightprobes_refresh(sldata, vedata);
-			/* Refreshing probes can take some times, allow exit. */
-			if (RE_engine_test_break(engine)) {
-				return;
-			}
-		}
+		RE_engine_update_stats(engine, NULL, "Updating Probes");
+		EEVEE_lightprobes_refresh(sldata, vedata);
 		EEVEE_lightprobes_refresh_planar(sldata, vedata);
 		DRW_uniformbuffer_update(sldata->common_ubo, &sldata->common_data);