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

chore(ppu): use @ptrCast in drawTextMode

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-11-03 07:51:06 -03:00
parent e67dc9b7de
commit 4ccacb0754
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/ppu.zig
View File

@ -573,7 +573,7 @@ pub const Ppu = struct {
switch (bg_mode) { switch (bg_mode) {
0x0 => { 0x0 => {
const framebuf_base = framebuf_pitch * @as(usize, scanline); const framebuf_base = width * @as(usize, scanline);
if (obj_enable) self.fetchSprites(); if (obj_enable) self.fetchSprites();
var layer: usize = 0; var layer: usize = 0;
@ -588,7 +588,7 @@ pub const Ppu = struct {
self.drawTextMode(framebuf_base); self.drawTextMode(framebuf_base);
}, },
0x1 => { 0x1 => {
const framebuf_base = framebuf_pitch * @as(usize, scanline); const framebuf_base = width * @as(usize, scanline);
if (obj_enable) self.fetchSprites(); if (obj_enable) self.fetchSprites();
var layer: usize = 0; var layer: usize = 0;
@ -602,7 +602,7 @@ pub const Ppu = struct {
self.drawTextMode(framebuf_base); self.drawTextMode(framebuf_base);
}, },
0x2 => { 0x2 => {
const framebuf_base = framebuf_pitch * @as(usize, scanline); const framebuf_base = width * @as(usize, scanline);
if (obj_enable) self.fetchSprites(); if (obj_enable) self.fetchSprites();
var layer: usize = 0; var layer: usize = 0;
@ -666,12 +666,15 @@ pub const Ppu = struct {
// Copy Drawn Scanline to Frame Buffer // Copy Drawn Scanline to Frame Buffer
// If there are any nulls present in self.scanline.top() it means that no background drew a pixel there, so draw backdrop // If there are any nulls present in self.scanline.top() it means that no background drew a pixel there, so draw backdrop
// FIXME: @ptrCast between slices changing the length isn't implemented yet
const framebuf = @ptrCast([*]u32, @alignCast(@alignOf(u32), self.framebuf.get(.Emulator)));
for (self.scanline.top()) |maybe_px, i| { for (self.scanline.top()) |maybe_px, i| {
const maybe_top = maybe_px; const maybe_top = maybe_px;
const maybe_btm = self.scanline.btm()[i]; const maybe_btm = self.scanline.btm()[i];
const bgr555 = self.getBgr555(maybe_top, maybe_btm); const bgr555 = self.getBgr555(maybe_top, maybe_btm);
std.mem.writeIntNative(u32, self.framebuf.get(.Emulator)[framebuf_base + i * @sizeOf(u32) ..][0..@sizeOf(u32)], rgba888(bgr555)); framebuf[framebuf_base + i] = rgba888(bgr555);
} }
// Reset Current Scanline Pixel Buffer and list of fetched sprites // Reset Current Scanline Pixel Buffer and list of fetched sprites