Support for --target wasm32-unknown-emscripten #2233
Conversation
|
Can I just apply |
yes, that's what we do. |
|
Blocked by grovesNL/glow#195 |
caiiiycuk
force-pushed
the
emscripten
branch
5 times, most recently
from
e86e194
to
cd7723a
Compare
|
Done |
caiiiycuk
force-pushed
the
emscripten
branch
3 times, most recently
from
8a608fb
to
6b867dd
Compare
|
Updated. Blocker is gone, can be merged now if it's ok |
| # Emscripten WebGL | ||
| - name: WebAssembly emscripten | ||
| os: ubuntu-20.04 | ||
| channel: stable |
| if: matrix.kind == 'webgl-em' | ||
| run: | | ||
| # check with no features | ||
| cargo ${{matrix.tool}} --target ${{ matrix.target }} -p wgpu -p wgpu-core |
There was a problem hiding this comment.
I think we need to do the same as regulalr webgl - require webgl feature to be passed in. Otherwise, this will be confusing when we get emscripten webgpu target.
| unsafe fn init(desc: &crate::InstanceDescriptor) -> Result<Self, crate::InstanceError> { | ||
| let egl_result = if cfg!(windows) { |
| @@ -613,6 +637,9 @@ impl crate::Instance<super::Api> for Instance { | |||
| (display, None, WindowKind::Unknown) | |||
| }; | |||
|
|
|||
| #[cfg(target_os = "emscripten")] | |||
| let display = egl.get_display(egl::DEFAULT_DISPLAY).unwrap(); | |||
There was a problem hiding this comment.
wouldn't it fall under this path anyway in the previous if/else chain?
| @@ -946,6 +979,8 @@ impl crate::Surface<super::Api> for Surface { | |||
| wl_window = Some(window); | |||
| window | |||
| } | |||
| #[cfg(target_os = "emscripten")] | |||
| ) | ||
| } | ||
| _ => self.egl.create_window_surface( | ||
| #[cfg(not(target_os = "emscripten"))] |
There was a problem hiding this comment.
no need for this cfg, it will go the regular create_window_surface way naturally, since self.wsi.kind == WindowKind::Unknown
| @@ -84,13 +84,13 @@ replay = ["serde", "wgc/replay"] | |||
| angle = ["wgc/angle"] | |||
| webgl = ["wgc"] | |||
|
|
|||
| [target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc] | |||
| [target.'cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))'.dependencies.wgc] | |||
There was a problem hiding this comment.
I don't think this configuration needs to change. Instead, it should be aligned with the current webgl path.
| #[cfg(all(target_arch = "wasm32", not(feature = "webgl")))] | ||
| #[cfg(all( | ||
| target_arch = "wasm32", | ||
| not(target_os = "emscripten"), |
There was a problem hiding this comment.
similarly, this configuration doesn't need to change. If emscripten path requires "webgl" feature, it mostly follows the same steps.
|
Will do new one based on "feature" |
Description
I found that adding support for
wasm32-unknown-emscriptenis not so hard. Even more implementation is not depended on 3rd party libraries like winit or stdweb. It's because emscripten it self provides complete implementation for creating OpenGL 3.0 context. So crates like glow, khronos-egl works as is. Only visible differences between emscripten and native platform is that emscripten does not support pbuffer (which is not needed) and window will created automatically.I think supporting
wasm32-unknown-emscriptenwill be a great unique feature of wgpu.Testing
You can test this changes by calling
./run-wasm-emscripten-example.sh. However you need to install emsdk first, andemccshould be in your path.