Skip to content

Commit d3327d9

Browse files
authored
Merge pull request #29 from msiglreith/na-winit-wgpu
update na-winit-wgpu example
2 parents 3dd9b9f + 49b28e1 commit d3327d9

File tree

3 files changed

+60
-65
lines changed

3 files changed

+60
-65
lines changed

na-winit-wgpu/Cargo.lock

Lines changed: 54 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

na-winit-wgpu/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env_logger = "0.9"
1616

1717
[target.'cfg(target_os = "android")'.dependencies]
1818
android_logger = "0.11.0"
19-
android-activity = { version = "0.3", features = [ "game-activity" ] }
19+
android-activity = { version = "0.3", features = [ "native-activity" ] }
2020

2121
[patch.crates-io]
2222

na-winit-wgpu/src/shader.wgsl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
[[stage(vertex)]]
2-
fn vs_main([[builtin(vertex_index)]] in_vertex_index: u32) -> [[builtin(position)]] vec4<f32> {
1+
@vertex
2+
fn vs_main(@builtin(vertex_index) in_vertex_index: u32) -> @builtin(position) vec4<f32> {
33
let x = f32(i32(in_vertex_index) - 1);
44
let y = f32(i32(in_vertex_index & 1u) * 2 - 1);
55
return vec4<f32>(x, y, 0.0, 1.0);
66
}
77

8-
[[stage(fragment)]]
9-
fn fs_main() -> [[location(0)]] vec4<f32> {
8+
@fragment
9+
fn fs_main() -> @location(0) vec4<f32> {
1010
return vec4<f32>(1.0, 0.0, 0.0, 1.0);
11-
}
11+
}

0 commit comments

Comments
 (0)