Add VSync function for iOS/OpenGL

Author: hrydgard

Common/TimeUtil.cpp

@@ -152,6 +152,10 @@ double from_time_raw_relative(uint64_t raw_time) {
 	return (double)raw_time * g_machTimeConversion;
 }
 
+double from_mach_time_interval(double interval) {
+	return interval - g_startTime * g_machTimeConversion;
+}
+
 double time_now_unix_utc() {
 	struct timespec tp;
 	clock_gettime(CLOCK_REALTIME, &tp);

Common/TimeUtil.h

@@ -5,7 +5,7 @@
 
 void TimeInit();
 
-// Seconds.
+// Seconds from app start.
 double time_now_d();
 
 // Raw time in nanoseconds.
@@ -15,6 +15,7 @@ uint64_t time_now_raw();
 // This is only interesting for Linux, in relation to VK_GOOGLE_display_timing.
 double from_time_raw(uint64_t raw_time);
 double from_time_raw_relative(uint64_t raw_time);
+double from_mach_time_interval(double interval);
 
 // Seconds, Unix UTC time
 double time_now_unix_utc();

UI/GamepadEmu.cpp

@@ -816,15 +816,15 @@ void InitPadLayout(TouchControlConfig *config, DeviceOrientation orientation, fl
 
 	if (orientation == DeviceOrientation::Portrait) {
 		int start_key_X = halfW;
-		int start_key_Y = yres - bottom_button_Y * scale;
+		int start_key_Y = yres - bottom_button_Y * scale + 20;
 		initTouchPos(&config->touchStartKey, start_key_X, start_key_Y);
 
 		int select_key_X = halfW;
 		int select_key_Y = yres - bottom_button_Y * scale - 50;
 		initTouchPos(&config->touchSelectKey, select_key_X, select_key_Y);
 
 		int fast_forward_key_X = halfW;
-		int fast_forward_key_Y = yres - bottom_button_Y * scale - 100;
+		int fast_forward_key_Y = yres - bottom_button_Y * scale - 140;
 		initTouchPos(&config->touchFastForwardKey, fast_forward_key_X, fast_forward_key_Y);
 	} else {
 		int start_key_X = halfW + bottom_key_spacing * scale;

UI/NativeApp.cpp

@@ -1530,6 +1530,7 @@ void NativeResized() {
 }
 
 void NativeVSync(int64_t vsyncId, double frameTime, double expectedPresentationTime) {
+	INFO_LOG(Log::System, "NativeVSync called with id %lld, frameTime %f, expectedPresentationTime %f", (long long)vsyncId, frameTime, expectedPresentationTime);
 	// TODO: Make use of this.
 }
 

ios/ViewController.mm

@@ -104,7 +104,6 @@ @interface PPSSPPViewControllerGL () {
 @property (nonatomic, strong) EAGLContext *glContext;
 @property (nonatomic, strong) GLKView *glView;
 @property (nonatomic, strong) CADisplayLink *displayLink;
-@property (nonatomic, assign) NSTimeInterval lastTimestamp;
 
 @property (nonatomic, strong) EAGLContext* context;
 
@@ -214,8 +213,6 @@ - (void)viewDidLoad {
 	}
 	[self.displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
 
-	self.lastTimestamp = 0;
-
 	[[DisplayManager shared] setupDisplayListener];
 
 	UIScreen* screen = [(AppDelegate*)[UIApplication sharedApplication].delegate screen];
@@ -275,29 +272,23 @@ - (void)dealloc {
 - (void)setPreferredFramesPerSecond:(NSInteger)preferredFramesPerSecond {
 	_preferredFramesPerSecond = preferredFramesPerSecond;
 	if (self.displayLink) {
-		if (@available(iOS 10.0, *)) {
-			self.displayLink.preferredFramesPerSecond = (NSInteger)preferredFramesPerSecond;
-		} else {
-			self.displayLink.frameInterval = MAX(1, (NSInteger)round(60.0 / preferredFramesPerSecond));
-		}
+		self.displayLink.preferredFramesPerSecond = (NSInteger)preferredFramesPerSecond;
 	}
 }
 
 - (void)displayLinkFired:(CADisplayLink *)dl {
-	// compute delta time
+	static uint64_t presentId = 0;
+	presentId++;
+
 	NSTimeInterval timestamp = dl.timestamp;
-	NSTimeInterval delta = 0;
-	if (self.lastTimestamp > 0) {
-		delta = timestamp - self.lastTimestamp;
-	} else {
-		delta = dl.duration; // fallback
-	}
-	self.lastTimestamp = timestamp;
+	NSTimeInterval targetTimestamp = dl.targetTimestamp;
 
 	// Ensure context is current before drawing
 	[EAGLContext setCurrentContext:self.glContext];
 
-	// Trigger GLKView draw
+	NativeVSync(presentId, from_mach_time_interval(timestamp), from_mach_time_interval(targetTimestamp));
+
+	// Trigger GLKView draw, which in turn calls glkView:drawInRect.
 	[self.glView display];
 }
 

ios/ViewControllerMetal.mm

@@ -18,6 +18,7 @@
 #include "Common/System/Request.h"
 #include "Common/GraphicsContext.h"
 #include "Common/Thread/ThreadUtil.h"
+#include "Common/TimeUtil.h"
 
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"

ios/main.mm

@@ -37,6 +37,7 @@
 #include "Common/Profiler/Profiler.h"
 #include "Common/Thread/ThreadUtil.h"
 #include "Common/System/Display.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Common/Log.h"
 #include "Common/Log/LogManager.h"
@@ -648,6 +649,8 @@ int main(int argc, char *argv[]) {
 		g_iosVersionMajor = 14;
 	}
 
+	TimeInit();
+
 	g_logManager.EnableOutput(LogOutput::Stdio);
 
 #if PPSSPP_PLATFORM(IOS_APP_STORE)