Skip to content

Commit bc1dbc0

Browse files
committed
Remove --proxy-to-worker/-sPROXY_TO_WORKER
Fixes: #25440
1 parent b1072be commit bc1dbc0

19 files changed

+11
-2691
lines changed

site/source/docs/api_reference/module.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@ Other methods
174174

175175
.. note:: Sanitizers or source map is currently not supported if overriding WebAssembly instantiation with Module.instantiateWasm. Providing Module.instantiateWasm when source map or sanitizer is enabled can prevent WebAssembly instantiation from finishing.
176176

177-
.. js:function:: Module.onCustomMessage
178-
179-
When compiled with ``PROXY_TO_WORKER = 1`` (see `settings.js <https://github.com/emscripten-core/emscripten/blob/main/src/settings.js>`_), this callback (which should be implemented on both the client and worker's ``Module`` object) allows sending custom messages and data between the web worker and the main thread (using the ``postCustomMessage`` function defined in `proxyClient.js <https://github.com/emscripten-core/emscripten/blob/main/src/proxyClient.js>`_ and `proxyWorker.js <https://github.com/emscripten-core/emscripten/blob/main/src/proxyWorker.js>`_).
180-
181177
.. js:function:: Module.fetchSettings
182178

183179
Override the default settings object used when fetching the Wasm module from

site/source/docs/api_reference/wasm_workers.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ The following build options are not supported at the moment with Wasm Workers:
396396

397397
- -sSINGLE_FILE
398398
- Dynamic linking (-sLINKABLE, -sMAIN_MODULE, -sSIDE_MODULE)
399-
- -sPROXY_TO_WORKER
400399
- -sPROXY_TO_PTHREAD
401400

402401
Example Code

site/source/docs/tools_reference/settings_reference.rst

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,27 +1679,6 @@ in a worker. See emscripten.h
16791679

16801680
Default value: false
16811681

1682-
.. _proxy_to_worker:
1683-
1684-
PROXY_TO_WORKER
1685-
===============
1686-
1687-
If set to 1, we build the project into a js file that will run in a worker,
1688-
and generate an html file that proxies input and output to/from it.
1689-
1690-
Default value: false
1691-
1692-
.. _proxy_to_worker_filename:
1693-
1694-
PROXY_TO_WORKER_FILENAME
1695-
========================
1696-
1697-
If set, the script file name the main thread loads. Useful if your project
1698-
doesn't run the main emscripten- generated script immediately but does some
1699-
setup before
1700-
1701-
Default value: ''
1702-
17031682
.. _proxy_to_pthread:
17041683

17051684
PROXY_TO_PTHREAD
@@ -3384,8 +3363,6 @@ the these settings please open a bug (or reply to one of the existing bugs).
33843363
- ``ASYNCIFY_EXPORTS``: please use JSPI_EXPORTS instead
33853364
- ``LINKABLE``: under consideration for removal (https://github.com/emscripten-core/emscripten/issues/25262)
33863365
- ``RELOCATABLE``: under consideration for removal (https://github.com/emscripten-core/emscripten/issues/25262)
3387-
- ``PROXY_TO_WORKER``: under consideration for removal (See https://github.com/emscripten-core/emscripten/issues/25440)
3388-
- ``PROXY_TO_WORKER_FILENAME``: under consideration for removal (See https://github.com/emscripten-core/emscripten/issues/25440)
33893366

33903367
.. _legacy-settings:
33913368

@@ -3471,3 +3448,4 @@ for backwards compatbility with older versions:
34713448
- ``USE_OFFSET_COVERTER``: No longer supported, not needed with modern v8 versions (Valid values: [0])
34723449
- ``ASYNCIFY_LAZY_LOAD_CODE``: No longer supported (Valid values: [0])
34733450
- ``USE_WEBGPU``: No longer supported; replaced by --use-port=emdawnwebgpu, which implements a newer (but incompatible) version of webgpu.h - see tools/ports/emdawnwebgpu.py (Valid values: [0])
3451+
- ``PROXY_TO_WORKER``: No longer supported (Valid values: [0])

src/lib/libegl.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -637,10 +637,6 @@ var LibraryEGL = {
637637
eglSwapBuffers__deps: ['$GLctx'],
638638
eglSwapBuffers__proxy: 'sync',
639639
eglSwapBuffers: (dpy, surface) => {
640-
#if PROXY_TO_WORKER
641-
if (Browser.doSwapBuffers) Browser.doSwapBuffers();
642-
#endif
643-
644640
if (!EGL.defaultDisplayInitialized) {
645641
EGL.setErrorCode(0x3001 /* EGL_NOT_INITIALIZED */);
646642
} else if (!GLctx) {

src/lib/libwasm_worker.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
#if RELOCATABLE
1919
#error "dynamic linking is not supported with -sWASM_WORKERS"
2020
#endif
21-
#if PROXY_TO_WORKER
22-
#error "-sPROXY_TO_WORKER is not supported with -sWASM_WORKERS"
23-
#endif
2421
#if WASM2JS && MODULARIZE
2522
#error "-sWASM=0 + -sMODULARIZE + -sWASM_WORKERS is not supported"
2623
#endif

src/postamble.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66

77
// === Auto-generated postamble setup entry stuff ===
88

9-
#if PROXY_TO_WORKER
10-
if (ENVIRONMENT_IS_WORKER) {
11-
#include "webGLWorker.js"
12-
#include "proxyWorker.js"
13-
}
14-
#endif
15-
169
#if LOAD_SOURCE_MAP
1710
#include "source_map_support.js"
1811
#endif

0 commit comments

Comments
 (0)