riyyi
/
garbage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Emulator: Separate pixel FIFO states into different functions

master
Riyyi 2 years ago
parent
91884d65fb
commit
301c9343da
2 changed files with 169 additions and 132 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 183
      src/ppu.cpp
  2. 34
      src/ppu.h

183
src/ppu.cpp
Unescape View File

@ -5,7 +5,7 @@
* SPDX-License-Identifier: MIT
*/
#include <cstdint> // uint32_t
#include <cstdint> // uint8_t, uint16_t, uint32_t
#include <memory> // std::make_shared
#include "glm/ext/vector_float3.hpp" // glm::vec3
@ -56,7 +56,7 @@ void PPU::update()
}
break;
case State::PixelTransfer:
pixelFifo();
updatePixelFifo();
if (m_lcd_x_coordinate == 160) {
m_lcd_x_coordinate = 0;
@ -112,31 +112,31 @@ void PPU::render()
scene.addComponent<Inferno::SpriteComponent>(m_entity, glm::vec4 { 1.0f }, texture);
}
void PPU::pixelFifo()
void PPU::resetFrame()
{
LCDC lcd_control = static_cast<LCDC>(Emu::the().readMemory(0xff40));
// Tile map
uint32_t bg_tile_map_address = (lcd_control & LCDC::BGTileMapArea) ? 0x9c00 : 0x9800;
// uint32_t window_tile_map_address = (lcd_control & LCDC::WindowTileMapArea) ? 0x9c00 : 0x9800;
m_state = State::OAMSearch;
m_clocks_into_frame = 0;
m_lcd_x_coordinate = 0;
m_lcd_y_coordinate = 0;
}
// Tile data
uint32_t tile_data_address = (lcd_control & LCDC::BGandWindowTileDataArea) ? 0x8000 : 0x8800;
// -----------------------------------------
uint32_t PPU::getBgTileDataAddress(uint8_t tile_index)
{
// https://gbdev.io/pandocs/Tile_Data.html
auto getBgTileDataAddress = [&](uint8_t tile_index) -> uint32_t {
switch (tile_data_address) {
switch (m_pixel_fifo.tile_data_address) {
case 0x8000:
// 0x8000-0x8fff: index 0 => 255
return tile_data_address + (tile_index * TILE_SIZE); // Each tile is 16 bytes
return m_pixel_fifo.tile_data_address + (tile_index * TILE_SIZE); // Each tile is 16 bytes
case 0x8800:
// 0x8800-0x8fff: index 128 => 255 (or -128 => -1)
// 0x9000-0x97ff: index 0 => 127
if (tile_index <= 127) {
return tile_data_address + 0x800 + (tile_index * TILE_SIZE); // Each tile is 16 bytes
return m_pixel_fifo.tile_data_address + 0x800 + (tile_index * TILE_SIZE); // Each tile is 16 bytes
}
else {
return tile_data_address + ((tile_index - 128) * TILE_SIZE); // Each tile is 16 bytes
return m_pixel_fifo.tile_data_address + ((tile_index - 128) * TILE_SIZE); // Each tile is 16 bytes
}
default:
VERIFY_NOT_REACHED();
@ -144,11 +144,63 @@ void PPU::pixelFifo()
};
};
// -------------------------------------
// FIFO Pixel Fetcher
std::array<uint8_t, 3> PPU::getPixelColor(uint8_t color_index, Palette palette)
{
VERIFY(color_index < 4, "trying to fetch invalid color index '{}'", color_index);
switch (Emu::the().mode()) {
case Emu::Mode::DMG: {
uint8_t palette_data = Emu::the().readMemory(palette) & 0xff;
uint8_t palette_value = palette_data >> (color_index * 2) & 0x3;
switch (palette_value) {
case 0:
return { 200, 199, 168 };
case 1:
return { 160, 160, 136 };
case 2:
return { 104, 104, 80 };
case 3:
return { 39, 40, 24 };
default:
VERIFY_NOT_REACHED();
};
}
case Emu::Mode::CGB:
VERIFY_NOT_REACHED();
default:
VERIFY_NOT_REACHED();
}
return {};
}
void PPU::updatePixelFifo()
{
switch (m_pixel_fifo.state) {
case PixelFifo::State::TileIndex:
tileIndex();
break;
case PixelFifo::State::TileDataLow:
tileDataLow();
break;
case PixelFifo::State::TileDataHigh:
tileDataHigh();
break;
case PixelFifo::State::Sleep:
sleep();
break;
case PixelFifo::State::Push:
pushFifo();
break;
default:
VERIFY_NOT_REACHED();
};
pushPixel();
}
void PPU::tileIndex()
{
if (!m_pixel_fifo.step) {
m_pixel_fifo.step = true;
}
@ -156,22 +208,33 @@ void PPU::pixelFifo()
m_pixel_fifo.step = false;
m_pixel_fifo.state = PixelFifo::State::TileDataLow;
LCDC lcd_control = static_cast<LCDC>(Emu::the().readMemory(0xff40));
// Tile map
uint32_t bg_tile_map_address = (lcd_control & LCDC::BGTileMapArea) ? 0x9c00 : 0x9800;
// uint32_t window_tile_map_address = (lcd_control & LCDC::WindowTileMapArea) ? 0x9c00 : 0x9800;
// Tile data
m_pixel_fifo.tile_data_address = (lcd_control & LCDC::BGandWindowTileDataArea) ? 0x8000 : 0x8800;
// Viewport
// https://gbdev.io/pandocs/Scrolling.html#mid-frame-behavior
m_viewport_x = Emu::the().readMemory(0xff43); // TODO: only read lower 3-bits at beginning of scanline
m_viewport_y = Emu::the().readMemory(0xff42);
m_pixel_fifo.viewport_x = Emu::the().readMemory(0xff43); // TODO: only read lower 3-bits at beginning of scanline
m_pixel_fifo.viewport_y = Emu::the().readMemory(0xff42);
// Read the tile map index
uint16_t offset = (((m_viewport_y + m_lcd_y_coordinate) / TILE_HEIGHT) * 32)
+ ((m_viewport_x + m_pixel_fifo.x_coordinate) / TILE_WIDTH);
uint16_t offset = (((m_pixel_fifo.viewport_y + m_lcd_y_coordinate) / TILE_HEIGHT) * 32)
+ ((m_pixel_fifo.viewport_x + m_pixel_fifo.x_coordinate) / TILE_WIDTH);
m_pixel_fifo.x_coordinate += 8;
m_pixel_fifo.tile_index = Emu::the().readMemory(bg_tile_map_address + offset) & 0xff;
m_pixel_fifo.tile_index = Emu::the().readMemory(bg_tile_map_address + offset);
// Set the tile line we're currently on
m_pixel_fifo.tile_line = (m_viewport_y + m_lcd_y_coordinate) % TILE_HEIGHT;
m_pixel_fifo.tile_line = (m_pixel_fifo.viewport_y + m_lcd_y_coordinate) % TILE_HEIGHT;
}
break;
case PixelFifo::State::TileDataLow:
}
void PPU::tileDataLow()
{
if (!m_pixel_fifo.step) {
m_pixel_fifo.step = true;
}
@ -184,8 +247,10 @@ void PPU::pixelFifo()
getBgTileDataAddress(m_pixel_fifo.tile_index)
+ m_pixel_fifo.tile_line * 2); // Each tile line is 2 bytes
}
break;
case PixelFifo::State::TileDataHigh:
}
void PPU::tileDataHigh()
{
if (!m_pixel_fifo.step) {
m_pixel_fifo.step = true;
}
@ -199,29 +264,29 @@ void PPU::pixelFifo()
+ m_pixel_fifo.tile_line * 2 // Each tile line is 2 bytes
+ 1);
}
break;
case PixelFifo::State::Sleep:
if (m_pixel_fifo.background.size() <= 9) {
}
void PPU::sleep()
{
if (m_pixel_fifo.background.size() <= TILE_WIDTH + 1) {
m_pixel_fifo.state = PixelFifo::State::Push;
}
break;
case PixelFifo::State::Push:
}
void PPU::pushFifo()
{
m_pixel_fifo.state = PixelFifo::State::TileIndex;
for (uint8_t i = 0; i < 8; ++i) {
for (uint8_t i = 0; i < TILE_WIDTH; ++i) {
uint8_t color_index = (m_pixel_fifo.pixels_lsb >> (7 - i)
| ((m_pixel_fifo.pixels_msb >> (7 - i)) << 1))
& 0x3;
m_pixel_fifo.background.push({ color_index, Palette::BGP });
}
break;
default:
VERIFY_NOT_REACHED();
};
// -------------------------------------
// Mode 3 Operation
}
void PPU::pushPixel()
{
// The pixel FIFO needs to contain more than 8 pixels to shift one out
if (m_pixel_fifo.background.size() > 8) {
auto pixel = m_pixel_fifo.background.front();
@ -235,41 +300,3 @@ void PPU::pixelFifo()
m_lcd_x_coordinate++;
}
}
std::array<uint8_t, 3> PPU::getPixelColor(uint8_t color_index, Palette palette)
{
VERIFY(color_index < 4, "trying to fetch invalid color index '{}'", color_index);
switch (Emu::the().mode()) {
case Emu::Mode::DMG: {
uint8_t palette_data = Emu::the().readMemory(palette) & 0xff;
uint8_t palette_value = palette_data >> (color_index * 2) & 0x3;
switch (palette_value) {
case 0:
return { 200, 199, 168 };
case 1:
return { 160, 160, 136 };
case 2:
return { 104, 104, 80 };
case 3:
return { 39, 40, 24 };
default:
VERIFY_NOT_REACHED();
};
}
case Emu::Mode::CGB:
VERIFY_NOT_REACHED();
default:
VERIFY_NOT_REACHED();
}
return {};
}
void PPU::resetFrame()
{
m_state = State::OAMSearch;
m_clocks_into_frame = 0;
m_lcd_x_coordinate = 0;
m_lcd_y_coordinate = 0;
}

