migrated to 0.14

0.14
Ben Hansen 2 years ago
parent 3d5ddd8fa4
commit 3f99b965a9

1801
Cargo.lock generated

File diff suppressed because it is too large Load Diff

@ -14,5 +14,5 @@ members = [
]
exclude = [
"code/showcase/imgui-demo",
# "code/showcase/pong",
"code/showcase/pong",
]

@ -13,16 +13,16 @@ path = "src/main.rs"
[dependencies]
cfg-if = "1"
winit = "0.26"
winit = "0.27"
env_logger = "0.9"
log = "0.4"
wgpu = "0.13"
wgpu = "0.14"
pollster = "0.2"
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
console_log = "0.2.0"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2.76"
wasm-bindgen-futures = "0.4.30"
web-sys = { version = "0.3.53", features = [

@ -9,16 +9,16 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
cfg-if = "1"
winit = "0.26"
winit = "0.27"
env_logger = "0.9"
log = "0.4"
wgpu = "0.13"
wgpu = "0.14"
pollster = "0.2"
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
console_log = "0.2.0"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -60,6 +60,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -59,6 +59,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -9,16 +9,16 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
cfg-if = "1"
winit = "0.26"
winit = "0.27"
env_logger = "0.9"
log = "0.4"
wgpu = "0.13"
wgpu = "0.14"
pollster = "0.2"
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
console_log = "0.2.0"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -58,6 +58,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -60,6 +60,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
cfg-if = "1"
winit = "0.26"
wgpu = "0.13"
winit = "0.27"
wgpu = "0.14"
env_logger = "0.9"
log = "0.4"
pollster = "0.2"
@ -21,7 +21,7 @@ bytemuck = { version = "1.4", features = [ "derive" ] }
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -121,6 +121,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -117,6 +117,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -14,8 +14,8 @@ bytemuck = { version = "1.4", features = [ "derive" ] }
env_logger = "0.9"
log = "0.4"
pollster = "0.2"
wgpu = "0.13"
winit = "0.26"
wgpu = "0.14"
winit = "0.27"
[dependencies.image]
version = "0.24"
@ -25,7 +25,7 @@ features = ["png", "jpeg"]
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -122,6 +122,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -122,6 +122,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -15,8 +15,8 @@ cgmath = "0.18"
env_logger = "0.9"
log = "0.4"
pollster = "0.2"
wgpu = "0.13"
winit = "0.26"
wgpu = "0.14"
winit = "0.27"
[dependencies.image]
version = "0.24"
@ -26,7 +26,7 @@ features = ["png", "jpeg"]
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -272,6 +272,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -272,6 +272,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -15,8 +15,8 @@ cgmath = "0.18"
env_logger = "0.9"
log = "0.4"
pollster = "0.2"
wgpu = "0.13"
winit = "0.26"
wgpu = "0.14"
winit = "0.27"
[dependencies.image]
version = "0.24"
@ -26,7 +26,7 @@ features = ["png", "jpeg"]
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -326,6 +326,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -333,6 +333,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -15,8 +15,8 @@ cgmath = "0.18"
env_logger = "0.9"
pollster = "0.2"
log = "0.4"
wgpu = "0.13"
winit = "0.26"
wgpu = "0.14"
winit = "0.27"
[dependencies.image]
version = "0.24"
@ -26,7 +26,7 @@ features = ["png", "jpeg"]
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -514,6 +514,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -343,6 +343,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -16,8 +16,8 @@ env_logger = "0.9"
pollster = "0.2"
log = "0.4"
tobj = { version = "3.2", features = ["async"]}
wgpu = "0.13"
winit = "0.26"
wgpu = "0.14"
winit = "0.27"
[dependencies.image]
version = "0.24"
@ -28,7 +28,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -286,6 +286,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -16,8 +16,8 @@ env_logger = "0.9"
pollster = "0.2"
log = "0.4"
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.13"}
winit = "0.26"
wgpu = { version = "0.14"}
winit = "0.27"
[dependencies.image]
version = "0.24"
@ -28,7 +28,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -378,6 +378,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -16,8 +16,8 @@ env_logger = "0.9"
pollster = "0.2"
log = "0.4"
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.13"}
winit = "0.26"
wgpu = { version = "0.14"}
winit = "0.27"
[dependencies.image]
version = "0.24"
@ -28,7 +28,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -378,6 +378,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -16,8 +16,8 @@ env_logger = "0.9"
pollster = "0.2"
log = "0.4"
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.13"}
winit = "0.26"
wgpu = { version = "0.14"}
winit = "0.27"
instant = "0.1"
[dependencies.image]
@ -29,7 +29,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -258,6 +258,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -16,8 +16,8 @@ env_logger = "0.9"
pollster = "0.2"
log = "0.4"
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.13"}
winit = "0.26"
wgpu = { version = "0.14"}
winit = "0.27"
instant = "0.1"
[dependencies.image]
@ -29,7 +29,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -260,6 +260,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -14,8 +14,8 @@ image = "0.24"
log = "0.4"
rayon = "1.4"
tobj = "2.0"
wgpu = "0.13"
winit = "0.26"
wgpu = "0.14"
winit = "0.27"
[build-dependencies]
anyhow = "1.0"

@ -197,6 +197,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -14,9 +14,9 @@ pollster = "0.2"
image = "0.24.2"
log = "0.4"
tobj = "2.0"
wgpu = "0.13"
wgpu = "0.14"
wgpu-subscriber = "0.1"
winit = "0.26"
winit = "0.27"
[build-dependencies]
anyhow = "1.0"

@ -67,6 +67,7 @@ impl Display {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -14,8 +14,8 @@ pollster = "0.2"
image = "0.24.2"
log = "0.4"
tobj = "3.1"
wgpu = "0.13"
winit = "0.26"
wgpu = "0.14"
winit = "0.27"
gif = "0.11.4"
futures-intrusive = "0.4"

@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
wgpu = "0.13"
wgpu = "0.14"
pollster = "0.2"
imgui = "0.7"
imgui-wgpu = "0.17"

@ -10,12 +10,12 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
cfg-if = "1"
env_logger = "0.9"
winit = "0.26"
winit = "0.27"
anyhow = "1.0"
bytemuck = { version = "1.4", features = [ "derive" ] }
cgmath = "0.18"
pollster = "0.2"
wgpu = { version = "0.13", features = ["spirv"]}
wgpu = { version = "0.14", features = ["spirv"]}
wgpu_glyph = "0.17"
rand = "0.8"
rodio = { version = "0.15", default-features = false, features = ["wav"] }
@ -34,7 +34,7 @@ web-sys = { version = "0.3.53", features = [
"Window",
"Element",
]}
wgpu = { version = "0.13", features = ["spirv", "webgl"]}
wgpu = { version = "0.14", features = ["spirv", "webgl"]}
[build-dependencies]
anyhow = "1.0"

@ -68,6 +68,7 @@ impl Render {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -17,8 +17,8 @@ pollster = "0.2"
log = "0.4"
rayon = "1.4" # NEW!
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.13"}
winit = "0.26"
wgpu = { version = "0.14"}
winit = "0.27"
instant = "0.1"
async-std = "1"
@ -31,7 +31,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -257,6 +257,7 @@ impl State {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);

@ -9,7 +9,7 @@ edition = "2018"
[dependencies]
image = "0.24"
shaderc = "0.8"
wgpu = { version = "0.13", features = ["spirv"] }
wgpu = { version = "0.14", features = ["spirv"] }
pollster = "0.2"
futures-intrusive = "0.4"

@ -59,6 +59,7 @@ module.exports = {
title: 'News',
collapsable: true,
children: [
'/news/0.14/',
'/news/0.13/',
'/news/0.12/',
'/news/pre-0.12/',

@ -8,10 +8,10 @@ For the beginner stuff, we're going to keep things very simple, we'll add things
```toml
[dependencies]
winit = "0.26"
winit = "0.27"
env_logger = "0.9"
log = "0.4"
wgpu = "0.13"
wgpu = "0.14"
```
## Using Rust's new resolver
@ -110,7 +110,7 @@ cfg-if = "1"
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
console_log = "0.2.0"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4.30"
web-sys = { version = "0.3", features = [

@ -142,6 +142,7 @@ The `limits` field describes the limit of certain types of resources that we can
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto,
};
surface.configure(&device, &config);
```
@ -226,16 +227,16 @@ If we try to build WASM now it will fail because `wasm-bindgen` doesn't support
```toml
[dependencies]
cfg-if = "1"
winit = "0.26"
winit = "0.27"
env_logger = "0.9"
log = "0.4"
wgpu = "0.13"
wgpu = "0.14"
pollster = "0.2"
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
console_log = "0.2.0"
wgpu = { version = "0.13", features = ["webgl"]}
wgpu = { version = "0.14", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

@ -438,11 +438,11 @@ For convenience, let's pull our texture code into its own module. We'll first ne
[dependencies]
image = "0.23"
cgmath = "0.18"
winit = "0.26"
winit = "0.27"
env_logger = "0.9"
log = "0.4"
pollster = "0.2"
wgpu = "0.13"
wgpu = "0.14"
bytemuck = { version = "1.4", features = [ "derive" ] }
anyhow = "1.0" # NEW!
```

@ -0,0 +1,25 @@
# Update to 0.14!
Not much has change as api wise at least as far as this tutorial is concerned. Here are the changes I had to make:
## SurfaceConfiguration changes
`SurfaceConfiguration` now expects an `alpha_mode` parameter. I believe this is to support transparent windows, but I haven't read into it. The code changes are minimal:
```rust
let config = wgpu::SurfaceConfiguration {
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
format: surface.get_supported_formats(&adapter)[0],
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::Fifo,
alpha_mode: wgpu::CompositeAlphaMode::Auto, // NEW!
};
```
## Winit updated
Winit has been updated to version "0.27" so if you build on linux you may need to update some of your packages:
```bash
sudo apt install libfontconfig libfontconfig1-dev
```

@ -263,12 +263,12 @@ In order for wasm-pack to work properly I first needed to add some dependencies:
```toml[dependencies]
cfg-if = "1"
env_logger = "0.9"
winit = "0.26"
winit = "0.27"
anyhow = "1.0"
bytemuck = { version = "1.4", features = [ "derive" ] }
cgmath = "0.18"
pollster = "0.2"
wgpu = { version = "0.13", features = ["spirv"]}
wgpu = { version = "0.14", features = ["spirv"]}
wgpu_glyph = "0.17"
rand = "0.8"
rodio = { version = "0.15", default-features = false, features = ["wav"] }
@ -287,7 +287,7 @@ web-sys = { version = "0.3.53", features = [
"Window",
"Element",
]}
wgpu = { version = "0.13", features = ["spirv", "webgl"]}
wgpu = { version = "0.14", features = ["spirv", "webgl"]}
[build-dependencies]
anyhow = "1.0"

@ -100,7 +100,7 @@ Update dependencies to support SPIR-V module.
[dependencies]
image = "0.23"
shaderc = "0.7"
wgpu = { version = "0.13", features = ["spirv"] }
wgpu = { version = "0.14", features = ["spirv"] }
pollster = "0.2"
```

Loading…
Cancel
Save