From ed6900b990e6f7514af0162d5c5b0fb463b28737 Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 18 Sep 2020 15:06:48 +0200 Subject: emscripten: netlist and OpenGL improvements. (#7254) * Most OpenGL link issues fixed. Two remain from drawogl.cpp. This isn't working anyhow. * "-video accel" now uses WebGL. This allows GL based scaling and provides a performance improvement. * Fixed pong and other games by adding another function to the exception whitelist * Target now is mame.html. This allows emrun to be used for testing. mame.js is created as well and thus the current behaviour unchanged. --- scripts/src/main.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 4d787bfbdaf..6ae28487563 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -151,10 +151,13 @@ end .. " -s ALLOW_MEMORY_GROWTH=0" .. " -s TOTAL_MEMORY=268435456" .. " -s DISABLE_EXCEPTION_CATCHING=2" - .. " -s EXCEPTION_CATCHING_WHITELIST=\"['__ZN15running_machine17start_all_devicesEv','__ZN12cli_frontend7executeEiPPc','__ZN8chd_file11open_commonEb','__ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','__ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE']\"" + .. " -s EXCEPTION_CATCHING_WHITELIST=\"['__ZN15running_machine17start_all_devicesEv','__ZN12cli_frontend7executeEiPPc','__ZN8chd_file11open_commonEb','__ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','__ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE','__ZNK19netlist_mame_device19base_validity_checkER16validity_checker']\"" .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__ZN15running_machine30emscripten_get_running_machineEv', '__ZN15running_machine17emscripten_get_uiEv', '__ZN15running_machine20emscripten_get_soundEv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio', '_SDL_SendKeyboardKey', '__ZN15running_machine15emscripten_saveEPKc', '__ZN15running_machine15emscripten_loadEPKc', '__ZN15running_machine21emscripten_hard_resetEv', '__ZN15running_machine21emscripten_soft_resetEv', '__ZN15running_machine15emscripten_exitEv']\"" .. " -s EXTRA_EXPORTED_RUNTIME_METHODS=\"['cwrap']\"" .. " -s ERROR_ON_UNDEFINED_SYMBOLS=0" + .. " -s USE_WEBGL2=1" + .. " -s LEGACY_GL_EMULATION=1" + .. " -s GL_UNSAFE_OPTS=0" .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js" .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js" .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains" @@ -179,7 +182,8 @@ end end postbuildcommands { - os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js", + --os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js", + os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".html", } end -- cgit v1.2.3-70-g09d2