V1.4.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [1.4.1] - 2024-12-25
+
+- PPU performance optimization through data caching and pixel format changes
+
 ## [1.4.0] - 2024-09-29
 
 - Works on browser using ruby.wasm

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubyboy (1.4.0)
+    rubyboy (1.4.1)
       ffi (~> 1.16, >= 1.16.3)
 
 GEM

lib/executor.rb

@@ -14,7 +14,7 @@ def initialize
   end
 
   def exec(direction_key = 0b1111, action_key = 0b1111)
-    bin = @emulator.step(direction_key, action_key).pack('C*')
+    bin = @emulator.step(direction_key, action_key).pack('V*')
     File.binwrite(File.join('/RUBYBOY_TMP', 'video.data'), bin)
   end
 

lib/rubyboy.rb

@@ -2,6 +2,7 @@
 
 require 'rubyboy/sdl'
 require_relative 'rubyboy/apu'
+require_relative 'rubyboy/audio'
 require_relative 'rubyboy/bus'
 require_relative 'rubyboy/cpu'
 require_relative 'rubyboy/emulator'

lib/rubyboy/apu.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative 'audio'
 require_relative 'apu_channels/channel1'
 require_relative 'apu_channels/channel2'
 require_relative 'apu_channels/channel3'
 require_relative 'apu_channels/channel4'
 
 module Rubyboy
   class Apu
+    attr_reader :samples
+
     def initialize
-      @audio = Audio.new
       @nr50 = 0
       @nr51 = 0
       @cycles = 0
@@ -67,10 +67,10 @@ def step(cycles)
         @sample_idx += 1
       end
 
-      return if @sample_idx < 512
+      return false if @sample_idx < 512
 
       @sample_idx = 0
-      @audio.queue(@samples)
+      true
     end
 
     def read_byte(addr)

lib/rubyboy/emulator.rb

@@ -18,6 +18,7 @@ def initialize(rom_path)
       @bus = Bus.new(@ppu, rom, ram, mbc, @timer, interrupt, @joypad, @apu)
       @cpu = Cpu.new(@bus, interrupt)
       @lcd = Lcd.new
+      @audio = Audio.new
     end
 
     def start
@@ -31,7 +32,7 @@ def start
           while elapsed_real_time > elapsed_machine_time
             cycles = @cpu.exec
             @timer.step(cycles)
-            @apu.step(cycles)
+            @audio.queue(@apu.samples) if @apu.step(cycles)
             if @ppu.step(cycles)
               @lcd.draw(@ppu.buffer)
               key_input_check

lib/rubyboy/emulator_wasm.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'apu_wasm'
+require_relative 'apu'
 require_relative 'bus'
 require_relative 'cpu'
 require_relative 'emulator'
-require_relative 'ppu_wasm'
+require_relative 'ppu'
 require_relative 'rom'
 require_relative 'ram'
 require_relative 'timer'
@@ -22,10 +22,10 @@ def initialize(rom_data)
       ram = Ram.new
       mbc = Cartridge::Factory.create(rom, ram)
       interrupt = Interrupt.new
-      @ppu = PpuWasm.new(interrupt)
+      @ppu = Ppu.new(interrupt)
       @timer = Timer.new(interrupt)
       @joypad = Joypad.new(interrupt)
-      @apu = ApuWasm.new
+      @apu = Apu.new
       @bus = Bus.new(@ppu, rom, ram, mbc, @timer, interrupt, @joypad, @apu)
       @cpu = Cpu.new(@bus, interrupt)
     end

lib/rubyboy/lcd.rb

@@ -11,21 +11,21 @@ class Lcd
     def initialize
       raise SDL.GetError() if SDL.InitSubSystem(SDL::INIT_VIDEO) != 0
 
-      @buffer = FFI::MemoryPointer.new(:uint8, SCREEN_WIDTH * SCREEN_HEIGHT * 3)
+      @buffer = FFI::MemoryPointer.new(:uint32, SCREEN_WIDTH * SCREEN_HEIGHT)
       @window = SDL.CreateWindow('Ruby Boy', 0, 0, SCREEN_WIDTH * SCALE, SCREEN_HEIGHT * SCALE, SDL::SDL_WINDOW_RESIZABLE)
 
       raise SDL.GetError() if @window.null?
 
       @renderer = SDL.CreateRenderer(@window, -1, 0)
       SDL.SetHint('SDL_HINT_RENDER_SCALE_QUALITY', '2')
       SDL.RenderSetLogicalSize(@renderer, SCREEN_WIDTH * SCALE, SCREEN_HEIGHT * SCALE)
-      @texture = SDL.CreateTexture(@renderer, SDL::PIXELFORMAT_RGB24, 1, SCREEN_WIDTH, SCREEN_HEIGHT)
+      @texture = SDL.CreateTexture(@renderer, SDL::PIXELFORMAT_ABGR8888, 1, SCREEN_WIDTH, SCREEN_HEIGHT)
       @event = FFI::MemoryPointer.new(:pointer)
     end
 
     def draw(framebuffer)
-      @buffer.write_array_of_uint8(framebuffer)
-      SDL.UpdateTexture(@texture, nil, @buffer, SCREEN_WIDTH * 3)
+      @buffer.write_array_of_uint32(framebuffer)
+      SDL.UpdateTexture(@texture, nil, @buffer, SCREEN_WIDTH * 4)
       SDL.RenderClear(@renderer)
       SDL.RenderCopy(@renderer, @texture, nil, nil)
       SDL.RenderPresent(@renderer)