Archives/learn-wgpu
2
0
Fork 0
mirror of https://github.com/sotrh/learn-wgpu.git synced 2024-11-10 01:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197 from sotrh/0.9

Browse Source 
0.9
This commit is contained in:
sotrh 2021-07-10 12:27:02 -06:00 committed by GitHub
commit 02994d1eb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 387 additions and 712 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1025
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -9,3 +9,7 @@ members = [
# showcase # showcase
"code/showcase/*", "code/showcase/*",
] ]
exclude = [
"code/showcase/imgui-demo",
"code/showcase/pong",
]

4
code/beginner/tutorial1-window/Cargo.toml
View File

@ -13,9 +13,9 @@ path = "src/main.rs"
[dependencies] [dependencies]
image = "0.23" image = "0.23"
winit = "0.24" winit = "0.25"
cgmath = "0.18" cgmath = "0.18"
env_logger = "0.8" env_logger = "0.8"
log = "0.4" log = "0.4"
wgpu = "0.8" wgpu = "0.9"
futures = "0.3" futures = "0.3"

4
code/beginner/tutorial2-swapchain/Cargo.toml
View File

@ -8,11 +8,11 @@ edition = "2018"
[dependencies] [dependencies]
image = "0.23" image = "0.23"
winit = "0.24" winit = "0.25"
cgmath = "0.18" cgmath = "0.18"
env_logger = "0.8" env_logger = "0.8"
log = "0.4" log = "0.4"
wgpu = "0.8" wgpu = "0.9"
futures = "0.3" futures = "0.3"

4
code/beginner/tutorial3-pipeline/Cargo.toml
View File

@ -6,12 +6,12 @@ edition = "2018"
[dependencies] [dependencies]
image = "0.23" image = "0.23"
winit = "0.24" winit = "0.25"
# shaderc = "0.7" # REMOVED! # shaderc = "0.7" # REMOVED!
cgmath = "0.18" cgmath = "0.18"
env_logger = "0.8" env_logger = "0.8"
log = "0.4" log = "0.4"
wgpu = "0.8" wgpu = "0.9"
futures = "0.3" futures = "0.3"
# NEW! # NEW!

4
code/beginner/tutorial4-buffer/Cargo.toml
View File

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

4
code/beginner/tutorial5-textures/Cargo.toml
View File

@ -14,8 +14,8 @@ env_logger = "0.8"
log = "0.4" log = "0.4"
futures = "0.3" futures = "0.3"
image = "0.23" image = "0.23"
wgpu = "0.8" wgpu = "0.9"
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

4
code/beginner/tutorial6-uniforms/Cargo.toml
View File

@ -12,8 +12,8 @@ env_logger = "0.8"
log = "0.4" log = "0.4"
futures = "0.3" futures = "0.3"
image = "0.23" image = "0.23"
wgpu = "0.8" wgpu = "0.9"
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

4
code/beginner/tutorial7-instancing/Cargo.toml
View File

@ -12,8 +12,8 @@ env_logger = "0.8"
log = "0.4" log = "0.4"
futures = "0.3" futures = "0.3"
image = "0.23" image = "0.23"
wgpu = "0.8" wgpu = "0.9"
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

4
code/beginner/tutorial8-depth/Cargo.toml
View File

@ -12,8 +12,8 @@ env_logger = "0.8"
futures = "0.3" futures = "0.3"
image = "0.23" image = "0.23"
log = "0.4" log = "0.4"
wgpu = "0.8" wgpu = "0.9"
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

2
code/beginner/tutorial9-models/Cargo.toml
View File

@ -14,7 +14,7 @@ image = "0.23"
log = "0.4" log = "0.4"
tobj = "3.0" tobj = "3.0"
wgpu = {version = "0.8", features = [ "cross" ]} wgpu = {version = "0.8", features = [ "cross" ]}
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

2
code/intermediate/tutorial10-lighting/Cargo.toml
View File

