Skip to content

Misc fixes #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
target
6 changes: 3 additions & 3 deletions android-activity/src/game_activity/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
}
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion examples/agdk-egui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] }
Expand Down
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion examples/agdk-egui/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down