Fix the object viewer

Reviewed-on: #7

Cargo.toml

@@ -4,52 +4,54 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.7.3"
+version = "0.11.0"
 edition = "2024"
 
 [dependencies]
 anyhow = "1"
 atoi = "2"
+audioadapter-buffers = "2"
 atomic = "0.6"
 bitflags = { version = "2", features = ["serde"] }
 bytemuck = { version = "1", features = ["derive"] }
 clap = { version = "4", features = ["derive"] }
 cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
 directories = "6"
-egui = { version = "0.32", features = ["serde"] }
+egui = { version = "0.34", features = ["serde"] }
-egui_extras = { version = "0.32", features = ["image"] }
+egui_extras = { version = "0.34", features = ["image"] }
-egui-notify = "0.20"
+egui-notify = "0.22"
-egui-winit = "0.32"
+egui-winit = "0.34"
-egui-wgpu = { version = "0.32", features = ["winit"] }
+egui-wgpu = { version = "0.34", features = ["winit"] }
 fxprof-processed-profile = "0.8"
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
-gimli = "0.32"
+gimli = "0.33"
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
 itertools = "0.14"
 normpath = "1"
+notify = "8"
 num-derive = "0.4"
 num-traits = "0.2"
-object = "0.37"
+object = "0.39"
-oneshot = "0.1"
+oneshot = { version = "0.2", features = ["async", "std"] }
 pollster = "0.4"
-rand = "0.9"
+rand = "0.10"
-rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
+rfd = "0.17"
 rtrb = "0.3"
-rubato = "0.16"
+rubato = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-thread-priority = "2"
+thread-priority = "3"
 tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "time"] }
 tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-wgpu = "25"
+wgpu = "29"
 wholesym = "0.8"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.61", features = ["Win32_System_Threading"] }
