[3.2] Mono: Make Godot provide its own WASM m2n trampolines #44373
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`-rdynamic` was causing the emsdk linker to silently fail to generate the output `.wasm` file (even though exit code was 0).
This depends on a custom Mono patch from this commit: godotengine/godot-mono-builds@0e31293
|
This PR against the 3.2 branch is tested and ready to be merged. Only pending review. |
akien-mga
reviewed
Dec 15, 2020
| @@ -95,7 +95,7 @@ | |||
| #define C_METHOD_MONOARRAY_TO(m_type) C_NS_MONOMARSHAL "::mono_array_to_" #m_type | |||
| #define C_METHOD_MONOARRAY_FROM(m_type) C_NS_MONOMARSHAL "::" #m_type "_to_mono_array" | |||
|
|
|||
| #define BINDINGS_GENERATOR_VERSION UINT32_C(11) | |||
| #define BINDINGS_GENERATOR_VERSION UINT32_C(13) | |||
There was a problem hiding this comment.
Is the bump from 11 to 13 expected?
There was a problem hiding this comment.
This was back-ported from master so probably version 12 was some other change that wasn't back-ported. It doesn't matter too much as this is used together with the API hash.
akien-mga
reviewed
Dec 15, 2020
| @@ -151,6 +154,21 @@ struct ScopeThreadAttach { | |||
| MonoThread *mono_thread; | |||
| }; | |||
|
|
|||
| template <typename... P> | |||
There was a problem hiding this comment.
Is this C++11/14 compatible in the end or does this form of parameter pack require C++17? https://en.cppreference.com/w/cpp/language/parameter_pack
There was a problem hiding this comment.
I think it's C++11. I only had to look for an alternative for the if constexprs when backporting this.
akien-mga
approved these changes
Dec 17, 2020
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Back-port of #44105 to the 3.2 branch.
This depends on a custom Mono patch from this commit: godotengine/godot-mono-builds@0e31293
Also fixes #36858