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

Merge pull request #47232 from zmanuel/eliminate-draw-pending-3.x 

[3.x] Remove redundant thread sync counter draw_pending
This commit is contained in:
Rémi Verschelde 2022-08-06 15:37:43 +02:00 committed by GitHub
parent 3b17447d43 9fbdace917
commit 7637b5d925
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servers/visual/visual_server_wrap_mt.cpp
View File

@ -37,13 +37,10 @@ void VisualServerWrapMT::thread_exit() {
}
void VisualServerWrapMT::thread_draw(bool p_swap_buffers, double frame_step) {
if (!draw_pending.decrement()) {
visual_server->draw(p_swap_buffers, frame_step);
}
visual_server->draw(p_swap_buffers, frame_step);
}
void VisualServerWrapMT::thread_flush() {
draw_pending.decrement();
}
void VisualServerWrapMT::_thread_callback(void *_instance) {
@ -75,7 +72,6 @@ void VisualServerWrapMT::thread_loop() {
void VisualServerWrapMT::sync() {
if (create_thread) {
draw_pending.increment();
command_queue.push_and_sync(this, &VisualServerWrapMT::thread_flush);
} else {
command_queue.flush_all(); //flush all pending from other threads
@ -84,7 +80,6 @@ void VisualServerWrapMT::sync() {
void VisualServerWrapMT::draw(bool p_swap_buffers, double frame_step) {
if (create_thread) {
draw_pending.increment();
command_queue.push(this, &VisualServerWrapMT::thread_draw, p_swap_buffers, frame_step);
} else {
visual_server->draw(p_swap_buffers, frame_step);

1
servers/visual/visual_server_wrap_mt.h
View File

@ -51,7 +51,6 @@ class VisualServerWrapMT : public VisualServer {
SafeFlag draw_thread_up;
bool create_thread;
SafeNumeric<uint64_t> draw_pending;
void thread_draw(bool p_swap_buffers, double frame_step);
void thread_flush();