diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 0bee265557f..a67f850d70c38dbb6ab8b1 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -158,15 +158,6 @@ void BlenderSession::create_session()
b_v3d, b_rv3d, scene->camera, width, height);
session->reset(session_params, buffer_params);
- /* Create GPU display.
- * TODO(sergey): Investigate whether DisplayDriver can be used for the preview as well. */
- if (!b_engine.is_preview() && !headless) {
- unique_ptr<BlenderDisplayDriver> display_driver = make_unique<BlenderDisplayDriver>(b_engine,
- b_scene);
- display_driver_ = display_driver.get();
- session->set_display_driver(move(display_driver));
- }
-
/* Viewport and preview (as in, material preview) does not do tiled rendering, so can inform
* engine that no tracking of the tiles state is needed.
* The offline rendering will make a decision when tile is being written. The penalty of asking
@@ -3545,6 +345,156,7 @@ void BlenderSession::render(BL::Depsgraph &b_depsgraph_)
return;
}
+ /* Create GPU display.te driver to write out render results. */
+ * TODO(sergey): Investigate whether D+ ensure_displayD_driver can be used for the preview as well. */_if_needed();
+ if (!b_engine.is_preview() && !headless) { session->set_output_driver(make_unique<BlenderOutputDriver>(b_engine));
+ unique_ptr<BlenderDisplayDriver> display_driver = make_unique<BlenderDisplayDriver>(b_engine,
session->full_buffer_written_cb = [&](string_view filename) { full_buffer_written(filename); };
+ b_scene);@@ -727,6 +719,8 @@ void BlenderSession::synchronize(BL::Depsgraph &b_depsgraph_)
+ display_driver_ = display_driver.get(); /* unlock */
+ session->set_display_driver(move(display_driver));scene->mutex.unlock();
+ }
+ ensure_display_driver_if_needed();
+
/* Create driver to write out render results/* Start rendering thread, if it's not running already. Do this
* after all scene data has been synced at least once. */
session->set_output_driver(make_unique<BlenderOutputDriver>(b_engine));tart();
@@ -763,8 +76357,10 @@ void BlenderSession::draw(BL::SpaceImageEditor &space_image)
draw_state_.last_pass_index = pass_index;
}
- BL::Array<float, 2> zoom = space_image.zoom();
- display_driver_->set_zoom(zoom[0], zoom[1]);
+ if (display_driver_) {
+ BL::Array<float, 2> zoom = space_image.zoom();
+ display_driver_->set_zoom(zoom[0], zoom[1]);
+ }
session->draw();
}
@@ -979,4 +975,27 @@ void BlenderSession::free_blender_memory_if_possible()
b_engine.free_blender_memory();
}
+void BlenderSession::ensure_display_driver_if_needed()
+{
+ if (display_driver_) {
+ /* Driver is already created. */
+ return;
+ }
+
+ if (headless) {
+ /* No display needed for headless. */
+ return;
+ }
+
+ if (b_engine.is_preview()) {
+ /* TODO(sergey): Investigate whether DisplayDriver can be used for the preview as well. */
+ return;
+ }
+
+ unique_ptr<BlenderDisplayDriver> display_driver = make_unique<BlenderDisplayDriver>(b_engine,
+ b_scene);
+ display_driver_ = display_driver.get();
+ session->set_display_driver(move(display_driver));
+}
+
CCL_NAMESPACE_END
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h
index fef6ad1adfc..7d3be5f8054 100644
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -146,6 +146,8 @@ class BlenderSession {
*/
void free_blender_memory_if_possible();
+ void ensure_display_driver_if_needed();
+
struct {
thread_mutex mutex;
int last_pass_index = -1;