From 62de97384dd55d1b5692ec1aa483e953b2dbdd24 Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Sun, 5 Jan 2025 22:08:37 -0500 Subject: [PATCH 1/4] Push fixes for red alarm --- shrooms-vb-core | 2 +- src/emulator/shrooms_vb_core.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/shrooms-vb-core b/shrooms-vb-core index 06849b5..57dcd83 160000 --- a/shrooms-vb-core +++ b/shrooms-vb-core @@ -1 +1 @@ -Subproject commit 06849b54ba7f7fd8bba09e1cf8a8cc9107ec269b +Subproject commit 57dcd8370a885541ae6a1de0f35b25675728b226 diff --git a/src/emulator/shrooms_vb_core.rs b/src/emulator/shrooms_vb_core.rs index 2c9510a..bc30433 100644 --- a/src/emulator/shrooms_vb_core.rs +++ b/src/emulator/shrooms_vb_core.rs @@ -147,7 +147,8 @@ impl Sim { let memory = vec![0u64; size.div_ceil(4)]; let sim: *mut VB = Box::into_raw(memory.into_boxed_slice()).cast(); unsafe { vb_init(sim) }; - unsafe { vb_set_option(sim, VBOption::PseudoHalt, 1) }; + // pseudohalt is disabled due to breaking red alarm + unsafe { vb_set_option(sim, VBOption::PseudoHalt, 0) }; unsafe { vb_reset(sim) }; // set up userdata From 0585bc27407fc4b6f4916b1e197598121dd8f329 Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Sun, 5 Jan 2025 22:11:56 -0500 Subject: [PATCH 2/4] chore: Release lemur version 0.2.6 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8eeb29e..f29dc30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1709,7 +1709,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "lemur" -version = "0.2.5" +version = "0.2.6" dependencies = [ "anyhow", "bitflags 2.6.0", diff --git a/Cargo.toml b/Cargo.toml index 54757fc..b4591bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ description = "An emulator for the Virtual Boy." repository = "https://git.virtual-boy.com/PVB/lemur" publish = false license = "MIT" -version = "0.2.5" +version = "0.2.6" edition = "2021" [dependencies] From 005ed509d55a067f56fc0000512ecd617c3e2a12 Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Tue, 7 Jan 2025 13:06:37 -0500 Subject: [PATCH 3/4] Stop using Vulkan on Windows --- src/app.rs | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/app.rs b/src/app.rs index 8c83a07..886127e 100644 --- a/src/app.rs +++ b/src/app.rs @@ -251,17 +251,23 @@ impl Viewport { }); egui_extras::install_image_loaders(&ctx); - let mut painter = egui_wgpu::winit::Painter::new( - ctx.clone(), - egui_wgpu::WgpuConfiguration { - present_mode: wgpu::PresentMode::AutoNoVsync, - ..egui_wgpu::WgpuConfiguration::default() - }, - 1, - None, - false, - true, - ); + #[allow(unused_mut)] + let mut wgpu_config = egui_wgpu::WgpuConfiguration { + present_mode: wgpu::PresentMode::AutoNoVsync, + ..egui_wgpu::WgpuConfiguration::default() + }; + #[cfg(windows)] + { + if let egui_wgpu::WgpuSetup::CreateNew { + supported_backends, .. + } = &mut wgpu_config.wgpu_setup + { + *supported_backends -= wgpu::Backends::VULKAN; + } + } + + let mut painter = + egui_wgpu::winit::Painter::new(ctx.clone(), wgpu_config, 1, None, false, true); let mut info = ViewportInfo::default(); let mut builder = app.initial_viewport(); From 423743ea5cc5e88b2c02b358bf6f876c5536fd58 Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Tue, 7 Jan 2025 13:07:11 -0500 Subject: [PATCH 4/4] chore: Release lemur version 0.2.7 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f29dc30..42fd9f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1709,7 +1709,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "lemur" -version = "0.2.6" +version = "0.2.7" dependencies = [ "anyhow", "bitflags 2.6.0", diff --git a/Cargo.toml b/Cargo.toml index b4591bd..d5889af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ description = "An emulator for the Virtual Boy." repository = "https://git.virtual-boy.com/PVB/lemur" publish = false license = "MIT" -version = "0.2.6" +version = "0.2.7" edition = "2021" [dependencies]