source/blender/draw/engines/eevee_next/eevee_instance.cc

@@ -452,11 +452,12 @@ void Instance::update_passes(RenderEngine *engine, Scene *scene, ViewLayer *view
                               EEVEE_RENDER_PASS_CRYPTOMATTE_MATERIAL);
 }
 
-void Instance::light_bake_irradiance(Object &probe,
+void Instance::light_bake_irradiance(
-                                     std::function<void()> context_enable,
+    Object &probe,
-                                     std::function<void()> context_disable,
+    std::function<void()> context_enable,
-                                     std::function<bool()> stop,
+    std::function<void()> context_disable,
-                                     std::function<void(LightProbeGridCacheFrame *)> result_update)
+    std::function<bool()> stop,
+    std::function<void(LightProbeGridCacheFrame *, float progress)> result_update)
 {
   BLI_assert(is_baking());
 
@@ -508,7 +509,10 @@ void Instance::light_bake_irradiance(Object &probe,
         else {
           cache_frame = irradiance_cache.bake.read_result_packed();
         }
-        result_update(cache_frame);
+
+        float bounce_progress = sampling.sample_index() / float(sampling.sample_count());
+        float progress = (bounce - 1 + bounce_progress) / float(bounce_len);
+        result_update(cache_frame, progress);
       });
 
       if (stop()) {

source/blender/draw/engines/eevee_next/eevee_instance.hh

@@ -146,11 +146,12 @@ class Instance {
   /* Light bake. */
 
   void init_light_bake(Depsgraph *depsgraph, draw::Manager *manager);
-  void light_bake_irradiance(Object &probe,
+  void light_bake_irradiance(
-                             std::function<void()> context_enable,
+      Object &probe,
-                             std::function<void()> context_disable,
+      std::function<void()> context_enable,
-                             std::function<bool()> stop,
+      std::function<void()> context_disable,
-                             std::function<void(LightProbeGridCacheFrame *)> result_update);
+      std::function<bool()> stop,
+      std::function<void(LightProbeGridCacheFrame *, float progress)> result_update);
 
   static void update_passes(RenderEngine *engine, Scene *scene, ViewLayer *view_layer);
 

source/blender/draw/engines/eevee_next/eevee_lightcache.cc

@@ -156,7 +156,7 @@ class LightBake {
           [this]() { context_enable(); },
           [this]() { context_disable(); },
           [&]() { return (G.is_break == true) || ((stop != nullptr) ? *stop : false); },
-          [&](LightProbeGridCacheFrame *cache_frame) {
+          [&](LightProbeGridCacheFrame *cache_frame, float grid_progress) {
             {
               std::scoped_lock lock(result_mutex_);
               /* Delete any existing cache that wasn't transferred to the original object. */
@@ -171,7 +171,7 @@ class LightBake {
             }
 
             if (progress) {
-              /* TODO: Update progress. */
+              *progress = (i + grid_progress) / original_probes_.size();
             }
           });
 

source/blender/draw/engines/eevee_next/eevee_sampling.hh

@@ -129,11 +129,18 @@ class Sampling {
     return interactive_mode_;
   }
 
+  /* Target sample count. */
   uint64_t sample_count() const
   {
     return sample_count_;
   }
 
+  /* 0 based current sample. Might not increase sequentially in viewport. */
+  uint64_t sample_index() const
+  {
+    return sample_;
+  }
+
   /* Return true if we are starting a new motion blur step. We need to run sync again since
    * depsgraph was updated by MotionBlur::step(). */
   bool do_render_sync() const