Fix the object viewer

Cargo.toml

@@ -4,27 +4,28 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.10.0"
+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.33", features = ["serde"] }
-egui_extras = { version = "0.33", features = ["image"] }
-egui-notify = "0.21"
-egui-winit = "0.33"
-egui-wgpu = { version = "0.33", features = ["winit"] }
+egui = { version = "0.34", features = ["serde"] }
+egui_extras = { version = "0.34", features = ["image"] }
+egui-notify = "0.22"
+egui-winit = "0.34"
+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"
@@ -32,20 +33,20 @@ normpath = "1"
 notify = "8"
 num-derive = "0.4"
 num-traits = "0.2"
-object = "0.38"
-oneshot = "0.1"
+object = "0.39"
+oneshot = { version = "0.2", features = ["async", "std"] }
 pollster = "0.4"
-rand = "0.9"
-rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
+rand = "0.10"
+rfd = "0.17"
 rtrb = "0.3"
-rubato = "0.16"
+rubato = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 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 = "27"
+wgpu = "29"
 wholesym = "0.8"
 winit = { version = "0.30", features = ["serde"] }
 

build.Dockerfile

@@ -9,21 +9,25 @@ 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-21 git lld-21 llvm-21 make patch xz-utils && \
+    ./install-llvm.sh && \
+    apt-get install -y bash bzip2 git make patch xz-utils && \
     ln -s $(which clang-21) /usr/bin/clang && \
     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.91-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-21 lld-21 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 && \

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[@]}"

src/app.rs

@@ -19,7 +19,7 @@ use crate::{
     config::CliArgs,
     controller::ControllerManager,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
-    images::ImageProcessor,
+    images::ImageTextureLoader,
     input::{MappingProvider, ShortcutProvider},
     memory::MemoryClient,
     persistence::Persistence,
@@ -50,7 +50,7 @@ pub struct Application {
     shortcuts: ShortcutProvider,
     controllers: ControllerManager,
     memory: Arc<MemoryClient>,
-    images: ImageProcessor,
+    images: Arc<ImageTextureLoader>,
     persistence: Persistence,
     viewports: HashMap<ViewportId, Viewport>,
     focused: Option<ViewportId>,
@@ -74,17 +74,17 @@ impl Application {
     ) -> Self {
         let wgpu = WgpuState::new();
         let icon = load_icon().ok().map(Arc::new);
-        let mappings = MappingProvider::new(persistence.clone());
+        let mappings = MappingProvider::new(persistence.clone(), args.player2_controller);
         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,
@@ -106,7 +106,16 @@ impl Application {
             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>) {
@@ -117,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,
+            ),
         );
     }
 }
@@ -145,23 +160,23 @@ impl ApplicationHandler<UserEvent> for Application {
             self.open(event_loop, Box::new(profiler));
         }
         if self.init_chardata {
-            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));
         }
         if self.init_bgmap {
-            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));
         }
         if self.init_objects {
-            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));
         }
         if self.init_worlds {
-            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));
         }
         if self.init_framebuffers {
-            let fb = 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(fb));
         }
         if self.init_registers {
@@ -271,23 +286,23 @@ 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 fb = 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(fb));
             }
             UserEvent::OpenRegisters(sim_id) => {
@@ -376,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,
         }))
