eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-23 08:34:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #257 from mirkosertic/master

Browse Source 
Made WASM benchmarks runable again in Firefox and Chrome
This commit is contained in:
Alexey Andreev 2017-04-05 11:22:00 +03:00 committed by GitHub
commit 74eda7e63c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
samples/benchmark/src/main/webapp/teavm-wasm.js
View File

@ -17,16 +17,16 @@
var Benchmark = function() { var Benchmark = function() {
function Benchmark(canvas) { function Benchmark(canvas) {
this.canvas = canvas; this.canvas = canvas;
this.module = null; this.instance = null;
this.line = ""; this.line = "";
this.resultTableBody = document.getElementById("result-table-body"); this.resultTableBody = document.getElementById("result-table-body");
} }
Benchmark.prototype.runAll = function() { Benchmark.prototype.runAll = function() {
load(this, function() { this.module.exports.main(); }.bind(this)); load(this, function() { this.instance.exports.main(); }.bind(this));
}; };
function tick(benchmark) { function tick(benchmark) {
var exports = benchmark.module.exports; var exports = benchmark.instance.exports;
exports.tick(); exports.tick();
var exception = exports.sys$catchException(); var exception = exports.sys$catchException();
if (exception !== 0) { if (exception !== 0) {
@ -132,9 +132,13 @@ var Benchmark = function() {
} }
} }
}; };
WebAssembly.compile(response).then(function(module) {
benchmark.module = new WebAssembly.Instance(module, importObj); WebAssembly.instantiate(response, importObj).then(function(resultObject) {
benchmark.instance = resultObject.instance;
console.log("Initialized")
callback(); callback();
}).catch(function(error) {
console.log("Error : " + error);
}); });
}; };
xhr.send(); xhr.send();