From c9b26e3db207c8349238e328a4f8570d56f831aa Mon Sep 17 00:00:00 2001 From: get <45425365+Minty-Meeo@users.noreply.github.com> Date: Sun, 23 Apr 2023 02:53:23 -0500 Subject: [PATCH] Update mGBA submodule to 8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51 --- Externals/mGBA/mgba | 2 +- Externals/mGBA/mgba.vcxproj | 7 +++++-- Source/Core/Core/HW/GBACore.cpp | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Externals/mGBA/mgba b/Externals/mGBA/mgba index 89f8873df3..8739b22fbc 160000 --- a/Externals/mGBA/mgba +++ b/Externals/mGBA/mgba @@ -1 +1 @@ -Subproject commit 89f8873df366a99dfdf40347f72e68763fb50bd9 +Subproject commit 8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51 diff --git a/Externals/mGBA/mgba.vcxproj b/Externals/mGBA/mgba.vcxproj index 6f1d3b3f6f..d1235246e3 100644 --- a/Externals/mGBA/mgba.vcxproj +++ b/Externals/mGBA/mgba.vcxproj @@ -150,23 +150,25 @@ + + - - + + @@ -214,6 +216,7 @@ + diff --git a/Source/Core/Core/HW/GBACore.cpp b/Source/Core/Core/HW/GBACore.cpp index cb62141522..5c8ac7b275 100644 --- a/Source/Core/Core/HW/GBACore.cpp +++ b/Source/Core/Core/HW/GBACore.cpp @@ -305,7 +305,7 @@ CoreInfo Core::GetCoreInfo() const info.has_rom = !m_rom_path.empty(); info.has_ereader = info.is_gba && static_cast<::GBA*>(m_core->board)->memory.hw.devices & HW_EREADER; - m_core->desiredVideoDimensions(m_core, &info.width, &info.height); + m_core->currentVideoSize(m_core, &info.width, &info.height); info.game_title = m_game_title; return info; } @@ -392,7 +392,7 @@ void Core::SetSIODriver() void Core::SetVideoBuffer() { u32 width, height; - m_core->desiredVideoDimensions(m_core, &width, &height); + m_core->currentVideoSize(m_core, &width, &height); m_video_buffer.resize(width * height); m_core->setVideoBuffer(m_core, m_video_buffer.data(), width); if (auto host = m_host.lock())