Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to emscripten 3.1.15 and remove workaround.

Browse Source 
Starting with 3.1.14, embind started to support for `noexcept`
which caused multiple definition errors since we have a workaround
in place that alreadys supplies template instantiations for `noexcept`.

This change should not affect G3 since our JS bindings are not used
in G3.

The upstream fix is here:
https://github.com/emscripten-core/emscripten/pull/17140

Fixes #5789.
This commit is contained in:
Philip Rideout
2022-07-15 12:00:45 -07:00
parent ec74cc2d39
commit 4afd0c5456
4 changed files with 4 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILDING.md
View File

@@ -352,7 +352,7 @@ same version that our continuous builds use.
```
cd <your chosen parent folder for the emscripten SDK>
curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.9.zip > emsdk.zip
curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.15.zip > emsdk.zip
unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
python ./emsdk.py install latest
python ./emsdk.py activate latest

2
RELEASE_NOTES.md
View File

@@ -5,6 +5,8 @@ A new header is inserted each time a *tag* is created.
## main branch
- WebGL: upgraded the JS bindings to work with emsdk 3.1.15
## v1.25.4
- backend: streamline texture upload APIs [⚠️ **API Change**]

2
build/web/ci-common.sh
View File

@@ -17,7 +17,7 @@ export PATH="$PWD:$PATH"
# npm install -g typescript
# Install emscripten.
curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.9.zip > emsdk.zip
curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.15.zip > emsdk.zip
unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
./emsdk install latest
./emsdk activate latest

47
web/filament-js/jsbindings.cpp
View File

@@ -145,53 +145,6 @@ namespace emscripten {
BIND(utils::EntityManager)
BIND(VertexBuffer)
BIND(View)
// embind is missing a template definition for "noexcept" methods, so
// we're supplying it ourselves while waiting for the upstream fix.
template<typename ClassType, typename ReturnType, typename... Args>
struct RegisterClassMethod<ReturnType (ClassType::*)(Args...) noexcept> {
template <typename CT, typename... Policies>
static void invoke(const char* methodName,
ReturnType (ClassType::*memberFunction)(Args...) noexcept) {
auto invoker = &MethodInvoker<decltype(memberFunction), ReturnType, ClassType*, Args...>::invoke;
typename WithPolicies<Policies...>::template ArgTypeList<ReturnType, AllowedRawPointer<ClassType>, Args...> args;
_embind_register_class_function(
TypeID<ClassType>::get(),
methodName,
args.getCount(),
args.getTypes(),
getSignature(invoker),
reinterpret_cast<GenericFunction>(invoker),
getContext(memberFunction),
isPureVirtual<Policies...>::value);
}
};
// embind is missing a template definition for "const noexcept" methods, so
// we're supplying it ourselves while waiting for the upstream fix.
template<typename ClassType, typename ReturnType, typename... Args>
struct RegisterClassMethod<ReturnType (ClassType::*)(Args...) const noexcept> {
template <typename CT, typename... Policies>
static void invoke(const char* methodName,
ReturnType (ClassType::*memberFunction)(Args...) const noexcept) {
auto invoker = &MethodInvoker<decltype(memberFunction), ReturnType, const ClassType*, Args...>::invoke;
typename WithPolicies<Policies...>::template ArgTypeList<ReturnType, AllowedRawPointer<const ClassType>, Args...> args;
_embind_register_class_function(
TypeID<ClassType>::get(),
methodName,
args.getCount(),
args.getTypes(),
getSignature(invoker),
reinterpret_cast<GenericFunction>(invoker),
getContext(memberFunction),
isPureVirtual<Policies...>::value);
}
};
}
}
#undef BIND