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

Merge branch 'master' of github.com:sotrh/learn-wgpu

Browse Source
This commit is contained in:
Ben Hansen 2020-07-21 19:35:21 -06:00
commit 69ec7ba20b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/intermediate/tutorial11-normals/src/light.vert
View File

@ -2,7 +2,7 @@
layout(location=0) in vec3 a_position; layout(location=0) in vec3 a_position;
layout(location=0) out vec4 v_color; layout(location=0) out vec3 v_color;
layout(set=0, binding=0) layout(set=0, binding=0)
uniform Uniforms { uniform Uniforms {
@ -23,5 +23,5 @@ void main() {
vec3 v_position = a_position * scale + u_position; vec3 v_position = a_position * scale + u_position;
gl_Position = u_view_proj * vec4(v_position, 1); gl_Position = u_view_proj * vec4(v_position, 1);
v_color = vec4(u_color, 0); v_color = u_color;
} }

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

@ -14,7 +14,14 @@ wgpu = "0.5.0"
futures = "0.3.4" futures = "0.3.4"
``` ```
If you're on MacOS, you can specify Vulkan (MoltenVK) as your desired backend instead of Metal by removing the `wgpu = "0.5.0"` and adding the following. ### Vulkan Portability Layer
You may also want to make the Vulkan backend available on platforms where it is by default not, e.g. Mac OS. The reason
you might want to enable the Vulkan backend is if you are doing cross-platform development and you need the
Vulkan validation layers output.
To enable the Vulkan backend, add this new section to `Cargo.toml`, and do not forget to remove `wgpu` from the earlier
`[dependencies]` section.
``` toml ``` toml
[dependencies.wgpu] [dependencies.wgpu]
@ -22,6 +29,10 @@ version = "0.5.0"
features = ["vulkan"] features = ["vulkan"]
``` ```
- This may not be necessary because normally `wgpu-rs` validation will catch problems. In fact that is one of it's
design goals.
- This is not intended for shipping code.
- See also [gfx-portability](https://github.com/gfx-rs/portability).
## The code ## The code
There's not much going on here yet, so I'm just going to post the code in full. Just paste this into you're `main.rs` or equivalent. There's not much going on here yet, so I'm just going to post the code in full. Just paste this into you're `main.rs` or equivalent.