GRIN/android-activity
1
0
Fork 0
mirror of https://github.com/rust-mobile/android-activity.git synced 2026-07-04 05:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples/*-winit-wgpu: make less verbose

Browse Source 
This updates the *-winit-wgpu examples to use `log::info!` instead of `trace!`
and sets the log level to `Info`

The examples now also print info about and Winit Window events.

This makes them more practical to use to see how Winit events
are delivered without lots of tracing spam from dependency crates.
This commit is contained in:
Robert Bragg
2022-11-11 20:33:07 +00:00
parent 649b65c0c0
commit 4669508823
3 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/agdk-winit-wgpu/Cargo.lock
Generated
+8 -8
View File
@@ -217,9 +217,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "calloop"
version = "0.10.1"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a22a6a8f622f797120d452c630b0ab12e1331a1a753e2039ce7868d4ac77b4ee"
checksum = "595eb0438b3c6d262395fe30e6de9a61beb57ea56290b00a07f227fe6e20cbf2"
dependencies = [
"log",
"nix",
@@ -230,9 +230,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.0.74"
version = "1.0.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
dependencies = [
"jobserver",
]
@@ -601,9 +601,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memmap2"
version = "0.5.7"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498"
checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
dependencies = [
"libc",
]
@@ -821,9 +821,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "owned_ttf_parser"
version = "0.17.0"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4665508572151759e8d60404e20dc096ef93a99801a05ac2ac6e43bf5b4ca187"
checksum = "18904d3c65493a9f0d7542293d1a7f69bfdc309a6b9ef4f46dc3e58b0577edc5"
dependencies = [
"ttf-parser",
]
examples/agdk-winit-wgpu/src/lib.rs
+21 -18
View File
@@ -47,16 +47,16 @@ impl App {
impl App {
fn create_surface<T>(&mut self, event_loop: &EventLoopWindowTarget<T>) {
let window = winit::window::Window::new(&event_loop).unwrap();
trace!("WGPU: creating surface for native window");
let window = winit::window::Window::new(event_loop).unwrap();
log::info!("WGPU: creating surface for native window");
let surface = unsafe { self.instance.create_surface(&window) };
self.surface_state = Some(SurfaceState { window, surface });
}
async fn init_render_state(adapter: &Adapter, target_format: TextureFormat) -> RenderState {
trace!("Initializing render state");
log::info!("Initializing render state");
trace!("WGPU: requesting device");
log::info!("WGPU: requesting device");
// Create the logical device and command queue
let (device, queue) = adapter
.request_device(
@@ -72,21 +72,21 @@ impl App {
.await
.expect("Failed to create device");
trace!("WGPU: loading shader");
log::info!("WGPU: loading shader");
// Load the shaders from disk
let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {
label: None,
source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
});
trace!("WGPU: creating pipeline layout");
log::info!("WGPU: creating pipeline layout");
let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: None,
bind_group_layouts: &[],
push_constant_ranges: &[],
});
trace!("WGPU: creating render pipeline");
log::info!("WGPU: creating render pipeline");
let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
label: None,
layout: Some(&pipeline_layout),
@@ -125,7 +125,7 @@ impl App {
async fn ensure_render_state_for_surface(&mut self) {
if let Some(surface_state) = &self.surface_state {
if self.adapter.is_none() {
trace!("WGPU: requesting a suitable adapter (compatible with our surface)");
log::info!("WGPU: requesting a suitable adapter (compatible with our surface)");
let adapter = self
.instance
.request_adapter(&wgpu::RequestAdapterOptions {
@@ -142,8 +142,8 @@ impl App {
let adapter = self.adapter.as_ref().unwrap();
if self.render_state.is_none() {
trace!("WGPU: finding supported swapchain format");
let swapchain_format = surface_state.surface.get_supported_formats(&adapter)[0];
log::info!("WGPU: finding supported swapchain format");
let swapchain_format = surface_state.surface.get_supported_formats(adapter)[0];
let rs = Self::init_render_state(adapter, swapchain_format).await;
self.render_state = Some(rs);
@@ -167,7 +167,7 @@ impl App {
alpha_mode: wgpu::CompositeAlphaMode::Inherit,
};
trace!("WGPU: Configuring surface swapchain: format = {swapchain_format:?}, size = {size:?}");
log::info!("WGPU: Configuring surface swapchain: format = {swapchain_format:?}, size = {size:?}");
surface_state
.surface
.configure(&render_state.device, &config);
@@ -182,7 +182,7 @@ impl App {
}
fn resume<T>(&mut self, event_loop: &EventLoopWindowTarget<T>) {
trace!("Resumed, creating render state...");
log::info!("Resumed, creating render state...");
self.create_surface(event_loop);
pollster::block_on(self.ensure_render_state_for_surface());
self.configure_surface_swapchain();
@@ -191,7 +191,7 @@ impl App {
}
fn run(event_loop: EventLoop<()>) {
trace!("Running mainloop...");
log::info!("Running mainloop...");
// doesn't need to be re-considered later
let instance = wgpu::Instance::new(wgpu::Backends::all());
@@ -200,7 +200,7 @@ fn run(event_loop: EventLoop<()>) {
let mut app = App::new(instance);
event_loop.run(move |event, event_loop, control_flow| {
trace!("Received Winit event: {event:?}");
log::info!("Received Winit event: {event:?}");
*control_flow = ControlFlow::Wait;
match event {
@@ -208,7 +208,7 @@ fn run(event_loop: EventLoop<()>) {
app.resume(event_loop);
}
Event::Suspended => {
trace!("Suspended, dropping render state...");
log::info!("Suspended, dropping render state...");
app.render_state = None;
}
Event::WindowEvent {
@@ -221,7 +221,7 @@ fn run(event_loop: EventLoop<()>) {
app.queue_redraw();
}
Event::RedrawRequested(_) => {
trace!("Handling Redraw Request");
log::info!("Handling Redraw Request");
if let Some(ref surface_state) = app.surface_state {
if let Some(ref rs) = app.render_state {
@@ -265,6 +265,9 @@ fn run(event_loop: EventLoop<()>) {
event: WindowEvent::CloseRequested,
..
} => *control_flow = ControlFlow::Exit,
Event::WindowEvent { event: _, .. } => {
log::info!("Window event {:#?}", event);
}
_ => {}
}
});
@@ -280,7 +283,7 @@ fn _main(event_loop: EventLoop<()>) {
fn android_main(app: AndroidApp) {
use winit::platform::android::EventLoopBuilderExtAndroid;
android_logger::init_once(android_logger::Config::default().with_min_level(log::Level::Trace));
android_logger::init_once(android_logger::Config::default().with_min_level(log::Level::Info));
let event_loop = EventLoopBuilder::new().with_android_app(app).build();
_main(event_loop);
@@ -290,7 +293,7 @@ fn android_main(app: AndroidApp) {
#[cfg(not(target_os = "android"))]
fn main() {
env_logger::builder()
.filter_level(log::LevelFilter::Warn) // Default Log Level
.filter_level(log::LevelFilter::Info) // Default Log Level
.parse_default_env()
.init();
examples/na-winit-wgpu/src/lib.rs
+21 -18
View File
@@ -47,16 +47,16 @@ impl App {
impl App {
fn create_surface<T>(&mut self, event_loop: &EventLoopWindowTarget<T>) {
let window = winit::window::Window::new(&event_loop).unwrap();
trace!("WGPU: creating surface for native window");
let window = winit::window::Window::new(event_loop).unwrap();
log::info!("WGPU: creating surface for native window");
let surface = unsafe { self.instance.create_surface(&window) };
self.surface_state = Some(SurfaceState { window, surface });
}
async fn init_render_state(adapter: &Adapter, target_format: TextureFormat) -> RenderState {
trace!("Initializing render state");
log::info!("Initializing render state");
trace!("WGPU: requesting device");
log::info!("WGPU: requesting device");
// Create the logical device and command queue
let (device, queue) = adapter
.request_device(
@@ -72,21 +72,21 @@ impl App {
.await
.expect("Failed to create device");
trace!("WGPU: loading shader");
log::info!("WGPU: loading shader");
// Load the shaders from disk
let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {
label: None,
source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
});
trace!("WGPU: creating pipeline layout");
log::info!("WGPU: creating pipeline layout");
let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: None,
bind_group_layouts: &[],
push_constant_ranges: &[],
});
trace!("WGPU: creating render pipeline");
log::info!("WGPU: creating render pipeline");
let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
label: None,
layout: Some(&pipeline_layout),
@@ -125,7 +125,7 @@ impl App {
async fn ensure_render_state_for_surface(&mut self) {
if let Some(surface_state) = &self.surface_state {
if self.adapter.is_none() {
trace!("WGPU: requesting a suitable adapter (compatible with our surface)");
log::info!("WGPU: requesting a suitable adapter (compatible with our surface)");
let adapter = self
.instance
.request_adapter(&wgpu::RequestAdapterOptions {
@@ -142,8 +142,8 @@ impl App {
let adapter = self.adapter.as_ref().unwrap();
if self.render_state.is_none() {
trace!("WGPU: finding supported swapchain format");
let swapchain_format = surface_state.surface.get_supported_formats(&adapter)[0];
log::info!("WGPU: finding supported swapchain format");
let swapchain_format = surface_state.surface.get_supported_formats(adapter)[0];
let rs = Self::init_render_state(adapter, swapchain_format).await;
self.render_state = Some(rs);
@@ -167,7 +167,7 @@ impl App {
alpha_mode: wgpu::CompositeAlphaMode::Inherit,
};
trace!("WGPU: Configuring surface swapchain: format = {swapchain_format:?}, size = {size:?}");
log::info!("WGPU: Configuring surface swapchain: format = {swapchain_format:?}, size = {size:?}");
surface_state
.surface
.configure(&render_state.device, &config);
@@ -182,7 +182,7 @@ impl App {
}
fn resume<T>(&mut self, event_loop: &EventLoopWindowTarget<T>) {
trace!("Resumed, creating render state...");
log::info!("Resumed, creating render state...");
self.create_surface(event_loop);
pollster::block_on(self.ensure_render_state_for_surface());
self.configure_surface_swapchain();
@@ -191,7 +191,7 @@ impl App {
}
fn run(event_loop: EventLoop<()>) {
trace!("Running mainloop...");
log::info!("Running mainloop...");
// doesn't need to be re-considered later
let instance = wgpu::Instance::new(wgpu::Backends::all());
@@ -200,7 +200,7 @@ fn run(event_loop: EventLoop<()>) {
let mut app = App::new(instance);
event_loop.run(move |event, event_loop, control_flow| {
trace!("Received Winit event: {event:?}");
log::info!("Received Winit event: {event:?}");
*control_flow = ControlFlow::Wait;
match event {
@@ -208,7 +208,7 @@ fn run(event_loop: EventLoop<()>) {
app.resume(event_loop);
}
Event::Suspended => {
trace!("Suspended, dropping render state...");
log::info!("Suspended, dropping render state...");
app.render_state = None;
}
Event::WindowEvent {
@@ -221,7 +221,7 @@ fn run(event_loop: EventLoop<()>) {
app.queue_redraw();
}
Event::RedrawRequested(_) => {
trace!("Handling Redraw Request");
log::info!("Handling Redraw Request");
if let Some(ref surface_state) = app.surface_state {
if let Some(ref rs) = app.render_state {
@@ -265,6 +265,9 @@ fn run(event_loop: EventLoop<()>) {
event: WindowEvent::CloseRequested,
..
} => *control_flow = ControlFlow::Exit,
Event::WindowEvent { event: _, .. } => {
log::info!("Window event {:#?}", event);
}
_ => {}
}
});
@@ -280,7 +283,7 @@ fn _main(event_loop: EventLoop<()>) {
fn android_main(app: AndroidApp) {
use winit::platform::android::EventLoopBuilderExtAndroid;
android_logger::init_once(android_logger::Config::default().with_min_level(log::Level::Trace));
android_logger::init_once(android_logger::Config::default().with_min_level(log::Level::Info));
let event_loop = EventLoopBuilder::new().with_android_app(app).build();
_main(event_loop);
@@ -290,7 +293,7 @@ fn android_main(app: AndroidApp) {
#[cfg(not(target_os = "android"))]
fn main() {
env_logger::builder()
.filter_level(log::LevelFilter::Warn) // Default Log Level
.filter_level(log::LevelFilter::Info) // Default Log Level
.parse_default_env()
.init();