Skip to content

Threaded core fixes part 2 #78

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

Merged
arianrhodsandlot merged 1 commit into from
Feb 3, 2026
Merged

Threaded core fixes part 2 #78

Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion src/classes/emulator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,16 @@ export class Emulator {
resize({ height, width }: { height: number; width: number }) {
const { Module } = this.getEmscripten()
if (typeof width === 'number' && typeof height === 'number') {
Module.setCanvasSize(width, height)
try {
Module.setCanvasSize(width, height)
} catch (error) {
if (error instanceof DOMException) {
Module.canvas.setAttribute('width', width.toString())
Module.canvas.setAttribute('height', height.toString())
} else {
throw error
}
}
}
}

Expand Down
32 changes: 22 additions & 10 deletions src/libs/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,28 @@ async function patchCoreJs({ js, name }: { js: ResolvableFile; name: string }) {
}
}`
} else if (isEsmScript(jsContent)) {
jsContent = `${jsContent.replace('var setImmediate', '').replace(
'readyPromiseResolve(Module)',
`readyPromiseResolve({
AL: typeof AL === 'undefined' ? null: AL,
Browser: typeof Browser === 'undefined' ? null: Browser,
JSEvents,
Module,
exit: _emscripten_force_exit
})`,
)};
jsContent = `${jsContent
.replace('var setImmediate', '')
.replace(
'readyPromiseResolve(Module)',
`readyPromiseResolve({
AL: typeof AL === 'undefined' ? null: AL,
Browser: typeof Browser === 'undefined' ? null: Browser,
JSEvents,
Module,
exit: _emscripten_force_exit
})`,
)
.replace(
'return moduleRtn;',
`return moduleRtn.then((Module) => ({
AL: typeof AL === 'undefined' ? null: AL,
Browser: typeof Browser === 'undefined' ? null: Browser,
JSEvents,
exit: _emscripten_force_exit,
...Module,
}));`,
)};
export function getEmscripten({ Module }) {
const fnA = (typeof libretro_${name} === "function") ? libretro_${name} : null;
const fnB = (typeof ${name} === "function") ? ${name} : null;
Expand Down