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

[GDNative] explicit calling convention

Browse source
This commit is contained in:
Karroffel 2017-04-19 13:39:57 +02:00
parent 8ee991a2a7
commit d4f4f14c68
2 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/gdnative/gdnative.cpp
View file

@ -424,7 +424,6 @@ Variant GDNativeScript::_new(const Variant **p_args, int p_argcount, Variant::Ca
// @Todo support varargs for constructors. // @Todo support varargs for constructors.
GDNativeInstance *instance = (GDNativeInstance *)instance_create(owner); GDNativeInstance *instance = (GDNativeInstance *)instance_create(owner);
owner->set_script(Ref<GDNativeScript>(this).get_ref_ptr());
owner->set_script_instance(instance); owner->set_script_instance(instance);
if (!instance) { if (!instance) {
if (ref.is_null()) { if (ref.is_null()) {

45
modules/gdnative/godot.h
View file

@ -38,12 +38,26 @@ extern "C" {
#define GDAPI_EXPORT #define GDAPI_EXPORT
#endif #endif
#if !defined(_WIN32) && !defined(_MSC_VER) #ifdef _WIN32
#define GDAPI #if defined(GDAPI_EXPORT)
#elif defined(GDAPI_EXPORT) #define GDCALLINGCONV __cdecl
#define GDAPI __declspec(dllexport) #define GDAPI __declspec(dllexport) GDCALLINGCONV
#else #else
#define GDAPI __declspec(dllimport) #define GDCALLINGCONV __cdecl
#define GDAPI __declspec(dllimport) GDCALLINGCONV
#endif
#elif defined(__APPLE__)
#include "TargetConditionals.h"
#if TARGET_OS_IPHONE
#define GDCALLINGCONV
#define GDAPI
#elif TARGET_OS_MAC
#define GDCALLINGCONV __attribute__((sysv_abi))
#define GDAPI GDCALLINGCONV
#endif
#else
#define GDCALLINGCONV __attribute__((sysv_abi))
#define GDAPI GDCALLINGCONV
#endif #endif
#include <stdbool.h> #include <stdbool.h>
@ -314,16 +328,16 @@ typedef struct godot_property_attributes {
typedef struct godot_instance_create_func { typedef struct godot_instance_create_func {
// instance pointer, method_data - return user data // instance pointer, method_data - return user data
void *(*create_func)(godot_object *, void *); GDCALLINGCONV void *(*create_func)(godot_object *, void *);
void *method_data; void *method_data;
void (*free_func)(void *); GDCALLINGCONV void (*free_func)(void *);
} godot_instance_create_func; } godot_instance_create_func;
typedef struct godot_instance_destroy_func { typedef struct godot_instance_destroy_func {
// instance pointer, method data, user data // instance pointer, method data, user data
void (*destroy_func)(godot_object *, void *, void *); GDCALLINGCONV void (*destroy_func)(godot_object *, void *, void *);
void *method_data; void *method_data;
void (*free_func)(void *); GDCALLINGCONV void (*free_func)(void *);
} godot_instance_destroy_func; } godot_instance_destroy_func;
void GDAPI godot_script_register_class(const char *p_name, const char *p_base, godot_instance_create_func p_create_func, godot_instance_destroy_func p_destroy_func); void GDAPI godot_script_register_class(const char *p_name, const char *p_base, godot_instance_create_func p_create_func, godot_instance_destroy_func p_destroy_func);
@ -332,25 +346,25 @@ void GDAPI godot_script_register_tool_class(const char *p_name, const char *p_ba
typedef struct godot_instance_method { typedef struct godot_instance_method {
// instance pointer, method data, user data, num args, args - return result as varaint // instance pointer, method data, user data, num args, args - return result as varaint
godot_variant (*method)(godot_object *, void *, void *, int, godot_variant **); GDCALLINGCONV godot_variant (*method)(godot_object *, void *, void *, int, godot_variant **);
void *method_data; void *method_data;
void (*free_func)(void *); GDCALLINGCONV void (*free_func)(void *);
} godot_instance_method; } godot_instance_method;
void GDAPI godot_script_register_method(const char *p_name, const char *p_function_name, godot_method_attributes p_attr, godot_instance_method p_method); void GDAPI godot_script_register_method(const char *p_name, const char *p_function_name, godot_method_attributes p_attr, godot_instance_method p_method);
typedef struct godot_property_set_func { typedef struct godot_property_set_func {
// instance pointer, method data, user data, value // instance pointer, method data, user data, value
void (*set_func)(godot_object *, void *, void *, godot_variant); GDCALLINGCONV void (*set_func)(godot_object *, void *, void *, godot_variant);
void *method_data; void *method_data;
void (*free_func)(void *); GDCALLINGCONV void (*free_func)(void *);
} godot_property_set_func; } godot_property_set_func;
typedef struct godot_property_get_func { typedef struct godot_property_get_func {
// instance pointer, method data, user data, value // instance pointer, method data, user data, value
godot_variant (*get_func)(godot_object *, void *, void *); GDCALLINGCONV godot_variant (*get_func)(godot_object *, void *, void *);
void *method_data; void *method_data;
void (*free_func)(void *); GDCALLINGCONV void (*free_func)(void *);
} godot_property_get_func; } godot_property_get_func;
void GDAPI godot_script_register_property(const char *p_name, const char *p_path, godot_property_attributes *p_attr, godot_property_set_func p_set_func, godot_property_get_func p_get_func); void GDAPI godot_script_register_property(const char *p_name, const char *p_path, godot_property_attributes *p_attr, godot_property_set_func p_set_func, godot_property_get_func p_get_func);
@ -376,6 +390,7 @@ void GDAPI godot_script_register_signal(const char *p_name, const godot_signal *
void GDAPI *godot_native_get_userdata(godot_object *p_instance); void GDAPI *godot_native_get_userdata(godot_object *p_instance);
// Calling convention?
typedef godot_object *(*godot_class_constructor)(); typedef godot_object *(*godot_class_constructor)();
godot_class_constructor GDAPI godot_get_class_constructor(const char *p_classname); godot_class_constructor GDAPI godot_get_class_constructor(const char *p_classname);