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

Merge pull request #48646 from akien-mga/gdnative-signal-callable-32bit 

GDNative: Fix size mismatch on 32-bit platforms for Signal and Callable
This commit is contained in:
Rémi Verschelde 2021-05-11 21:51:35 +02:00 committed by GitHub
parent 048abb50aa ed11756d26
commit 0f334e60f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/variant/callable.h
View File

@ -44,9 +44,9 @@ class CallableCustom;
// is required. It is designed for the standard case (object and method)
// but can be optimized or customized.
// Enforce 16 bytes with `alignas` to avoid arch-specific alignment issues on x86 vs armv7.
class Callable {
//needs to be max 16 bytes in 64 bits
StringName method;
alignas(8) StringName method;
union {
uint64_t object = 0;
CallableCustom *custom;
@ -138,8 +138,9 @@ public:
// be put inside a Variant, but it is not
// used by the engine itself.
// Enforce 16 bytes with `alignas` to avoid arch-specific alignment issues on x86 vs armv7.
class Signal {
StringName name;
alignas(8) StringName name;
ObjectID object;
public:

1
modules/gdnative/include/gdnative/callable.h
View File

@ -37,6 +37,7 @@ extern "C" {
#include <stdint.h>
// Alignment hardcoded in `core/variant/callable.h`.
#define GODOT_CALLABLE_SIZE (16)
#ifndef GODOT_CORE_API_GODOT_CALLABLE_TYPE_DEFINED

1
modules/gdnative/include/gdnative/signal.h
View File

@ -37,6 +37,7 @@ extern "C" {
#include <stdint.h>
// Alignment hardcoded in `core/variant/callable.h`.
#define GODOT_SIGNAL_SIZE (16)
#ifndef GODOT_CORE_API_GODOT_SIGNAL_TYPE_DEFINED