asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #35758 from zmanuel/eliminate-draw-pending

Browse source 
Remove redundant thread sync counter draw_pending
This commit is contained in:
Rémi Verschelde 2022-06-22 18:20:41 +02:00 committed by GitHub
commit d8ef904ffc
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/rendering/rendering_server_default.cpp
View file

@ -333,13 +333,10 @@ void RenderingServerDefault::_thread_exit() {
} }
void RenderingServerDefault::_thread_draw(bool p_swap_buffers, double frame_step) { void RenderingServerDefault::_thread_draw(bool p_swap_buffers, double frame_step) {
if (!draw_pending.decrement()) { _draw(p_swap_buffers, frame_step);
_draw(p_swap_buffers, frame_step);
}
} }
void RenderingServerDefault::_thread_flush() { void RenderingServerDefault::_thread_flush() {
draw_pending.decrement();
} }
void RenderingServerDefault::_thread_callback(void *_instance) { void RenderingServerDefault::_thread_callback(void *_instance) {
@ -370,7 +367,6 @@ void RenderingServerDefault::_thread_loop() {
void RenderingServerDefault::sync() { void RenderingServerDefault::sync() {
if (create_thread) { if (create_thread) {
draw_pending.increment();
command_queue.push_and_sync(this, &RenderingServerDefault::_thread_flush); command_queue.push_and_sync(this, &RenderingServerDefault::_thread_flush);
} else { } else {
command_queue.flush_all(); //flush all pending from other threads command_queue.flush_all(); //flush all pending from other threads
@ -379,7 +375,6 @@ void RenderingServerDefault::sync() {
void RenderingServerDefault::draw(bool p_swap_buffers, double frame_step) { void RenderingServerDefault::draw(bool p_swap_buffers, double frame_step) {
if (create_thread) { if (create_thread) {
draw_pending.increment();
command_queue.push(this, &RenderingServerDefault::_thread_draw, p_swap_buffers, frame_step); command_queue.push(this, &RenderingServerDefault::_thread_draw, p_swap_buffers, frame_step);
} else { } else {
_draw(p_swap_buffers, frame_step); _draw(p_swap_buffers, frame_step);

1
servers/rendering/rendering_server_default.h
View file

@ -84,7 +84,6 @@ class RenderingServerDefault : public RenderingServer {
SafeFlag draw_thread_up; SafeFlag draw_thread_up;
bool create_thread; bool create_thread;
SafeNumeric<uint64_t> draw_pending;
void _thread_draw(bool p_swap_buffers, double frame_step); void _thread_draw(bool p_swap_buffers, double frame_step);
void _thread_flush(); void _thread_flush();