ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update mGBA submodule to 8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51

This commit is contained in:
get 2023-04-23 02:53:23 -05:00
parent 8fbfee03ab
commit c9b26e3db2
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/mGBA/mgba vendored

@ -1 +1 @@
Subproject commit 89f8873df366a99dfdf40347f72e68763fb50bd9 Subproject commit 8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51

7
Externals/mGBA/mgba.vcxproj vendored
View File

@ -150,23 +150,25 @@
<ClCompile Include="mgba\src\util\crc32.c" /> <ClCompile Include="mgba\src\util\crc32.c" />
<ClCompile Include="mgba\src\util\formatting.c" /> <ClCompile Include="mgba\src\util\formatting.c" />
<ClCompile Include="mgba\src\util\gbk-table.c" /> <ClCompile Include="mgba\src\util\gbk-table.c" />
<ClCompile Include="mgba\src\util\geometry.c" />
<ClCompile Include="mgba\src\util\hash.c" /> <ClCompile Include="mgba\src\util\hash.c" />
<ClCompile Include="mgba\src\util\image.c" />
<ClCompile Include="mgba\src\util\string.c" /> <ClCompile Include="mgba\src\util\string.c" />
<ClCompile Include="mgba\src\util\table.c" /> <ClCompile Include="mgba\src\util\table.c" />
<ClCompile Include="mgba\src\util\vector.c" /> <ClCompile Include="mgba\src\util\vector.c" />
<ClCompile Include="mgba\src\util\vfs.c" /> <ClCompile Include="mgba\src\util\vfs.c" />
<ClCompile Include="mgba\src\util\convolve.c" /> <ClCompile Include="mgba\src\util\convolve.c" />
<ClCompile Include="mgba\src\util\elf-read.c" /> <ClCompile Include="mgba\src\util\elf-read.c" />
<ClCompile Include="mgba\src\util\export.c" />
<ClCompile Include="mgba\src\util\patch.c" /> <ClCompile Include="mgba\src\util\patch.c" />
<ClCompile Include="mgba\src\util\patch-fast.c" /> <ClCompile Include="mgba\src\util\patch-fast.c" />
<ClCompile Include="mgba\src\util\patch-ips.c" /> <ClCompile Include="mgba\src\util\patch-ips.c" />
<ClCompile Include="mgba\src\util\patch-ups.c" /> <ClCompile Include="mgba\src\util\patch-ups.c" />
<ClCompile Include="mgba\src\util\png-io.c" />
<ClCompile Include="mgba\src\util\ring-fifo.c" /> <ClCompile Include="mgba\src\util\ring-fifo.c" />
<ClCompile Include="mgba\src\util\sfo.c" /> <ClCompile Include="mgba\src\util\sfo.c" />
<ClCompile Include="mgba\src\util\text-codec.c" /> <ClCompile Include="mgba\src\util\text-codec.c" />
<ClCompile Include="version.c" /> <ClCompile Include="version.c" />
<ClCompile Include="mgba\src\util\image\export.c" />
<ClCompile Include="mgba\src\util\image\png-io.c" />
<ClCompile Include="mgba\src\util\vfs\vfs-mem.c" /> <ClCompile Include="mgba\src\util\vfs\vfs-mem.c" />
<ClCompile Include="mgba\src\util\vfs\vfs-fifo.c" /> <ClCompile Include="mgba\src\util\vfs\vfs-fifo.c" />
<ClCompile Include="mgba\src\util\vfs\vfs-fd.c" /> <ClCompile Include="mgba\src\util\vfs\vfs-fd.c" />
@ -214,6 +216,7 @@
<ClCompile Include="mgba\src\feature\thread-proxy.c" /> <ClCompile Include="mgba\src\feature\thread-proxy.c" />
<ClCompile Include="mgba\src\feature\updater.c" /> <ClCompile Include="mgba\src\feature\updater.c" />
<ClCompile Include="mgba\src\feature\video-logger.c" /> <ClCompile Include="mgba\src\feature\video-logger.c" />
<ClCompile Include="mgba\src\feature\video-backend.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(ExternalsDir)zlib-ng\exports.props" /> <Import Project="$(ExternalsDir)zlib-ng\exports.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

4
Source/Core/Core/HW/GBACore.cpp
View File

@ -305,7 +305,7 @@ CoreInfo Core::GetCoreInfo() const
info.has_rom = !m_rom_path.empty(); info.has_rom = !m_rom_path.empty();
info.has_ereader = info.has_ereader =
info.is_gba && static_cast<::GBA*>(m_core->board)->memory.hw.devices & HW_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; info.game_title = m_game_title;
return info; return info;
} }
@ -392,7 +392,7 @@ void Core::SetSIODriver()
void Core::SetVideoBuffer() void Core::SetVideoBuffer()
{ {
u32 width, height; u32 width, height;
m_core->desiredVideoDimensions(m_core, &width, &height); m_core->currentVideoSize(m_core, &width, &height);
m_video_buffer.resize(width * height); m_video_buffer.resize(width * height);
m_core->setVideoBuffer(m_core, m_video_buffer.data(), width); m_core->setVideoBuffer(m_core, m_video_buffer.data(), width);
if (auto host = m_host.lock()) if (auto host = m_host.lock())