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

fix libretro build broken in 16dd5d40 #339 

Conditionally compile out the code for the feature implemented in
16dd5d40 (which is the throttle and frame skip configuration for the
speedup button) for libretro, and use the old behavior of skipping 9
frames.

Affects GBA.cpp and GB.cpp .

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2019-02-03 15:28:26 -08:00
parent 16dd5d4068
commit eb6dfb4bfa
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gb/GB.cpp
View File

@ -4843,6 +4843,8 @@ void gbEmulate(int ticksToStop)
if ((gbLcdTicksDelayed <= 0) && (gbLCDChangeHappened)) {
int framesToSkip = systemFrameSkip;
#ifndef __LIBRETRO__
static bool speedup_throttle_set = false;
static uint32_t last_throttle;
@ -4868,6 +4870,10 @@ void gbEmulate(int ticksToStop)
speedup_throttle_set = false;
}
#else
if ((gbJoymask[0] >> 10) & 1)
framesToSkip = 9;
#endif
//gbLcdTicksDelayed = gbLcdTicks+1;
gbLCDChangeHappened = false;
@ -4946,7 +4952,11 @@ void gbEmulate(int ticksToStop)
speedup = false;
#ifndef __LIBRETRO__
if (newmask & 1 && speedup_throttle == 0)
#else
if (newmask & 1)
#endif
speedup = true;
gbCapture = (newmask & 2) ? true : false;

10
src/gba/GBA.cpp
View File

@ -3756,6 +3756,8 @@ void CPULoop(int ticks)
}
} else {
int framesToSkip = systemFrameSkip;
#ifndef __LIBRETRO__
static bool speedup_throttle_set = false;
static uint32_t last_throttle;
@ -3781,6 +3783,10 @@ void CPULoop(int ticks)
speedup_throttle_set = false;
}
#else
if ((joy >> 10) & 1)
framesToSkip = 9;
#endif
if (DISPSTAT & 2) {
// if in H-Blank, leave it and move to drawing mode
@ -3814,7 +3820,11 @@ void CPULoop(int ticks)
speedup = false;
#ifndef __LIBRETRO__
if (ext & 1 && speedup_throttle == 0)
#else
if (ext & 1)
#endif
speedup = true;
capture = (ext & 2) ? true : false;