EEVEE-Next: Cleanup: Isolate render result readback and prototype progress

Still not working but the idea is to read the result and display the
first image sample so that user has a better feedback of the
rendering.

2 files changed, 32 insertions, 7 deletions

diff --git a/source/blender/draw/engines/eevee_next/eevee_instance.cc b/source/blender/draw/engines/eevee_next/eevee_instance.cc
index 2bd47d9cfc6..fe347eed7b1 100644
--- a/source/blender/draw/engines/eevee_next/eevee_instance.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_instance.cc
@@ -217,14 +217,8 @@ void Instance::render_sample()
   motion_blur.step();
 }
 
-void Instance::render_frame(RenderLayer *render_layer, const char *view_name)
+void Instance::render_read_result(RenderLayer *render_layer, const char *view_name)
 {
-  while (!sampling.finished()) {
-    this->render_sample();
-    /* TODO(fclem) print progression. */
-  }
-
-  /* Read Results. */
   eViewLayerEEVEEPassType pass_bits = film.enabled_passes_get();
   for (auto i : IndexRange(EEVEE_RENDER_PASS_MAX_BIT)) {
     eViewLayerEEVEEPassType pass_type = eViewLayerEEVEEPassType(pass_bits & (1 << i));
@@ -250,6 +244,36 @@ void Instance::render_frame(RenderLayer *render_layer, const char *view_name)
   }
 }
 
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Interface
+ * \{ */
+
+void Instance::render_frame(RenderLayer *render_layer, const char *view_name)
+{
+  while (!sampling.finished()) {
+    this->render_sample();
+
+    /* TODO(fclem) print progression. */
+#if 0
+    /* TODO(fclem): Does not currently work. But would be better to just display to 2D view like
+     * cycles does. */
+    if (G.background == false && first_read) {
+      /* Allow to preview the first sample. */
+      /* TODO(fclem): Might want to not do this during animation render to avoid too much stall. */
+      this->render_read_result(render_layer, view_name);
+      first_read = false;
+      DRW_render_context_disable(render->re);
+      /* Allow the 2D viewport to grab the ticket mutex to display the render. */
+      DRW_render_context_enable(render->re);
+    }
+#endif
+  }
+
+  this->render_read_result(render_layer, view_name);
+}
+
 void Instance::draw_viewport(DefaultFramebufferList *dfbl)
 {
   UNUSED_VARS(dfbl);
diff --git a/source/blender/draw/engines/eevee_next/eevee_instance.hh b/source/blender/draw/engines/eevee_next/eevee_instance.hh
index 01763fd76d9..d714111a3c6 100644
--- a/source/blender/draw/engines/eevee_next/eevee_instance.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_instance.hh
@@ -142,6 +142,7 @@ class Instance {
                                  RenderEngine *engine,
                                  Depsgraph *depsgraph);
   void render_sample();
+  void render_read_result(RenderLayer *render_layer, const char *view_name);
 
   void mesh_sync(Object *ob, ObjectHandle &ob_handle);