mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-28 21:08:04 +03:00
Merge 191f50d74a
into 8ee64a84c7
This commit is contained in:
commit
2e41e7d234
1 changed files with 15 additions and 7 deletions
|
@ -306,7 +306,11 @@ 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->currentVideoSize(m_core, &info.width, &info.height);
|
#ifdef NEW_MGBA_VERSION
|
||||||
|
m_core->currentVideoSize(m_core, &info.width, &info.height);
|
||||||
|
#else
|
||||||
|
m_core->desiredVideoDimensions(m_core, &info.width, &info.height);
|
||||||
|
#endif
|
||||||
info.game_title = m_game_title;
|
info.game_title = m_game_title;
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
@ -390,14 +394,18 @@ void Core::SetSIODriver()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
void Core::SetVideoBuffer()
|
void Core::SetVideoBuffer() {
|
||||||
{
|
|
||||||
u32 width, height;
|
u32 width, height;
|
||||||
m_core->currentVideoSize(m_core, &width, &height);
|
#ifdef NEW_MGBA_VERSION
|
||||||
m_video_buffer.resize(width * height);
|
m_core->currentVideoSize(m_core, &width, &height);
|
||||||
m_core->setVideoBuffer(m_core, m_video_buffer.data(), width);
|
#else
|
||||||
if (auto host = m_host.lock())
|
m_core->desiredVideoDimensions(m_core, &width, &height);
|
||||||
|
#endif
|
||||||
|
m_video_buffer.resize(width * height);
|
||||||
|
m_core->setVideoBuffer(m_core, m_video_buffer.data(), width);
|
||||||
|
if (auto host = m_host.lock()) {
|
||||||
host->GameChanged();
|
host->GameChanged();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Core::SetSampleRates()
|
void Core::SetSampleRates()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue