Support forcing 60 Hz when 60 FPS is forced (#62)

masagrator · Nov 10, 2024 · 43f1f6d · 43f1f6d
1 parent 4c1b572
commit 43f1f6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/saltysd_core/source/NX-FPS.cpp b/saltysd_core/source/NX-FPS.cpp
@@ -547,10 +547,10 @@ int eglSwap (const void* EGLDisplay, const void* EGLSurface) {
 	uint32_t FPStimingoverride = 0;
 	(Shared -> forceOriginalRefreshRate) = false;
 	if (LOCK::overwriteRefreshRate > 0) {
-		if (LOCK::overwriteRefreshRate == 30) {
+		if ((LOCK::overwriteRefreshRate == 30) || (LOCK::overwriteRefreshRate == 60)) {
 			(Shared -> forceOriginalRefreshRate) = true;
-			eglInterval(EGLDisplay, -2);
 			FPStimingoverride = 1;
+			eglInterval(EGLDisplay, (LOCK::overwriteRefreshRate / -30));
 		}
 		else {
 			eglInterval(EGLDisplay, -1);
@@ -780,10 +780,10 @@ void nvnPresentTexture(const void* _this, const NVNWindow* nvnWindow, const void
 	uint32_t FPStimingoverride = 0;
 	(Shared -> forceOriginalRefreshRate) = false;
 	if (LOCK::overwriteRefreshRate > 0) {
-		if (LOCK::overwriteRefreshRate == 30) {
+		if ((LOCK::overwriteRefreshRate == 30) || (LOCK::overwriteRefreshRate == 60)) {
 			(Shared -> forceOriginalRefreshRate) = true;
-			nvnSetPresentInterval(nvnWindow, -2);
 			FPStimingoverride = 1;
+			nvnSetPresentInterval(nvnWindow, (LOCK::overwriteRefreshRate / -30));
 		}
 		else {
 			nvnSetPresentInterval(nvnWindow, -1);

diff --git a/saltysd_core32/source/NX-FPS.cpp b/saltysd_core32/source/NX-FPS.cpp
@@ -532,10 +532,11 @@ int eglSwap (const void* EGLDisplay, const void* EGLSurface) {
 	uint32_t FPStimingoverride = 0;
 	(Shared -> forceOriginalRefreshRate) = false;
 	if (LOCK::overwriteRefreshRate > 0) {
-		if (LOCK::overwriteRefreshRate == 30) {
+		if ((LOCK::overwriteRefreshRate == 30) || (LOCK::overwriteRefreshRate == 60)) {
 			(Shared -> forceOriginalRefreshRate) = true;
-			eglInterval(EGLDisplay, -2);
 			FPStimingoverride = 1;
+			eglInterval(EGLDisplay, (LOCK::overwriteRefreshRate / -30));
+
 		}
 		else {
 			eglInterval(EGLDisplay, -1);
@@ -769,10 +770,10 @@ void nvnPresentTexture(const void* _this, const NVNWindow* nvnWindow, const void
 	uint32_t FPStimingoverride = 0;
 	(Shared -> forceOriginalRefreshRate) = false;
 	if (LOCK::overwriteRefreshRate > 0) {
-		if (LOCK::overwriteRefreshRate == 30) {
+		if ((LOCK::overwriteRefreshRate == 30) || (LOCK::overwriteRefreshRate == 60)) {
 			(Shared -> forceOriginalRefreshRate) = true;
-			nvnSetPresentInterval(nvnWindow, -2);
 			FPStimingoverride = 1;
+			nvnSetPresentInterval(nvnWindow, (LOCK::overwriteRefreshRate / -30));
 		}
 		else {
 			nvnSetPresentInterval(nvnWindow, -1);