Skip to content

De-duplicate code in wasm module loading #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kajacx wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −46
Open

De-duplicate code in wasm module loading #587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 27 additions & 46 deletions js/gl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,53 +1529,34 @@ function load(wasm_path) {

register_plugins(plugins);

var module_promise;
if (typeof WebAssembly.compileStreaming === 'function') {
WebAssembly.compileStreaming(req)
.then(obj => {
add_missing_functions_stabs(obj);
return WebAssembly.instantiate(obj, importObject);
})
.then(
obj => {
wasm_memory = obj.exports.memory;
wasm_exports = obj.exports;

var crate_version = wasm_exports.crate_version();
if (version != crate_version) {
console.error(
"Version mismatch: gl.js version is: " + version +
", miniquad crate version is: " + crate_version);
}
init_plugins(plugins);
obj.exports.main();
})
.catch(err => {
console.error(err);
})
module_promise = WebAssembly.compileStreaming(req);
} else {
req
.then(function (x) { return x.arrayBuffer(); })
.then(function (bytes) { return WebAssembly.compile(bytes); })
.then(function (obj) {
add_missing_functions_stabs(obj);
return WebAssembly.instantiate(obj, importObject);
})
.then(function (obj) {
wasm_memory = obj.exports.memory;
wasm_exports = obj.exports;

var crate_version = wasm_exports.crate_version();
if (version != crate_version) {
console.error(
"Version mismatch: gl.js version is: " + version +
", rust sapp-wasm crate version is: " + crate_version);
}
init_plugins(plugins);
obj.exports.main();
})
.catch(err => {
console.error("WASM failed to load, probably incompatible gl.js version");
console.error(err);
});
module_promise = req
.then(response => response.arrayBuffer())
.then(bytes => WebAssembly.compile(bytes));
}

module_promise
.then(obj => {
add_missing_functions_stabs(obj);
return WebAssembly.instantiate(obj, importObject);
})
.then(obj => {
wasm_memory = obj.exports.memory;
wasm_exports = obj.exports;

var crate_version = wasm_exports.crate_version();
if (version != crate_version) {
console.error(
"Version mismatch: gl.js version is: " + version +
", miniquad crate version is: " + crate_version);
}
init_plugins(plugins);
obj.exports.main();
})
.catch(err => {
console.error(err);
});
}
Loading