godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72827 from RandomShaper/fix_slow_step

Browse Source 
Pace debugger draw requests
This commit is contained in:
Rémi Verschelde 2023-02-07 14:08:15 +01:00
commit 1cd66a76fc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/debugger/script_editor_debugger.cpp
View File

@ -308,6 +308,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
String error = p_data[1]; String error = p_data[1];
bool has_stackdump = p_data[2]; bool has_stackdump = p_data[2];
breaked = true; breaked = true;
can_request_idle_draw = true;
can_debug = can_continue; can_debug = can_continue;
_update_buttons_state(); _update_buttons_state();
_set_reason_text(error, MESSAGE_ERROR); _set_reason_text(error, MESSAGE_ERROR);
@ -378,6 +379,8 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
vmem_total->set_tooltip_text(TTR("Bytes:") + " " + itos(total)); vmem_total->set_tooltip_text(TTR("Bytes:") + " " + itos(total));
vmem_total->set_text(String::humanize_size(total)); vmem_total->set_text(String::humanize_size(total));
} else if (p_msg == "servers:drawn") {
can_request_idle_draw = true;
} else if (p_msg == "stack_dump") { } else if (p_msg == "stack_dump") {
DebuggerMarshalls::ScriptStackDump stack; DebuggerMarshalls::ScriptStackDump stack;
stack.deserialize(p_data); stack.deserialize(p_data);
@ -843,8 +846,9 @@ void ScriptEditorDebugger::_notification(int p_what) {
msg.push_back(cam->get_far()); msg.push_back(cam->get_far());
_put_msg("scene:override_camera_3D:transform", msg); _put_msg("scene:override_camera_3D:transform", msg);
} }
if (breaked) { if (breaked && can_request_idle_draw) {
_put_msg("servers:draw", Array()); _put_msg("servers:draw", Array());
can_request_idle_draw = false;
} }
} }

1
editor/debugger/script_editor_debugger.h
View File

@ -155,6 +155,7 @@ private:
bool breaked = false; bool breaked = false;
bool can_debug = false; bool can_debug = false;
bool move_to_foreground = true; bool move_to_foreground = true;
bool can_request_idle_draw = false;
bool live_debug; bool live_debug;

1
servers/debugger/servers_debugger.cpp
View File

@ -409,6 +409,7 @@ Error ServersDebugger::_capture(void *p_user, const String &p_cmd, const Array &
if (RenderingServer::get_singleton()->has_changed()) { if (RenderingServer::get_singleton()->has_changed()) {
RenderingServer::get_singleton()->draw(true, delta); RenderingServer::get_singleton()->draw(true, delta);
} }
EngineDebugger::get_singleton()->send_message("servers:drawn", Array());
} else if (p_cmd == "foreground") { } else if (p_cmd == "foreground") {
singleton->last_draw_time = 0.0; singleton->last_draw_time = 0.0;
DisplayServer::get_singleton()->window_move_to_foreground(); DisplayServer::get_singleton()->window_move_to_foreground();