paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(ppu): reimplement modes 3, 4, and 5

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-11-03 07:38:46 -03:00
parent c3f79b4aa9
commit c94913c1d0
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/core/ppu.zig
View File

@ -615,24 +615,29 @@ pub const Ppu = struct {
self.drawTextMode(framebuf_base); self.drawTextMode(framebuf_base);
}, },
0x3 => { 0x3 => {
const vram_base = width * @sizeOf(u16) * @as(usize, scanline); const vram_base = width * @as(usize, scanline);
const framebuf_base = framebuf_pitch * @as(usize, scanline); const framebuf_base = width * @as(usize, scanline);
var i: usize = 0; // FIXME: @ptrCast between slices changing the length isn't implemented yet
while (i < width) : (i += 1) { const vram_buf = @ptrCast([*]const u16, @alignCast(@alignOf(u16), self.vram.buf));
const bgr555 = self.vram.read(u16, vram_base + i * @sizeOf(u16)); const framebuf = @ptrCast([*]u32, @alignCast(@alignOf(u32), self.framebuf.get(.Emulator)));
std.mem.writeIntNative(u32, self.framebuf.get(.Emulator)[framebuf_base + i * @sizeOf(u32) ..][0..@sizeOf(u32)], rgba888(bgr555));
for (vram_buf[vram_base .. vram_base + width]) |bgr555, i| {
framebuf[framebuf_base + i] = rgba888(bgr555);
} }
}, },
0x4 => { 0x4 => {
const sel = self.dispcnt.frame_select.read(); const sel = self.dispcnt.frame_select.read();
const vram_base = width * @as(usize, scanline) + if (sel) 0xA000 else @as(usize, 0);
const framebuf_base = framebuf_pitch * @as(usize, scanline);
// Render Current Scanline const vram_base = width * @as(usize, scanline) + if (sel) 0xA000 else @as(usize, 0);
for (self.vram.buf[vram_base .. vram_base + width]) |byte, i| { const framebuf_base = width * @as(usize, scanline);
const bgr555 = self.palette.read(u16, @as(u16, byte) * @sizeOf(u16));
std.mem.writeIntNative(u32, self.framebuf.get(.Emulator)[framebuf_base + i * @sizeOf(u32) ..][0..@sizeOf(u32)], rgba888(bgr555)); // FIXME: @ptrCast between slices changing the length isn't implemented yet
const pal_buf = @ptrCast([*]const u16, @alignCast(@alignOf(u16), self.palette.buf));
const framebuf = @ptrCast([*]u32, @alignCast(@alignOf(u32), self.framebuf.get(.Emulator)));
for (self.vram.buf[vram_base .. vram_base + width]) |pal_id, i| {
framebuf[framebuf_base + i] = rgba888(pal_buf[pal_id]);
} }
}, },
0x5 => { 0x5 => {
@ -640,16 +645,17 @@ pub const Ppu = struct {
const m5_height = 128; const m5_height = 128;
const sel = self.dispcnt.frame_select.read(); const sel = self.dispcnt.frame_select.read();
const vram_base = m5_width * @sizeOf(u16) * @as(usize, scanline) + if (sel) 0xA000 else @as(usize, 0); const vram_base = m5_width * @as(usize, scanline) + if (sel) 0xA000 else @as(usize, 0);
const framebuf_base = framebuf_pitch * @as(usize, scanline); const framebuf_base = width * @as(usize, scanline);
// FIXME: @ptrCast between slices changing the length isn't implemented yet
const vram_buf = @ptrCast([*]const u16, @alignCast(@alignOf(u16), self.vram.buf));
const framebuf = @ptrCast([*]u32, @alignCast(@alignOf(u32), self.framebuf.get(.Emulator)));
var i: usize = 0; var i: usize = 0;
while (i < width) : (i += 1) { while (i < width) : (i += 1) {
// If we're outside of the bounds of mode 5, draw the background colour const bgr555 = if (scanline < m5_height and i < m5_width) vram_buf[vram_base + i] else self.palette.backdrop();
const bgr555 = framebuf[framebuf_base + i] = rgba888(bgr555);
if (scanline < m5_height and i < m5_width) self.vram.read(u16, vram_base + i * @sizeOf(u16)) else self.palette.backdrop();
std.mem.writeIntNative(u32, self.framebuf.get(.Emulator)[framebuf_base + i * @sizeOf(u32) ..][0..@sizeOf(u32)], rgba888(bgr555));
} }
}, },
else => std.debug.panic("[PPU] TODO: Implement BG Mode {}", .{bg_mode}), else => std.debug.panic("[PPU] TODO: Implement BG Mode {}", .{bg_mode}),

4
src/core/ppu/Palette.zig
View File

@ -42,6 +42,6 @@ pub fn deinit(self: *Self) void {
self.* = undefined; self.* = undefined;
} }
pub fn backdrop(self: *const Self) u16 { pub inline fn backdrop(self: *const Self) u16 {
return self.read(u16, 0); return std.mem.readIntNative(u16, self.buf[0..2]);
} }