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

3DS: Redo video sync to be more precise

This commit is contained in:
Vicki Pfau 2020-08-07 18:27:24 -07:00
parent 38613b5770
commit a87fe56ec6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -25,6 +25,7 @@ Emulation fixes:
- GBA Video: Fix Hblank timing - GBA Video: Fix Hblank timing
- SM83: Emulate HALT bug - SM83: Emulate HALT bug
Other fixes: Other fixes:
- 3DS: Redo video sync to be more precise
- All: Improve export headers (fixes mgba.io/i/1738) - All: Improve export headers (fixes mgba.io/i/1738)
- Core: Ensure ELF regions can be written before trying - Core: Ensure ELF regions can be written before trying
- Debugger: Don't skip undefined instructions when debugger attached - Debugger: Don't skip undefined instructions when debugger attached

17
src/platform/3ds/main.c
View File

@ -95,7 +95,7 @@ static int activeOutputTexture = 0;
static ndspWaveBuf dspBuffer[DSP_BUFFERS]; static ndspWaveBuf dspBuffer[DSP_BUFFERS];
static int bufferId = 0; static int bufferId = 0;
static bool frameLimiter = true; static bool frameLimiter = true;
static u64 tickCounter; static u32 frameCounter;
static C3D_RenderTarget* topScreen[2]; static C3D_RenderTarget* topScreen[2];
static C3D_RenderTarget* bottomScreen[2]; static C3D_RenderTarget* bottomScreen[2];
@ -213,11 +213,17 @@ static void _drawStart(void) {
return; return;
} }
frameStarted = true; frameStarted = true;
int screen = screenMode >= SM_PA_TOP ? GSP_SCREEN_TOP : GSP_SCREEN_BOTTOM;
if (frameLimiter) { if (frameLimiter) {
if (tickCounter + 4481000 > svcGetSystemTick()) { u32 oldFrame = frameCounter;
C3D_FrameSync(); frameCounter = C3D_FrameCounter(screen);
while (oldFrame == frameCounter) {
gspWaitForAnyEvent();
frameCounter = C3D_FrameCounter(screen);
} }
tickCounter = svcGetSystemTick(); } else {
frameCounter = C3D_FrameCounter(screen);
} }
C3D_FrameBegin(0); C3D_FrameBegin(0);
ctrStartFrame(); ctrStartFrame();
@ -350,7 +356,7 @@ static void _gameLoaded(struct mGUIRunner* runner) {
} }
osSetSpeedupEnable(true); osSetSpeedupEnable(true);
double ratio = GBAAudioCalculateRatio(1, 59.8260982880808, 1); double ratio = GBAAudioCalculateRatio(1, 268111856.f / 4481136.f, 1);
blip_set_rates(runner->core->getAudioChannel(runner->core, 0), runner->core->frequency(runner->core), 32768 * ratio); blip_set_rates(runner->core->getAudioChannel(runner->core, 0), runner->core->frequency(runner->core), 32768 * ratio);
blip_set_rates(runner->core->getAudioChannel(runner->core, 1), runner->core->frequency(runner->core), 32768 * ratio); blip_set_rates(runner->core->getAudioChannel(runner->core, 1), runner->core->frequency(runner->core), 32768 * ratio);
if (hasSound != NO_SOUND) { if (hasSound != NO_SOUND) {
@ -659,7 +665,6 @@ static void _setFrameLimiter(struct mGUIRunner* runner, bool limit) {
return; return;
} }
frameLimiter = limit; frameLimiter = limit;
tickCounter = svcGetSystemTick();
} }
static bool _running(struct mGUIRunner* runner) { static bool _running(struct mGUIRunner* runner) {