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

Merge pull request #71636 from RandomShaper/revert_unneeded_bound_mq

Browse source 
Revert "Make MessageQueue::push_callable(p) work with bound arguments"
This commit is contained in:
Rémi Verschelde 2023-01-18 21:09:47 +01:00 committed by GitHub
commit 6ca1bf9589
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/object/message_queue.cpp
View file

@ -114,11 +114,7 @@ Error MessageQueue::push_set(Object *p_object, const StringName &p_prop, const V
Error MessageQueue::push_callablep(const Callable &p_callable, const Variant **p_args, int p_argcount, bool p_show_error) { Error MessageQueue::push_callablep(const Callable &p_callable, const Variant **p_args, int p_argcount, bool p_show_error) {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
Vector<Variant> bound_arguments; int room_needed = sizeof(Message) + sizeof(Variant) * p_argcount;
int bound_argcount = 0;
p_callable.get_bound_arguments_ref(bound_arguments, bound_argcount);
int room_needed = sizeof(Message) + sizeof(Variant) * (bound_argcount + p_argcount);
if ((buffer_end + room_needed) >= buffer_size) { if ((buffer_end + room_needed) >= buffer_size) {
print_line("Failed method: " + p_callable); print_line("Failed method: " + p_callable);
@ -127,7 +123,7 @@ Error MessageQueue::push_callablep(const Callable &p_callable, const Variant **p
} }
Message *msg = memnew_placement(&buffer[buffer_end], Message); Message *msg = memnew_placement(&buffer[buffer_end], Message);
msg->args = bound_argcount + p_argcount; msg->args = p_argcount;
msg->callable = p_callable; msg->callable = p_callable;
msg->type = TYPE_CALL; msg->type = TYPE_CALL;
if (p_show_error) { if (p_show_error) {
@ -136,11 +132,6 @@ Error MessageQueue::push_callablep(const Callable &p_callable, const Variant **p
buffer_end += sizeof(Message); buffer_end += sizeof(Message);
for (int i = 0; i < bound_argcount; i++) {
Variant *v = memnew_placement(&buffer[buffer_end], Variant);
buffer_end += sizeof(Variant);
*v = bound_arguments[i];
}
for (int i = 0; i < p_argcount; i++) { for (int i = 0; i < p_argcount; i++) {
Variant *v = memnew_placement(&buffer[buffer_end], Variant); Variant *v = memnew_placement(&buffer[buffer_end], Variant);
buffer_end += sizeof(Variant); buffer_end += sizeof(Variant);