From 30a94868d127721d337f06396c8c24e71f8243a7 Mon Sep 17 00:00:00 2001
From: Alex Janka <alex@alexjanka.com>
Date: Fri, 17 Mar 2023 13:33:38 +1100
Subject: [PATCH] its less annoying now lol

---
 gb-emu/src/main.rs                            |  6 ++--
 gb-vst/Cargo.toml                             |  2 +-
 gb-vst/src/lib.rs                             |  6 ++--
 lib/Cargo.toml                                |  1 -
 lib/src/connect/mod.rs                        | 14 ---------
 lib/src/lib.rs                                | 18 +++++------
 .../processor/instructions/instructions.rs    |  3 +-
 lib/src/processor/instructions/primitives.rs  |  3 +-
 lib/src/processor/memory.rs                   | 26 ++++++++--------
 lib/src/processor/memory/mmio/gpu.rs          | 30 ++++++++++---------
 .../processor/memory/mmio/gpu/addresses.rs    |  7 +++--
 .../processor/memory/mmio/gpu/tile_window.rs  |  8 ++---
 lib/src/processor/mod.rs                      | 20 ++++++-------
 lib/src/processor/opcodes.rs                  |  3 +-
 14 files changed, 70 insertions(+), 77 deletions(-)

diff --git a/gb-emu/src/main.rs b/gb-emu/src/main.rs
index 775dbad..0bea01a 100644
--- a/gb-emu/src/main.rs
+++ b/gb-emu/src/main.rs
@@ -88,8 +88,8 @@ fn main() {
         .with_no_save(args.no_save)
         .with_verbose(args.verbose);
 
-    let tile_window: Option<Box<dyn Renderer<u32>>> = if args.tile_window {
-        Some(Box::new(WindowRenderer::new(factor, None)))
+    let tile_window: Option<WindowRenderer> = if args.tile_window {
+        Some(WindowRenderer::new(factor, None))
     } else {
         None
     };
@@ -103,7 +103,7 @@ fn main() {
     let mut core = EmulatorCore::init(
         receiver,
         options,
-        Box::new(WindowRenderer::new(factor, Some(Gilrs::new().unwrap()))),
+        WindowRenderer::new(factor, Some(Gilrs::new().unwrap())),
         output,
         tile_window,
     );
diff --git a/gb-vst/Cargo.toml b/gb-vst/Cargo.toml
index be67d00..d4f1070 100644
--- a/gb-vst/Cargo.toml
+++ b/gb-vst/Cargo.toml
@@ -12,7 +12,7 @@ default = []
 savestate = []
 
 [dependencies]
-gb-emu-lib = { path = "../lib", features = ["async"] }
+gb-emu-lib = { path = "../lib" }
 nih_plug = { path = "../vendored/nih-plug", features = ["standalone"] }
 baseview = { path = "../vendored/baseview" }
 pixels = "0.11"
diff --git a/gb-vst/src/lib.rs b/gb-vst/src/lib.rs
index a56286d..541a146 100644
--- a/gb-vst/src/lib.rs
+++ b/gb-vst/src/lib.rs
@@ -49,7 +49,7 @@ struct EmuParams {
 struct EmuVars {
     rx: AsyncHeapConsumer<[f32; 2]>,
     sender: Sender<EmulatorMessage>,
-    emulator_core: EmulatorCore<[u8; 4]>,
+    emulator_core: EmulatorCore<[u8; 4], EmulatorRenderer>,
     serial_tx: Sender<u8>,
 }
 
@@ -236,13 +236,11 @@ impl Plugin for GameboyEmu {
                 DOWNSAMPLE_TYPE,
             );
 
-            let (renderer, frame_receiver, key_handler) = EmulatorRenderer::new();
+            let (window, frame_receiver, key_handler) = EmulatorRenderer::new();
 
             *self.frame_receiver.lock().unwrap() = Some(frame_receiver);
             *self.key_handler.lock().unwrap() = Some(key_handler);
 
-            let window = Box::new(renderer);
-
             let (serial_tx, gb_serial_rx) = mpsc::channel::<u8>();
             let serial_target = SerialTarget::Custom {
                 rx: Some(gb_serial_rx),
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 04f8761..e5c7cbc 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [features]
 default = []
-async = []
 clocked-serial = []
 
 [dependencies]
diff --git a/lib/src/connect/mod.rs b/lib/src/connect/mod.rs
index 12a73a3..c6c5433 100644
--- a/lib/src/connect/mod.rs
+++ b/lib/src/connect/mod.rs
@@ -20,20 +20,6 @@ pub enum RomFile {
     Raw(Vec<u8>),
 }
 
-#[cfg(feature = "async")]
-pub trait Renderer<Format: From<Colour>>: Send {
-    fn prepare(&mut self, width: usize, height: usize);
-
-    fn display(&mut self, buffer: &[Format]);
-
-    fn set_title(&mut self, _title: String) {}
-
-    fn latest_joypad_state(&mut self) -> JoypadState;
-
-    fn set_rumble(&mut self, _rumbling: bool) {}
-}
-
-#[cfg(not(feature = "async"))]
 pub trait Renderer<Format: From<Colour>> {
     fn prepare(&mut self, width: usize, height: usize);
 
diff --git a/lib/src/lib.rs b/lib/src/lib.rs
index 3fbb192..4028ca6 100644
--- a/lib/src/lib.rs
+++ b/lib/src/lib.rs
@@ -93,18 +93,18 @@ static VERBOSE: OnceCell<bool> = OnceCell::new();
 pub const WIDTH: usize = 160;
 pub const HEIGHT: usize = 144;
 
-pub struct EmulatorCore<ColourFormat: From<Colour> + Clone> {
+pub struct EmulatorCore<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> {
     receiver: Receiver<EmulatorMessage>,
-    cpu: Cpu<ColourFormat>,
+    cpu: Cpu<ColourFormat, R>,
 }
 
-impl<ColourFormat: From<Colour> + Clone> EmulatorCore<ColourFormat> {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> EmulatorCore<ColourFormat, R> {
     pub fn init(
         receiver: Receiver<EmulatorMessage>,
         options: Options,
-        mut window: Box<dyn Renderer<ColourFormat>>,
+        mut window: R,
         output: AudioOutput,
-        tile_window: Option<Box<dyn Renderer<ColourFormat>>>,
+        tile_window: Option<R>,
     ) -> Self {
         if options.verbose {
             VERBOSE.set(true).unwrap();
@@ -164,7 +164,7 @@ impl<ColourFormat: From<Colour> + Clone> EmulatorCore<ColourFormat> {
         )
     }
 
-    fn new(receiver: Receiver<EmulatorMessage>, cpu: Cpu<ColourFormat>) -> Self {
+    fn new(receiver: Receiver<EmulatorMessage>, cpu: Cpu<ColourFormat, R>) -> Self {
         Self { receiver, cpu }
     }
 
@@ -217,15 +217,15 @@ impl<ColourFormat: From<Colour> + Clone> EmulatorCore<ColourFormat> {
         }
     }
 
-    pub fn get_save_state(&self) -> CpuSaveState<ColourFormat> {
+    pub fn get_save_state(&self) -> CpuSaveState<ColourFormat, R> {
         CpuSaveState::create(&self.cpu)
     }
 
     pub fn from_save_state(
-        state: CpuSaveState<ColourFormat>,
+        state: CpuSaveState<ColourFormat, R>,
         rom: RomFile,
         receiver: Receiver<EmulatorMessage>,
-        window: Box<dyn Renderer<ColourFormat>>,
+        window: R,
         output: AudioOutput,
         serial_target: SerialTarget,
     ) -> Self {
diff --git a/lib/src/processor/instructions/instructions.rs b/lib/src/processor/instructions/instructions.rs
index facb28d..98d7d2d 100644
--- a/lib/src/processor/instructions/instructions.rs
+++ b/lib/src/processor/instructions/instructions.rs
@@ -1,9 +1,10 @@
 use crate::{
+    connect::Renderer,
     processor::{memory::mmio::gpu::Colour, Cpu, Direction, Flags, Reg8, SplitRegister},
     util::{clear_bit, get_bit, set_bit},
 };
 
-impl<ColourFormat: From<Colour> + Clone> Cpu<ColourFormat> {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> Cpu<ColourFormat, R> {
     pub(crate) fn and(&mut self, first: u8, second: u8) -> u8 {
         let result = first & second;
         self.set_or_clear_flag(Flags::Zero, result == 0x0);
diff --git a/lib/src/processor/instructions/primitives.rs b/lib/src/processor/instructions/primitives.rs
index 8ebced6..462e0d9 100644
--- a/lib/src/processor/instructions/primitives.rs
+++ b/lib/src/processor/instructions/primitives.rs
@@ -1,10 +1,11 @@
 use crate::{
+    connect::Renderer,
     processor::{memory::mmio::gpu::Colour, Cpu, Direction, Flags, SplitRegister},
     util::{as_signed, get_bit, get_rotation_carry, rotate, Nibbles},
 };
 use std::ops::{BitAnd, BitOr};
 
-impl<ColourFormat: From<Colour> + Clone> Cpu<ColourFormat> {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> Cpu<ColourFormat, R> {
     pub(crate) fn pop_word(&mut self) -> u16 {
         let mut word: u16 = 0x0;
         word.set_low(self.memory.get(self.reg.sp));
diff --git a/lib/src/processor/memory.rs b/lib/src/processor/memory.rs
index b9e1a8b..3f2a446 100644
--- a/lib/src/processor/memory.rs
+++ b/lib/src/processor/memory.rs
@@ -22,7 +22,7 @@ pub(crate) mod rom;
 
 pub(crate) type Address = u16;
 
-pub struct Memory<ColourFormat: From<Colour> + Clone> {
+pub struct Memory<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> {
     bootrom: Option<Vec<u8>>,
     rom: Rom,
     ram: [u8; 8192],
@@ -32,7 +32,7 @@ pub struct Memory<ColourFormat: From<Colour> + Clone> {
     pub(super) ime_scheduled: u8,
     dma_addr: u8,
     joypad: Joypad,
-    gpu: Gpu<ColourFormat>,
+    gpu: Gpu<ColourFormat, R>,
     apu: Apu,
     serial: Serial,
     timers: Timer,
@@ -40,7 +40,7 @@ pub struct Memory<ColourFormat: From<Colour> + Clone> {
 
 #[serde_with::serde_as]
 #[derive(Serialize, Deserialize)]
-pub struct MemorySaveState<ColourFormat: From<Colour> + Clone> {
+pub struct MemorySaveState<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> {
     rom: RomSaveState,
     #[serde_as(as = "[_; 8192]")]
     ram: [u8; 8192],
@@ -51,14 +51,16 @@ pub struct MemorySaveState<ColourFormat: From<Colour> + Clone> {
     pub(super) ime_scheduled: u8,
     dma_addr: u8,
     joypad: Joypad,
-    gpu: GpuSaveState<ColourFormat>,
+    gpu: GpuSaveState<ColourFormat, R>,
     apu: ApuSaveState,
     serial: SerialSaveState,
     timers: Timer,
 }
 
-impl<ColourFormat: From<Colour> + Clone> MemorySaveState<ColourFormat> {
-    pub fn create(memory: &Memory<ColourFormat>) -> Self {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>>
+    MemorySaveState<ColourFormat, R>
+{
+    pub fn create(memory: &Memory<ColourFormat, R>) -> Self {
         Self {
             rom: RomSaveState::create(&memory.rom),
             ram: memory.ram,
@@ -76,14 +78,14 @@ impl<ColourFormat: From<Colour> + Clone> MemorySaveState<ColourFormat> {
     }
 }
 
-impl<ColourFormat: From<Colour> + Clone> Memory<ColourFormat> {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> Memory<ColourFormat, R> {
     pub fn init(
         bootrom: Option<Vec<u8>>,
         rom: Rom,
-        window: Box<dyn Renderer<ColourFormat>>,
+        window: R,
         output: AudioOutput,
         serial_target: SerialTarget,
-        tile_window: Option<Box<dyn Renderer<ColourFormat>>>,
+        tile_window: Option<R>,
     ) -> Self {
         Self {
             bootrom,
@@ -274,9 +276,9 @@ impl<ColourFormat: From<Colour> + Clone> Memory<ColourFormat> {
     }
 
     pub fn from_save_state(
-        state: MemorySaveState<ColourFormat>,
+        state: MemorySaveState<ColourFormat, R>,
         data: Vec<u8>,
-        window: Box<dyn Renderer<ColourFormat>>,
+        window: R,
         output: AudioOutput,
         serial_target: SerialTarget,
     ) -> Self {
@@ -298,7 +300,7 @@ impl<ColourFormat: From<Colour> + Clone> Memory<ColourFormat> {
     }
 }
 
-impl<ColourFormat: From<Colour> + Clone> Cpu<ColourFormat> {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> Cpu<ColourFormat, R> {
     pub fn increment_timers(&mut self, machine_cycles: u8) {
         let steps = (machine_cycles as usize) * 4;
 
diff --git a/lib/src/processor/memory/mmio/gpu.rs b/lib/src/processor/memory/mmio/gpu.rs
index 13d3359..37e1a8c 100644
--- a/lib/src/processor/memory/mmio/gpu.rs
+++ b/lib/src/processor/memory/mmio/gpu.rs
@@ -1,3 +1,5 @@
+use std::marker::PhantomData;
+
 use self::{
     tile_window::TileWindow,
     types::{
@@ -21,18 +23,18 @@ mod types;
 const TILE_WINDOW_WIDTH: usize = 16 * 8;
 const TILE_WINDOW_HEIGHT: usize = 24 * 8;
 
-pub struct Gpu<Format: From<Colour>> {
+pub struct Gpu<Format: From<Colour>, R: Renderer<Format>> {
     pub buffer: Vec<Format>,
     pub vram: Vram,
     pub oam: Oam,
-    pub window: Box<dyn Renderer<Format>>,
+    pub window: R,
     is_bg_zero: Vec<bool>,
     lcdc: Lcdc,
     stat: Stat,
     mode_clock: usize,
     scanline: u8,
     lyc: u8,
-    tile_window: Option<TileWindow<Format>>,
+    tile_window: Option<TileWindow<Format, R>>,
     window_lc: u8,
     has_window_been_enabled: bool,
     bg_palette: Palette,
@@ -46,7 +48,7 @@ pub struct Gpu<Format: From<Colour>> {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct GpuSaveState<Format: From<Colour>> {
+pub struct GpuSaveState<Format: From<Colour>, R: Renderer<Format>> {
     buffer: Vec<Format>,
     vram: Vram,
     oam: Oam,
@@ -66,10 +68,12 @@ pub struct GpuSaveState<Format: From<Colour>> {
     wx: u8,
     wy: u8,
     prev_stat: bool,
+    #[serde(skip)]
+    spooky: PhantomData<R>,
 }
 
-impl<Format: From<Colour> + Clone> GpuSaveState<Format> {
-    pub fn create(gpu: &Gpu<Format>) -> Self {
+impl<Format: From<Colour> + Clone, R: Renderer<Format>> GpuSaveState<Format, R> {
+    pub fn create(gpu: &Gpu<Format, R>) -> Self {
         Self {
             buffer: gpu.buffer.clone(),
             vram: gpu.vram,
@@ -90,15 +94,13 @@ impl<Format: From<Colour> + Clone> GpuSaveState<Format> {
             wx: gpu.wx,
             wy: gpu.wy,
             prev_stat: gpu.prev_stat,
+            spooky: PhantomData,
         }
     }
 }
 
-impl<Format: From<Colour> + Clone> Gpu<Format> {
-    pub fn new(
-        window: Box<dyn Renderer<Format>>,
-        tile_window_renderer: Option<Box<dyn Renderer<Format>>>,
-    ) -> Self {
+impl<Format: From<Colour> + Clone, R: Renderer<Format>> Gpu<Format, R> {
+    pub fn new(window: R, tile_window_renderer: Option<R>) -> Self {
         let tile_window = if let Some(mut tile_window_renderer) = tile_window_renderer {
             tile_window_renderer.prepare(TILE_WINDOW_WIDTH, TILE_WINDOW_HEIGHT);
             Some(TileWindow::new(tile_window_renderer))
@@ -133,9 +135,9 @@ impl<Format: From<Colour> + Clone> Gpu<Format> {
     }
 
     pub fn from_save_state(
-        state: GpuSaveState<Format>,
-        window: Box<dyn Renderer<Format>>,
-        tile_window_renderer: Option<Box<dyn Renderer<Format>>>,
+        state: GpuSaveState<Format, R>,
+        window: R,
+        tile_window_renderer: Option<R>,
     ) -> Self {
         let tile_window = if let Some(mut tile_window_renderer) = tile_window_renderer {
             tile_window_renderer.prepare(TILE_WINDOW_WIDTH, TILE_WINDOW_HEIGHT);
diff --git a/lib/src/processor/memory/mmio/gpu/addresses.rs b/lib/src/processor/memory/mmio/gpu/addresses.rs
index a5b3bf2..d38e730 100644
--- a/lib/src/processor/memory/mmio/gpu/addresses.rs
+++ b/lib/src/processor/memory/mmio/gpu/addresses.rs
@@ -1,11 +1,14 @@
-use crate::util::{get_bit, set_or_clear_bit};
+use crate::{
+    connect::Renderer,
+    util::{get_bit, set_or_clear_bit},
+};
 
 use super::{
     types::{DrawMode, ObjSize, Palette, TiledataArea, TilemapArea},
     Colour, Gpu,
 };
 
-impl<Format: From<Colour>> Gpu<Format> {
+impl<Format: From<Colour>, R: Renderer<Format>> Gpu<Format, R> {
     pub fn update_lcdc(&mut self, data: u8) {
         self.lcdc.enable = get_bit(data, 7);
         self.lcdc.window_tilemap = if get_bit(data, 6) {
diff --git a/lib/src/processor/memory/mmio/gpu/tile_window.rs b/lib/src/processor/memory/mmio/gpu/tile_window.rs
index 01e95cc..1c6bed0 100644
--- a/lib/src/processor/memory/mmio/gpu/tile_window.rs
+++ b/lib/src/processor/memory/mmio/gpu/tile_window.rs
@@ -6,13 +6,13 @@ use crate::{
 
 use super::{types::Vram, Colour};
 
-pub(super) struct TileWindow<Format: From<Colour>> {
+pub(super) struct TileWindow<Format: From<Colour>, R: Renderer<Format>> {
     sprite_buffer: Vec<Format>,
-    sprite_renderer: Box<dyn Renderer<Format>>,
+    sprite_renderer: R,
 }
 
-impl<Format: From<Colour>> TileWindow<Format> {
-    pub(super) fn new(window: Box<dyn Renderer<Format>>) -> Self {
+impl<Format: From<Colour>, R: Renderer<Format>> TileWindow<Format, R> {
+    pub(super) fn new(window: R) -> Self {
         let mut sprite_buffer = Vec::new();
         sprite_buffer.reserve_exact(TILE_WINDOW_WIDTH * TILE_WINDOW_HEIGHT);
 
diff --git a/lib/src/processor/mod.rs b/lib/src/processor/mod.rs
index af8aca0..3ccc859 100644
--- a/lib/src/processor/mod.rs
+++ b/lib/src/processor/mod.rs
@@ -23,8 +23,8 @@ pub(crate) enum Direction {
     Right,
 }
 
-pub struct Cpu<ColourFormat: From<Colour> + Clone> {
-    pub memory: Memory<ColourFormat>,
+pub struct Cpu<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> {
+    pub memory: Memory<ColourFormat, R>,
     pub reg: Registers,
     pub last_instruction: u8,
     last_instruction_addr: u16,
@@ -33,8 +33,8 @@ pub struct Cpu<ColourFormat: From<Colour> + Clone> {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct CpuSaveState<ColourFormat: From<Colour> + Clone> {
-    memory: MemorySaveState<ColourFormat>,
+pub struct CpuSaveState<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> {
+    memory: MemorySaveState<ColourFormat, R>,
     reg: Registers,
     last_instruction: u8,
     last_instruction_addr: u16,
@@ -42,8 +42,8 @@ pub struct CpuSaveState<ColourFormat: From<Colour> + Clone> {
     should_halt_bug: bool,
 }
 
-impl<ColourFormat: From<Colour> + Clone> CpuSaveState<ColourFormat> {
-    pub fn create(cpu: &Cpu<ColourFormat>) -> Self {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> CpuSaveState<ColourFormat, R> {
+    pub fn create(cpu: &Cpu<ColourFormat, R>) -> Self {
         Self {
             memory: MemorySaveState::create(&cpu.memory),
             reg: cpu.reg,
@@ -55,8 +55,8 @@ impl<ColourFormat: From<Colour> + Clone> CpuSaveState<ColourFormat> {
     }
 }
 
-impl<ColourFormat: From<Colour> + Clone> Cpu<ColourFormat> {
-    pub fn new(mut memory: Memory<ColourFormat>, run_bootrom: bool) -> Self {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> Cpu<ColourFormat, R> {
+    pub fn new(mut memory: Memory<ColourFormat, R>, run_bootrom: bool) -> Self {
         if !run_bootrom {
             memory.cpu_ram_init();
         }
@@ -155,9 +155,9 @@ impl<ColourFormat: From<Colour> + Clone> Cpu<ColourFormat> {
     }
 
     pub fn from_save_state(
-        state: CpuSaveState<ColourFormat>,
+        state: CpuSaveState<ColourFormat, R>,
         data: Vec<u8>,
-        window: Box<dyn Renderer<ColourFormat>>,
+        window: R,
         output: AudioOutput,
         serial_target: SerialTarget,
     ) -> Self {
diff --git a/lib/src/processor/opcodes.rs b/lib/src/processor/opcodes.rs
index e858e88..d2e7012 100644
--- a/lib/src/processor/opcodes.rs
+++ b/lib/src/processor/opcodes.rs
@@ -1,4 +1,5 @@
 use crate::{
+    connect::Renderer,
     processor::{
         instructions::instructions::{res, set},
         Cpu, Flags, Reg8, SplitRegister,
@@ -8,7 +9,7 @@ use crate::{
 
 use super::memory::mmio::gpu::Colour;
 
-impl<ColourFormat: From<Colour> + Clone> Cpu<ColourFormat> {
+impl<ColourFormat: From<Colour> + Clone, R: Renderer<ColourFormat>> Cpu<ColourFormat, R> {
     pub fn run_opcode(&mut self, opcode: u8) -> u8 {
         match opcode {
             0x00 => {