Test MSAA on Android: gfx-rs/wgpu#3429

Cargo.toml

@@ -17,8 +17,6 @@ hal = { git = "https://github.com/gfx-rs/wgpu", package = "wgpu-hal", version =
 
 # wgpu = { path = "../../forks/wgpu/wgpu" }
 # hal = { package = "wgpu-hal", path = "../../forks/wgpu/wgpu-hal" }
-# wgpu = { path = "../../forks/wgpu-i509VCB/wgpu" }
-# hal = { package = "wgpu-hal", path = "../../forks/wgpu-i509VCB/wgpu-hal" }
 
 async-executor = "1.0"
 winit = "0.27.1"

wgpu-in-app/Cargo.toml

@@ -39,6 +39,7 @@ libc.workspace = true
 android_logger.workspace = true
 jni.workspace = true
 jni_fn.workspace = true
+log-panics = "*"
 
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]

wgpu-in-app/src/examples/msaa_line.rs

@@ -37,10 +37,29 @@ pub struct MSAALine {
 }
 
 impl MSAALine {
- pub fn new(app_surface: &AppSurface) -> Self {
+ pub fn new(app_surface: &mut AppSurface) -> Self {
+ // Only srgb format can show real MSAA effect on metal backend.
+ let msaa_format = app_surface.config.format.add_srgb_suffix();
+ app_surface.sdq.update_config_format(msaa_format);
+
  let config = &app_surface.config;
  let device = &app_surface.device;
- let sample_count = 4;
+
+ let sample_flags = app_surface
+ .adapter
+ .get_texture_format_features(config.format)
+ .flags;
+ let sample_count = {
+ if sample_flags.contains(wgpu::TextureFormatFeatureFlags::MULTISAMPLE_X8) {
+ 8
+ } else if sample_flags.contains(wgpu::TextureFormatFeatureFlags::MULTISAMPLE_X4) {
+ 4
+ } else if sample_flags.contains(wgpu::TextureFormatFeatureFlags::MULTISAMPLE_X2) {
+ 2
+ } else {
+ 1
+ }
+ };
 
  let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor {
  label: None,

wgpu-in-app/src/ffi/android.rs

@@ -10,6 +10,7 @@ use log::{info, Level};
 #[no_mangle]
 #[jni_fn("name.jinleili.wgpu.RustBridge")]
 pub fn createWgpuCanvas(env: *mut JNIEnv, _: JClass, surface: jobject, idx: jint) -> jlong {
+ log_panics::init();
  android_logger::init_once(Config::default().with_min_level(Level::Info));
  let canvas = WgpuCanvas::new(AppSurface::new(env as *mut _, surface), idx as i32);
  info!("WgpuCanvas created!");

wgpu-in-app/src/main.rs

@@ -26,7 +26,7 @@ fn main() {
  let window = builder.build(&events_loop).unwrap();
 
  let app_view = pollster::block_on(AppSurface::new(window));
- let mut canvas = WgpuCanvas::new(app_view, 3);
+ let mut canvas = WgpuCanvas::new(app_view, 0);
 
  let mut last_update_inst = Instant::now();
  let target_frametime = Duration::from_secs_f64(1.0 / 60.0);