diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-11 00:27:21 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-11 00:27:21 +0200 |
| commit | c5ca2887716cf1c854436cb3fbea179ee4b5af9f (patch) | |
| tree | 1320fef6075185c80182dbbccb55cb194df1ceb6 /servers/rendering_server.h | |
| parent | 543f694e2c2f53b62203dab26294d3f7ab3e532c (diff) | |
| parent | bf8c85e13b04563563e0c57c9f5fb9570fab949e (diff) | |
| download | redot-engine-c5ca2887716cf1c854436cb3fbea179ee4b5af9f.tar.gz | |
Merge pull request #94121 from BastiaanOlij/remove_render_thread_guard
Remove our `ERR_ON_RENDER_THREAD` guard, it is not reliable
Diffstat (limited to 'servers/rendering_server.h')
| -rw-r--r-- | servers/rendering_server.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/servers/rendering_server.h b/servers/rendering_server.h index e15dba4353..693c822488 100644 --- a/servers/rendering_server.h +++ b/servers/rendering_server.h @@ -44,14 +44,6 @@ // Helper macros for code outside of the rendering server, but that is // called by the rendering server. #ifdef DEBUG_ENABLED -#define ERR_ON_RENDER_THREAD \ - RenderingServer *rendering_server = RenderingServer::get_singleton(); \ - ERR_FAIL_NULL(rendering_server); \ - ERR_FAIL_COND(rendering_server->is_on_render_thread()); -#define ERR_ON_RENDER_THREAD_V(m_ret) \ - RenderingServer *rendering_server = RenderingServer::get_singleton(); \ - ERR_FAIL_NULL_V(rendering_server, m_ret); \ - ERR_FAIL_COND_V(rendering_server->is_on_render_thread(), m_ret); #define ERR_NOT_ON_RENDER_THREAD \ RenderingServer *rendering_server = RenderingServer::get_singleton(); \ ERR_FAIL_NULL(rendering_server); \ @@ -61,8 +53,6 @@ ERR_FAIL_NULL_V(rendering_server, m_ret); \ ERR_FAIL_COND_V(!rendering_server->is_on_render_thread(), m_ret); #else -#define ERR_ON_RENDER_THREAD -#define ERR_ON_RENDER_THREAD_V(m_ret) #define ERR_NOT_ON_RENDER_THREAD #define ERR_NOT_ON_RENDER_THREAD_V(m_ret) #endif |