From 5fbc26c61fbcb8dcdff6295c777493fbd0729161 Mon Sep 17 00:00:00 2001 From: msiglreith Date: Sun, 18 Sep 2022 16:10:07 +0200 Subject: [PATCH] na-winit-wgpu: update shader and use native-activity instead of game-activity --- examples/na-winit-wgpu/Cargo.toml | 2 +- examples/na-winit-wgpu/src/shader.wgsl | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/na-winit-wgpu/Cargo.toml b/examples/na-winit-wgpu/Cargo.toml index 49bf673..cf29ef6 100644 --- a/examples/na-winit-wgpu/Cargo.toml +++ b/examples/na-winit-wgpu/Cargo.toml @@ -16,7 +16,7 @@ env_logger = "0.9" [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.11.0" -android-activity = { version = "0.3", features = [ "game-activity" ] } +android-activity = { version = "0.3", features = [ "native-activity" ] } [patch.crates-io] diff --git a/examples/na-winit-wgpu/src/shader.wgsl b/examples/na-winit-wgpu/src/shader.wgsl index 4903d72..f84ccfe 100644 --- a/examples/na-winit-wgpu/src/shader.wgsl +++ b/examples/na-winit-wgpu/src/shader.wgsl @@ -1,11 +1,11 @@ -[[stage(vertex)]] -fn vs_main([[builtin(vertex_index)]] in_vertex_index: u32) -> [[builtin(position)]] vec4 { +@vertex +fn vs_main(@builtin(vertex_index) in_vertex_index: u32) -> @builtin(position) vec4 { let x = f32(i32(in_vertex_index) - 1); let y = f32(i32(in_vertex_index & 1u) * 2 - 1); return vec4(x, y, 0.0, 1.0); } -[[stage(fragment)]] -fn fs_main() -> [[location(0)]] vec4 { +@fragment +fn fs_main() -> @location(0) vec4 { return vec4(1.0, 0.0, 0.0, 1.0); -} \ No newline at end of file +}