diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-04 19:08:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 19:08:43 +0200 |
| commit | 84f64ddde956f5ecba4674750442df89b75556c9 (patch) | |
| tree | 920e09993cd21dc3f809735a4669b6adaf7cd7cd /core/extension | |
| parent | 3a82b7eeef005fdc654aaccadbaa80b4520b5f13 (diff) | |
| parent | de0ca3b999819a99a5dcab99f0083a760277b95e (diff) | |
Merge pull request #60723 from reduz/refactor-module-initialization
Diffstat (limited to 'core/extension')
| -rw-r--r-- | core/extension/gdnative_interface.h | 1 | ||||
| -rw-r--r-- | core/extension/native_extension.cpp | 1 | ||||
| -rw-r--r-- | core/extension/native_extension.h | 9 |
3 files changed, 4 insertions, 7 deletions
diff --git a/core/extension/gdnative_interface.h b/core/extension/gdnative_interface.h index ad4c8917df..4d2682b253 100644 --- a/core/extension/gdnative_interface.h +++ b/core/extension/gdnative_interface.h @@ -556,7 +556,6 @@ typedef enum { GDNATIVE_INITIALIZATION_CORE, GDNATIVE_INITIALIZATION_SERVERS, GDNATIVE_INITIALIZATION_SCENE, - GDNATIVE_INITIALIZATION_DRIVER, GDNATIVE_INITIALIZATION_EDITOR, GDNATIVE_MAX_INITIALIZATION_LEVEL, } GDNativeInitializationLevel; diff --git a/core/extension/native_extension.cpp b/core/extension/native_extension.cpp index 5c02cb9190..441bdd2ac4 100644 --- a/core/extension/native_extension.cpp +++ b/core/extension/native_extension.cpp @@ -334,7 +334,6 @@ void NativeExtension::_bind_methods() { BIND_ENUM_CONSTANT(INITIALIZATION_LEVEL_CORE); BIND_ENUM_CONSTANT(INITIALIZATION_LEVEL_SERVERS); BIND_ENUM_CONSTANT(INITIALIZATION_LEVEL_SCENE); - BIND_ENUM_CONSTANT(INITIALIZATION_LEVEL_DRIVER); BIND_ENUM_CONSTANT(INITIALIZATION_LEVEL_EDITOR); } diff --git a/core/extension/native_extension.h b/core/extension/native_extension.h index 028a627b2e..af5a474e79 100644 --- a/core/extension/native_extension.h +++ b/core/extension/native_extension.h @@ -70,11 +70,10 @@ public: void close_library(); enum InitializationLevel { - INITIALIZATION_LEVEL_CORE, - INITIALIZATION_LEVEL_SERVERS, - INITIALIZATION_LEVEL_SCENE, - INITIALIZATION_LEVEL_DRIVER, - INITIALIZATION_LEVEL_EDITOR, + INITIALIZATION_LEVEL_CORE = GDNATIVE_INITIALIZATION_CORE, + INITIALIZATION_LEVEL_SERVERS = GDNATIVE_INITIALIZATION_SERVERS, + INITIALIZATION_LEVEL_SCENE = GDNATIVE_INITIALIZATION_SCENE, + INITIALIZATION_LEVEL_EDITOR = GDNATIVE_INITIALIZATION_EDITOR }; bool is_library_open() const; |