diff options
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics_2d/godot_body_2d.cpp | 5 | ||||
| -rw-r--r-- | servers/physics_3d/godot_body_3d.cpp | 5 | ||||
| -rw-r--r-- | servers/rendering/renderer_canvas_cull.cpp | 8 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/storage_rd/utilities.cpp | 8 | ||||
| -rw-r--r-- | servers/rendering/rendering_server_default.cpp | 4 |
5 files changed, 7 insertions, 23 deletions
diff --git a/servers/physics_2d/godot_body_2d.cpp b/servers/physics_2d/godot_body_2d.cpp index 1bcb1ba310..4a7b470768 100644 --- a/servers/physics_2d/godot_body_2d.cpp +++ b/servers/physics_2d/godot_body_2d.cpp @@ -693,10 +693,7 @@ void GodotBody2D::call_queries() { } if (body_state_callback.get_object()) { - const Variant *vp[1] = { &direct_state_variant }; - Callable::CallError ce; - Variant rv; - body_state_callback.callp(vp, 1, rv, ce); + body_state_callback.call(direct_state_variant); } } diff --git a/servers/physics_3d/godot_body_3d.cpp b/servers/physics_3d/godot_body_3d.cpp index 260cb84ccd..21d5e49828 100644 --- a/servers/physics_3d/godot_body_3d.cpp +++ b/servers/physics_3d/godot_body_3d.cpp @@ -772,10 +772,7 @@ void GodotBody3D::call_queries() { } if (body_state_callback.get_object()) { - const Variant *vp[1] = { &direct_state_variant }; - Callable::CallError ce; - Variant rv; - body_state_callback.callp(vp, 1, rv, ce); + body_state_callback.call(direct_state_variant); } } diff --git a/servers/rendering/renderer_canvas_cull.cpp b/servers/rendering/renderer_canvas_cull.cpp index 7c533f207c..d6040e8820 100644 --- a/servers/rendering/renderer_canvas_cull.cpp +++ b/servers/rendering/renderer_canvas_cull.cpp @@ -2005,9 +2005,7 @@ void RendererCanvasCull::update_visibility_notifiers() { if (RSG::threaded) { visibility_notifier->enter_callable.call_deferred(); } else { - Callable::CallError ce; - Variant ret; - visibility_notifier->enter_callable.callp(nullptr, 0, ret, ce); + visibility_notifier->enter_callable.call(); } } } else { @@ -2018,9 +2016,7 @@ void RendererCanvasCull::update_visibility_notifiers() { if (RSG::threaded) { visibility_notifier->exit_callable.call_deferred(); } else { - Callable::CallError ce; - Variant ret; - visibility_notifier->exit_callable.callp(nullptr, 0, ret, ce); + visibility_notifier->exit_callable.call(); } } } diff --git a/servers/rendering/renderer_rd/storage_rd/utilities.cpp b/servers/rendering/renderer_rd/storage_rd/utilities.cpp index 8df14d04db..cb035c494c 100644 --- a/servers/rendering/renderer_rd/storage_rd/utilities.cpp +++ b/servers/rendering/renderer_rd/storage_rd/utilities.cpp @@ -202,9 +202,7 @@ void Utilities::visibility_notifier_call(RID p_notifier, bool p_enter, bool p_de if (p_deferred) { vn->enter_callback.call_deferred(); } else { - Variant r; - Callable::CallError ce; - vn->enter_callback.callp(nullptr, 0, r, ce); + vn->enter_callback.call(); } } } else { @@ -212,9 +210,7 @@ void Utilities::visibility_notifier_call(RID p_notifier, bool p_enter, bool p_de if (p_deferred) { vn->exit_callback.call_deferred(); } else { - Variant r; - Callable::CallError ce; - vn->exit_callback.callp(nullptr, 0, r, ce); + vn->exit_callback.call(); } } } diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp index 2c8265b7d7..65a6da8ac3 100644 --- a/servers/rendering/rendering_server_default.cpp +++ b/servers/rendering/rendering_server_default.cpp @@ -387,9 +387,7 @@ void RenderingServerDefault::draw(bool p_swap_buffers, double frame_step) { } void RenderingServerDefault::_call_on_render_thread(const Callable &p_callable) { - Variant ret; - Callable::CallError ce; - p_callable.callp(nullptr, 0, ret, ce); + p_callable.call(); } RenderingServerDefault::RenderingServerDefault(bool p_create_thread) : |