UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Review VSync on fullscreen mode

Browse source 
It seems to work ok on my old Intel HD Graphics card... it should work anywhere else
This commit is contained in:
Ray 2019-12-01 13:58:29 +01:00
parent 8eecbbe4aa
commit 95f3b6e18e
1 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/core.c
View file

@ -313,8 +313,7 @@ static unsigned int displayWidth, displayHeight;// Display width and height (mon
static int screenWidth, screenHeight; // Screen width and height (used render area) static int screenWidth, screenHeight; // Screen width and height (used render area)
static int renderWidth, renderHeight; // Framebuffer width and height (render area, including black bars if required) static int renderWidth, renderHeight; // Framebuffer width and height (render area, including black bars if required)
static int currentWidth, currentHeight; // Current render width and height, it could change on BeginTextureMode() static int currentWidth, currentHeight; // Current render width and height, it could change on BeginTextureMode()
static int windowLeftPos, windowTopPos; static int windowPositionX, windowPositionY; // Window position on screen (required on fullscreen toggle)
static int requireVsync = 0;
static int renderOffsetX = 0; // Offset X from render area (must be divided by 2) static int renderOffsetX = 0; // Offset X from render area (must be divided by 2)
static int renderOffsetY = 0; // Offset Y from render area (must be divided by 2) static int renderOffsetY = 0; // Offset Y from render area (must be divided by 2)
static bool fullscreen = false; // Fullscreen mode (useful only for PLATFORM_DESKTOP) static bool fullscreen = false; // Fullscreen mode (useful only for PLATFORM_DESKTOP)
@ -857,11 +856,12 @@ void ToggleFullscreen(void)
{ {
#if defined(PLATFORM_DESKTOP) #if defined(PLATFORM_DESKTOP)
fullscreen = !fullscreen; // Toggle fullscreen flag fullscreen = !fullscreen; // Toggle fullscreen flag
requireVsync = true;
// NOTE: glfwSetWindowMonitor() doesn't work properly (bugs) // NOTE: glfwSetWindowMonitor() doesn't work properly (bugs)
if (fullscreen) { if (fullscreen)
glfwGetWindowPos(window, &windowLeftPos, &windowTopPos); {
// Store previous window position (in case we exit fullscreen)
glfwGetWindowPos(window, &windowPositionX, &windowPositionY);
GLFWmonitor *monitor = glfwGetPrimaryMonitor(); GLFWmonitor *monitor = glfwGetPrimaryMonitor();
if (!monitor) if (!monitor)
@ -873,8 +873,12 @@ void ToggleFullscreen(void)
const GLFWvidmode *mode = glfwGetVideoMode(monitor); const GLFWvidmode *mode = glfwGetVideoMode(monitor);
glfwSetWindowMonitor(window, glfwGetPrimaryMonitor(), 0, 0, screenWidth, screenHeight, mode->refreshRate); glfwSetWindowMonitor(window, glfwGetPrimaryMonitor(), 0, 0, screenWidth, screenHeight, mode->refreshRate);
// 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 (configFlags & FLAG_VSYNC_HINT) glfwSwapInterval(1);
} }
else glfwSetWindowMonitor(window, NULL, windowLeftPos, windowTopPos, screenWidth, screenHeight, GLFW_DONT_CARE); else glfwSetWindowMonitor(window, NULL, windowPositionX, windowPositionY, screenWidth, screenHeight, GLFW_DONT_CARE);
#endif #endif
#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) #if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI)
@ -1775,7 +1779,6 @@ Color Fade(Color color, float alpha)
void SetConfigFlags(unsigned int flags) void SetConfigFlags(unsigned int flags)
{ {
configFlags = flags; configFlags = flags;
requireVsync = true;
if (configFlags & FLAG_FULLSCREEN_MODE) fullscreen = true; if (configFlags & FLAG_FULLSCREEN_MODE) fullscreen = true;
if (configFlags & FLAG_WINDOW_ALWAYS_RUN) alwaysRun = true; if (configFlags & FLAG_WINDOW_ALWAYS_RUN) alwaysRun = true;
@ -2715,11 +2718,11 @@ static bool InitGraphicsDevice(int width, int height)
if (fullscreen) if (fullscreen)
{ {
// remember center for switchinging from fullscreen to window // remember center for switchinging from fullscreen to window
windowLeftPos = displayWidth/2 - screenWidth/2; windowPositionX = displayWidth/2 - screenWidth/2;
windowTopPos = displayHeight/2 - screenHeight/2; windowPositionY = displayHeight/2 - screenHeight/2;
if (windowLeftPos < 0) windowLeftPos = 0; if (windowPositionX < 0) windowPositionX = 0;
if (windowTopPos < 0) windowTopPos = 0; if (windowPositionY < 0) windowPositionY = 0;
// Obtain recommended displayWidth/displayHeight from a valid videomode for the monitor // Obtain recommended displayWidth/displayHeight from a valid videomode for the monitor
int count = 0; int count = 0;
@ -2809,10 +2812,8 @@ static bool InitGraphicsDevice(int width, int height)
glfwMakeContextCurrent(window); glfwMakeContextCurrent(window);
// Try to disable GPU V-Sync by default, set framerate using SetTargetFPS()
// NOTE: V-Sync can be enabled by graphic driver configuration
#if !defined(PLATFORM_WEB) #if !defined(PLATFORM_WEB)
glfwSwapInterval(0); glfwSwapInterval(0); // No V-Sync by default
#endif #endif
#if defined(PLATFORM_DESKTOP) #if defined(PLATFORM_DESKTOP)
@ -3818,11 +3819,6 @@ static void PollInputEvents(void)
static void SwapBuffers(void) static void SwapBuffers(void)
{ {
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
if (requireVsync) {
glfwMakeContextCurrent(window);
glfwSwapInterval((configFlags & FLAG_VSYNC_HINT) != 0);
requireVsync = false;
}
glfwSwapBuffers(window); glfwSwapBuffers(window);
#endif #endif