Archives
/
learn-wgpu
mirror of https://github.com/sotrh/learn-wgpu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes #362

Browse Source
pull/366/head
Ben Hansen 2 years ago
parent 44f0978b10
commit bcb4282f1e
9 changed files with 341 additions and 480 deletions
Show Stats Download Patch File Download Diff File

757
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
code/intermediate/tutorial10-lighting/Cargo.toml
Unescape Escape View File

@ -16,7 +16,7 @@ env_logger = "0.9"
pollster = "0.2"
log = "0.4"
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko"}
wgpu = { version = "0.12"}
winit = "0.26"
[dependencies.image]
@ -28,7 +28,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko", features = ["webgl"]}
wgpu = { version = "0.12", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

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

@ -16,7 +16,7 @@ env_logger = "0.9"
pollster = "0.2"
log = "0.4"
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko"}
wgpu = { version = "0.12"}
winit = "0.26"
[dependencies.image]
@ -28,7 +28,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko", features = ["webgl"]}
wgpu = { version = "0.12", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

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

@ -16,7 +16,7 @@ env_logger = "0.9"
pollster = "0.2"
log = "0.4"
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko"}
wgpu = { version = "0.12"}
winit = "0.26"
instant = "0.1"
@ -29,7 +29,7 @@ features = ["png", "jpeg"]
reqwest = { version = "0.11" }
console_error_panic_hook = "0.1"
console_log = "0.2"
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko", features = ["webgl"]}
wgpu = { version = "0.12", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

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

@ -17,7 +17,7 @@ pollster = "0.2"
log = "0.4"
rayon = "1.4" # NEW!
tobj = { version = "3.2", features = ["async"]}
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko"}
wgpu = { version = "0.12"}
winit = "0.26"
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.12", git="https://github.com/gfx-rs/wgpu", branch="gecko", features = ["webgl"]}
wgpu = { version = "0.12", features = ["webgl"]}
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [

12
docs/intermediate/tutorial10-lighting/README.md
Unescape Escape View File

@ -2,17 +2,9 @@
<div class="warn">
The shaders used in this example don't compile on WASM using version 0.12.0 of wgpu. They are working on the "gecko" branch, so to get the code working for WASM, change the wgpu entries in Cargo.toml to be the following.
The shaders used in this example don't compile on WASM using version 0.12.0 of wgpu. I created an issue [here](https://github.com/gfx-rs/naga/issues/1739). The issue is fixed on the most recent version of naga, but that is using the updated WGSL syntax.
```toml
[dependencies]
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko"}
[target.'cfg(target_arch = "wasm32")'.dependencies]
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko", features = ["webgl"]}
```
Once 0.13 comes out I'll revert to using the version published on crates.io.
Once 0.13 comes out I'll port the WGSL code to the new syntax and this example should be working.
</div>

12
docs/intermediate/tutorial11-normals/README.md
Unescape Escape View File

@ -2,17 +2,9 @@
<div class="warn">
The shaders used in this example don't compile on WASM using version 0.12.0 of wgpu. They are working on the "gecko" branch, so to get the code working for WASM, change the wgpu entries in Cargo.toml to be the following.
The shaders used in this example don't compile on WASM using version 0.12.0 of wgpu. I created an issue [here](https://github.com/gfx-rs/naga/issues/1739). The issue is fixed on the most recent version of naga, but that is using the updated WGSL syntax.
```toml
[dependencies]
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko"}
[target.'cfg(target_arch = "wasm32")'.dependencies]
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko", features = ["webgl"]}
```
Once 0.13 comes out I'll revert to using the version published on crates.io.
Once 0.13 comes out I'll port the WGSL code to the new syntax and this example should be working.
</div>

12
docs/intermediate/tutorial12-camera/README.md
Unescape Escape View File

@ -2,17 +2,9 @@
<div class="warn">
The shaders used in this example don't compile on WASM using version 0.12.0 of wgpu. They are working on the "gecko" branch, so to get the code working for WASM, change the wgpu entries in Cargo.toml to be the following.
The shaders used in this example don't compile on WASM using version 0.12.0 of wgpu. I created an issue [here](https://github.com/gfx-rs/naga/issues/1739). The issue is fixed on the most recent version of naga, but that is using the updated WGSL syntax.
```toml
[dependencies]
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko"}
[target.'cfg(target_arch = "wasm32")'.dependencies]
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko", features = ["webgl"]}
```
Once 0.13 comes out I'll revert to using the version published on crates.io.
Once 0.13 comes out I'll port the WGSL code to the new syntax and this example should be working.
</div>

12
docs/intermediate/tutorial13-threading/README.md
Unescape Escape View File

@ -2,17 +2,9 @@
<div class="warn">
The shaders used in this example don't compile on WASM using version 0.12.0 of wgpu. They are working on the "gecko" branch, so to get the code working for WASM, change the wgpu entries in Cargo.toml to be the following.
The shaders used in this example don't compile on WASM using version 0.12.0 of wgpu. I created an issue [here](https://github.com/gfx-rs/naga/issues/1739). The issue is fixed on the most recent version of naga, but that is using the updated WGSL syntax.
```toml
[dependencies]
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko"}
[target.'cfg(target_arch = "wasm32")'.dependencies]
wgpu = { version = "0.12", git="https://github.com/gfx-rs/wgpu", branch="gecko", features = ["webgl"]}
```
Once 0.13 comes out I'll revert to using the version published on crates.io.
Once 0.13 comes out I'll port the WGSL code to the new syntax and this example should be working.
</div>

Write Preview
Loading…
Cancel
Save