@ -14,7 +14,7 @@ image = "0.23"
log = "0.4" log = "0.4"
tobj = "3.0" tobj = "3.0"
wgpu = { version = "0.8", features = ["cross"]} wgpu = { version = "0.8", features = ["cross"]}
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

4
code/intermediate/tutorial11-normals/Cargo.toml
View File

@ -13,8 +13,8 @@ futures = "0.3"
image = "0.23" image = "0.23"
log = "0.4" log = "0.4"
tobj = "3.0" tobj = "3.0"
wgpu = "0.8" wgpu = "0.9"
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

4
code/intermediate/tutorial12-camera/Cargo.toml
View File

@ -13,8 +13,8 @@ futures = "0.3"
image = "0.23" image = "0.23"
log = "0.4" log = "0.4"
tobj = "3.0" tobj = "3.0"
wgpu = "0.8" wgpu = "0.9"
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

4
code/intermediate/tutorial13-threading/Cargo.toml
View File

@ -14,8 +14,8 @@ image = "0.23"
log = "0.4" log = "0.4"
rayon = "1.4" # NEW! rayon = "1.4" # NEW!
tobj = "3.0" tobj = "3.0"
wgpu = "0.8" wgpu = "0.9"
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

2
code/showcase/compute/Cargo.toml
View File

@ -15,7 +15,7 @@ log = "0.4"
rayon = "1.4" rayon = "1.4"
tobj = "2.0" tobj = "2.0"
wgpu = { version = "0.8", features = ["trace", "cross"] } wgpu = { version = "0.8", features = ["trace", "cross"] }
winit = "0.24" winit = "0.25"
[build-dependencies] [build-dependencies]
anyhow = "1.0" anyhow = "1.0"

2
code/showcase/framework/Cargo.toml
View File

@ -14,7 +14,7 @@ futures = "0.3"
image = "0.23" image = "0.23"
log = "0.4" log = "0.4"
tobj = "2.0" tobj = "2.0"
wgpu = "0.8" wgpu = "0.9"
wgpu-subscriber = "0.1" wgpu-subscriber = "0.1"
winit = "0.24" winit = "0.24"

4
code/showcase/gifs/Cargo.toml
View File

@ -14,8 +14,8 @@ futures = "0.3"
image = "0.23" image = "0.23"
log = "0.4" log = "0.4"
tobj = "2.0" tobj = "2.0"
wgpu = "0.8" wgpu = "0.9"
winit = "0.24" winit = "0.25"
gif = "0.10.3" gif = "0.10.3"
framework = { version = "0.1.0", path = "../framework" } framework = { version = "0.1.0", path = "../framework" }

2
code/showcase/imgui-demo/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2018"
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
wgpu = "0.8" wgpu = "0.9"
futures = "0.3" futures = "0.3"
imgui = "0.7" imgui = "0.7"
imgui-wgpu = "0.15" imgui-wgpu = "0.15"

2
code/showcase/pong/Cargo.toml
View File

@ -11,7 +11,7 @@ anyhow = "1.0"
bytemuck = { version = "1.4", features = [ "derive" ] } bytemuck = { version = "1.4", features = [ "derive" ] }
cgmath = "0.18" cgmath = "0.18"
futures = "0.3" futures = "0.3"
wgpu = "0.8" wgpu = "0.9"
wgpu_glyph = "0.12" wgpu_glyph = "0.12"
rand = "0.8" rand = "0.8"
rodio = "0.14" rodio = "0.14"

4
code/showcase/windowless/Cargo.toml
View File

@ -9,10 +9,10 @@ edition = "2018"
[dependencies] [dependencies]
image = "0.23" image = "0.23"
raw-window-handle = "0.3" raw-window-handle = "0.3"
winit = "0.24" winit = "0.25"
shaderc = "0.7" shaderc = "0.7"
cgmath = "0.18" cgmath = "0.18"
wgpu = "0.8" wgpu = "0.9"
futures = "0.3.4" futures = "0.3.4"
[[bin]] [[bin]]

4
docs/beginner/tutorial1-window/README.md
View File

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

2
docs/beginner/tutorial5-textures/README.md
View File

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