nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 06:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow workspace to be built on wasm (#3840)

Browse Source
This commit is contained in:
Connor Fitzgerald 2023-06-06 06:58:20 -04:00 committed by GitHub
parent 3f0aed789d
commit 4aff9b67af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 178 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cts_runner/Cargo.toml
View File

@ -9,7 +9,9 @@ description = "CTS runner for wgpu"
license.workspace = true
publish = false
[dependencies]
# We make all dependencies conditional on not being wasm,
# so the whole workspace can built as wasm.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
deno_console.workspace = true
deno_core.workspace = true
deno_url.workspace = true

23
cts_runner/src/main.rs
View File

@ -1,3 +1,5 @@
#[cfg(not(target_arch = "wasm32"))]
mod native {
use std::{
env, fmt,
io::{Read, Write},
@ -19,12 +21,7 @@ use termcolor::Color::Red;
use termcolor::ColorSpec;
use termcolor::WriteColor;
#[tokio::main(flavor = "current_thread")]
async fn main() {
unwrap_or_exit(run().await)
}
async fn run() -> Result<(), AnyError> {
pub async fn run() -> Result<(), AnyError> {
let mut args_iter = env::args();
let _ = args_iter.next();
let url = args_iter
@ -131,7 +128,7 @@ fn get_error_class_name(e: &AnyError) -> &'static str {
})
}
fn unwrap_or_exit<T>(result: Result<T, AnyError>) -> T {
pub fn unwrap_or_exit<T>(result: Result<T, AnyError>) -> T {
match result {
Ok(value) => value,
Err(error) => {
@ -166,3 +163,15 @@ impl deno_web::TimersPermission for Permissions {
fn check_unstable(&self, _state: &deno_core::OpState, _api_name: &'static str) {}
}
}
#[cfg(not(target_arch = "wasm32"))]
#[tokio::main(flavor = "current_thread")]
async fn main() {
native::unwrap_or_exit(native::run().await)
}
#[cfg(target_arch = "wasm32")]
fn main() {
panic!("This is a native only module. It can't be run on the web!");
}

6
deno_webgpu/Cargo.toml
View File

@ -16,14 +16,16 @@ path = "lib.rs"
[features]
surface = ["wgpu-core/raw-window-handle", "dep:raw-window-handle"]
[dependencies]
# We make all dependencies conditional on not being wasm,
# so the whole workspace can built as wasm.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
deno_core.workspace = true
serde = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["full"] }
wgpu-types = { workspace = true, features = ["trace", "replay", "serde"] }
raw-window-handle = { workspace = true, optional = true }
[dependencies.wgpu-core]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgpu-core]
workspace = true
features = ["trace", "replay", "serde", "strict_asserts", "wgsl", "gles"]

2
deno_webgpu/lib.rs
View File

@ -1,5 +1,5 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
#![cfg(not(target_arch = "wasm32"))]
#![warn(unsafe_op_in_unsafe_fn)]
use deno_core::error::AnyError;