@@ -412,6 +428,7 @@ struct Viewport {
 }
 impl Viewport {
     pub fn new(
+        images: &Arc<ImageTextureLoader>,
         event_loop: &ActiveEventLoop,
         wgpu: &WgpuState,
         icon: Option<Arc<IconData>>,
@@ -431,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(),
@@ -467,7 +485,6 @@ impl Viewport {
 
         let render_state = painter.render_state();
         let args = InitArgs {
-            ctx: &ctx,
             window: &window,
             render_state: render_state.as_ref().unwrap(),
         };
@@ -518,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| {
-            self.app.show(ctx);
+        let mut output = self.ctx.run_ui(input, |ui| {
+            self.app.show(ui);
         });
         let clipped_primitives = self.ctx.tessellate(output.shapes, output.pixels_per_point);
         self.painter.paint_and_update_textures(

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::{FastFixedOut, Resampler};
+use rubato::Resampler;
 use tracing::error;
 
 pub struct Audio {
     #[allow(unused)]
     stream: cpal::Stream,
-    sampler: FastFixedOut<f32>,
-    input_buffer: Vec<Vec<f32>>,
-    output_buffer: Vec<Vec<f32>>,
+    sampler: rubato::Async<f32>,
+    input_buffer: 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 output_buffer = sampler.output_buffer_allocate(true);
+        let input_buffer = Vec::with_capacity(sampler.nbr_channels() * sampler.input_frames_max());
+        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]) {
-        for sample in samples.chunks_exact(2) {
-            for (channel, value) in self.input_buffer.iter_mut().zip(sample) {
-                channel.push(*value);
-            }
-            if self.input_buffer[0].len() >= self.sampler.input_frames_next() {
+    pub fn update(&mut self, mut samples: &[f32]) {
+        while self.input_buffer.len() + samples.len() >= self.sampler.input_frames_next() * 2 {
+            let samples_needed =
+                (self.sampler.input_frames_next() * 2).saturating_sub(self.input_buffer.len());
+            let (current_samples, future_samples) = samples.split_at(samples_needed);
+            self.input_buffer.extend_from_slice(current_samples);
+            samples = future_samples;
+
+            let buffer_in =
+                InterleavedSlice::new(&self.input_buffer, 2, self.sampler.input_frames_next())
+                    .unwrap();
+            let mut buffer_out = InterleavedSlice::new_mut(
+                &mut self.output_buffer,
+                2,
+                self.sampler.output_frames_next(),
+            )
+            .unwrap();
             let (_, output_samples) = self
                 .sampler
-                    .process_into_buffer(&self.input_buffer, &mut self.output_buffer, None)
+                .process_into_buffer(&buffer_in, &mut buffer_out, None)
                 .unwrap();
-
             let chunk = match self.sample_sink.write_chunk_uninit(output_samples * 2) {
                 Ok(c) => c,
                 Err(rtrb::chunks::ChunkError::TooFewSlots(n)) => {
                     self.sample_sink.write_chunk_uninit(n).unwrap()
                 }
             };
-                let interleaved = self.output_buffer[0]
-                    .iter()
-                    .interleave(self.output_buffer[1].iter())
-                    .cloned();
-                chunk.fill_from_iter(interleaved);
+            chunk.fill_from_iter(self.output_buffer[..output_samples * 2].iter().copied());
 
-                for channel in &mut self.input_buffer {
-                    channel.clear();
-                }
-            }
+            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

@@ -7,6 +7,7 @@ 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>,
@@ -40,6 +41,12 @@ pub struct CliArgs {
     /// 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] = [

src/emulator/cart.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use notify::Watcher;
-use rand::Rng;
+use rand::RngExt;
 use std::{
     fs::{self, File},
     io::{Read, Seek as _, SeekFrom, Write as _},

src/emulator/game_info.rs

@@ -245,9 +245,12 @@ 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);

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)]
-pub struct ImageHandle {
+struct ImageEntry {
     size: [f32; 2],
-    data: Arc<Mutex<Option<Arc<ColorImage>>>>,
-}
-
-impl ImageHandle {
-    fn pull(&mut self) -> Option<Arc<ColorImage>> {
-        self.data.lock().unwrap().take()
-    }
+    data: Weak<Mutex<Option<Arc<ColorImage>>>>,
+    texture: Option<TextureHandle>,
 }
 
 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()) {
@@ -683,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/window.rs

@@ -1,7 +1,7 @@
 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;
@@ -32,8 +32,11 @@ 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, args: InitArgs) {
         let _ = args;
     }
@@ -49,7 +52,6 @@ pub trait AppWindow {
 }
 
 pub struct InitArgs<'a> {
-    pub ctx: &'a Context,
     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) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn show(&mut self, ui: &mut 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

@@ -13,7 +13,7 @@ use crate::{
 };
 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};
@@ -67,7 +67,7 @@ impl GameWindow {
         }
     }
 
-    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;
@@ -208,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
@@ -328,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;
@@ -344,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));
                     }
                 }
             });
@@ -374,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| {
@@ -497,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);
@@ -509,11 +509,11 @@ impl AppWindow for GameWindow {
                 self.toasts.add(toast);
             }
         }
