Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #58196 from poiati/fix-extension-registration-order

Browse source
This commit is contained in:
Rémi Verschelde 2022-02-18 09:07:21 +01:00 • committed by GitHub
commit b4dc2e91e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/register_core_types.cpp
View file

@ -316,9 +316,11 @@ void register_core_extensions() {
native_extension_manager->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_CORE); native_extension_manager->initialize_extensions(NativeExtension::INITIALIZATION_LEVEL_CORE);
} }
void unregister_core_types() { void unregister_core_extensions() {
native_extension_manager->deinitialize_extensions(NativeExtension::INITIALIZATION_LEVEL_CORE); native_extension_manager->deinitialize_extensions(NativeExtension::INITIALIZATION_LEVEL_CORE);
}
void unregister_core_types() {
memdelete(native_extension_manager); memdelete(native_extension_manager);
memdelete(resource_uid); memdelete(resource_uid);

1
core/register_core_types.h
View file

@ -36,5 +36,6 @@ void register_core_settings();
void register_core_extensions(); void register_core_extensions();
void register_core_singletons(); void register_core_singletons();
void unregister_core_types(); void unregister_core_types();
void unregister_core_extensions();
#endif // REGISTER_CORE_TYPES_H #endif // REGISTER_CORE_TYPES_H

7
main/main.cpp
View file

@ -487,6 +487,7 @@ void Main::test_cleanup() {
} }
unregister_core_driver_types(); unregister_core_driver_types();
unregister_core_extensions();
unregister_core_types(); unregister_core_types();
OS::get_singleton()->finalize_core(); OS::get_singleton()->finalize_core();
@ -554,6 +555,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
globals = memnew(ProjectSettings); globals = memnew(ProjectSettings);
register_core_settings(); //here globals are present register_core_settings(); //here globals are present
register_core_extensions(); // core extensions must be registered after core settings and before display
translation_server = memnew(TranslationServer); translation_server = memnew(TranslationServer);
performance = memnew(Performance); performance = memnew(Performance);
@ -634,7 +636,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
continue; continue;
} }
#endif #endif
List<String>::Element *N = I->next(); List<String>::Element *N = I->next();
if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
@ -1271,8 +1272,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
Logger::set_flush_stdout_on_print(ProjectSettings::get_singleton()->get("application/run/flush_stdout_on_print")); Logger::set_flush_stdout_on_print(ProjectSettings::get_singleton()->get("application/run/flush_stdout_on_print"));
OS::get_singleton()->set_cmdline(execpath, main_args); OS::get_singleton()->set_cmdline(execpath, main_args);
register_core_extensions(); //before display
// possibly be worth changing the default from vulkan to something lower spec, // possibly be worth changing the default from vulkan to something lower spec,
// for the project manager, depending on how smooth the fallback is. // for the project manager, depending on how smooth the fallback is.
GLOBAL_DEF_RST("rendering/driver/driver_name", "vulkan"); GLOBAL_DEF_RST("rendering/driver/driver_name", "vulkan");
@ -1529,6 +1528,7 @@ error:
} }
unregister_core_driver_types(); unregister_core_driver_types();
unregister_core_extensions();
unregister_core_types(); unregister_core_types();
OS::get_singleton()->_cmdline.clear(); OS::get_singleton()->_cmdline.clear();
@ -2888,6 +2888,7 @@ void Main::cleanup(bool p_force) {
memdelete(message_queue); memdelete(message_queue);
unregister_core_driver_types(); unregister_core_driver_types();
unregister_core_extensions();
unregister_core_types(); unregister_core_types();
OS::get_singleton()->finalize_core(); OS::get_singleton()->finalize_core();