From e5454cd6603ca01bdf47f69cafbb1ef755525a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Mon, 15 Jan 2024 19:34:06 +0100 Subject: [PATCH] Run resource previewer on the main thread if using GL compatibility --- editor/editor_resource_preview.cpp | 48 ++++++++++++++++++++++-------- editor/editor_resource_preview.h | 3 +- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index f21f0ac21621..8a85bbde39d9 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -41,6 +41,7 @@ #include "editor/editor_settings.h" #include "editor/editor_string_names.h" #include "scene/resources/image_texture.h" +#include "servers/rendering/rendering_server_default.h" bool EditorResourcePreviewGenerator::handles(const String &p_type) const { bool success = false; @@ -338,6 +339,20 @@ void EditorResourcePreview::_thread() { exited.set(); } +void EditorResourcePreview::_idle_callback() { + if (!singleton) { + // Just in case the shutdown of the editor involves the deletion of the singleton + // happening while additional idle callbacks can happen. + return; + } + + // Process preview tasks, trying to leave a little bit of responsiveness worst case. + uint64_t start = OS::get_singleton()->get_ticks_msec(); + while (!singleton->queue.is_empty() && OS::get_singleton()->get_ticks_msec() - start < 100) { + singleton->_iterate(); + } +} + void EditorResourcePreview::_update_thumbnail_sizes() { if (small_thumbnail_size == -1) { // Kind of a workaround to retrieve the default icon size. @@ -441,27 +456,36 @@ void EditorResourcePreview::check_for_invalidation(const String &p_path) { } void EditorResourcePreview::start() { - if (DisplayServer::get_singleton()->get_name() != "headless") { + if (DisplayServer::get_singleton()->get_name() == "headless") { + return; + } + + if (RSG::texture_storage->can_create_resources_async()) { ERR_FAIL_COND_MSG(thread.is_started(), "Thread already started."); thread.start(_thread_func, this); + } else { + SceneTree *st = Object::cast_to(OS::get_singleton()->get_main_loop()); + ERR_FAIL_NULL_MSG(st, "Editor's MainLoop is not a SceneTree. This is a bug."); } } void EditorResourcePreview::stop() { - if (thread.is_started()) { - exiting.set(); - preview_sem.post(); + if (RSG::texture_storage->can_create_resources_async()) { + if (thread.is_started()) { + exiting.set(); + preview_sem.post(); - for (int i = 0; i < preview_generators.size(); i++) { - preview_generators.write[i]->abort(); - } + for (int i = 0; i < preview_generators.size(); i++) { + preview_generators.write[i]->abort(); + } - while (!exited.is_set()) { - OS::get_singleton()->delay_usec(10000); - RenderingServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on rendering server - } + while (!exited.is_set()) { + OS::get_singleton()->delay_usec(10000); + RenderingServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on rendering server + } - thread.wait_to_finish(); + thread.wait_to_finish(); + } } } diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index 324245ba2385..bc99372bc23a 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -103,7 +103,8 @@ class EditorResourcePreview : public Node { int small_thumbnail_size = -1; static void _thread_func(void *ud); - void _thread(); + void _thread(); // For rendering drivers supporting async texture creation. + static void _idle_callback(); // For other rendering drivers (i.e., OpenGL). void _iterate(); void _write_preview_cache(Ref p_file, int p_thumbnail_size, bool p_has_small_texture, uint64_t p_modified_time, String p_hash, const Dictionary &p_metadata);