Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gfx-rs/wgpu
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0a1e81674a61334fbeb8ac5b6479c3dedf92ae64
Choose a base ref
..
head repository: gfx-rs/wgpu
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 95ca71949ce5b107ecc052e9e07ecd8738a0a158
Choose a head ref
Showing with 4 additions and 5 deletions.
  1. +1 −2 wgpu-core/Cargo.toml
  2. +2 −2 wgpu-core/src/instance.rs
  3. +1 −1 wgpu/Cargo.toml
3 changes: 1 addition & 2 deletions wgpu-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ replay = ["serde", "wgt/replay", "arrayvec/serde", "naga/deserialize"]
serial-pass = ["serde", "wgt/serde", "arrayvec/serde"]
id32 = []
vulkan-portability = ["hal/vulkan"]
webgl = ["web-sys"]

[dependencies]
arrayvec = "0.7"
@@ -59,7 +58,7 @@ version = "0.12"

[target.'cfg(target_arch = "wasm32")'.dependencies]
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.12", features = ["gles"] }
web-sys = { version = "0.3", features = ["HtmlCanvasElement"], optional = true }
web-sys = { version = "0.3", features = ["HtmlCanvasElement"] }

[target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
hal = { path = "../wgpu-hal", package = "wgpu-hal", version = "0.12", features = ["metal"] }
4 changes: 2 additions & 2 deletions wgpu-core/src/instance.rs
View file
Original file line number Diff line number Diff line change
@@ -493,7 +493,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
id.0
}

#[cfg(all(target_arch = "wasm32", feature = "webgl", not(feature = "emscripten")))]
#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
pub fn create_surface_webgl_canvas(
&self,
canvas: &web_sys::HtmlCanvasElement,
@@ -516,7 +516,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
id.0
}

#[cfg(all(target_arch = "wasm32", feature = "webgl", not(feature = "emscripten")))]
#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
pub fn create_surface_webgl_offscreen_canvas(
&self,
canvas: &web_sys::OffscreenCanvas,
2 changes: 1 addition & 1 deletion wgpu/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ glsl = ["naga/glsl-in"]
trace = ["serde", "wgc/trace"]
replay = ["serde", "wgc/replay"]
angle = ["wgc/angle"]
webgl = ["wgc", "wgc/webgl"]
webgl = ["wgc"]
emscripten = ["webgl"]
vulkan-portability = ["wgc/vulkan-portability"]