Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/lib/libglfw.js
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ var LibraryGLFW = {
err('glfwSetInputMode called with GLFW_LOCK_KEY_MODS mode not implemented');
break;
}
case 0x000330005: { // GLFW_RAW_MOUSE_MOTION
case 0x00033005: { // GLFW_RAW_MOUSE_MOTION
err('glfwSetInputMode called with GLFW_RAW_MOUSE_MOTION mode not implemented');
break;
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/libopenal.js
Original file line number Diff line number Diff line change
Expand Up @@ -3778,7 +3778,7 @@ var LibraryOpenAL = {
break;
default:
#if OPENAL_DEBUG
dbg(`alBufferData() called with invalid format ${format}`;
dbg(`alBufferData() called with invalid format ${format}`);
#endif
AL.currentCtx.err = {{{ cDefs.AL_INVALID_VALUE }}};
return;
Expand All @@ -3787,7 +3787,7 @@ var LibraryOpenAL = {
buf.audioBuf = audioBuf;
} catch (e) {
#if OPENAL_DEBUG
dbg(`alBufferData() upload failed with an exception ${e}`;
dbg(`alBufferData() upload failed with an exception ${e}`);
#endif
AL.currentCtx.err = {{{ cDefs.AL_INVALID_VALUE }}};
return;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/libwebsocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ var LibraryWebSocket = {
}

#if WEBSOCKET_DEBUG
dbg(`emscripten_websocket_set_onopen_callback(socketId=${socketId},userData=${userData},callbackFunc='+callbackFunc})`);
dbg(`emscripten_websocket_set_onopen_callback(socketId=${socketId},userData=${userData},callbackFunc=${callbackFunc})`);
#endif
socket.onopen = function(e) {
#if WEBSOCKET_DEBUG
Expand Down
2 changes: 1 addition & 1 deletion src/threadprofiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var emscriptenThreadProfiler = {
if (threadName) {
threadName = `"${threadName}" (${ptrToString(threadPtr)})`;
} else {
threadName = `(${ptrToString(threadPtr)}})`;
threadName = `(${ptrToString(threadPtr)})`;
}

console.log(`Thread ${threadName} now: ${PThread.threadStatusAsString(threadPtr)}. `);
Expand Down
2 changes: 1 addition & 1 deletion src/wasm_worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function startWasmWorker(props) {
#endif
// Drop now unneeded references to from the Module object in this Worker,
// these are not needed anymore.
props.wasm = props.memMemory = 0;
props.wasm = props.wasmMemory = 0;
}

#if AUDIO_WORKLET
Expand Down
4 changes: 2 additions & 2 deletions system/include/webgl/webgl2_ext.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ WEBGL_APICALL void GL_APIENTRY glMultiDrawElementsInstancedBaseVertexBaseInstanc
const GLvoid* const* offsets __attribute__((nonnull)),
const GLsizei* instanceCounts __attribute__((nonnull)),
const GLint* baseVertices __attribute__((nonnull)),
const GLuint* baseinstances __attribute__((nonnull)),
const GLuint* baseInstances __attribute__((nonnull)),
GLsizei drawCount);

#endif /* EMSCRIPTEN_GL_WEBGL_multi_draw_instanced_base_vertex_base_instance */
#endif /* EMSCRIPTEN_GL_WEBGL_multi_draw_instanced_base_vertex_base_instance */
2 changes: 1 addition & 1 deletion test/browser/test_glfw.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ char* GetKeyName(int key){
case GLFW_KEY_TAB: return "tab";
case GLFW_KEY_ENTER: return "enter";
case GLFW_KEY_BACKSPACE: return "backspace";
case GLFW_KEY_INSERT: return "insertr";
case GLFW_KEY_INSERT: return "insert";
case GLFW_KEY_DEL: return "del";
case GLFW_KEY_PAGEUP: return "page up";
case GLFW_KEY_PAGEDOWN: return "page down";
Expand Down
26 changes: 13 additions & 13 deletions test/codesize/audio_worklet_wasm.expected.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ var m = globalThis.Module || "undefined" != typeof Module ? Module : {}, p = !!g

function v(a) {
u = a;
w = a.L;
w = a.H;
x();
m ||= {};
m.wasm = a.G;
y();
a.G = a.M = 0;
a.G = a.H = 0;
}

t && !p && (onmessage = a => {
Expand All @@ -26,9 +26,9 @@ if (p) {
this.u = d.u;
this.s = 4 * this.u;
this.B = Array(Math.min((u.F - 16) / this.s | 0, 64));
this.K();
this.L();
}
K() {
L() {
for (var d = C(), g = D(this.B.length * this.s) >> 2, e = this.B.length - 1; 0 <= e; e--) this.B[e] = E.subarray(g, g += this.u);
F(d);
}
Expand Down Expand Up @@ -81,9 +81,9 @@ if (p) {
port.onmessage = async b => {
await z;
b = b.data;
b._boot ? v(b) : b._wpn ? (registerProcessor(b._wpn, a(b.H)), port.postMessage({
b._boot ? v(b) : b._wpn ? (registerProcessor(b._wpn, a(b.I)), port.postMessage({
_wsc: b.v,
C: [ b.I, 1, b.A ]
C: [ b.J, 1, b.A ]
})) : b._wsc && A.get(b._wsc)(...b.C);
};
}
Expand Down Expand Up @@ -134,7 +134,7 @@ var K = [], L = a => {
a = {
latencyHint: c,
sampleRate: G[a + 4 >> 2] || void 0,
N: 0 > b ? "hardware" : b || "default"
M: 0 > b ? "hardware" : b || "default"
};
} else a = void 0;
a = new AudioContext(a);
Expand Down Expand Up @@ -178,8 +178,8 @@ var K = [], L = a => {
}), c += 16;
O[a].audioWorklet.port.postMessage({
_wpn: d,
H: e,
I: a,
I: e,
J: a,
v: b,
A: h
});
Expand All @@ -204,10 +204,10 @@ var K = [], L = a => {
});
e.port.postMessage({
_boot: 1,
O: ba++,
N: ba++,
G: m.wasm,
L: w,
J: c,
H: w,
K: c,
F: b
});
e.port.onmessage = ca;
Expand Down Expand Up @@ -246,7 +246,7 @@ function y() {
C = a.n;
Y = a.o;
A = a.k;
t ? (Y(u.J, u.F), p || (removeEventListener("message", M), K = K.forEach(L), addEventListener("message", L))) : a.i();
t ? (Y(u.K, u.F), p || (removeEventListener("message", M), K = K.forEach(L), addEventListener("message", L))) : a.i();
t || X();
}));
}
Expand Down
14 changes: 7 additions & 7 deletions test/codesize/hello_wasm_worker_wasm.expected.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ var c = Module, d = "em-ww" == globalThis.name, e, f, y, z, l, A, t;
d && (onmessage = a => {
onmessage = null;
e = a = a.data;
f = a.o;
f = a.l;
g();
c ||= {};
c.wasm = a.j;
h();
a.j = a.s = 0;
a.j = a.l = 0;
});

function g() {}
Expand All @@ -30,11 +30,11 @@ var k = [], n = a => {
name: "em-ww"
});
m.postMessage({
u: r,
s: r,
j: t,
o: f,
l: a,
m: b
l: f,
m: a,
o: b
});
m.onmessage = n;
return r++;
Expand Down Expand Up @@ -67,7 +67,7 @@ function h() {
y = b.g;
z = b.i;
l = b.h;
d ? (z(e.l, e.m), removeEventListener("message", p), k = k.forEach(n), addEventListener("message", n)) : b.f();
d ? (z(e.m, e.o), removeEventListener("message", p), k = k.forEach(n), addEventListener("message", n)) : b.f();
d || y();
}));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"a.html": 519,
"a.html.gz": 357,
"a.js": 4309,
"a.js.gz": 2219,
"a.js.gz": 2217,
"a.wasm": 1329,
"a.wasm.gz": 895,
"total": 6157,
"total_gz": 3471
"total_gz": 3469
}
2 changes: 1 addition & 1 deletion tools/cmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ def consume_arg_file():
override=True)
elif arg == '-mno-sign-ext':
feature_matrix.disable_feature(feature_matrix.Feature.SIGN_EXT)
elif arg == '-mnontrappting-fptoint':
elif arg == '-mnontrapping-fptoint':
feature_matrix.enable_feature(feature_matrix.Feature.NON_TRAPPING_FPTOINT,
'-mnontrapping-fptoint',
override=True)
Expand Down