+windows = { version = "0.62", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"

build.Dockerfile

@@ -9,31 +9,35 @@ ADD "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.
 RUN apt-get update && \
     apt-get install -y ca-certificates
 COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
+COPY install-llvm.sh .
 RUN apt-get update && \
-    apt-get install -y bash bzip2 clang-20 git lld-20 llvm-20 make patch xz-utils && \
+    ./install-llvm.sh && \
-    ln -s $(which clang-20) /usr/bin/clang && \
+    apt-get install -y bash bzip2 git make patch xz-utils && \
-    ln -s $(which clang++-20) /usr/bin/clang++ && \
+    ln -s $(which clang-21) /usr/bin/clang && \
-    ln -s $(which ld64.lld-20) /usr/bin/ld64.lld && \
+    ln -s $(which clang++-21) /usr/bin/clang++ && \
+    ln -s $(which ld64.lld-21) /usr/bin/ld64.lld && \
     SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
 
-FROM rust:1.89-bookworm
+FROM rust:1.94-bookworm
 ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
 COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
+COPY install-llvm.sh .
 RUN rustup target add x86_64-pc-windows-msvc && \
     rustup target add x86_64-apple-darwin && \
     rustup target add aarch64-apple-darwin && \
     apt-get update && \
-    apt-get install -y clang-20 lld-20 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
+    ./install-llvm.sh && \
+    apt-get install -y libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
     cargo install cargo-bundle xwin && \
     xwin --accept-license splat --output xwin && \
     rm -rf .xwin-cache && \
-    ln -s $(which clang-20) /usr/bin/clang && \
+    ln -s $(which clang-21) /usr/bin/clang && \
-    ln -s $(which clang++-20) /usr/bin/clang++
+    ln -s $(which clang++-21) /usr/bin/clang++
 COPY --from=osxcross /osxcross /osxcross
 
 ENV PATH="/osxcross/bin:$PATH" \
     LD_LIBRARY_PATH="/osxcross/lib" \
-    CC="clang-20" CXX="clang++-20" AR="llvm-ar-20" \
+    CC="clang-21" CXX="clang++-21" AR="llvm-ar-21" \
     CC_x86_64-apple-darwin="o64-clang" \
     CXX_x86_64-apple-darwin="o64-clang++" \
     CC_aarch64-apple-darwin="oa64-clang" \
@@ -41,12 +45,13 @@ ENV PATH="/osxcross/bin:$PATH" \
     SHROOMS_CFLAGS_x86_64-unknown-linux-gnu="-flto" \
     CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang -Clink-arg=-fuse-ld=lld" \
     SHROOMS_CFLAGS_x86_64-pc-windows-msvc="-flto" \
+    CFLAGS_x86_64-pc-windows-msvc="-I/xwin/crt/include -I/xwin/sdk/include/ucrt -I/xwin/sdk/include/um -I/xwin/sdk/include/shared" \
     CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUSTFLAGS="-Lnative=/xwin/crt/lib/x86_64 -Lnative=/xwin/sdk/lib/um/x86_64 -Lnative=/xwin/sdk/lib/ucrt/x86_64 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld" \
-    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-20" \
+    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-21" \
     CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
-    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-20" \
+    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-21" \
     CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="oa64-clang" \
-    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-20" \
+    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-21" \
-    RC_PATH="llvm-rc-20" \
+    RC_PATH="llvm-rc-21" \
     MACOSX_DEPLOYMENT_TARGET="14.5"
 ENTRYPOINT ["bash"]

build.rs

@@ -18,8 +18,10 @@ fn main() -> Result<(), Box<dyn Error>> {
     };
     builder
         .include(Path::new("shrooms-vb-core/core"))
+        .include(Path::new("shrooms-vb-core/util"))
         .opt_level(opt_level)
         .flag_if_supported("-fno-strict-aliasing")
+        .define("_CRT_SECURE_NO_WARNINGS", None)
         .define("VB_LITTLE_ENDIAN", None)
         .define("VB_SIGNED_PROPAGATE", None)
         .define("VB_DIV_GENERIC", None)
@@ -29,7 +31,10 @@ fn main() -> Result<(), Box<dyn Error>> {
         .define("VB_DIRECT_FRAME", "on_frame")
         .define("VB_DIRECT_READ", "on_read")
         .define("VB_DIRECT_WRITE", "on_write")
+        .define("VBU_REALLOC", "vbu_realloc_shim")
         .file(Path::new("shrooms-vb-core/core/vb.c"))
+        .file(Path::new("shrooms-vb-core/util/isx.c"))
+        .file(Path::new("shrooms-vb-core/util/vbu.c"))
         .compile("vb");
 
     Ok(())

install-llvm.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Hopefully temporary script to manually install working llvm packages.
+# The apt index for these is broken in bookworm, and upgrading to trixie
+# would make them depend on too new of a libc version.
+
+# https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-21/clang-21_21.1.5~%2B%2B20251023083151%2B45afac62e373-1~exp1~20251023083333.51_amd64.deb
+PACKAGES=('clang-21' 'clang-tools-21' 'libclang-common-21-dev' 'libclang-cpp21' 'libclang-rt-21-dev' 'libclang1-21' 'libllvm21' 'lld-21' 'llvm-21' 'llvm-21-dev' 'llvm-21-linker-tools' 'llvm-21-runtime' 'llvm-21-tools')
+FILES=()
+URL='https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-21'
+VERSION='21.1.5~%2B%2B20251023083151%2B45afac62e373-1~exp1~20251023083333.51_amd64.deb'
+
+apt-get install -y curl python3
+for package in "${PACKAGES[@]}"; do
+    curl -O -L "$URL/${package}_$VERSION"
+    FILES+=("./${package}_$VERSION")
+done
+
+apt-get install -y "${FILES[@]}"

llvm.sources

@@ -1,4 +1,4 @@
 Types: deb deb-src
 URIs: http://apt.llvm.org/bookworm/
-Suites: llvm-toolchain-bookworm-20
+Suites: llvm-toolchain-bookworm-21
 Components: main

src/app.rs

@@ -16,16 +16,17 @@ use winit::{
 };
 
 use crate::{
+    config::CliArgs,
     controller::ControllerManager,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
-    images::ImageProcessor,
+    images::ImageTextureLoader,
     input::{MappingProvider, ShortcutProvider},
     memory::MemoryClient,
     persistence::Persistence,
     window::{
         AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
-        GdbServerWindow, HotkeysWindow, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
+        GdbServerWindow, HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow,
-        TerminalWindow, WorldWindow,
+        RegisterWindow, TerminalWindow, WorldWindow,
     },
 };
 
@@ -49,35 +50,41 @@ pub struct Application {
     shortcuts: ShortcutProvider,
     controllers: ControllerManager,
     memory: Arc<MemoryClient>,
-    images: ImageProcessor,
+    images: Arc<ImageTextureLoader>,
     persistence: Persistence,
     viewports: HashMap<ViewportId, Viewport>,
     focused: Option<ViewportId>,
     init_debug_port: Option<u16>,
     init_profiling: bool,
+    init_bgmap: bool,
+    init_chardata: bool,
+    init_objects: bool,
+    init_worlds: bool,
+    init_framebuffers: bool,
+    init_registers: bool,
+    init_terminal: bool,
 }
 
 impl Application {
     pub fn new(
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
-        debug_port: Option<u16>,
+        persistence: Persistence,
-        profiling: bool,
+        args: CliArgs,
     ) -> Self {
         let wgpu = WgpuState::new();
         let icon = load_icon().ok().map(Arc::new);
-        let persistence = Persistence::new();
+        let mappings = MappingProvider::new(persistence.clone(), args.player2_controller);
-        let mappings = MappingProvider::new(persistence.clone());
         let shortcuts = ShortcutProvider::new(persistence.clone());
         let controllers = ControllerManager::new(client.clone(), &mappings);
         let memory = Arc::new(MemoryClient::new(client.clone()));
-        let images = ImageProcessor::new();
+        let images = Arc::new(ImageTextureLoader::new());
         {
             let mappings = mappings.clone();
             let proxy = proxy.clone();
             thread::spawn(|| process_gamepad_input(mappings, proxy));
         }
-        Self {
+        let app = Self {
             icon,
             wgpu,
             client,
@@ -90,9 +97,25 @@ impl Application {
             persistence,
             viewports: HashMap::new(),
             focused: None,
-            init_debug_port: debug_port,
+            init_debug_port: args.debug_port,
-            init_profiling: profiling,
+            init_profiling: args.profile,
+            init_bgmap: args.bgmap_data,
+            init_chardata: args.character_data,
+            init_objects: args.object_data,
+            init_worlds: args.worlds,
+            init_framebuffers: args.frame_buffers,
+            init_registers: args.registers,
+            init_terminal: args.terminal,
+        };
+        if args.player2 {
+            app.client
+                .send_command(EmulatorCommand::StartSecondSim(args.rom.clone()));
+
+            app.proxy
+                .send_event(UserEvent::OpenPlayer2)
+                .expect("Failed to open Player 2 window");
         }
+        app
     }
 
     fn open(&mut self, event_loop: &ActiveEventLoop, window: Box<dyn AppWindow>) {
@@ -103,7 +126,13 @@ impl Application {
         }
         self.viewports.insert(
             viewport_id,
-            Viewport::new(event_loop, &self.wgpu, self.icon.clone(), window),
+            Viewport::new(
+                &self.images,
+                event_loop,
+                &self.wgpu,
+                self.icon.clone(),
+                window,
+            ),
         );
     }
 }
@@ -124,11 +153,40 @@ impl ApplicationHandler<UserEvent> for Application {
             SimId::Player1,
         );
         self.open(event_loop, Box::new(app));
+        let sim_id = SimId::Player1;
         if self.init_profiling {
-            let mut profiler = ProfileWindow::new(SimId::Player1, self.client.clone());
+            let mut profiler = ProfileWindow::new(sim_id, self.client.clone());
             profiler.launch();
             self.open(event_loop, Box::new(profiler));
         }
+        if self.init_chardata {
+            let chardata = CharacterDataWindow::new(sim_id, &self.memory, &self.images);
+            self.open(event_loop, Box::new(chardata));
+        }
+        if self.init_bgmap {
+            let bgmap = BgMapWindow::new(sim_id, &self.memory, &self.images);
+            self.open(event_loop, Box::new(bgmap));
+        }
+        if self.init_objects {
+            let objects = ObjectWindow::new(sim_id, &self.memory, &self.images);
+            self.open(event_loop, Box::new(objects));
+        }
+        if self.init_worlds {
+            let world = WorldWindow::new(sim_id, &self.memory, &self.images);
+            self.open(event_loop, Box::new(world));
+        }
+        if self.init_framebuffers {
+            let fb = FrameBufferWindow::new(sim_id, &self.memory, &self.images);
+            self.open(event_loop, Box::new(fb));
+        }
+        if self.init_registers {
+            let registers = RegisterWindow::new(sim_id, &self.memory);
+            self.open(event_loop, Box::new(registers));
+        }
+        if self.init_terminal {
+            let terminal = TerminalWindow::new(sim_id, &self.client);
+            self.open(event_loop, Box::new(terminal));
+        }
     }
 
     fn window_event(
@@ -228,24 +286,24 @@ impl ApplicationHandler<UserEvent> for Application {
                 self.open(event_loop, Box::new(about));
             }
             UserEvent::OpenCharacterData(sim_id) => {
-                let chardata = CharacterDataWindow::new(sim_id, &self.memory, &mut self.images);
+                let chardata = CharacterDataWindow::new(sim_id, &self.memory, &self.images);
                 self.open(event_loop, Box::new(chardata));
             }
             UserEvent::OpenBgMap(sim_id) => {
-                let bgmap = BgMapWindow::new(sim_id, &self.memory, &mut self.images);
+                let bgmap = BgMapWindow::new(sim_id, &self.memory, &self.images);
                 self.open(event_loop, Box::new(bgmap));
             }
             UserEvent::OpenObjects(sim_id) => {
-                let objects = ObjectWindow::new(sim_id, &self.memory, &mut self.images);
+                let objects = ObjectWindow::new(sim_id, &self.memory, &self.images);
                 self.open(event_loop, Box::new(objects));
             }
             UserEvent::OpenWorlds(sim_id) => {
-                let world = WorldWindow::new(sim_id, &self.memory, &mut self.images);
+                let world = WorldWindow::new(sim_id, &self.memory, &self.images);
                 self.open(event_loop, Box::new(world));
             }
             UserEvent::OpenFrameBuffers(sim_id) => {
-                let world = FrameBufferWindow::new(sim_id, &self.memory, &mut self.images);
+                let fb = FrameBufferWindow::new(sim_id, &self.memory, &self.images);
-                self.open(event_loop, Box::new(world));
+                self.open(event_loop, Box::new(fb));
             }
             UserEvent::OpenRegisters(sim_id) => {
                 let registers = RegisterWindow::new(sim_id, &self.memory);
@@ -333,13 +391,14 @@ impl WgpuState {
         #[cfg(windows)]
         let backends = wgpu::Backends::from_env()
             .unwrap_or((wgpu::Backends::PRIMARY | wgpu::Backends::GL) - wgpu::Backends::VULKAN);
-        let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
             backends,
-            ..wgpu::InstanceDescriptor::default()
+            ..wgpu::InstanceDescriptor::new_without_display_handle_from_env()
         });
 
         let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference: wgpu::PowerPreference::HighPerformance,
+            power_preference:
+                wgpu::PowerPreference::from_env().unwrap_or(wgpu::PowerPreference::LowPower),
             compatible_surface: None,
             force_fallback_adapter: false,
         }))
@@ -369,6 +428,7 @@ struct Viewport {
 }
 impl Viewport {
     pub fn new(
+        images: &Arc<ImageTextureLoader>,
         event_loop: &ActiveEventLoop,
         wgpu: &WgpuState,
         icon: Option<Arc<IconData>>,
@@ -388,15 +448,16 @@ impl Viewport {
             .unwrap()
             .insert(0, "Selawik".into());
         ctx.set_fonts(fonts);
-        ctx.style_mut(|s| {
+        ctx.global_style_mut(|s| {
             s.wrap_mode = Some(TextWrapMode::Extend);
             s.visuals.menu_corner_radius = Default::default();
             s.spacing.scroll = ScrollStyle::thin();
         });
         egui_extras::install_image_loaders(&ctx);
+        ctx.add_texture_loader(images.clone());
 
         let wgpu_config = egui_wgpu::WgpuConfiguration {
-            present_mode: wgpu::PresentMode::AutoNoVsync,
+            present_mode: wgpu::PresentMode::AutoVsync,
             wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
                 instance: wgpu.instance.clone(),
                 adapter: wgpu.adapter.clone(),
@@ -406,13 +467,12 @@ impl Viewport {
             ..egui_wgpu::WgpuConfiguration::default()
         };
 
+        let options = egui_wgpu::RendererOptions::default();
         let mut painter = pollster::block_on(egui_wgpu::winit::Painter::new(
             ctx.clone(),
             wgpu_config,
-            1,
-            None,
             false,
-            true,
+            options,
         ));
 
         let mut info = ViewportInfo::default();
@@ -423,7 +483,12 @@ impl Viewport {
         let (window, state) = create_window_and_state(&ctx, event_loop, &builder, &mut painter);
         egui_winit::update_viewport_info(&mut info, &ctx, &window, true);
 
-        app.on_init(&ctx, painter.render_state().as_ref().unwrap());
+        let render_state = painter.render_state();
+        let args = InitArgs {
+            window: &window,
+            render_state: render_state.as_ref().unwrap(),
+        };
+        app.on_init(args);
         Self {
             painter,
             ctx,
@@ -470,8 +535,8 @@ impl Viewport {
     fn redraw(&mut self, event_loop: &ActiveEventLoop) -> Option<Action> {
         let mut input = self.state.take_egui_input(&self.window);
         input.viewports = std::iter::once((ViewportId::ROOT, self.info.clone())).collect();
-        let mut output = self.ctx.run(input, |ctx| {
+        let mut output = self.ctx.run_ui(input, |ui| {
-            self.app.show(ctx);
+            self.app.show(ui);
         });
         let clipped_primitives = self.ctx.tessellate(output.shapes, output.pixels_per_point);
         self.painter.paint_and_update_textures(
@@ -505,7 +570,7 @@ impl Viewport {
             &mut self.info,
             std::mem::take(&mut self.commands),
             &self.window,
-            &mut HashSet::default(),
+            &mut vec![],
         );
 
         if self.info.close_requested() {

src/audio.rs

@@ -1,17 +1,17 @@
 use std::time::Duration;
 
 use anyhow::{Result, bail};
+use audioadapter_buffers::direct::InterleavedSlice;
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
-use itertools::Itertools;
+use rubato::Resampler;
-use rubato::{FastFixedOut, Resampler};
 use tracing::error;
 
 pub struct Audio {
     #[allow(unused)]
     stream: cpal::Stream,
-    sampler: FastFixedOut<f32>,
+    sampler: rubato::Async<f32>,
-    input_buffer: Vec<Vec<f32>>,
+    input_buffer: Vec<f32>,
-    output_buffer: Vec<Vec<f32>>,
+    output_buffer: Vec<f32>,
     sample_sink: rtrb::Producer<f32>,
 }
 
@@ -32,17 +32,18 @@ impl Audio {
         let mut config = config.with_max_sample_rate().config();
         let resample_ratio = config.sample_rate.0 as f64 / VB_FREQUENCY as f64;
         let chunk_size = (834.0 * resample_ratio) as usize;
-        let sampler = FastFixedOut::new(
+        let sampler = rubato::Async::new_poly(
             resample_ratio,
             64.0,
             rubato::PolynomialDegree::Cubic,
             chunk_size,
             2,
+            rubato::FixedAsync::Output,
         )?;
         config.buffer_size = cpal::BufferSize::Fixed(sampler.output_frames_max() as u32);
 
-        let input_buffer = sampler.input_buffer_allocate(true);
+        let input_buffer = Vec::with_capacity(sampler.nbr_channels() * sampler.input_frames_max());
-        let output_buffer = sampler.output_buffer_allocate(true);
+        let output_buffer = vec![0.0; sampler.nbr_channels() * sampler.output_frames_max()];
         let (sample_sink, mut sample_source) =
             rtrb::RingBuffer::new(sampler.output_frames_max() * 4);
 
@@ -78,34 +79,38 @@ impl Audio {
         })
     }
 
-    pub fn update(&mut self, samples: &[f32]) {
+    pub fn update(&mut self, mut samples: &[f32]) {
-        for sample in samples.chunks_exact(2) {
+        while self.input_buffer.len() + samples.len() >= self.sampler.input_frames_next() * 2 {
-            for (channel, value) in self.input_buffer.iter_mut().zip(sample) {
+            let samples_needed =
-                channel.push(*value);
+                (self.sampler.input_frames_next() * 2).saturating_sub(self.input_buffer.len());
-            }
+            let (current_samples, future_samples) = samples.split_at(samples_needed);
-            if self.input_buffer[0].len() >= self.sampler.input_frames_next() {
+            self.input_buffer.extend_from_slice(current_samples);
-                let (_, output_samples) = self
+            samples = future_samples;
-                    .sampler
+
-                    .process_into_buffer(&self.input_buffer, &mut self.output_buffer, None)
+            let buffer_in =
+                InterleavedSlice::new(&self.input_buffer, 2, self.sampler.input_frames_next())
                     .unwrap();
-
+            let mut buffer_out = InterleavedSlice::new_mut(
-                let chunk = match self.sample_sink.write_chunk_uninit(output_samples * 2) {
+                &mut self.output_buffer,
-                    Ok(c) => c,
+                2,
-                    Err(rtrb::chunks::ChunkError::TooFewSlots(n)) => {
+                self.sampler.output_frames_next(),
-                        self.sample_sink.write_chunk_uninit(n).unwrap()
+            )
-                    }
+            .unwrap();
-                };
+            let (_, output_samples) = self
-                let interleaved = self.output_buffer[0]
+                .sampler
-                    .iter()
+                .process_into_buffer(&buffer_in, &mut buffer_out, None)
-                    .interleave(self.output_buffer[1].iter())
+                .unwrap();
-                    .cloned();
+            let chunk = match self.sample_sink.write_chunk_uninit(output_samples * 2) {
-                chunk.fill_from_iter(interleaved);
+                Ok(c) => c,
-
+                Err(rtrb::chunks::ChunkError::TooFewSlots(n)) => {
-                for channel in &mut self.input_buffer {
+                    self.sample_sink.write_chunk_uninit(n).unwrap()
-                    channel.clear();
                 }
-            }
+            };
+            chunk.fill_from_iter(self.output_buffer[..output_samples * 2].iter().copied());
+
+            self.input_buffer.clear();
         }
+        self.input_buffer.extend_from_slice(samples);
 
         while self.sample_sink.slots() < self.sampler.output_frames_max() * 2 {
             std::thread::sleep(Duration::from_micros(500));

src/config.rs

@@ -0,0 +1,103 @@
+use anyhow::Result;
+use clap::Parser;
+use egui::{Color32, Vec2};
+use serde::{Deserialize, Serialize};
+
+use crate::{emulator::SimId, persistence::Persistence, window::DisplayMode};
+use std::path::PathBuf;
+
+#[derive(Parser)]
+#[command(version, long_version = env!("CARGO_PKG_VERSION"))]
+pub struct CliArgs {
+    /// The path to a virtual boy ROM to run.
+    pub rom: Option<PathBuf>,
+    /// Start a GDB/LLDB debug server on this port.
+    #[arg(short, long)]
+    pub debug_port: Option<u16>,
+    /// Enable profiling a game
+    #[arg(short, long)]
+    pub profile: bool,
+    /// Open character data window
+    #[arg(short, long)]
+    pub character_data: bool,
+    /// Open bgmap data window
+    #[arg(short, long)]
+    pub bgmap_data: bool,
+    /// Open object data window
+    #[arg(short, long)]
+    pub object_data: bool,
+    /// Open worlds window
+    #[arg(long)]
+    pub worlds: bool,
+    /// Open frame buffers window
+    #[arg(short, long)]
+    pub frame_buffers: bool,
+    /// Open registers window
+    #[arg(short, long)]
+    pub registers: bool,
+    /// Open terminal
+    #[arg(short, long)]
+    pub terminal: bool,
+    /// Watch ROM files for changes, automatically reload
+    #[arg(short, long)]
+    pub watch: bool,
+    /// Automatically open Player 2 for multiplayer
+    #[arg(long)]
+    pub player2: bool,
+    /// Map the first connected controller to Player 2
+    #[arg(long)]
+    pub player2_controller: bool,
+}
+
+pub const COLOR_PRESETS: [[Color32; 2]; 3] = [
+    [
+        Color32::from_rgb(0xff, 0x00, 0x00),
+        Color32::from_rgb(0x00, 0xc6, 0xf0),
+    ],
+    [
+        Color32::from_rgb(0x00, 0xb4, 0x00),
+        Color32::from_rgb(0xc8, 0x00, 0xff),
+    ],
+    [
+        Color32::from_rgb(0xb4, 0x9b, 0x00),
+        Color32::from_rgb(0x00, 0x00, 0xff),
+    ],
+];
+
+const fn default_audio_enabled() -> bool {
+    true
+}
+
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
+pub struct SimConfig {
+    pub display_mode: DisplayMode,
+    pub colors: [Color32; 2],
+    pub dimensions: Vec2,
+    #[serde(default = "default_audio_enabled")]
+    pub audio_enabled: bool,
+}
+
+impl SimConfig {
+    pub fn load(persistence: &Persistence, sim_id: SimId) -> Self {
+        if let Ok(config) = persistence.load_config(config_filename(sim_id)) {
+            return config;
+        }
+        Self {
+            display_mode: DisplayMode::Anaglyph,
+            colors: COLOR_PRESETS[0],
+            dimensions: DisplayMode::Anaglyph.proportions() + Vec2::new(0.0, 22.0),
+            audio_enabled: true,
+        }
+    }
+
+    pub fn save(&self, persistence: &Persistence, sim_id: SimId) -> Result<()> {
+        persistence.save_config(config_filename(sim_id), self)
+    }
+}
+
+fn config_filename(sim_id: SimId) -> &'static str {
+    match sim_id {
+        SimId::Player1 => "config_p1",
+        SimId::Player2 => "config_p2",
+    }
+}

src/emulator.rs

@@ -5,7 +5,7 @@ use std::{
     sync::{
         Arc, Weak,
         atomic::{AtomicBool, Ordering},
-        mpsc::{self, RecvError, TryRecvError},
+        mpsc::{self, RecvTimeoutError, TryRecvError},
     },
     time::Duration,
 };
@@ -33,6 +33,7 @@ mod cart;
 mod game_info;
 mod inline_stack_map;
 mod shrooms_vb_core;
+mod shrooms_vb_util;
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub enum SimId {
@@ -74,6 +75,7 @@ pub struct EmulatorBuilder {
     audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
     start_paused: bool,
+    watch_rom: Arc<[AtomicBool; 2]>,
 }
 
 impl EmulatorBuilder {
@@ -90,12 +92,13 @@ impl EmulatorBuilder {
             audio_on: Arc::new([AtomicBool::new(true), AtomicBool::new(true)]),
             linked: Arc::new(AtomicBool::new(false)),
             start_paused: false,
+            watch_rom: Arc::new([AtomicBool::new(false), AtomicBool::new(false)]),
         };
         let client = EmulatorClient {
             queue,
             sim_state: builder.sim_state.clone(),
             state: builder.state.clone(),
-            audio_on: builder.audio_on.clone(),
+            watch_rom: builder.watch_rom.clone(),
             linked: builder.linked.clone(),
         };
         (builder, client)
@@ -115,12 +118,25 @@ impl EmulatorBuilder {
         }
     }
 
+    pub fn with_audio_on(self, p1: bool, p2: bool) -> Self {
+        self.audio_on[0].store(p1, Ordering::Relaxed);
+        self.audio_on[1].store(p2, Ordering::Relaxed);
+        self
+    }
+
+    pub fn with_watch_rom(self, p1: bool, p2: bool) -> Self {
+        self.watch_rom[0].store(p1, Ordering::Relaxed);
+        self.watch_rom[1].store(p2, Ordering::Relaxed);
+        self
+    }
+
     pub fn build(self) -> Result<Emulator> {
         let mut emulator = Emulator::new(
             self.commands,
             self.sim_state,
             self.state,
             self.audio_on,
+            self.watch_rom,
             self.linked,
         )?;
         if let Some(path) = self.rom {
@@ -141,6 +157,7 @@ pub struct Emulator {
     sim_state: Arc<[Atomic<SimState>; 2]>,
     state: Arc<Atomic<EmulatorState>>,
     audio_on: Arc<[AtomicBool; 2]>,
+    watch_rom: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
     profilers: [Option<ProfileSender>; 2],
     renderers: HashMap<SimId, TextureSink>,
@@ -159,6 +176,7 @@ impl Emulator {
         sim_state: Arc<[Atomic<SimState>; 2]>,
         state: Arc<Atomic<EmulatorState>>,
         audio_on: Arc<[AtomicBool; 2]>,
+        watch_rom: Arc<[AtomicBool; 2]>,
         linked: Arc<AtomicBool>,
     ) -> Result<Self> {
         Ok(Self {
@@ -169,6 +187,7 @@ impl Emulator {
             sim_state,
             state,
             audio_on,
+            watch_rom,
             linked,
             profilers: [None, None],
             renderers: HashMap::new(),
@@ -182,9 +201,18 @@ impl Emulator {
         })
     }
 
+    pub fn reload_cart(&mut self, sim_id: SimId) -> Result<()> {
+        let Some(cart) = &self.carts[sim_id.to_index()] else {
+            return Ok(());
+        };
+        let path = cart.file_path.clone();
+        self.load_cart(sim_id, &path)
+    }
+
     pub fn load_cart(&mut self, sim_id: SimId, path: &Path) -> Result<()> {
-        let cart = Cart::load(path, sim_id)?;
+        let watch = self.watch_rom[sim_id.to_index()].load(Ordering::Acquire);
-        self.reset_sim(sim_id, Some(cart))?;
+        let cart = Cart::load(path, sim_id, watch)?;
+        self.try_reset_sim(sim_id, Some(cart))?;
         Ok(())
     }
 
@@ -194,16 +222,26 @@ impl Emulator {
         } else {
             self.carts[0].as_ref().map(|c| c.file_path.clone())
         };
+        let watch = self.watch_rom[SimId::Player2.to_index()].load(Ordering::Acquire);
         let cart = match file_path {
-            Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2)?),
+            Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2, watch)?),
             None => None,
         };
-        self.reset_sim(SimId::Player2, cart)?;
+        self.try_reset_sim(SimId::Player2, cart)?;
         self.link_sims();
         Ok(())
     }
 
-    fn reset_sim(&mut self, sim_id: SimId, new_cart: Option<Cart>) -> Result<()> {
+    fn reset_sim(&mut self, sim_id: SimId, new_cart: Option<Cart>) -> bool {
+        if let Err(error) = self.try_reset_sim(sim_id, new_cart) {
+            self.report_error(sim_id, format!("Error resetting sim: {error}"));
+            false
+        } else {
+            true
+        }
+    }
+
+    fn try_reset_sim(&mut self, sim_id: SimId, new_cart: Option<Cart>) -> Result<()> {
         self.save_sram(sim_id)?;
 
         let index = sim_id.to_index();
@@ -224,6 +262,10 @@ impl Emulator {
             sim.load_cart(cart.rom.clone(), cart.sram.clone())?;
             self.carts[index] = Some(cart);
             self.sim_state[index].store(SimState::Ready, Ordering::Release);
+        } else if let Some(cart) = self.carts[index].as_mut()
+            && cart.is_watching()
+        {
+            cart.restart_watching();
         }
         let mut profiling = false;
         if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref()
@@ -340,7 +382,7 @@ impl Emulator {
 
     fn start_profiling(&mut self, sim_id: SimId, sender: ProfileSender) -> Result<()> {
         self.profilers[sim_id.to_index()] = Some(sender);
-        self.reset_sim(sim_id, None)
+        self.try_reset_sim(sim_id, None)
     }
 
     fn start_debugging(&mut self, sim_id: SimId, sender: DebugSender) {
@@ -416,11 +458,30 @@ impl Emulator {
             let idle = self.tick();
             if idle {
                 // The game is paused, and we have output all the video/audio we have.
-                // Block the thread until a new command comes in.
+                // Block the thread until a new command comes in, or a ROM changes.
-                match self.commands.recv() {
+                loop {
-                    Ok(command) => self.handle_command(command),
+                    match self.commands.recv_timeout(Duration::from_millis(250)) {
-                    Err(RecvError) => {
+                        Ok(command) => {
-                        return;
+                            self.handle_command(command);
+                            break;
+                        }
+                        Err(RecvTimeoutError::Timeout) => {
+                            let mut changed = false;
+                            for sim_id in SimId::values() {
+                                let Some(cart) = self.carts[sim_id.to_index()].as_ref() else {
+                                    continue;
+                                };
+                                if cart.changed() {
+                                    changed |= self.reset_sim(sim_id, None);
+                                }
+                            }
+                            if changed {
+                                break;
+                            }
+                        }
+                        Err(RecvTimeoutError::Disconnected) => {
+                            return;
+                        }
                     }
                 }
             }
@@ -435,6 +496,14 @@ impl Emulator {
                     }
                 }
             }
+            for sim_id in SimId::values() {
+                let Some(cart) = self.carts[sim_id.to_index()].as_ref() else {
+                    continue;
+                };
+                if cart.changed() {
+                    self.reset_sim(sim_id, None);
+                }
+            }
             self.watched_regions.retain(|range, region| {
                 let Some(region) = region.upgrade() else {
                     return false;
@@ -601,6 +670,22 @@ impl Emulator {
                     self.report_error(sim_id, format!("Error loading rom: {error}"));
                 }
             }
+            EmulatorCommand::ReloadRom(sim_id) => {
+                if let Err(error) = self.reload_cart(sim_id) {
+                    self.report_error(sim_id, format!("Error loading rom: {error}"));
+                }
+            }
+            EmulatorCommand::WatchRom(sim_id, watch) => {
+                self.watch_rom[sim_id.to_index()].store(watch, Ordering::Release);
+                let Some(cart) = self.carts[sim_id.to_index()].as_mut() else {
+                    return;
+                };
+                if watch {
+                    cart.restart_watching();
+                } else {
+                    cart.stop_watching();
+                }
+            }
             EmulatorCommand::StartSecondSim(path) => {
                 if let Err(error) = self.start_second_sim(path) {
                     self.report_error(
@@ -714,9 +799,8 @@ impl Emulator {
                 };
                 sim.watch_stdout(true);
             }
-            EmulatorCommand::SetAudioEnabled(p1, p2) => {
+            EmulatorCommand::SetAudioEnabled(sim_id, enabled) => {
-                self.audio_on[SimId::Player1.to_index()].store(p1, Ordering::Release);
+                self.audio_on[sim_id.to_index()].store(enabled, Ordering::Release);
-                self.audio_on[SimId::Player2.to_index()].store(p2, Ordering::Release);
             }
             EmulatorCommand::Link => {
                 self.link_sims();
@@ -725,9 +809,7 @@ impl Emulator {
                 self.unlink_sims();
             }
             EmulatorCommand::Reset(sim_id) => {
-                if let Err(error) = self.reset_sim(sim_id, None) {
+                self.reset_sim(sim_id, None);
-                    self.report_error(sim_id, format!("Error resetting sim: {error}"));
-                }
             }
             EmulatorCommand::SetKeys(sim_id, keys) => {
                 if let Some(sim) = self.sims.get_mut(sim_id.to_index()) {
@@ -769,6 +851,8 @@ impl Emulator {
 pub enum EmulatorCommand {
     ConnectToSim(SimId, TextureSink, mpsc::Sender<Toast>),
     LoadGame(SimId, PathBuf),
+    ReloadRom(SimId),
+    WatchRom(SimId, bool),
     StartSecondSim(Option<PathBuf>),
     StopSecondSim,
     Pause,
@@ -791,7 +875,7 @@ pub enum EmulatorCommand {
     AddWatchpoint(SimId, u32, usize, VBWatchpointType),
     RemoveWatchpoint(SimId, u32, usize, VBWatchpointType),
     WatchStdout(SimId, mpsc::Sender<String>),
-    SetAudioEnabled(bool, bool),
+    SetAudioEnabled(SimId, bool),
     Link,
     Unlink,
     Reset(SimId),
@@ -857,8 +941,8 @@ pub struct EmulatorClient {
     queue: mpsc::Sender<EmulatorCommand>,
     sim_state: Arc<[Atomic<SimState>; 2]>,
     state: Arc<Atomic<EmulatorState>>,
-    audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
+    watch_rom: Arc<[AtomicBool; 2]>,
 }
 
 impl EmulatorClient {
@@ -868,12 +952,12 @@ impl EmulatorClient {
     pub fn emulator_state(&self) -> EmulatorState {
         self.state.load(Ordering::Acquire)
     }
-    pub fn is_audio_enabled(&self, sim_id: SimId) -> bool {
-        self.audio_on[sim_id.to_index()].load(Ordering::Acquire)
-    }
     pub fn are_sims_linked(&self) -> bool {
         self.linked.load(Ordering::Acquire)
     }
+    pub fn is_rom_watched(&self, sim_id: SimId) -> bool {
+        self.watch_rom[sim_id.to_index()].load(Ordering::Acquire)
+    }
     pub fn send_command(&self, command: EmulatorCommand) -> bool {
         match self.queue.send(command) {
             Ok(()) => true,

src/emulator/cart.rs

@@ -1,13 +1,14 @@
 use anyhow::Result;
-use rand::Rng;
+use notify::Watcher;
+use rand::RngExt;
 use std::{
     fs::{self, File},
     io::{Read, Seek as _, SeekFrom, Write as _},
     path::{Path, PathBuf},
-    sync::Arc,
+    sync::{Arc, atomic::AtomicBool},
 };
 
-use crate::emulator::{SimId, game_info::GameInfo};
+use crate::emulator::{SimId, game_info::GameInfo, shrooms_vb_util::rom_from_isx};
 
 pub struct Cart {
     pub file_path: PathBuf,
@@ -15,13 +16,16 @@ pub struct Cart {
     sram_file: File,
     pub sram: Vec<u8>,
     pub info: Arc<GameInfo>,
+    watcher: Option<notify::RecommendedWatcher>,
+    changed: Arc<AtomicBool>,
 }
 
 impl Cart {
-    pub fn load(file_path: &Path, sim_id: SimId) -> Result<Self> {
+    pub fn load(file_path: &Path, sim_id: SimId, watch: bool) -> Result<Self> {
         let rom = fs::read(file_path)?;
-        let (rom, info) =
+        let (rom, info) = try_parse_isx(file_path, &rom)
-            try_parse_elf(file_path, &rom).unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
+            .or_else(|| try_parse_elf(file_path, &rom))
+            .unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
 
         let mut sram_file = File::options()
             .read(true)
@@ -44,12 +48,21 @@ impl Cart {
             sram
         };
 
+        let changed = Arc::new(AtomicBool::new(false));
+        let watcher = if watch {
+            build_watcher(file_path, changed.clone())
+        } else {
+            None
+        };
+
         Ok(Cart {
             file_path: file_path.to_path_buf(),
             rom,
             sram_file,
             sram,
             info: Arc::new(info),
+            watcher,
+            changed,
         })
     }
 
@@ -58,6 +71,56 @@ impl Cart {
         self.sram_file.write_all(&self.sram)?;
         Ok(())
     }
+
+    pub fn changed(&self) -> bool {
+        self.changed.load(std::sync::atomic::Ordering::Relaxed)
+    }
+
+    pub fn is_watching(&self) -> bool {
+        self.watcher.is_some()
+    }
+
+    pub fn restart_watching(&mut self) {
+        self.changed = Arc::new(AtomicBool::new(false));
+        if let Some(mut watcher) = self.watcher.take() {
+            let _ = watcher.unwatch(&self.file_path);
+        };
+        self.watcher = build_watcher(&self.file_path, self.changed.clone());
+    }
+
+    pub fn stop_watching(&mut self) {
+        self.changed = Arc::new(AtomicBool::new(false));
+        self.watcher = None;
+    }
+}
+
+fn build_watcher(file_path: &Path, changed: Arc<AtomicBool>) -> Option<notify::RecommendedWatcher> {
+    let file_path = file_path.to_path_buf();
+    let mut watcher =
+        notify::recommended_watcher(move |event: Result<notify::Event, notify::Error>| {
+            let Ok(e) = event else {
+                return;
+            };
+            let modified = !matches!(
+                e.kind,
+                notify::EventKind::Access(_)
+                    | notify::EventKind::Modify(notify::event::ModifyKind::Metadata(_))
+            );
+            if modified {
+                changed.store(true, std::sync::atomic::Ordering::Relaxed);
+            }
+        })
+        .ok()?;
+    watcher
+        .watch(&file_path, notify::RecursiveMode::NonRecursive)
+        .ok()?;
+    Some(watcher)
+}
+
+fn try_parse_isx(file_path: &Path, data: &[u8]) -> Option<(Vec<u8>, GameInfo)> {
+    let rom = rom_from_isx(data)?;
+    let info = GameInfo::from_isx(file_path, data);
+    Some((rom, info))
 }
 
 fn try_parse_elf(file_path: &Path, data: &[u8]) -> Option<(Vec<u8>, GameInfo)> {
@@ -73,7 +136,7 @@ fn try_parse_elf(file_path: &Path, data: &[u8]) -> Option<(Vec<u8>, GameInfo)> {
         }
         _ => return None,
     };
-    let info = GameInfo::new(file_path, data).unwrap_or_else(|_| GameInfo::empty(file_path));
+    let info = GameInfo::from_elf(file_path, data).unwrap_or_else(|_| GameInfo::empty(file_path));
     Some((program, info))
 }
 
@@ -86,12 +149,13 @@ fn parse_elf_program<Elf: object::read::elf::FileHeader<Endian = object::Endiann
     let mut bytes = vec![];
     let mut pstart = None;
     for phdr in header.program_headers(endian, data).ok()? {
-        if phdr.p_filesz(endian).into() == 0 {
+        let pma = phdr.p_paddr(endian).into();
+        if pma < 0x07000000 || phdr.p_filesz(endian).into() == 0 {
             continue;
         }
-        let start = pstart.unwrap_or(phdr.p_paddr(endian).into());
+        let start = pstart.unwrap_or(pma);
         pstart = Some(start);
-        bytes.resize((phdr.p_paddr(endian).into() - start) as usize, 0);
+        bytes.resize((pma - start) as usize, 0);
         let data = phdr.data(endian, data).ok()?;
         bytes.extend_from_slice(data);
     }

src/emulator/game_info.rs

@@ -14,7 +14,7 @@ pub struct GameInfo {
 }
 
 impl GameInfo {
-    pub fn new(file_path: &Path, input: &[u8]) -> Result<Self> {
+    pub fn from_elf(file_path: &Path, input: &[u8]) -> Result<Self> {
         let file = object::File::parse(input)?;
 
         let (name, path) = name_and_path(file_path);
@@ -52,6 +52,26 @@ impl GameInfo {
         })
     }
 
+    pub fn from_isx(file_path: &Path, input: &[u8]) -> Self {
+        let (name, path) = name_and_path(file_path);
+        let symbols = extract_isx_symbols(input);
+        let library_info = LibraryInfo {
+            name: name.clone(),
+            debug_name: name,
+            path: path.clone(),
+            debug_path: path,
+            debug_id: DebugId::default(),
+            code_id: None,
+            arch: None,
+            symbol_table: symbols.map(|syms| Arc::new(SymbolTable::new(syms))),
+        };
+        let inline_stack_map = InlineStackMap::empty();
+        Self {
+            library_info,
+            inline_stack_map,
+        }
+    }
+
     pub fn empty(file_path: &Path) -> Self {
         let (name, path) = name_and_path(file_path);
         let library_info = LibraryInfo {
@@ -115,6 +135,66 @@ fn build_inline_stack_map(file: object::File) -> Result<InlineStackMap> {
     Ok(frames.build())
 }
 
+fn extract_isx_symbols(input: &[u8]) -> Option<Vec<Symbol>> {
+    let mut syms = vec![];
+    let (_, mut buf) = input.split_at_checked(32)?;
+    while !buf.is_empty() {
+        let typ;
+        (typ, buf) = buf.split_first()?;
+        match typ {
+            0x11 => {
+                // Code (Virtual Boy)
+                (_, buf) = buf.split_at_checked(4)?;
+                let len_bytes;
+                (len_bytes, buf) = buf.split_first_chunk()?;
+                let len = u32::from_le_bytes(*len_bytes);
+                (_, buf) = buf.split_at_checked(len as usize)?;
+            }
+            0x13 => {
+                // Range (Virtual Boy)
+                let count_bytes;
+                (count_bytes, buf) = buf.split_first_chunk()?;
+                let count = u16::from_le_bytes(*count_bytes);
+                (_, buf) = buf.split_at_checked(count as usize * 9)?;
+            }
+            0x14 => {
+                // Symbol (Virtual Boy)
+                let count_bytes;
+                (count_bytes, buf) = buf.split_first_chunk()?;
+                let count = u16::from_le_bytes(*count_bytes);
+                for _ in 0..count {
+                    let name_len;
+                    (name_len, buf) = buf.split_first()?;
+                    let name_bytes;
+                    (name_bytes, buf) = buf.split_at_checked(*name_len as usize)?;
+                    (_, buf) = buf.split_at_checked(2)?;
+                    let address_bytes;
+                    (address_bytes, buf) = buf.split_first_chunk()?;
+
+                    let name_str = String::from_utf8_lossy(name_bytes);
+                    let address = u32::from_le_bytes(*address_bytes);
+                    syms.push(Symbol {
+                        address: address & 0x07ffffff,
+                        size: Some(4),
+                        name: demangle_any(&name_str),
+                    });
+                }
+            }
+            0x20..=0x22 => {
+                // System (undocumented)
+                let length_bytes;
+                (length_bytes, buf) = buf.split_first_chunk()?;
+                let length = u32::from_le_bytes(*length_bytes);
+                (_, buf) = buf.split_at_checked(length as usize)?;
+            }
+            _ => {
+                return None;
+            }
+        }
+    }
+    Some(syms)
+}
+
 type Reader<'a> = gimli::EndianSlice<'a, gimli::RunTimeEndian>;
 
 struct ParseContext<'a> {
@@ -165,16 +245,19 @@ impl ParseContext<'_> {
     }
 }
 
-fn parse_inline(ctx: &mut ParseContext, node: gimli::EntriesTreeNode<Reader>) -> Result<()> {
+fn parse_inline<'a>(
+    ctx: &mut ParseContext<'a>,
+    node: gimli::EntriesTreeNode<'a, '_, Reader<'a>>,
+) -> Result<()> {
     if node.entry().tag() == gimli::DW_TAG_inlined_subroutine
-        && let Some(attr) = node.entry().attr_value(gimli::DW_AT_abstract_origin)?
+        && let Some(attr) = node.entry().attr_value(gimli::DW_AT_abstract_origin)
         && let Some(name) = ctx.name_attr(attr)?
     {
         let name = Arc::new(name);
         let mut ranges = ctx.dorf.die_ranges(ctx.unit, node.entry())?;
         while let Some(range) = ranges.next()? {
-            let start = range.begin as u32;
+            let start = range.begin as u32 & 0x07ffffff;
-            let end = range.end as u32;
+            let end = range.end as u32 & 0x07ffffff;
             ctx.frames.add(start, end, name.clone());
         }
     }

src/emulator/shrooms_vb_core.rs

@@ -261,7 +261,7 @@ extern "C" fn on_exception(sim: *mut VB, cause: *mut u16) -> c_int {
     };
     data.monitor.event = data.monitor.queued_event.take();
     data.monitor.new_inline_stack = data.monitor.detect_new_inline_stack(pc);
-    data.monitor.queued_event = Some(SimEvent::Interrupt(cause, pc));
+    data.monitor.queued_event = Some(SimEvent::Interrupt(cause, pc & 0x07ffffff));
     unsafe { vb_set_exception_callback(sim, None) };
     if data.monitor.event.is_some() || data.monitor.new_inline_stack.is_some() {
         1
@@ -439,7 +439,9 @@ impl EventMonitor {
                 // JAL .+4 is how programs get r31 to a known value for indirect calls
                 // (which we detect later.)
                 // Any other JAL is a function call.
-                return Some(SimEvent::Call(address.wrapping_add_signed(disp)));
+                return Some(SimEvent::Call(
+                    address.wrapping_add_signed(disp) & 0x07ffffff,
+                ));
             }
         }
 
@@ -453,7 +455,7 @@ impl EventMonitor {
             if r31 as u32 == address.wrapping_add(2) {
                 // JMP anywhere else, if r31 points to after the JMP, is an indirect call
                 let target = unsafe { vb_get_program_register(sim, jmp_reg as u32) };
-                return Some(SimEvent::Call(target as u32));
+                return Some(SimEvent::Call(target as u32 & 0x07ffffff));
             }
         }
 

src/emulator/shrooms_vb_util.rs

@@ -0,0 +1,31 @@
+use std::ffi::c_void;
+
+#[unsafe(no_mangle)]
+unsafe fn vbu_realloc_shim(ptr: *mut c_void, new_size: usize) -> *mut c_void {
+    if !ptr.is_null() {
+        // not supporting proper realloc because it needs bookkeeping and it's unnecessary
+        return std::ptr::null_mut();
+    }
+    let allocation = vec![0u8; new_size].into_boxed_slice();
+    Box::into_raw(allocation).cast()
+}
+
+#[link(name = "vb")]
+unsafe extern "C" {
+    #[link_name = "vbuFromISX"]
+    fn vbu_from_isx(bytes: *const c_void, length: usize, rom_length: *mut usize) -> *mut c_void;
+}
+
+pub fn rom_from_isx(bytes: &[u8]) -> Option<Vec<u8>> {
+    if !bytes.starts_with(b"ISX") {
+        return None;
+    }
+    let mut rom_length = 0;
+    let raw_rom = unsafe { vbu_from_isx(bytes.as_ptr().cast(), bytes.len(), &mut rom_length) };
+    if raw_rom.is_null() {
+        return None;
+    }
+    // SAFETY: the rom was allocated by vbu_realloc_shim, which created it from a Vec<u8>.
+    let rom = unsafe { Vec::from_raw_parts(raw_rom.cast(), rom_length, rom_length) };
+    Some(rom)
+}

src/images.rs

@@ -1,5 +1,5 @@
 use std::{
-    collections::HashMap,
+    collections::{HashMap, hash_map::Entry},
     ops::Deref,
     sync::{Arc, Mutex, Weak},
     thread,
@@ -7,17 +7,21 @@ use std::{
 };
 
 use egui::{
-    Color32, ColorImage, TextureHandle, TextureOptions,
+    Color32, ColorImage, TextureHandle,
     epaint::ImageDelta,
+    generate_loader_id,
     load::{LoadError, SizedTexture, TextureLoader, TexturePoll},
 };
 use tokio::{sync::mpsc, time::timeout};
 
-pub struct ImageProcessor {
+use crate::emulator::SimId;
+
+pub struct ImageTextureLoader {
+    cache: Mutex<HashMap<String, ImageEntry>>,
     sender: mpsc::UnboundedSender<Box<dyn ImageRendererImpl>>,
 }
 
-impl ImageProcessor {
+impl ImageTextureLoader {
     pub fn new() -> Self {
         let (sender, receiver) = mpsc::unbounded_channel();
         thread::spawn(move || {
@@ -26,29 +30,52 @@ impl ImageProcessor {
                 .build()
                 .unwrap()
                 .block_on(async move {
-                    let mut worker = ImageProcessorWorker {
+                    let mut worker = ImageTextureLoaderWorker {
                         receiver,
                         renderers: vec![],
                     };
                     worker.run().await
                 })
         });
-        Self { sender }
+        Self {
+            cache: Mutex::new(HashMap::new()),
+            sender,
+        }
     }
 
     pub fn add<const N: usize, R: ImageRenderer<N> + 'static>(
         &self,
+        sim_id: SimId,
         renderer: R,
         params: R::Params,
-    ) -> ([ImageHandle; N], ImageParams<R::Params>) {
+    ) -> ImageParams<R::Params> {
         let states = renderer.sizes().map(ImageState::new);
-        let handles = states.clone().map(|state| ImageHandle {
-            size: state.size.map(|i| i as f32),
-            data: state.sink,
-        });
         let images = renderer
             .sizes()
             .map(|[width, height]| ImageBuffer::new(width, height));
+        {
+            let mut cache = self.cache.lock().unwrap();
+            for (name, state) in renderer.names().into_iter().zip(&states) {
+                let url = format!("vip://{sim_id}/{name}");
+                let entry = ImageEntry {
+                    size: state.size.map(|i| i as f32),
+                    data: Arc::downgrade(&state.sink),
+                    texture: None,
+                };
+                match cache.entry(url) {
+                    Entry::Vacant(e) => {
+                        e.insert(entry);
+                    }
+                    Entry::Occupied(mut e) => {
+                        // Only overwrite an old entry if that entry is dead.
+                        // Otherwise, we clear out the reference to a texture actually in use.
+                        if e.get().data.strong_count() == 0 {
+                            e.insert(entry);
+                        }
+                    }
+                }
+            }
+        }
         let sink = Arc::new(Mutex::new(params.clone()));
         let _ = self.sender.send(Box::new(ImageRendererWrapper {
             renderer,
@@ -56,20 +83,87 @@ impl ImageProcessor {
             images,
             states,
         }));
-        let params = ImageParams {
+        ImageParams {
             value: params,
             sink,
-        };
+        }
-        (handles, params)
     }
 }
 
-struct ImageProcessorWorker {
+impl TextureLoader for ImageTextureLoader {
+    fn id(&self) -> &str {
+        generate_loader_id!(ImageTextureLoader2)
+    }
+
+    fn load(
+        &self,
+        ctx: &egui::Context,
+        uri: &str,
+        texture_options: egui::TextureOptions,
+        _size_hint: egui::SizeHint,
+    ) -> Result<TexturePoll, LoadError> {
+        let mut cache = self.cache.lock().unwrap();
+        let Some(entry) = cache.get_mut(uri) else {
+            return Err(LoadError::NotSupported);
+        };
+        if texture_options != egui::TextureOptions::NEAREST {
+            return Err(LoadError::Loading(
+                "Only TextureOptions::NEAREST are supported".into(),
+            ));
+        }
+        let Some(data) = entry.data.upgrade() else {
+            cache.remove(uri);
+            return Err(LoadError::Loading("Backing loader no longer exists".into()));
+        };
+        match (data.lock().unwrap().take(), entry.texture.as_ref()) {
+            (Some(update), Some(handle)) => {
+                let delta = ImageDelta::full(update, texture_options);
+                ctx.tex_manager().write().set(handle.id(), delta);
+                let texture = SizedTexture::new(handle, entry.size);
+                Ok(TexturePoll::Ready { texture })
+            }
+            (Some(update), None) => {
+                let handle = ctx.load_texture(uri, update, texture_options);
+                let texture = SizedTexture::new(&handle, entry.size);
+                entry.texture.replace(handle);
+                Ok(TexturePoll::Ready { texture })
+            }
+            (None, Some(handle)) => {
+                let texture = SizedTexture::new(handle, entry.size);
+                Ok(TexturePoll::Ready { texture })
+            }
+            (None, None) => {
+                let size = entry.size.into();
+                Ok(TexturePoll::Pending { size: Some(size) })
+            }
+        }
+    }
+
+    fn forget(&self, uri: &str) {
+        let _ = uri;
+    }
+
+    fn forget_all(&self) {}
+
+    fn byte_size(&self) -> usize {
+        self.cache
+            .lock()
+            .unwrap()
+            .values()
+            .map(|entry| {
+                let [width, height] = entry.size;
+                width as usize * height as usize * 4
+            })
+            .sum()
+    }
+}
+
+struct ImageTextureLoaderWorker {
     receiver: mpsc::UnboundedReceiver<Box<dyn ImageRendererImpl>>,
     renderers: Vec<Box<dyn ImageRendererImpl>>,
 }
 
-impl ImageProcessorWorker {
+impl ImageTextureLoaderWorker {
     async fn run(&mut self) {
         loop {
             if self.renderers.is_empty() {
@@ -142,16 +236,10 @@ impl ImageBuffer {
     }
 }
 
-#[derive(Clone)]
+struct ImageEntry {
-pub struct ImageHandle {
     size: [f32; 2],
-    data: Arc<Mutex<Option<Arc<ColorImage>>>>,
+    data: Weak<Mutex<Option<Arc<ColorImage>>>>,
-}
+    texture: Option<TextureHandle>,
-
-impl ImageHandle {
-    fn pull(&mut self) -> Option<Arc<ColorImage>> {
-        self.data.lock().unwrap().take()
-    }
 }
 
 pub struct ImageParams<T> {
@@ -178,6 +266,7 @@ impl<T: Clone + Eq> ImageParams<T> {
 
 pub trait ImageRenderer<const N: usize>: Send {
     type Params: Clone + Send;
+    fn names(&self) -> [&str; N];
     fn sizes(&self) -> [[usize; 2]; N];
     fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; N]);
 }
@@ -246,83 +335,3 @@ impl<const N: usize, R: ImageRenderer<N> + Send> ImageRendererImpl for ImageRend
         Ok(())
     }
 }
-
-pub struct ImageTextureLoader {
-    cache: Mutex<HashMap<String, (ImageHandle, Option<TextureHandle>)>>,
-}
-
-impl ImageTextureLoader {
-    pub fn new(renderers: impl IntoIterator<Item = (String, ImageHandle)>) -> Self {
-        let mut cache = HashMap::new();
-        for (key, image) in renderers {
-            cache.insert(key, (image, None));
-        }
-        Self {
-            cache: Mutex::new(cache),
-        }
-    }
-}
-
-impl TextureLoader for ImageTextureLoader {
-    fn id(&self) -> &str {
-        concat!(module_path!(), "ImageTextureLoader")
-    }
-
-    fn load(
-        &self,
-        ctx: &egui::Context,
-        uri: &str,
-        texture_options: TextureOptions,
-        _size_hint: egui::SizeHint,
-    ) -> Result<TexturePoll, LoadError> {
-        let mut cache = self.cache.lock().unwrap();
-        let Some((image, maybe_handle)) = cache.get_mut(uri) else {
-            return Err(LoadError::NotSupported);
-        };
-        if texture_options != TextureOptions::NEAREST {
-            return Err(LoadError::Loading(
-                "Only TextureOptions::NEAREST are supported".into(),
-            ));
-        }
-        match (image.pull(), maybe_handle.as_ref()) {
-            (Some(update), Some(handle)) => {
-                let delta = ImageDelta::full(update, texture_options);
-                ctx.tex_manager().write().set(handle.id(), delta);
-                let texture = SizedTexture::new(handle, image.size);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (Some(update), None) => {
-                let handle = ctx.load_texture(uri, update, texture_options);
-                let texture = SizedTexture::new(&handle, image.size);
-                maybe_handle.replace(handle);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (None, Some(handle)) => {
-                let texture = SizedTexture::new(handle, image.size);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (None, None) => {
-                let size = image.size.into();
-                Ok(TexturePoll::Pending { size: Some(size) })
-            }
-        }
-    }
-
-    fn forget(&self, uri: &str) {
-        let _ = uri;
-    }
-
-    fn forget_all(&self) {}
-
-    fn byte_size(&self) -> usize {
-        self.cache
-            .lock()
-            .unwrap()
-            .values()
-            .map(|(image, _)| {
-                let [width, height] = image.size;
-                width as usize * height as usize * 4
-            })
-            .sum()
-    }
-}

src/input.rs

@@ -272,13 +272,14 @@ impl Mappings for InputMapping {
 #[derive(Clone)]
 pub struct MappingProvider {
     persistence: Persistence,
+    first_gamepad_is_p2: bool,
     device_mappings: Arc<RwLock<HashMap<DeviceId, Arc<RwLock<GamepadMapping>>>>>,
     sim_mappings: HashMap<SimId, Arc<RwLock<InputMapping>>>,
     gamepad_info: Arc<RwLock<HashMap<GamepadId, GamepadInfo>>>,
 }
 
 impl MappingProvider {
-    pub fn new(persistence: Persistence) -> Self {
+    pub fn new(persistence: Persistence, first_gamepad_is_p2: bool) -> Self {
         let mut sim_mappings = HashMap::new();
         let mut device_mappings = HashMap::new();
 
@@ -307,6 +308,7 @@ impl MappingProvider {
             device_mappings: Arc::new(RwLock::new(device_mappings)),
             gamepad_info: Arc::new(RwLock::new(HashMap::new())),
             sim_mappings,
+            first_gamepad_is_p2,
         }
     }
 
@@ -338,7 +340,12 @@ impl MappingProvider {
         .clone();
         drop(lock);
         let mut lock = self.gamepad_info.write().unwrap();
-        let bound_to = SimId::values()
+        let players = if self.first_gamepad_is_p2 {
+            vec![SimId::Player2, SimId::Player1]
+        } else {
+            vec![SimId::Player1, SimId::Player2]
+        };
+        let bound_to = players
             .into_iter()
             .find(|sim_id| lock.values().all(|info| info.bound_to != Some(*sim_id)));
         if let Entry::Vacant(entry) = lock.entry(gamepad.id()) {
@@ -457,15 +464,10 @@ struct PersistedGamepadMapping {
     default_axes: Vec<(Code, (VBKey, VBKey))>,
 }
 
-#[derive(Serialize, Deserialize)]
-pub struct Shortcut {
-    pub shortcut: KeyboardShortcut,
-    pub command: Command,
-}
-
 #[derive(Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub enum Command {
     OpenRom,
+    ReloadRom,
     Quit,
     FrameAdvance,
     FastForward(u32),
@@ -476,9 +478,10 @@ pub enum Command {
 }
 
 impl Command {
-    pub fn all() -> [Self; 7] {
+    pub fn all() -> [Self; 8] {
         [
             Self::OpenRom,
+            Self::ReloadRom,
             Self::Quit,
             Self::PauseResume,
             Self::Reset,
@@ -491,6 +494,7 @@ impl Command {
     pub fn name(self) -> &'static str {
         match self {
             Self::OpenRom => "Open ROM",
+            Self::ReloadRom => "Reload ROM",
             Self::Quit => "Exit",
             Self::PauseResume => "Pause/Resume",
             Self::Reset => "Reset",
@@ -522,6 +526,10 @@ impl Default for Shortcuts {
             Command::OpenRom,
             KeyboardShortcut::new(Modifiers::COMMAND, Key::O),
         );
+        shortcuts.set(
+            Command::ReloadRom,
+            KeyboardShortcut::new(Modifiers::COMMAND | Modifiers::SHIFT, Key::F5),
+        );
         shortcuts.set(
             Command::Quit,
             KeyboardShortcut::new(Modifiers::COMMAND, Key::Q),
@@ -682,7 +690,7 @@ impl ShortcutProvider {
                 else {
                     return true;
                 };
-                if shortcut.logical_key != *key || !shortcut.modifiers.contains(*modifiers) {
+                if *key != shortcut.logical_key || !modifiers.contains(shortcut.modifiers) {
                     return true;
                 }
                 if matches!(command, Command::FastForward(_)) {

src/main.rs

@@ -1,7 +1,7 @@
 // hide console in release mode
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-use std::{path::PathBuf, process, time::SystemTime};
+use std::{process, time::SystemTime};
 
 use anyhow::{Result, bail};
 use app::Application;
@@ -12,8 +12,15 @@ use tracing::error;
 use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::SubscriberInitExt};
 use winit::event_loop::{ControlFlow, EventLoop};
 
+use crate::{
+    config::{CliArgs, SimConfig},
+    emulator::SimId,
+    persistence::Persistence,
+};
+
 mod app;
 mod audio;
+mod config;
 mod controller;
 mod emulator;
 mod gdbserver;
@@ -25,18 +32,6 @@ mod persistence;
 mod profiler;
 mod window;
 
-#[derive(Parser)]
-struct Args {
-    /// The path to a virtual boy ROM to run.
-    rom: Option<PathBuf>,
-    /// Start a GDB/LLDB debug server on this port.
-    #[arg(short, long)]
-    debug_port: Option<u16>,
-    /// Enable profiling a game
-    #[arg(short, long)]
-    profile: bool,
-}
-
 fn init_logger() {
     let directives = std::env::var("RUST_LOG").unwrap_or("error,lemur=info".into());
     let filter = EnvFilter::builder().parse_lossy(directives);
@@ -98,7 +93,9 @@ fn main() -> Result<()> {
     #[cfg(windows)]
     set_process_priority_to_high()?;
 
-    let args = Args::parse();
+    let args = CliArgs::parse();
+
+    let persistence = Persistence::new();
 
     let (mut builder, client) = EmulatorBuilder::new();
     if let Some(path) = &args.rom {
@@ -113,6 +110,14 @@ fn main() -> Result<()> {
     if args.profile {
         builder = builder.start_paused(true)
     }
+    let p1 = SimConfig::load(&persistence, SimId::Player1);
+    let p2 = SimConfig::load(&persistence, SimId::Player2);
+
+    let watch = args.watch;
+
+    builder = builder
+        .with_audio_on(p1.audio_enabled, p2.audio_enabled)
+        .with_watch_rom(watch, watch);
 
     ThreadBuilder::default()
         .name("Emulator".to_owned())
@@ -131,11 +136,6 @@ fn main() -> Result<()> {
     let event_loop = EventLoop::with_user_event().build().unwrap();
     event_loop.set_control_flow(ControlFlow::Poll);
     let proxy = event_loop.create_proxy();
-    event_loop.run_app(&mut Application::new(
+    event_loop.run_app(&mut Application::new(client, proxy, persistence, args))?;
-        client,
-        proxy,
-        args.debug_port,
-        args.profile,
-    ))?;
     Ok(())
 }

src/memory.rs

@@ -50,11 +50,11 @@ impl MemoryClient {
 }
 
 fn aligned_memory(start: u32, length: usize) -> BoxBytes {
-    if start % 4 == 0 && length % 4 == 0 {
+    if start.is_multiple_of(4) && length.is_multiple_of(4) {
         let memory = vec![0u32; length / 4].into_boxed_slice();
         return bytemuck::box_bytes_of(memory);
     }
-    if start % 2 == 0 && length % 2 == 0 {
+    if start.is_multiple_of(2) && length.is_multiple_of(2) {
         let memory = vec![0u16; length / 2].into_boxed_slice();
         return bytemuck::box_bytes_of(memory);
     }

src/profiler/state.rs

@@ -60,6 +60,11 @@ impl ProgramState {
         let Some(stack) = self.call_stacks.get_mut(code) else {
             bail!("missing stack {code:04x}");
         };
+        // just popping the inline frames first
+        while stack
+            .pop_if(|f| matches!(f, StackFrame::Label(_)))
+            .is_some()
+        {}
         if stack.pop().is_none() {
             bail!("returned from {code:04x} but stack was empty");
         }

src/window.rs

@@ -1,6 +1,9 @@
+use std::sync::Arc;
+
 pub use about::AboutWindow;
-use egui::{Context, ViewportBuilder, ViewportId};
+use egui::{Ui, ViewportBuilder, ViewportId};
 pub use game::GameWindow;
+pub use game_screen::DisplayMode;
 pub use gdb::GdbServerWindow;
 pub use hotkeys::HotkeysWindow;
 pub use input::InputWindow;
@@ -9,7 +12,7 @@ pub use terminal::TerminalWindow;
 pub use vip::{
     BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
 };
-use winit::event::KeyEvent;
+use winit::{event::KeyEvent, window::Window};
 
 use crate::emulator::SimId;
 
@@ -29,11 +32,13 @@ pub trait AppWindow {
     fn sim_id(&self) -> SimId {
         SimId::Player1
     }
+    fn image_url(&self, name: &str) -> String {
+        format!("vip://{}/{name}", self.sim_id())
+    }
     fn initial_viewport(&self) -> ViewportBuilder;
-    fn show(&mut self, ctx: &Context);
+    fn show(&mut self, ui: &mut Ui);
-    fn on_init(&mut self, ctx: &Context, render_state: &egui_wgpu::RenderState) {
+    fn on_init(&mut self, args: InitArgs) {
-        let _ = ctx;
+        let _ = args;
-        let _ = render_state;
     }
     fn on_destroy(&mut self) {}
     fn handle_key_event(&mut self, event: &KeyEvent) -> bool {
@@ -45,3 +50,8 @@ pub trait AppWindow {
         false
     }
 }
+
+pub struct InitArgs<'a> {
+    pub window: &'a Arc<Window>,
+    pub render_state: &'a egui_wgpu::RenderState,
+}

src/window/about.rs

@@ -1,4 +1,4 @@
-use egui::{CentralPanel, Context, Image, ViewportBuilder, ViewportId};
+use egui::{CentralPanel, Image, Ui, ViewportBuilder, ViewportId};
 
 use super::AppWindow;
 
@@ -15,8 +15,8 @@ impl AppWindow for AboutWindow {
             .with_inner_size((300.0, 200.0))
     }
 
-    fn show(&mut self, ctx: &Context) {
+    fn show(&mut self, ui: &mut Ui) {
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.vertical_centered(|ui| {
                 ui.label("Lemur Virtual Boy Emulator");
                 ui.label(format!("Version {}", env!("CARGO_PKG_VERSION")));

src/window/game.rs

@@ -1,18 +1,22 @@
-use std::{sync::mpsc, time::Duration};
+use std::{
+    sync::{Arc, mpsc},
+    time::Duration,
+};
 
 use crate::{
     app::UserEvent,
+    config::{COLOR_PRESETS, SimConfig},
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
     input::{Command, ShortcutProvider},
     persistence::Persistence,
+    window::InitArgs,
 };
 use anyhow::Context as _;
 use egui::{
-    Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, TopBottomPanel, Ui, Vec2,
+    Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, Panel, Ui, Vec2,
     ViewportBuilder, ViewportCommand, ViewportId, Window,
 };
 use egui_notify::{Anchor, Toast, Toasts};
-use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
 use super::{
@@ -21,32 +25,18 @@ use super::{
     utils::UiExt as _,
 };
 
-const COLOR_PRESETS: [[Color32; 2]; 3] = [
-    [
-        Color32::from_rgb(0xff, 0x00, 0x00),
-        Color32::from_rgb(0x00, 0xc6, 0xf0),
-    ],
-    [
-        Color32::from_rgb(0x00, 0xb4, 0x00),
-        Color32::from_rgb(0xc8, 0x00, 0xff),
-    ],
-    [
-        Color32::from_rgb(0xb4, 0x9b, 0x00),
-        Color32::from_rgb(0x00, 0x00, 0xff),
-    ],
-];
-
 pub struct GameWindow {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     persistence: Persistence,
     shortcuts: ShortcutProvider,
     sim_id: SimId,
-    config: GameConfig,
+    config: SimConfig,
     toasts: Toasts,
     screen: Option<GameScreen>,
     messages: Option<mpsc::Receiver<Toast>>,
     color_picker: Option<ColorPickerState>,
+    window: Option<Arc<winit::window::Window>>,
 }
 
 impl GameWindow {
@@ -57,7 +47,7 @@ impl GameWindow {
         shortcuts: ShortcutProvider,
         sim_id: SimId,
     ) -> Self {
-        let config = load_config(&persistence, sim_id);
+        let config = SimConfig::load(&persistence, sim_id);
         let toasts = Toasts::new()
             .with_anchor(Anchor::BottomLeft)
             .with_margin((10.0, 10.0).into())
@@ -73,10 +63,11 @@ impl GameWindow {
             screen: None,
             messages: None,
             color_picker: None,
+            window: None,
         }
     }
 
-    fn show_menu(&mut self, ctx: &Context, ui: &mut Ui) {
+    fn show_menu(&mut self, ui: &mut Ui) {
         let state = self.client.emulator_state();
         let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
         let can_pause = is_ready && state == EmulatorState::Running;
@@ -87,13 +78,17 @@ impl GameWindow {
             match command {
                 Command::OpenRom => {
                     let rom = rfd::FileDialog::new()
-                        .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
+                        .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
                         .pick_file();
                     if let Some(path) = rom {
                         self.client
                             .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
                     }
                 }
+                Command::ReloadRom => {
+                    self.client
+                        .send_command(EmulatorCommand::ReloadRom(self.sim_id));
+                }
                 Command::Quit => {
                     let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
                 }
@@ -139,13 +134,25 @@ impl GameWindow {
                 .clicked()
             {
                 let rom = rfd::FileDialog::new()
-                    .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
+                    .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
                     .pick_file();
                 if let Some(path) = rom {
                     self.client
                         .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
                 }
             }
+            if ui
+                .add(self.button_for(ui.ctx(), "Reload ROM", Command::ReloadRom))
+                .clicked()
+            {
+                self.client
+                    .send_command(EmulatorCommand::ReloadRom(self.sim_id));
+            }
+            let watch_rom = self.client.is_rom_watched(self.sim_id);
+            if ui.selectable_button(watch_rom, "Watch ROM").clicked() {
+                self.client
+                    .send_command(EmulatorCommand::WatchRom(self.sim_id, !watch_rom));
+            }
             if ui
                 .add(self.button_for(ui.ctx(), "Quit", Command::Quit))
                 .clicked()
@@ -201,7 +208,7 @@ impl GameWindow {
                 pollster::block_on(self.take_screenshot());
             }
         });
-        ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
+        ui.menu_button("Options", |ui| self.show_options_menu(ui));
         ui.menu_button("Multiplayer", |ui| {
             let has_player_2 = self.client.sim_state(SimId::Player2) != SimState::Uninitialized;
             if self.sim_id == SimId::Player1
@@ -298,10 +305,13 @@ impl GameWindow {
         self.client
             .send_command(EmulatorCommand::Screenshot(self.sim_id, tx));
         let bytes = rx.await.context("Could not take screenshot")?;
-        let file = rfd::FileDialog::new()
+        let mut file_dialog = rfd::FileDialog::new()
             .add_filter("PNG images", &["png"])
-            .set_file_name("screenshot.png")
+            .set_file_name("screenshot.png");
-            .save_file();
+        if let Some(window) = self.window.as_ref() {
+            file_dialog = file_dialog.set_parent(window);
+        }
+        let file = file_dialog.save_file();
         let Some(path) = file else {
             return Ok(None);
         };
@@ -318,7 +328,7 @@ impl GameWindow {
         Ok(Some(path.display().to_string()))
     }
 
-    fn show_options_menu(&mut self, ctx: &Context, ui: &mut Ui) {
+    fn show_options_menu(&mut self, ui: &mut Ui) {
         ui.menu_button("Video", |ui| {
             ui.menu_button("Screen Size", |ui| {
                 let current_dims = self.config.dimensions;
@@ -334,7 +344,7 @@ impl GameWindow {
                         .selectable_button((current_dims - dims).length() < 1.0, label)
                         .clicked()
                     {
-                        ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
+                        ui.send_viewport_cmd(ViewportCommand::InnerSize(dims));
                     }
                 }
             });
@@ -364,7 +374,7 @@ impl GameWindow {
                 let new_proportions = display_mode.proportions();
                 let scale = new_proportions / old_proportions;
                 if scale != Vec2::new(1.0, 1.0) {
-                    ctx.send_viewport_cmd(ViewportCommand::InnerSize(current_dims * scale));
+                    ui.send_viewport_cmd(ViewportCommand::InnerSize(current_dims * scale));
                 }
 
                 self.update_config(|c| {
@@ -401,15 +411,15 @@ impl GameWindow {
             });
         });
         ui.menu_button("Audio", |ui| {
-            let p1_enabled = self.client.is_audio_enabled(SimId::Player1);
+            if ui
-            let p2_enabled = self.client.is_audio_enabled(SimId::Player2);
+                .selectable_button(self.config.audio_enabled, "Enabled")
-            if ui.selectable_button(p1_enabled, "Player 1").clicked() {
+                .clicked()
-                self.client
+            {
-                    .send_command(EmulatorCommand::SetAudioEnabled(!p1_enabled, p2_enabled));
+                self.update_config(|c| c.audio_enabled = !c.audio_enabled);
-            }
+                self.client.send_command(EmulatorCommand::SetAudioEnabled(
-            if ui.selectable_button(p2_enabled, "Player 2").clicked() {
+                    self.sim_id,
-                self.client
+                    self.config.audio_enabled,
-                    .send_command(EmulatorCommand::SetAudioEnabled(p1_enabled, !p2_enabled));
+                ));
             }
         });
         ui.menu_button("Input", |ui| {
@@ -451,13 +461,11 @@ impl GameWindow {
         }
     }
 
-    fn update_config(&mut self, update: impl FnOnce(&mut GameConfig)) {
+    fn update_config(&mut self, update: impl FnOnce(&mut SimConfig)) {
         let mut new_config = self.config.clone();
         update(&mut new_config);
         if self.config != new_config {
-            let _ = self
+            let _ = new_config.save(&self.persistence, self.sim_id);
-                .persistence
-                .save_config(config_filename(self.sim_id), &new_config);
         }
         self.config = new_config;
     }
@@ -471,24 +479,6 @@ impl GameWindow {
     }
 }
 
-fn config_filename(sim_id: SimId) -> &'static str {
-    match sim_id {
-        SimId::Player1 => "config_p1",
-        SimId::Player2 => "config_p2",
-    }
-}
-
-fn load_config(persistence: &Persistence, sim_id: SimId) -> GameConfig {
-    if let Ok(config) = persistence.load_config(config_filename(sim_id)) {
-        return config;
-    }
-    GameConfig {
-        display_mode: DisplayMode::Anaglyph,
-        colors: COLOR_PRESETS[0],
-        dimensions: DisplayMode::Anaglyph.proportions() + Vec2::new(0.0, 22.0),
-    }
-}
-
 impl AppWindow for GameWindow {
     fn viewport_id(&self) -> ViewportId {
         match self.sim_id {
@@ -507,9 +497,9 @@ impl AppWindow for GameWindow {
             .with_inner_size(self.config.dimensions)
     }
 
-    fn show(&mut self, ctx: &Context) {
+    fn show(&mut self, ui: &mut Ui) {
         let dimensions = {
-            let bounds = ctx.available_rect();
+            let bounds = ui.content_rect();
             bounds.max - bounds.min
         };
         self.update_config(|c| c.dimensions = dimensions);
@@ -519,11 +509,11 @@ impl AppWindow for GameWindow {
                 self.toasts.add(toast);
             }
         }
-        TopBottomPanel::top("menubar")
+        Panel::top("menubar")
-            .exact_height(22.0)
+            .exact_size(22.0)
-            .show(ctx, |ui| {
+            .show_inside(ui, |ui| {
                 MenuBar::new().ui(ui, |ui| {
-                    self.show_menu(ctx, ui);
+                    self.show_menu(ui);
                 });
             });
         if self.color_picker.is_some() {
@@ -531,22 +521,22 @@ impl AppWindow for GameWindow {
                 .title_bar(false)
                 .resizable(false)
                 .anchor(Align2::CENTER_CENTER, Vec2::ZERO)
-                .show(ctx, |ui| {
+                .show(ui, |ui| {
                     self.show_color_picker(ui);
                 });
         }
-        let frame = Frame::central_panel(&ctx.style()).fill(Color32::BLACK);
+        let frame = Frame::central_panel(ui.style()).fill(Color32::BLACK);
-        CentralPanel::default().frame(frame).show(ctx, |ui| {
+        CentralPanel::default().frame(frame).show_inside(ui, |ui| {
             if let Some(screen) = self.screen.as_mut() {
                 screen.update(self.config.display_mode, self.config.colors);
                 ui.add(screen);
             }
         });
-        self.toasts.show(ctx);
+        self.toasts.show(ui);
     }
 
-    fn on_init(&mut self, _ctx: &Context, render_state: &egui_wgpu::RenderState) {
+    fn on_init(&mut self, args: InitArgs) {
-        let (screen, sink) = GameScreen::init(render_state);
+        let (screen, sink) = GameScreen::init(args.render_state);
         let (message_sink, message_source) = mpsc::channel();
         self.client.send_command(EmulatorCommand::ConnectToSim(
             self.sim_id,
@@ -555,6 +545,7 @@ impl AppWindow for GameWindow {
         ));
         self.screen = Some(screen);
         self.messages = Some(message_source);
+        self.window = Some(args.window.clone());
     }
 
     fn on_destroy(&mut self) {
@@ -570,10 +561,3 @@ struct ColorPickerState {
     just_opened: bool,
     unpause_on_close: bool,
 }
-
-#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
-struct GameConfig {
-    display_mode: DisplayMode,
-    colors: [Color32; 2],
-    dimensions: Vec2,
-}

src/window/game_screen.rs

@@ -53,8 +53,8 @@ impl GameScreen {
         let render_pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 label: Some("render pipeline layout"),
-                bind_group_layouts: &[&bind_group_layout],
+                bind_group_layouts: &[Some(&bind_group_layout)],
-                push_constant_ranges: &[],
+                immediate_size: 0,
             });
 
         let create_render_pipeline = |entry_point: &str| {
@@ -92,7 +92,7 @@ impl GameScreen {
                     mask: !0,
                     alpha_to_coverage_enabled: false,
                 },
-                multiview: None,
+                multiview_mask: None,
                 cache: None,
             })
         };

src/window/gdb.rs

@@ -56,10 +56,10 @@ impl AppWindow for GdbServerWindow {
             .with_inner_size((300.0, 200.0))
     }
 
-    fn show(&mut self, ctx: &egui::Context) {
+    fn show(&mut self, ui: &mut egui::Ui) {
         let port_num: Option<u16> = self.port_str.parse().ok();
         let status = self.server.status();
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 if port_num.is_none() {
                     let style = ui.style_mut();

src/window/hotkeys.rs

@@ -1,6 +1,6 @@
 use egui::{
-    Button, CentralPanel, Context, Event, KeyboardShortcut, Label, Layout, Slider, Ui,
+    Button, CentralPanel, Event, KeyboardShortcut, Label, Layout, Slider, Ui, ViewportBuilder,
-    ViewportBuilder, ViewportId,
+    ViewportId,
 };
 use egui_extras::{Column, TableBuilder};
 
@@ -135,8 +135,8 @@ impl AppWindow for HotkeysWindow {
             .with_inner_size((400.0, 400.0))
     }
 
-    fn show(&mut self, ctx: &Context) {
+    fn show(&mut self, ui: &mut Ui) {
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 if ui.button("Use defaults").clicked() {
                     self.shortcuts.reset();

src/window/input.rs

@@ -1,6 +1,4 @@
-use egui::{
+use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder, ViewportId};
-    Button, CentralPanel, Context, Label, Layout, TopBottomPanel, Ui, ViewportBuilder, ViewportId,
-};
 use egui_extras::{Column, TableBuilder};
 use gilrs::{EventType, GamepadId};
 use std::sync::RwLock;
@@ -172,8 +170,8 @@ impl AppWindow for InputWindow {
             .with_inner_size((600.0, 400.0))
     }
 
-    fn show(&mut self, ctx: &Context) {
+    fn show(&mut self, ui: &mut Ui) {
-        TopBottomPanel::top("options").show(ctx, |ui| {
+        Panel::top("options").show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 let old_active_tab = self.active_tab;
                 ui.selectable_value(&mut self.active_tab, InputTab::Player1, "Player 1");
@@ -188,7 +186,7 @@ impl AppWindow for InputWindow {
                 }
             });
         });
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             match self.active_tab {
                 InputTab::Player1 => self.show_key_bindings(ui, SimId::Player1),
                 InputTab::Player2 => self.show_key_bindings(ui, SimId::Player2),

src/window/profile.rs

@@ -1,13 +1,14 @@
-use std::{fs, time::Duration};
+use std::{fs, sync::Arc, time::Duration};
 
 use anyhow::Result;
 use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
 use egui_notify::{Anchor, Toast, Toasts};
+use winit::window::Window;
 
 use crate::{
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId},
     profiler::{Profiler, ProfilerStatus},
-    window::AppWindow,
+    window::{AppWindow, InitArgs},
 };
 
 pub struct ProfileWindow {
@@ -15,6 +16,7 @@ pub struct ProfileWindow {
     client: EmulatorClient,
     profiler: Profiler,
     toasts: Toasts,
+    window: Option<Arc<Window>>,
 }
 
 impl ProfileWindow {
@@ -27,6 +29,7 @@ impl ProfileWindow {
                 .with_anchor(Anchor::BottomLeft)
                 .with_margin((10.0, 10.0).into())
                 .reverse(true),
+            window: None,
         }
     }
 
@@ -59,12 +62,16 @@ impl ProfileWindow {
 
     fn try_finish_recording(&mut self) -> Result<Option<String>> {
         let bytes_receiver = self.profiler.finish_recording();
-        let file = rfd::FileDialog::new()
+        let mut file_dialog = rfd::FileDialog::new()
             .add_filter("Profiler files", &["json"])
-            .set_file_name("profile.json")
+            .set_file_name("profile.json");
-            .save_file();
+        if let Some(window) = self.window.as_ref() {
+            file_dialog = file_dialog.set_parent(window);
+        }
+        let file = file_dialog.save_file();
         if let Some(path) = file {
             let bytes = pollster::block_on(bytes_receiver)?;
+            let _ = fs::remove_file(&path);
             fs::write(&path, bytes)?;
             Ok(Some(path.display().to_string()))
         } else {
@@ -89,10 +96,10 @@ impl AppWindow for ProfileWindow {
             .with_inner_size((300.0, 200.0))
     }
 
-    fn show(&mut self, ctx: &egui::Context) {
+    fn show(&mut self, ui: &mut egui::Ui) {
         let status = self.profiler.status();
         let recording = matches!(status, ProfilerStatus::Recording);
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.horizontal_wrapped(|ui| {
                 ui.spacing_mut().item_spacing.x = 0.0;
                 ui.add(
@@ -157,6 +164,10 @@ impl AppWindow for ProfileWindow {
                 _ => {}
             }
         });
-        self.toasts.show(ctx);
+        self.toasts.show(ui);
+    }
+
+    fn on_init(&mut self, args: InitArgs) {
+        self.window = Some(args.window.clone());
     }
 }

src/window/terminal.rs

@@ -1,8 +1,7 @@
 use std::{collections::VecDeque, sync::mpsc};
 
 use egui::{
-    Align, CentralPanel, Context, FontFamily, Label, RichText, ScrollArea, ViewportBuilder,
+    Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder, ViewportId,
-    ViewportId,
 };
 
 use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
@@ -46,7 +45,7 @@ impl AppWindow for TerminalWindow {
             .with_inner_size((640.0, 480.0))
     }
 
-    fn show(&mut self, ctx: &Context) {
+    fn show(&mut self, ui: &mut Ui) {
         if let Ok(text) = self.receiver.try_recv() {
             let mut rest = text.as_str();
             while let Some(index) = rest.find('\n') {
@@ -61,7 +60,7 @@ impl AppWindow for TerminalWindow {
             }
             self.lines.back_mut().unwrap().push_str(rest);
         }
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ScrollArea::vertical()
                 .stick_to_bottom(true)
                 .auto_shrink([false, false])

src/window/vip/bgmap.rs

@@ -1,14 +1,14 @@
 use std::sync::Arc;
 
 use egui::{
-    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
+    Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
     TextureOptions, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
+    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
         AppWindow,
@@ -20,7 +20,6 @@ use super::utils::{self, CellData, CharacterGrid};
 
 pub struct BgMapWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
     memory: Arc<MemoryClient>,
     bgmaps: MemoryView,
     cell_index: usize,
@@ -31,14 +30,11 @@ pub struct BgMapWindow {
 }
 
 impl BgMapWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
         let renderer = BgMapRenderer::new(sim_id, memory);
-        let ([cell, bgmap], params) = images.add(renderer, BgMapParams::default());
+        let params = images.add(sim_id, renderer, BgMapParams::default());
-        let loader =
-            ImageTextureLoader::new([("vip://cell".into(), cell), ("vip://bgmap".into(), bgmap)]);
         Self {
             sim_id,
-            loader: Arc::new(loader),
             memory: memory.clone(),
             bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
             cell_index: params.cell_index,
@@ -90,7 +86,7 @@ impl BgMapWindow {
                         });
                     });
                 });
-            let image = Image::new("vip://cell")
+            let image = Image::new(self.image_url("bgmap-cell"))
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
@@ -162,7 +158,7 @@ impl BgMapWindow {
     }
 
     fn show_bgmap(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vip://bgmap")
+        let grid = CharacterGrid::new(self.image_url("bgmap"))
             .with_scale(self.scale)
             .with_grid(self.show_grid)
             .with_selected(self.cell_index % 4096);
@@ -187,12 +183,8 @@ impl AppWindow for BgMapWindow {
             .with_inner_size((640.0, 480.0))
     }
 
-    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
+    fn show(&mut self, ui: &mut Ui) {
-        ctx.add_texture_loader(self.loader.clone());
+        CentralPanel::default().show_inside(ui, |ui| {
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -300,6 +292,10 @@ impl BgMapRenderer {
 impl ImageRenderer<2> for BgMapRenderer {
     type Params = BgMapParams;
 
+    fn names(&self) -> [&str; 2] {
+        ["bgmap-cell", "bgmap"]
+    }
+
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [8 * 64, 8 * 64]]
     }

src/window/vip/chardata.rs

@@ -1,15 +1,15 @@
-use std::{fmt::Display, sync::Arc};
+use std::fmt::Display;
 
 use egui::{
-    Align, CentralPanel, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
+    Align, CentralPanel, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
-    TextureOptions, Ui, Vec2, ViewportBuilder, ViewportId,
+    Ui, Vec2, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 use serde::{Deserialize, Serialize};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
+    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
         AppWindow,
@@ -81,7 +81,6 @@ impl Display for Palette {
 
 pub struct CharacterDataWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
     brightness: MemoryView,
     palettes: MemoryView,
     palette: Palette,
@@ -92,16 +91,11 @@ pub struct CharacterDataWindow {
 }
 
 impl CharacterDataWindow {
-    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &ImageTextureLoader) -> Self {
         let renderer = CharDataRenderer::new(sim_id, memory);
-        let ([char, chardata], params) = images.add(renderer, CharDataParams::default());
+        let params = images.add(sim_id, renderer, CharDataParams::default());
-        let loader = ImageTextureLoader::new([
-            ("vip://char".into(), char),
-            ("vip://chardata".into(), chardata),
-        ]);
         Self {
             sim_id,
-            loader: Arc::new(loader),
             brightness: memory.watch(sim_id, 0x0005f824, 8),
             palettes: memory.watch(sim_id, 0x0005f860, 16),
             palette: params.palette,
@@ -160,7 +154,7 @@ impl CharacterDataWindow {
                         });
                     });
                 });
-            let image = Image::new("vip://char")
+            let image = Image::new(self.image_url("chardata-char"))
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
@@ -226,7 +220,7 @@ impl CharacterDataWindow {
     }
 
     fn show_chardata(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vip://chardata")
+        let grid = CharacterGrid::new(self.image_url("chardata"))
             .with_scale(self.scale)
             .with_grid(self.show_grid)
             .with_selected(self.index);
@@ -251,12 +245,8 @@ impl AppWindow for CharacterDataWindow {
             .with_inner_size((640.0, 480.0))
     }
 
-    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
+    fn show(&mut self, ui: &mut Ui) {
-        ctx.add_texture_loader(self.loader.clone());
+        CentralPanel::default().show_inside(ui, |ui| {
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -274,12 +264,6 @@ impl AppWindow for CharacterDataWindow {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
-enum CharDataResource {
-    Character { palette: Palette, index: usize },
-    CharacterData { palette: Palette },
-}
-
 #[derive(Clone, Default, PartialEq, Eq)]
 struct CharDataParams {
     palette: Palette,
@@ -295,6 +279,10 @@ struct CharDataRenderer {
 impl ImageRenderer<2> for CharDataRenderer {
     type Params = CharDataParams;
 
+    fn names(&self) -> [&str; 2] {
+        ["chardata-char", "chardata"]
+    }
+
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [16 * 8, 128 * 8]]
     }

src/window/vip/framebuffer.rs

@@ -1,14 +1,12 @@
-use std::sync::Arc;
-
 use egui::{
-    Align, CentralPanel, Color32, Context, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
+    Align, CentralPanel, Color32, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
     ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
+    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
         AppWindow,
@@ -20,7 +18,6 @@ use super::utils;
 
 pub struct FrameBufferWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
     index: usize,
     left: bool,
     right: bool,
@@ -30,7 +27,7 @@ pub struct FrameBufferWindow {
 }
 
 impl FrameBufferWindow {
-    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &ImageTextureLoader) -> Self {
         let initial_params = FrameBufferParams {
             index: 0,
             left: true,
@@ -40,11 +37,9 @@ impl FrameBufferWindow {
             right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
         };
         let renderer = FrameBufferRenderer::new(sim_id, memory);
-        let ([buffer], params) = images.add(renderer, initial_params);
+        let params = images.add(sim_id, renderer, initial_params);
-        let loader = ImageTextureLoader::new([("vip://buffer".into(), buffer)]);
         Self {
             sim_id,
-            loader: Arc::new(loader),
             index: params.index,
             left: params.left,
             right: params.right,
@@ -131,7 +126,7 @@ impl FrameBufferWindow {
     }
 
     fn show_buffers(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://buffer")
+        let image = Image::new(self.image_url("buffer"))
             .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
         ui.add(image);
@@ -153,12 +148,8 @@ impl AppWindow for FrameBufferWindow {
             .with_inner_size((640.0, 480.0))
     }
 
-    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
+    fn show(&mut self, ui: &mut Ui) {
-        ctx.add_texture_loader(self.loader.clone());
+        CentralPanel::default().show_inside(ui, |ui| {
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -208,6 +199,10 @@ impl FrameBufferRenderer {
 impl ImageRenderer<1> for FrameBufferRenderer {
     type Params = FrameBufferParams;
 
+    fn names(&self) -> [&str; 1] {
+        ["buffer"]
+    }
+
     fn sizes(&self) -> [[usize; 2]; 1] {
         [[384, 224]]
     }

src/window/vip/object.rs

@@ -1,14 +1,14 @@
 use std::sync::Arc;
 
 use egui::{
-    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
+    Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
     TextureOptions, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
+    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
         AppWindow,
@@ -20,7 +20,6 @@ use super::utils::{self, Object};
 
 pub struct ObjectWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
     memory: Arc<MemoryClient>,
     objects: MemoryView,
     index: usize,
@@ -30,7 +29,7 @@ pub struct ObjectWindow {
 }
 
 impl ObjectWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
         let initial_params = ObjectParams {
             index: 0,
             generic_palette: false,
@@ -38,12 +37,9 @@ impl ObjectWindow {
             right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
         };
         let renderer = ObjectRenderer::new(sim_id, memory);
-        let ([zoom, full], params) = images.add(renderer, initial_params);
+        let params = images.add(sim_id, renderer, initial_params);
-        let loader =
-            ImageTextureLoader::new([("vip://zoom".into(), zoom), ("vip://full".into(), full)]);
         Self {
             sim_id,
-            loader: Arc::new(loader),
             memory: memory.clone(),
             objects: memory.watch(sim_id, 0x0003e000, 0x2000),
             index: params.index,
@@ -82,7 +78,7 @@ impl ObjectWindow {
                         });
                     });
                 });
-            let image = Image::new("vip://zoom")
+            let image = Image::new(self.image_url("object-zoom"))
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
@@ -186,7 +182,7 @@ impl ObjectWindow {
     }
 
     fn show_object(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://full")
+        let image = Image::new(self.image_url("object-full"))
             .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
         ui.add(image);
@@ -208,12 +204,8 @@ impl AppWindow for ObjectWindow {
             .with_inner_size((640.0, 500.0))
     }
 
-    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
+    fn show(&mut self, ui: &mut Ui) {
-        ctx.add_texture_loader(self.loader.clone());
+        CentralPanel::default().show_inside(ui, |ui| {
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -327,6 +319,10 @@ impl ObjectRenderer {
 impl ImageRenderer<2> for ObjectRenderer {
     type Params = ObjectParams;
 
+    fn names(&self) -> [&str; 2] {
+        ["object-zoom", "object-full"]
+    }
+
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [384, 224]]
     }

src/window/vip/registers.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use egui::{
-    Align, Button, CentralPanel, Checkbox, Color32, Context, Direction, Label, Layout, ScrollArea,
+    Align, Button, CentralPanel, Checkbox, Color32, Direction, Label, Layout, ScrollArea, TextEdit,
-    TextEdit, Ui, ViewportBuilder, ViewportId,
+    Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
@@ -644,8 +644,8 @@ impl AppWindow for RegisterWindow {
             .with_inner_size((800.0, 480.0))
     }
 
-    fn show(&mut self, ctx: &Context) {
+    fn show(&mut self, ui: &mut Ui) {
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ScrollArea::vertical().show(ui, |ui| {
                 ui.horizontal_top(|ui| {
                     let width = ui.available_width();

src/window/vip/world.rs

@@ -1,7 +1,7 @@
 use std::{fmt::Display, sync::Arc};
 
 use egui::{
-    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
+    Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
     TextureOptions, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -14,7 +14,7 @@ use num_traits::{FromPrimitive, ToPrimitive};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
+    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryRef, MemoryView},
     window::{
         AppWindow,
@@ -26,7 +26,6 @@ use super::utils::{self, CellData, Object, shade};
 
 pub struct WorldWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
     memory: Arc<MemoryClient>,
     worlds: MemoryView,
     bgmaps: MemoryView,
@@ -39,7 +38,7 @@ pub struct WorldWindow {
 }
 
 impl WorldWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
         let initial_params = WorldParams {
             index: 31,
             generic_palette: false,
@@ -47,11 +46,9 @@ impl WorldWindow {
             right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
         };
         let renderer = WorldRenderer::new(sim_id, memory);
-        let ([world], params) = images.add(renderer, initial_params);
+        let params = images.add(sim_id, renderer, initial_params);
-        let loader = ImageTextureLoader::new([("vip://world".into(), world)]);
         Self {
             sim_id,
-            loader: Arc::new(loader),
             memory: memory.clone(),
             worlds: memory.watch(sim_id, 0x0003d800, 0x400),
             bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
@@ -426,7 +423,7 @@ impl WorldWindow {
     }
 
     fn show_world(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://world")
+        let image = Image::new(self.image_url("world"))
             .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
         let res = ui.add(image);
@@ -523,12 +520,8 @@ impl AppWindow for WorldWindow {
             .with_inner_size((640.0, 520.0))
     }
 
-    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
+    fn show(&mut self, ui: &mut Ui) {
-        ctx.add_texture_loader(self.loader.clone());
+        CentralPanel::default().show_inside(ui, |ui| {
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -779,6 +772,10 @@ impl WorldRenderer {
 impl ImageRenderer<1> for WorldRenderer {
     type Params = WorldParams;
 
+    fn names(&self) -> [&str; 1] {
+        ["world"]
+    }
+
     fn sizes(&self) -> [[usize; 2]; 1] {
         [[384, 224]]
     }