Merge pull request #197 from sotrh/0.9

0.9
3 years ago · 02994d1eb6
parent dd7725f2d2 0813fd03a4
commit 02994d1eb6
23 changed files with 388 additions and 713 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -8,4 +8,8 @@ members = [

    # showcase
    "code/showcase/*",
+]
+exclude = [
+    "code/showcase/imgui-demo",
+    "code/showcase/pong",
 ]
--- a/code/beginner/tutorial1-window/Cargo.toml
+++ b/code/beginner/tutorial1-window/Cargo.toml
@ -13,9 +13,9 @@ path = "src/main.rs"

 [dependencies]
 image = "0.23"
-winit = "0.24"
+winit = "0.25"
 cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
-wgpu = "0.8"
+wgpu = "0.9"
 futures = "0.3"
--- a/code/beginner/tutorial2-swapchain/Cargo.toml
+++ b/code/beginner/tutorial2-swapchain/Cargo.toml
@ -8,11 +8,11 @@ edition = "2018"

 [dependencies]
 image = "0.23"
-winit = "0.24"
+winit = "0.25"
 cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
-wgpu = "0.8"
+wgpu = "0.9"
 futures = "0.3"


--- a/code/beginner/tutorial3-pipeline/Cargo.toml
+++ b/code/beginner/tutorial3-pipeline/Cargo.toml
@ -6,12 +6,12 @@ edition = "2018"

 [dependencies]
 image = "0.23"
-winit = "0.24"
+winit = "0.25"
 # shaderc = "0.7" # REMOVED!
 cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
-wgpu = "0.8"
+wgpu = "0.9"
 futures = "0.3"

 # NEW!
--- a/code/beginner/tutorial4-buffer/Cargo.toml
+++ b/code/beginner/tutorial4-buffer/Cargo.toml
@ -8,8 +8,8 @@ edition = "2018"
 [dependencies]
 image = "0.23"
 cgmath = "0.18"
-winit = "0.24"
-wgpu = "0.8"
+winit = "0.25"
+wgpu = "0.9"
 env_logger = "0.8"
 log = "0.4"
 futures = "0.3"
--- a/code/beginner/tutorial5-textures/Cargo.toml
+++ b/code/beginner/tutorial5-textures/Cargo.toml
@ -14,8 +14,8 @@ env_logger = "0.8"
 log = "0.4"
 futures = "0.3"
 image = "0.23"
-wgpu = "0.8"
-winit = "0.24"
+wgpu = "0.9"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/beginner/tutorial6-uniforms/Cargo.toml
+++ b/code/beginner/tutorial6-uniforms/Cargo.toml
@ -12,8 +12,8 @@ env_logger = "0.8"
 log = "0.4"
 futures = "0.3"
 image = "0.23"
-wgpu = "0.8"
-winit = "0.24"
+wgpu = "0.9"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/beginner/tutorial7-instancing/Cargo.toml
+++ b/code/beginner/tutorial7-instancing/Cargo.toml
@ -12,8 +12,8 @@ env_logger = "0.8"
 log = "0.4"
 futures = "0.3"
 image = "0.23"
-wgpu = "0.8"
-winit = "0.24"
+wgpu = "0.9"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/beginner/tutorial8-depth/Cargo.toml
+++ b/code/beginner/tutorial8-depth/Cargo.toml
@ -12,8 +12,8 @@ env_logger = "0.8"
 futures = "0.3"
 image = "0.23"
 log = "0.4"
-wgpu = "0.8"
-winit = "0.24"
+wgpu = "0.9"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/beginner/tutorial9-models/Cargo.toml
+++ b/code/beginner/tutorial9-models/Cargo.toml
@ -14,7 +14,7 @@ image = "0.23"
 log = "0.4"
 tobj = "3.0"
 wgpu = {version = "0.8", features = [ "cross" ]}
-winit = "0.24"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/intermediate/tutorial10-lighting/Cargo.toml
+++ b/code/intermediate/tutorial10-lighting/Cargo.toml
@ -14,7 +14,7 @@ image = "0.23"
 log = "0.4"
 tobj = "3.0"
 wgpu = { version = "0.8", features = ["cross"]}
-winit = "0.24"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/intermediate/tutorial11-normals/Cargo.toml
+++ b/code/intermediate/tutorial11-normals/Cargo.toml
@ -13,8 +13,8 @@ futures = "0.3"
 image = "0.23"
 log = "0.4"
 tobj = "3.0"
