Skip to content

Commit bfef11d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into 22_descriptor_pools_and_sets
2 parents 64756f2 + 72b1d26 commit bfef11d

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

.github/main.workflow

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
workflow "CI" {
2+
on = "push"
3+
resolves = ["Build & Lint"]
4+
}
5+
6+
action "Build & Lint" {
7+
uses = "bwasty/rust-action@master"
8+
args = "cargo build && cargo clippy -- -D warnings -A clippy::ref_in_deref"
9+
}

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Then add this to your `Cargo.toml`:
7070
vulkano = "0.11.1"
7171
```
7272

73-
On macOS, copy [mac-env.sh](mac-env.sh), adapt the `VULKAN_SDK` path if necessary and `source` the file in your terminal. See also [vulkano-rs/vulkano#macos-and-ios-setup](https://github.com/vulkano-rs/vulkano#macos-and-ios-setup).
73+
On macOS, copy [mac-env.sh](mac-env.sh), adapt the `VULKAN_SDK` path if necessary and `source` the file in your terminal. See also [vulkano-rs/vulkano#macos-and-ios-specific-setup](https://github.com/vulkano-rs/vulkano#macos-and-ios-specific-setup).
7474

7575
## Drawing a triangle
7676
### Setup
@@ -97,7 +97,7 @@ impl HelloTriangleApplication {
9797
}
9898

9999
fn main() {
100-
let mut app = HelloTriangleApplication::new();
100+
let mut app = HelloTriangleApplication::initialize();
101101
app.main_loop();
102102
}
103103
```
@@ -106,7 +106,7 @@ fn main() {
106106
Vulkano handles calling `vkDestroyXXX`/`vkFreeXXX` in the `Drop` implementation of all wrapper objects, so we will skip all cleanup code.
107107

108108
##### Integrating ~GLFW~ winit
109-
Instead of GLFW we're using [winit](https://github.com/tomaka/winit), an alternative window managment library written in pure Rust.
109+
Instead of GLFW we'll be using [winit](https://github.com/tomaka/winit), an alternative window managment library written in pure Rust.
110110

111111
Add this to your Cargo.toml:
112112
```
@@ -148,9 +148,8 @@ struct HelloTriangleApplication {
148148
loop {
149149
let mut done = false;
150150
self.events_loop.poll_events(|ev| {
151-
match ev {
152-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
153-
_ => ()
151+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
152+
done = true
154153
}
155154
});
156155
if done {
@@ -219,11 +218,13 @@ struct HelloTriangleApplication {
219218
}
220219
```
221220

222-
[Complete code](src/bin/01_instance_creation.rs)
221+
[Diff](src/bin/01_instance_creation.rs.diff) / [Complete code](src/bin/01_instance_creation.rs)
223222

224223
#### Validation layers
225224
https://vulkan-tutorial.com/Drawing_a_triangle/Setup/Validation_layers
226225

226+
From here on we'll just link to the code instead of putting everything in the README:
227+
227228
[Diff](src/bin/02_validation_layers.rs.diff) / [Complete code](src/bin/02_validation_layers.rs)
228229

229230

0 commit comments

Comments
 (0)