diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2023-09-04 04:04:01 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-09-04 04:04:01 +0200 |
| commit | a56b25b9096d47ada3c4349f5b91110dfaa92bf6 (patch) | |
| tree | c9308e295f7e5752facc83b5c6c1ed2f261135ba | |
| parent | 2c51e3478bfb1c53ea7e63b1f1dc74ec46faa748 (diff) | |
| parent | 685e44587c8c89be455838d6b96f3b762da836f9 (diff) | |
| download | iced-a56b25b9096d47ada3c4349f5b91110dfaa92bf6.tar.gz iced-a56b25b9096d47ada3c4349f5b91110dfaa92bf6.tar.bz2 iced-a56b25b9096d47ada3c4349f5b91110dfaa92bf6.zip | |
Merge pull request #2068 from iced-rs/webgpu-by-default
Enable WebGPU backend in `wgpu` by default instead of WebGL
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | renderer/Cargo.toml | 1 | ||||
| -rw-r--r-- | wgpu/Cargo.toml | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9a9b3f9..ac8d27f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,6 +25,8 @@ jobs: web: runs-on: ubuntu-latest + env: + RUSTFLAGS: --cfg=web_sys_unstable_apis steps: - uses: hecrj/setup-rust-action@v1 with: @@ -39,6 +39,8 @@ palette = ["iced_core/palette"] system = ["iced_winit/system"] # Enables broken "sRGB linear" blending to reproduce color management of the Web web-colors = ["iced_renderer/web-colors"] +# Enables the WebGL backend, replacing WebGPU +webgl = ["iced_renderer/webgl"] # Enables the advanced module advanced = [] diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml index 89326d73..2c88cf31 100644 --- a/renderer/Cargo.toml +++ b/renderer/Cargo.toml @@ -17,6 +17,7 @@ svg = ["iced_tiny_skia/svg", "iced_wgpu?/svg"] geometry = ["iced_graphics/geometry", "iced_tiny_skia/geometry", "iced_wgpu?/geometry"] tracing = ["iced_wgpu?/tracing"] web-colors = ["iced_wgpu?/web-colors"] +webgl = ["iced_wgpu?/webgl"] [dependencies] raw-window-handle = "0.5" diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index b0f70220..49c62673 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -12,6 +12,7 @@ geometry = ["iced_graphics/geometry", "lyon"] image = ["iced_graphics/image"] svg = ["resvg"] web-colors = ["iced_graphics/web-colors"] +webgl = ["wgpu/webgl"] [dependencies] wgpu = "0.17" @@ -24,9 +25,6 @@ once_cell = "1.0" rustc-hash = "1.1" log = "0.4" -[target.'cfg(target_arch = "wasm32")'.dependencies] -wgpu = { version = "0.17", features = ["webgl"] } - [dependencies.twox-hash] version = "1.6" default-features = false |