34
src/ppu.h
Unescape View File

@ -62,13 +62,16 @@ public:
Push,
};
State state = State::TileIndex;
bool step = false;
uint8_t x_coordinate = 0;
uint8_t tile_index = 0;
uint8_t tile_line = 0;
uint8_t pixels_lsb = 0;
uint8_t pixels_msb = 0;
State state { State::TileIndex };
bool step { false };
uint32_t tile_data_address { 0 };
uint8_t viewport_x { 0 };
uint8_t viewport_y { 0 };
uint8_t x_coordinate { 0 };
uint8_t tile_index { 0 };
uint8_t tile_line { 0 };
uint8_t pixels_lsb { 0 };
uint8_t pixels_msb { 0 };
using Fifo = std::queue<std::pair<uint8_t, Palette>>; // colorID, source
@ -78,20 +81,27 @@ public:
void update() override;
void render();
void resetFrame();
void pixelFifo();
private:
uint32_t getBgTileDataAddress(uint8_t tile_index);
std::array<uint8_t, 3> getPixelColor(uint8_t color_index, Palette palette);
void resetFrame();
void updatePixelFifo();
void tileIndex();
void tileDataLow();
void tileDataHigh();
void sleep();
void pushFifo();
void pushPixel();
// -------------------------------------
private:
State m_state { State::OAMSearch };
uint32_t m_clocks_into_frame { 0 };
uint32_t m_lcd_x_coordinate { 0 };
uint32_t m_lcd_y_coordinate { 0 }; // Note: includes V-Blank
uint8_t m_viewport_x { 0 };
uint8_t m_viewport_y { 0 };
PixelFifo m_pixel_fifo;
uint32_t m_entity { 0 };

Write Preview
Loading…
Cancel
Save