-        TopBottomPanel::top("menubar")
-            .exact_height(22.0)
-            .show(ctx, |ui| {
+        Panel::top("menubar")
+            .exact_size(22.0)
+            .show_inside(ui, |ui| {
                 MenuBar::new().ui(ui, |ui| {
-                    self.show_menu(ctx, ui);
+                    self.show_menu(ui);
                 });
             });
         if self.color_picker.is_some() {
@@ -521,18 +521,18 @@ 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);
-        CentralPanel::default().frame(frame).show(ctx, |ui| {
+        let frame = Frame::central_panel(ui.style()).fill(Color32::BLACK);
+        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, args: InitArgs) {

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],
-                push_constant_ranges: &[],
+                bind_group_layouts: &[Some(&bind_group_layout)],
+                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,
-    ViewportBuilder, ViewportId,
+    Button, CentralPanel, Event, KeyboardShortcut, Label, Layout, Slider, Ui, ViewportBuilder,
+    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) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn show(&mut self, ui: &mut 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::{
-    Button, CentralPanel, Context, Label, Layout, TopBottomPanel, Ui, ViewportBuilder, ViewportId,
-};
+use egui::{Button, CentralPanel, Label, Layout, Panel, 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) {
-        TopBottomPanel::top("options").show(ctx, |ui| {
+    fn show(&mut self, ui: &mut 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

@@ -96,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(
@@ -164,7 +164,7 @@ impl AppWindow for ProfileWindow {
                 _ => {}
             }
         });
-        self.toasts.show(ctx);
+        self.toasts.show(ui);
     }
 
     fn on_init(&mut self, args: InitArgs) {

src/window/terminal.rs

@@ -1,8 +1,7 @@
 use std::{collections::VecDeque, sync::mpsc};
 
 use egui::{
-    Align, CentralPanel, Context, FontFamily, Label, RichText, ScrollArea, ViewportBuilder,
-    ViewportId,
+    Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder, 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,17 +1,17 @@
 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, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt},
     },
 };
@@ -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 loader =
-            ImageTextureLoader::new([("vip://cell".into(), cell), ("vip://bgmap".into(), bgmap)]);
+        let params = images.add(sim_id, renderer, BgMapParams::default());
         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, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn show(&mut self, ui: &mut Ui) {
+        CentralPanel::default().show_inside(ui, |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,18 +1,18 @@
-use std::{fmt::Display, sync::Arc};
+use std::fmt::Display;
 
 use egui::{
-    Align, CentralPanel, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
-    TextureOptions, Ui, Vec2, ViewportBuilder, ViewportId,
+    Align, CentralPanel, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
+    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, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt as _},
     },
 };
@@ -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 loader = ImageTextureLoader::new([
-            ("vip://char".into(), char),
-            ("vip://chardata".into(), chardata),
-        ]);
+        let params = images.add(sim_id, renderer, CharDataParams::default());
         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, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn show(&mut self, ui: &mut Ui) {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -289,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,17 +1,15 @@
-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, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt as _},
     },
 };
@@ -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 loader = ImageTextureLoader::new([("vip://buffer".into(), buffer)]);
+        let params = images.add(sim_id, renderer, initial_params);
         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, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn show(&mut self, ui: &mut Ui) {
+        CentralPanel::default().show_inside(ui, |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,17 +1,17 @@
 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, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt as _},
     },
 };
@@ -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 loader =
-            ImageTextureLoader::new([("vip://zoom".into(), zoom), ("vip://full".into(), full)]);
+        let params = images.add(sim_id, renderer, initial_params);
         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, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn show(&mut self, ui: &mut Ui) {
+        CentralPanel::default().show_inside(ui, |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,
-    TextEdit, Ui, ViewportBuilder, ViewportId,
+    Align, Button, CentralPanel, Checkbox, Color32, Direction, Label, Layout, ScrollArea, TextEdit,
+    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) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn show(&mut self, ui: &mut 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,10 +14,10 @@ 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, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt as _},
     },
 };
@@ -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 loader = ImageTextureLoader::new([("vip://world".into(), world)]);
+        let params = images.add(sim_id, renderer, initial_params);
         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, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn show(&mut self, ui: &mut Ui) {
+        CentralPanel::default().show_inside(ui, |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]]
     }