From e7a663901a4db72b647263c9de2ec4a45dd2e5e5 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 26 Dec 2023 11:59:14 -0600 Subject: [PATCH] [nostalgia/core/opengl] Fix duplicate and missing symbol --- src/nostalgia/modules/core/src/opengl/gfx.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/nostalgia/modules/core/src/opengl/gfx.cpp b/src/nostalgia/modules/core/src/opengl/gfx.cpp index 602a80bd..3dd9dc88 100644 --- a/src/nostalgia/modules/core/src/opengl/gfx.cpp +++ b/src/nostalgia/modules/core/src/opengl/gfx.cpp @@ -592,12 +592,11 @@ void setBgTile( uint_t bgIdx, int column, int row, - unsigned tile, - unsigned palBank) noexcept { + BgTile const&tile) noexcept { oxTracef( "nostalgia.core.gfx.setBgTile", - "bgIdx: {}, column: {}, row: {}, tile: {}", - bgIdx, column, row, tile); + "bgIdx: {}, column: {}, row: {}, tile: {}, palBank: {}", + bgIdx, column, row, tile.tileIdx, tile.palBank); const auto z = static_cast(bgIdx); const auto y = static_cast(row); const auto x = static_cast(column); @@ -610,9 +609,9 @@ void setBgTile( static_cast(i * renderer::BgVertexVboRows), static_cast(x), static_cast(y), - static_cast(tile), + static_cast(tile.tileIdx), bg.priority, - static_cast(palBank * 16), + static_cast(tile.palBank * 16), vbo, ebo); cbb.updated = true;