From 55053b1ff149552784e13e1158fe114938660c13 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Sun, 7 Mar 2021 08:03:50 -0800 Subject: [PATCH] Always try to set vsync. Use the internal monitor function to correctly get the display for windows. --- src/core.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/core.c b/src/core.c index 60620085e..c0eb0a156 100644 --- a/src/core.c +++ b/src/core.c @@ -1033,7 +1033,13 @@ void ToggleFullscreen(void) // Store previous window position (in case we exit fullscreen) glfwGetWindowPos(CORE.Window.handle, &CORE.Window.position.x, &CORE.Window.position.y); - GLFWmonitor *monitor = glfwGetWindowMonitor(CORE.Window.handle); + int monitorCount = 0; + GLFWmonitor** monitors = glfwGetMonitors(&monitorCount); + + int monitorIndex = GetCurrentMonitor(); + // use GetCurrentMonitor so we correctly get the display the window is on + GLFWmonitor* monitor = monitorIndex < monitorCount ? monitors[monitorIndex] : NULL; + if (!monitor) { TRACELOG(LOG_WARNING, "GLFW: Failed to get monitor"); @@ -1047,10 +1053,6 @@ void ToggleFullscreen(void) glfwSetWindowSizeCallback(CORE.Window.handle, NULL); glfwSetWindowMonitor(CORE.Window.handle, monitor, 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE); glfwSetWindowSizeCallback(CORE.Window.handle, WindowSizeCallback); - - // Try to enable GPU V-Sync, so frames are limited to screen refresh rate (60Hz -> 60 FPS) - // NOTE: V-Sync can be enabled by graphic driver configuration - if (CORE.Window.flags & FLAG_VSYNC_HINT) glfwSwapInterval(1); } else { @@ -1059,6 +1061,10 @@ void ToggleFullscreen(void) glfwSetWindowSizeCallback(CORE.Window.handle, WindowSizeCallback); } + // Try to enable GPU V-Sync, so frames are limited to screen refresh rate (60Hz -> 60 FPS) + // NOTE: V-Sync can be enabled by graphic driver configuration + if (CORE.Window.flags & FLAG_VSYNC_HINT) glfwSwapInterval(1); + CORE.Window.fullscreen = !CORE.Window.fullscreen; // Toggle fullscreen flag CORE.Window.flags ^= FLAG_FULLSCREEN_MODE;