fix(cpp): simplify INIT_JNI_BINDINGS macros

utopia-rise · Aug 21, 2024 · 809c286 · 809c286
1 parent 7df1928
commit 809c286
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 35 deletions.
diff --git a/src/jvm_wrapper/bootstrap.h b/src/jvm_wrapper/bootstrap.h
@@ -4,6 +4,7 @@
 #include "jvm_wrapper/jvm_instance_wrapper.h"
 
 JVM_INSTANCE_WRAPPER(Bootstrap, "godot.runtime.Bootstrap") {
+    JVM_CLASS(Bootstrap)
 
     // clang-format off
     JNI_METHOD(INIT)

diff --git a/src/jvm_wrapper/bridge/packed_array_bridge.h b/src/jvm_wrapper/bridge/packed_array_bridge.h
@@ -12,7 +12,7 @@
 #define PACKED_ARRAY_BRIDGE_CLASS(NAME, ELEMENT_TYPE) \
     friend class PackedArrayBridge<NAME, ELEMENT_TYPE, NAME##QualifiedName>;            \
     friend class JvmSingletonWrapper<NAME, NAME##QualifiedName>;                        \
-    static inline constexpr const char* fq_name = NAME##QualifiedName;                  \
+    JVM_CLASS(NAME)                                                                     \
                                                                                         \
 public:                                                                                 \
     NAME(const NAME&) = delete;                                                         \
@@ -43,7 +43,7 @@ namespace bridges {
         ~PackedArrayBridge() = default;
 
         // clang-format off
-        INIT_JNI_BINDINGS_TEMPLATE(
+        INIT_JNI_BINDINGS(
             INIT_NATIVE_METHOD("engine_call_constructor", "()J", (PackedArrayBridge<Derived, T, fq_name>::engine_call_constructor))
             INIT_NATIVE_METHOD("engine_call_constructor_packed_array", "()J", (PackedArrayBridge<Derived, T, fq_name>::engine_call_constructor_packed_array))
             INIT_NATIVE_METHOD("engine_call_constructor_array", "()J", (PackedArrayBridge<Derived, T, fq_name>::engine_call_constructor_array))

diff --git a/src/jvm_wrapper/bridge/packed_byte_array_bridge.h b/src/jvm_wrapper/bridge/packed_byte_array_bridge.h
@@ -9,7 +9,7 @@ namespace bridges {
         PACKED_ARRAY_BRIDGE_CLASS(PackedByteArrayBridge, uint8_t)
 
         // clang-format off
-        INIT_JNI_BINDINGS_TEMPLATE(
+        INIT_JNI_BINDINGS(
             PackedArrayBridge<PackedByteArrayBridge, uint8_t, PackedByteArrayBridgeQualifiedName>::initialize_jni_binding(p_env, class_loader);
 
             INIT_NATIVE_METHOD("engine_call_compress", "(J)V", PackedByteArrayBridge::engine_call_compress)

diff --git a/src/jvm_wrapper/bridge/packed_byte_array_bridge.macos.editor.arm64-533601e1.o.tmp b/src/jvm_wrapper/bridge/packed_byte_array_bridge.macos.editor.arm64-533601e1.o.tmp
diff --git a/src/jvm_wrapper/bridge/packed_float_32_array_bridge.h b/src/jvm_wrapper/bridge/packed_float_32_array_bridge.h
@@ -8,7 +8,7 @@ namespace bridges {
         PACKED_ARRAY_BRIDGE_CLASS(PackedFloat32ArrayBridge, float)
 
         // clang-format off
-        INIT_JNI_BINDINGS_TEMPLATE(
+        INIT_JNI_BINDINGS(
             PackedArrayBridge<PackedFloat32ArrayBridge, float, PackedFloat32ArrayBridgeQualifiedName>::initialize_jni_binding(p_env, class_loader);
             INIT_NATIVE_METHOD("engine_convert_to_godot", "([F)J", PackedFloat32ArrayBridge::engine_convert_to_godot)
             INIT_NATIVE_METHOD("engine_convert_to_jvm", "(J)[F", PackedFloat32ArrayBridge::engine_convert_to_jvm)

diff --git a/src/jvm_wrapper/bridge/packed_float_32_array_bridge.macos.editor.arm64-3de58ecf.o.tmp b/src/jvm_wrapper/bridge/packed_float_32_array_bridge.macos.editor.arm64-3de58ecf.o.tmp
diff --git a/src/jvm_wrapper/bridge/packed_float_64_array_bridge.h b/src/jvm_wrapper/bridge/packed_float_64_array_bridge.h
@@ -9,7 +9,7 @@ namespace bridges {
         PACKED_ARRAY_BRIDGE_CLASS(PackedFloat64ArrayBridge, double)
 
         // clang-format off
-        INIT_JNI_BINDINGS_TEMPLATE(
+        INIT_JNI_BINDINGS(
             PackedArrayBridge<PackedFloat64ArrayBridge, double, PackedFloat64ArrayBridgeQualifiedName>::initialize_jni_binding(p_env, class_loader);
             INIT_NATIVE_METHOD("engine_convert_to_godot", "([D)J", PackedFloat64ArrayBridge::engine_convert_to_godot)
             INIT_NATIVE_METHOD("engine_convert_to_jvm", "(J)[D", PackedFloat64ArrayBridge::engine_convert_to_jvm)

diff --git a/src/jvm_wrapper/bridge/packed_float_64_array_bridge.macos.editor.arm64-ea8ce6af.o.tmp b/src/jvm_wrapper/bridge/packed_float_64_array_bridge.macos.editor.arm64-ea8ce6af.o.tmp
diff --git a/src/jvm_wrapper/bridge/packed_int_32_array_bridge.h b/src/jvm_wrapper/bridge/packed_int_32_array_bridge.h
@@ -9,7 +9,7 @@ namespace bridges {
         PACKED_ARRAY_BRIDGE_CLASS(PackedInt32ArrayBridge, int)
 
         // clang-format off
-        INIT_JNI_BINDINGS_TEMPLATE(
+        INIT_JNI_BINDINGS(
             PackedArrayBridge<PackedInt32ArrayBridge, int, PackedInt32ArrayBridgeQualifiedName>::initialize_jni_binding(p_env, class_loader);
 
             INIT_NATIVE_METHOD("engine_convert_to_godot", "([I)J", PackedInt32ArrayBridge::engine_convert_to_godot)

diff --git a/src/jvm_wrapper/bridge/packed_int_32_array_bridge.macos.editor.arm64-72d5917d.o.tmp b/src/jvm_wrapper/bridge/packed_int_32_array_bridge.macos.editor.arm64-72d5917d.o.tmp
diff --git a/src/jvm_wrapper/bridge/packed_int_64_array_bridge.h b/src/jvm_wrapper/bridge/packed_int_64_array_bridge.h
@@ -9,7 +9,7 @@ namespace bridges {
         PACKED_ARRAY_BRIDGE_CLASS(PackedInt64ArrayBridge, int64_t)
 
         // clang-format off
-        INIT_JNI_BINDINGS_TEMPLATE(
+        INIT_JNI_BINDINGS(
             PackedArrayBridge<PackedInt64ArrayBridge, int64_t, PackedInt64ArrayBridgeQualifiedName>::initialize_jni_binding(p_env, class_loader);
 
             INIT_NATIVE_METHOD("engine_convert_to_godot", "([J)J", PackedInt64ArrayBridge::engine_convert_to_godot)

diff --git a/src/jvm_wrapper/bridge/packed_int_64_array_bridge.macos.editor.arm64-cd375222.o.tmp b/src/jvm_wrapper/bridge/packed_int_64_array_bridge.macos.editor.arm64-cd375222.o.tmp
diff --git a/src/jvm_wrapper/bridge/variant_array_bridge.macos.editor.arm64-31425541.o.tmp b/src/jvm_wrapper/bridge/variant_array_bridge.macos.editor.arm64-31425541.o.tmp
diff --git a/src/jvm_wrapper/jvm_instance_wrapper.h b/src/jvm_wrapper/jvm_instance_wrapper.h
@@ -8,6 +8,10 @@
     inline constexpr char NAME##QualifiedName[] = FQNAME; \
     class NAME : public JvmInstanceWrapper<NAME, NAME##QualifiedName>
 
+#define JVM_CLASS(NAME) \
+    friend class JvmInstanceWrapper<NAME, NAME##QualifiedName>; \
+    static inline constexpr const char* fq_name = NAME##QualifiedName;
+
 #define JNI_METHOD(var_name) inline static jni::MethodId var_name {nullptr};
 
 #define INIT_JNI_METHOD(var_name, name, signature) var_name = clazz.get_method_id(p_env, name, signature);
@@ -22,9 +26,9 @@ public:
         Vector<jni::JNativeMethod> methods;                                          \
         jni::JClass clazz;                                                           \
         if (class_loader) {                                                          \
-            clazz = class_loader->load_class(p_env, get_fully_qualified_name());     \
+            clazz = class_loader->load_class(p_env, fq_name);                        \
         } else {                                                                     \
-            clazz = p_env.find_class(get_fully_qualified_name());                    \
+            clazz = p_env.find_class(fq_name);                                       \
         }                                                                            \
                                                                                      \
         __VA_ARGS__                                                                  \
@@ -34,25 +38,6 @@ public:
                                                                                      \
 private:
 
-#define INIT_JNI_BINDINGS_TEMPLATE(...)                                                       \
-                                                                                              \
-public:                                                                                       \
-    static void initialize_jni_binding(jni::Env& p_env, ClassLoader* class_loader) {          \
-        Vector<jni::JNativeMethod> methods;                                                   \
-        jni::JClass clazz;                                                                    \
-        if (class_loader) {                                                                   \
-            clazz = class_loader->load_class(p_env, fq_name);                                 \
-        } else {                                                                              \
-            clazz = p_env.find_class(fq_name);                                                \
-        }                                                                                     \
-                                                                                              \
-        __VA_ARGS__                                                                           \
-        if (methods.size() > 0) { clazz.register_natives(p_env, methods); }                   \
-        clazz.delete_local_ref(p_env);                                                        \
-    }                                                                                         \
-                                                                                              \
-private:
-
 /**
  * This class wraps a JObject representing a JVM instance.
  * This class is a base that allows to setup JavaToNative and NativeToJava call easily.
@@ -79,8 +64,6 @@ class JvmInstanceWrapper {
 
     void swap_to_weak_unsafe(jni::Env& p_env);
 
-    static constexpr const char* get_fully_qualified_name();
-
     static Derived* create_instance(jni::Env& p_env, ClassLoader* class_loader);
 };
 
@@ -137,11 +120,6 @@ void JvmInstanceWrapper<Derived, FqName>::swap_to_weak_unsafe(jni::Env& p_env) {
     is_weak = true;
 }
 
-template<class Derived, const char* FqName>
-constexpr const char* JvmInstanceWrapper<Derived, FqName>::get_fully_qualified_name() {
-    return FqName;
-}
-
 template<class Derived, const char* FqName>
 const jni::JObject& JvmInstanceWrapper<Derived, FqName>::get_wrapped() const {
     return wrapped;

diff --git a/src/jvm_wrapper/jvm_singleton_wrapper.h b/src/jvm_wrapper/jvm_singleton_wrapper.h
@@ -9,6 +9,7 @@
 
 #define SINGLETON_CLASS(NAME)                                             \
     friend class JvmSingletonWrapper<NAME, NAME##QualifiedName>;          \
+    JVM_CLASS(NAME)                                                       \
                                                                           \
 public:                                                                   \
     NAME(const NAME&) = delete;                                           \

diff --git a/src/jvm_wrapper/memory/kt_binding.h b/src/jvm_wrapper/memory/kt_binding.h
@@ -5,6 +5,7 @@
 #include "jvm_wrapper/jvm_instance_wrapper.h"
 
 JVM_INSTANCE_WRAPPER(KtBinding, "godot.core.memory.GodotBinding") {
+    JVM_CLASS(KtBinding)
 public:
     explicit KtBinding(jni::Env& p_env, jni::JObject p_wrapped);
     ~KtBinding();

diff --git a/src/jvm_wrapper/memory/kt_binding.macos.editor.arm64-a1cb275f.o.tmp b/src/jvm_wrapper/memory/kt_binding.macos.editor.arm64-a1cb275f.o.tmp
diff --git a/src/jvm_wrapper/memory/long_string_queue.macos.editor.arm64-88fb0a13.o.tmp b/src/jvm_wrapper/memory/long_string_queue.macos.editor.arm64-88fb0a13.o.tmp
diff --git a/src/jvm_wrapper/registration/kt_class.h b/src/jvm_wrapper/registration/kt_class.h
@@ -13,6 +13,7 @@
 const int MAX_CONSTRUCTOR_SIZE = MAX_CONSTRUCTOR_ARG_COUNT + 1;
 
 JVM_INSTANCE_WRAPPER(KtClass, "godot.core.KtClass") {
+    JVM_CLASS(KtClass)
 
     // clang-format off
     JNI_METHOD(GET_REGISTERED_NAME)

diff --git a/src/jvm_wrapper/registration/kt_constructor.h b/src/jvm_wrapper/registration/kt_constructor.h
@@ -5,6 +5,8 @@
 #include "kt_object.h"
 
 JVM_INSTANCE_WRAPPER(KtConstructor, "godot.core.KtConstructor") {
+    JVM_CLASS(KtConstructor)
+
     // clang-format off
     JNI_METHOD(GET_PARAMETER_COUNT)
     JNI_METHOD(CONSTRUCT)

diff --git a/src/jvm_wrapper/registration/kt_function.h b/src/jvm_wrapper/registration/kt_function.h
@@ -7,6 +7,7 @@
 #include "kt_rpc_config.h"
 
 JVM_INSTANCE_WRAPPER(KtFunctionInfo, "godot.core.KtFunctionInfo") {
+    JVM_CLASS(KtFunctionInfo)
 
     // clang-format off
     JNI_METHOD(GET_NAME)
@@ -35,6 +36,7 @@ JVM_INSTANCE_WRAPPER(KtFunctionInfo, "godot.core.KtFunctionInfo") {
 };
 
 JVM_INSTANCE_WRAPPER(KtFunction, "godot.core.KtFunction") {
+    JVM_CLASS(KtFunction)
 
     // clang-format off
     JNI_METHOD(GET_FUNCTION_INFO)

diff --git a/src/jvm_wrapper/registration/kt_object.h b/src/jvm_wrapper/registration/kt_object.h
@@ -8,6 +8,7 @@
 #include "jvm_wrapper/jvm_instance_wrapper.h"
 
 JVM_INSTANCE_WRAPPER(KtObject, "godot.core.KtObject") {
+    JVM_CLASS(KtObject)
 
     // clang-format off
     JNI_METHOD(ON_DESTROY)

diff --git a/src/jvm_wrapper/registration/kt_property.h b/src/jvm_wrapper/registration/kt_property.h
@@ -7,6 +7,7 @@
 #include "kt_object.h"
 
 JVM_INSTANCE_WRAPPER(KtPropertyInfo, "godot.core.KtPropertyInfo") {
+    JVM_CLASS(KtPropertyInfo)
 
     // clang-format off
     JNI_METHOD(GET_TYPE)
@@ -43,6 +44,7 @@ JVM_INSTANCE_WRAPPER(KtPropertyInfo, "godot.core.KtPropertyInfo") {
 };
 
 JVM_INSTANCE_WRAPPER(KtProperty, "godot.core.KtProperty") {
+    JVM_CLASS(KtProperty)
 
     // clang-format off
     JNI_METHOD(GET_KT_PROPERTY_INFO)

diff --git a/src/jvm_wrapper/registration/kt_rpc_config.h b/src/jvm_wrapper/registration/kt_rpc_config.h
@@ -7,6 +7,7 @@
 #include "scene/main/multiplayer_api.h"
 
 JVM_INSTANCE_WRAPPER(KtRpcConfig, "godot.core.KtRpcConfig") {
+    JVM_CLASS(KtRpcConfig)
 
     // clang-format off
     JNI_METHOD(GET_RPC_MODE_ID)

diff --git a/src/jvm_wrapper/registration/kt_signal_info.h b/src/jvm_wrapper/registration/kt_signal_info.h
@@ -6,6 +6,7 @@
 #include "kt_property.h"
 
 JVM_INSTANCE_WRAPPER(KtSignalInfo, "godot.core.KtSignalInfo") {
+    JVM_CLASS(KtSignalInfo)
 
     // clang-format off
     JNI_METHOD(GET_NAME)

diff --git a/src/kotlin_callable_custom.h b/src/kotlin_callable_custom.h
@@ -6,6 +6,7 @@
 #include "core/variant/callable.h"
 
 JVM_INSTANCE_WRAPPER(KtCallable, "godot.core.callable.KtCallable") {
+    JVM_CLASS(KtCallable)
     // clang-format off
 
     JNI_METHOD(INVOKE_NO_RETURN)