From b1b7f49c7e9438f3d0fbd0239a5c64c38b1bdf00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Tue, 9 Aug 2022 22:43:22 +0200 Subject: [PATCH 1/4] Add target/ to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eb5a316 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target From 875952b2a948b6141a23ec53644360119868be00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Tue, 9 Aug 2022 22:44:04 +0200 Subject: [PATCH 2/4] Update Gradle to build with Java 18 --- examples/agdk-egui/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/agdk-egui/gradle/wrapper/gradle-wrapper.properties b/examples/agdk-egui/gradle/wrapper/gradle-wrapper.properties index b53fece..0460660 100644 --- a/examples/agdk-egui/gradle/wrapper/gradle-wrapper.properties +++ b/examples/agdk-egui/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon May 02 15:39:12 BST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 114e249cbd2c7ee413f6d4b6383ce51b77df34ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Tue, 9 Aug 2022 22:44:50 +0200 Subject: [PATCH 3/4] Fix egui build --- examples/agdk-egui/Cargo.toml | 2 +- examples/agdk-egui/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/agdk-egui/Cargo.toml b/examples/agdk-egui/Cargo.toml index 21774e5..3c6a6e4 100644 --- a/examples/agdk-egui/Cargo.toml +++ b/examples/agdk-egui/Cargo.toml @@ -9,7 +9,7 @@ resolver = "2" [dependencies] log = "0.4" winit = "0.26" -wgpu = "0.12.0" +wgpu = "0.13.0" pollster = "0.2" egui = "0.18" egui-wgpu = { version = "0.18", features = [ "winit" ] } diff --git a/examples/agdk-egui/src/lib.rs b/examples/agdk-egui/src/lib.rs index 267d92b..f5eb43c 100644 --- a/examples/agdk-egui/src/lib.rs +++ b/examples/agdk-egui/src/lib.rs @@ -122,7 +122,7 @@ fn _main(event_loop: EventLoop) { &ctx.tessellate(full_output.shapes), &full_output.textures_delta); - if full_output.needs_repaint { + if full_output.repaint_after.is_zero() { window.request_redraw(); } } From 5a7bc64bb1ba496832a849b15d7ca761e4c3beaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Tue, 9 Aug 2022 22:55:37 +0200 Subject: [PATCH 4/4] Fix types --- android-activity/src/game_activity/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs index e44687c..6cd4fed 100644 --- a/android-activity/src/game_activity/mod.rs +++ b/android-activity/src/game_activity/mod.rs @@ -4,7 +4,7 @@ use std::ffi::{CStr, CString}; use std::fs::File; use std::io::{BufRead, BufReader}; use std::marker::PhantomData; -use std::os::raw; +use std::os::raw::{self, c_char}; use std::ptr::NonNull; use std::sync::Arc; use std::sync::RwLock; @@ -72,7 +72,7 @@ impl<'a> StateSaver<'a> { } (*app_ptr).savedState = buf; - (*app_ptr).savedStateSize = state.len() as u64; + (*app_ptr).savedStateSize = state.len() as ffi::size_t; } } } @@ -328,7 +328,7 @@ impl AndroidAppInner { } } - fn try_get_path_from_ptr(path: *const u8) -> Option { + fn try_get_path_from_ptr(path: *const c_char) -> Option { if path == ptr::null() { return None; } let cstr = unsafe { let cstr_slice = CStr::from_ptr(path);