From c1108301c01016e3b94b69e642a0ad0c308ceea2 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 13 May 2025 21:54:14 -0500 Subject: [PATCH] [nostalgia/gfx] Cleanup --- .../modules/gfx/include/nostalgia/gfx/gfx.hpp | 2 +- src/nostalgia/modules/gfx/src/gba/gfx.cpp | 39 ++++++++++--------- src/nostalgia/modules/gfx/src/opengl/gfx.cpp | 14 ++++--- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp index 1271ac6e..3736d23d 100644 --- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp +++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp @@ -223,7 +223,7 @@ bool bgStatus(Context &ctx, unsigned bg) noexcept; void setBgStatus(Context &ctx, unsigned bg, bool status) noexcept; -void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept; +void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbbIdx) noexcept; void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept; diff --git a/src/nostalgia/modules/gfx/src/gba/gfx.cpp b/src/nostalgia/modules/gfx/src/gba/gfx.cpp index 2bccaa0f..e9f33f92 100644 --- a/src/nostalgia/modules/gfx/src/gba/gfx.cpp +++ b/src/nostalgia/modules/gfx/src/gba/gfx.cpp @@ -36,9 +36,9 @@ ox::Error initGfx(Context&, InitParams const&) noexcept { ox::Error loadBgPalette( Context&, - size_t palBank, + size_t const palBank, CompactPalette const&palette, - size_t page) noexcept { + size_t const page) noexcept { if (palette.pages.empty()) { return {}; } @@ -52,7 +52,7 @@ ox::Error loadBgPalette( ox::Error loadSpritePalette( Context&, CompactPalette const&palette, - size_t page) noexcept { + size_t const page) noexcept { if (palette.pages.empty()) { return {}; } @@ -133,7 +133,7 @@ ox::Error loadBgTileSheet( ox::Error loadBgTileSheet( Context &ctx, - unsigned cbb, + unsigned const cbb, CompactTileSheet const&ts, ox::Optional const&paletteBank) noexcept { auto const cnt = (ts.pixels.size() * PixelsPerTile) / (1 + (ts.bpp == 4)); @@ -184,7 +184,7 @@ static void setSpritesBpp(unsigned const bpp) noexcept { ox::Error loadSpriteTileSheet( Context &ctx, CompactTileSheet const&ts, - bool loadDefaultPalette) noexcept { + bool const loadDefaultPalette) noexcept { for (size_t i = 0; i < ts.pixels.size(); i += 2) { uint16_t v = ts.pixels[i]; v |= static_cast(ts.pixels[i + 1] << 8); @@ -206,7 +206,8 @@ ox::Error loadSpriteTileSheet( return {}; } -void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&tile) noexcept { +void setBgTile( + Context &ctx, uint_t const bgIdx, int const column, int const row, BgTile const&tile) noexcept { auto const tileIdx = static_cast(row * tileColumns(ctx) + column); // see Tonc 9.3 MEM_BG_MAP[bgIdx][tileIdx] = @@ -216,7 +217,7 @@ void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&til static_cast(tile.palBank << 0xc); } -void clearBg(Context &ctx, uint_t bgIdx) noexcept { +void clearBg(Context &ctx, uint_t const bgIdx) noexcept { memset(MEM_BG_MAP[bgIdx].data(), 0, static_cast(tileRows(ctx) * tileColumns(ctx))); } @@ -224,39 +225,39 @@ uint8_t bgStatus(Context&) noexcept { return (REG_DISPCTL >> 8u) & 0b1111u; } -void setBgStatus(Context&, uint32_t status) noexcept { +void setBgStatus(Context&, uint32_t const status) noexcept { constexpr auto BgStatus = 8; REG_DISPCTL = (REG_DISPCTL & ~0b111100000000u) | status << BgStatus; } -bool bgStatus(Context&, unsigned bg) noexcept { +bool bgStatus(Context&, unsigned const bg) noexcept { return (REG_DISPCTL >> (8 + bg)) & 1; } -void setBgStatus(Context&, unsigned bg, bool status) noexcept { +void setBgStatus(Context&, unsigned const bg, bool const status) noexcept { constexpr auto Bg0Status = 8; const auto mask = static_cast(status) << (Bg0Status + bg); REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask); } -void setBgBpp(Context&, unsigned bgIdx, unsigned bpp) noexcept { +void setBgBpp(Context&, unsigned const bgIdx, unsigned const bpp) noexcept { auto &bgCtl = regBgCtl(bgIdx); teagba::bgSetBpp(bgCtl, bpp); } -void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept { +void setBgCbb(Context &ctx, unsigned const bgIdx, unsigned const cbbIdx) noexcept { auto &bgCtl = regBgCtl(bgIdx); - const auto &cbbData = ctx.cbbData[cbb]; + const auto &cbbData = ctx.cbbData[cbbIdx]; teagba::bgSetBpp(bgCtl, cbbData.bpp); - teagba::bgSetCbb(bgCtl, cbb); + teagba::bgSetCbb(bgCtl, cbbIdx); } -void setBgPriority(Context&, uint_t bgIdx, uint_t priority) noexcept { +void setBgPriority(Context&, uint_t const bgIdx, uint_t const priority) noexcept { auto &bgCtl = regBgCtl(bgIdx); bgCtl = (bgCtl & 0b1111'1111'1111'1100u) | (priority & 0b11); } -void hideSprite(Context&, unsigned idx) noexcept { +void hideSprite(Context&, unsigned const idx) noexcept { //oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow"); teagba::addSpriteUpdate({ .attr0 = uint16_t{0b11 << 8}, @@ -264,7 +265,7 @@ void hideSprite(Context&, unsigned idx) noexcept { }); } -void showSprite(Context&, unsigned idx) noexcept { +void showSprite(Context&, unsigned const idx) noexcept { //oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow"); teagba::addSpriteUpdate({ .attr0 = 0, @@ -272,7 +273,7 @@ void showSprite(Context&, unsigned idx) noexcept { }); } -void setSprite(Context&, uint_t idx, Sprite const&s) noexcept { +void setSprite(Context&, uint_t const idx, Sprite const&s) noexcept { //oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow"); uint16_t const eightBpp = s.bpp == 8; teagba::addSpriteUpdate({ @@ -293,7 +294,7 @@ void setSprite(Context&, uint_t idx, Sprite const&s) noexcept { }); } -uint_t spriteCount(Context const &) noexcept { +uint_t spriteCount(Context const&) noexcept { return SpriteCount; } diff --git a/src/nostalgia/modules/gfx/src/opengl/gfx.cpp b/src/nostalgia/modules/gfx/src/opengl/gfx.cpp index e88e7e0c..7f47b619 100644 --- a/src/nostalgia/modules/gfx/src/opengl/gfx.cpp +++ b/src/nostalgia/modules/gfx/src/opengl/gfx.cpp @@ -106,7 +106,7 @@ static constexpr ox::CStringView spritefshadTmpl = R"glsl( })glsl"; [[nodiscard]] -static constexpr auto bgVertexRow(uint_t x, uint_t y) noexcept { +static constexpr auto bgVertexRow(uint_t const x, uint_t const y) noexcept { return y * TileRows + x; } @@ -290,8 +290,8 @@ static void initBackgroundBufferset( } static glutils::GLTexture createTexture( - GLsizei w, - GLsizei h, + GLsizei const w, + GLsizei const h, void const*pixels) noexcept { GLuint texId = 0; glGenTextures(1, &texId); @@ -523,7 +523,11 @@ static ox::Result normalizeTileSheet( pixels[i * 2 + 1] = ts.pixels[i] >> 4; } } - return TileSheetData{std::move(pixels), width, height}; + return TileSheetData{ + .pixels = std::move(pixels), + .width = width, + .height = height + }; } ox::Error loadBgPalette( @@ -762,7 +766,7 @@ uint_t spriteCount(Context const &ctx) noexcept { namespace gl { -ox::Size drawSize(int scale) noexcept { +ox::Size drawSize(int const scale) noexcept { return {240 * scale, 160 * scale}; }