Merge pull request #8 from Zoxc/misc-fixes

Misc agdk-egui fixes

Author: rib

.gitignore

@@ -0,0 +1 @@
+target

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<std::path::PathBuf> {
+    fn try_get_path_from_ptr(path: *const c_char) -> Option<std::path::PathBuf> {
         if path == ptr::null() { return None; }
         let cstr = unsafe {
             let cstr_slice = CStr::from_ptr(path);

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" ] }

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

examples/agdk-egui/src/lib.rs

@@ -122,7 +122,7 @@ fn _main(event_loop: EventLoop<Event>) {
                         &ctx.tessellate(full_output.shapes),
                         &full_output.textures_delta);
 
-                    if full_output.needs_repaint {
+                    if full_output.repaint_after.is_zero() {
                         window.request_redraw();
                     }
                 }