-wgpu = "0.8"
-winit = "0.24"
+wgpu = "0.9"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/intermediate/tutorial12-camera/Cargo.toml
+++ b/code/intermediate/tutorial12-camera/Cargo.toml
@ -13,8 +13,8 @@ futures = "0.3"
 image = "0.23"
 log = "0.4"
 tobj = "3.0"
-wgpu = "0.8"
-winit = "0.24"
+wgpu = "0.9"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/intermediate/tutorial13-threading/Cargo.toml
+++ b/code/intermediate/tutorial13-threading/Cargo.toml
@ -14,8 +14,8 @@ image = "0.23"
 log = "0.4"
 rayon = "1.4" # NEW!
 tobj = "3.0"
-wgpu = "0.8"
-winit = "0.24"
+wgpu = "0.9"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/showcase/compute/Cargo.toml
+++ b/code/showcase/compute/Cargo.toml
@ -15,7 +15,7 @@ log = "0.4"
 rayon = "1.4"
 tobj = "2.0"
 wgpu = { version = "0.8", features = ["trace", "cross"] }
-winit = "0.24"
+winit = "0.25"

 [build-dependencies]
 anyhow = "1.0"
--- a/code/showcase/framework/Cargo.toml
+++ b/code/showcase/framework/Cargo.toml
@ -14,7 +14,7 @@ futures = "0.3"
 image = "0.23"
 log = "0.4"
 tobj = "2.0"
-wgpu = "0.8"
+wgpu = "0.9"
 wgpu-subscriber = "0.1"
 winit = "0.24"

--- a/code/showcase/gifs/Cargo.toml
+++ b/code/showcase/gifs/Cargo.toml
@ -14,8 +14,8 @@ futures = "0.3"
 image = "0.23"
 log = "0.4"
 tobj = "2.0"
-wgpu = "0.8"
-winit = "0.24"
+wgpu = "0.9"
+winit = "0.25"
 gif = "0.10.3"

 framework = { version = "0.1.0", path = "../framework" }
--- a/code/showcase/imgui-demo/Cargo.toml
+++ b/code/showcase/imgui-demo/Cargo.toml
@ -8,7 +8,7 @@ edition = "2018"

 [dependencies]
 anyhow = "1.0"
-wgpu = "0.8"
+wgpu = "0.9"
 futures = "0.3"
 imgui = "0.7"
 imgui-wgpu = "0.15"
--- a/code/showcase/pong/Cargo.toml
+++ b/code/showcase/pong/Cargo.toml
@ -11,7 +11,7 @@ anyhow = "1.0"
 bytemuck = { version = "1.4", features = [ "derive" ] }
 cgmath = "0.18"
 futures = "0.3"
-wgpu = "0.8"
+wgpu = "0.9"
 wgpu_glyph = "0.12"
 rand = "0.8"
 rodio = "0.14"
--- a/code/showcase/windowless/Cargo.toml
+++ b/code/showcase/windowless/Cargo.toml
@ -9,10 +9,10 @@ edition = "2018"
 [dependencies]
 image = "0.23"
 raw-window-handle = "0.3"
-winit = "0.24"
+winit = "0.25"
 shaderc = "0.7"
 cgmath = "0.18"
-wgpu = "0.8"
+wgpu = "0.9"
 futures = "0.3.4"

 [[bin]]
--- a/docs/beginner/tutorial1-window/README.md
+++ b/docs/beginner/tutorial1-window/README.md
@ -9,11 +9,11 @@ For the beginner stuff, we're going to keep things very simple, we'll add things
 ```toml
 [dependencies]
 image = "0.23"
-winit = "0.24"
+winit = "0.25"
 cgmath = "0.18"
 env_logger = "0.8"
 log = "0.4"
-wgpu = "0.8"
+wgpu = "0.9"
 futures = "0.3"
 ```

--- a/docs/beginner/tutorial5-textures/README.md
+++ b/docs/beginner/tutorial5-textures/README.md
@ -425,7 +425,7 @@ For convenience sake, let's pull our texture code into its module. We'll first n
 [dependencies]
 image = "0.23"
 cgmath = "0.18"
-winit = "0.24"
+winit = "0.25"
 env_logger = "0.8"
 log = "0.4"
 futures = "0.3"