From ab1027c7772b2d77c67e1bf249e21087f871326c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 12 Aug 2025 10:03:28 +1000 Subject: [PATCH] Cleanup: capitalization of the term "VSync" Follow the convention widely used by AMD/Intel/Nvidia. --- intern/ghost/intern/GHOST_Context.cc | 2 +- intern/ghost/intern/GHOST_Context.hh | 4 ++-- intern/ghost/intern/GHOST_ContextEGL.cc | 2 +- intern/ghost/intern/GHOST_ContextGLX.cc | 4 ++-- intern/ghost/intern/GHOST_ContextMTL.mm | 2 +- intern/ghost/intern/GHOST_ContextSDL.cc | 2 +- intern/ghost/intern/GHOST_ContextVK.cc | 4 ++-- intern/ghost/intern/GHOST_ContextWGL.cc | 2 +- source/creator/creator_args.cc | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/intern/ghost/intern/GHOST_Context.cc b/intern/ghost/intern/GHOST_Context.cc index 14f7e3ad269..0d0dff78a00 100644 --- a/intern/ghost/intern/GHOST_Context.cc +++ b/intern/ghost/intern/GHOST_Context.cc @@ -143,7 +143,7 @@ void GHOST_Context::initClearGL() } #endif -const char *GHOST_Context::getEnvVarVsyncString() +const char *GHOST_Context::getEnvVarVSyncString() { const char *ghost_vsync_string = getenv("BLENDER_VSYNC"); return ghost_vsync_string; diff --git a/intern/ghost/intern/GHOST_Context.hh b/intern/ghost/intern/GHOST_Context.hh index 608fb5f97c3..27c7d01d921 100644 --- a/intern/ghost/intern/GHOST_Context.hh +++ b/intern/ghost/intern/GHOST_Context.hh @@ -169,8 +169,8 @@ class GHOST_Context : public GHOST_IContext { static void initClearGL(); #endif - /** For performance measurements with vsync disabled. */ - static const char *getEnvVarVsyncString(); + /** For performance measurements with VSync disabled. */ + static const char *getEnvVarVSyncString(); MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_Context") }; diff --git a/intern/ghost/intern/GHOST_ContextEGL.cc b/intern/ghost/intern/GHOST_ContextEGL.cc index f266cd2d122..3fe150fecd2 100644 --- a/intern/ghost/intern/GHOST_ContextEGL.cc +++ b/intern/ghost/intern/GHOST_ContextEGL.cc @@ -626,7 +626,7 @@ GHOST_TSuccess GHOST_ContextEGL::initializeDrawingContext() } { - const char *ghost_vsync_string = getEnvVarVsyncString(); + const char *ghost_vsync_string = getEnvVarVSyncString(); if (ghost_vsync_string) { int swapInterval = atoi(ghost_vsync_string); setSwapInterval(swapInterval); diff --git a/intern/ghost/intern/GHOST_ContextGLX.cc b/intern/ghost/intern/GHOST_ContextGLX.cc index 0daea2922a3..8dd13655298 100644 --- a/intern/ghost/intern/GHOST_ContextGLX.cc +++ b/intern/ghost/intern/GHOST_ContextGLX.cc @@ -280,8 +280,8 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext() glXMakeCurrent(m_display, m_window, m_context); - /* For performance measurements with vsync disabled. */ - const char *ghost_vsync_string = getEnvVarVsyncString(); + /* For performance measurements with VSync disabled. */ + const char *ghost_vsync_string = getEnvVarVSyncString(); if (ghost_vsync_string) { int swapInterval = atoi(ghost_vsync_string); setSwapInterval(swapInterval); diff --git a/intern/ghost/intern/GHOST_ContextMTL.mm b/intern/ghost/intern/GHOST_ContextMTL.mm index 2c9e03f8273..8dd20f87a57 100644 --- a/intern/ghost/intern/GHOST_ContextMTL.mm +++ b/intern/ghost/intern/GHOST_ContextMTL.mm @@ -88,7 +88,7 @@ GHOST_ContextMTL::GHOST_ContextMTL(bool stereoVisual, m_metalLayer.device = metalDevice; m_metalLayer.allowsNextDrawableTimeout = NO; - const char *ghost_vsync_string = getEnvVarVsyncString(); + const char *ghost_vsync_string = getEnvVarVSyncString(); if (ghost_vsync_string) { int swapInterval = atoi(ghost_vsync_string); m_metalLayer.displaySyncEnabled = swapInterval != 0 ? YES : NO; diff --git a/intern/ghost/intern/GHOST_ContextSDL.cc b/intern/ghost/intern/GHOST_ContextSDL.cc index 4bcfadf0313..26455ff72ca 100644 --- a/intern/ghost/intern/GHOST_ContextSDL.cc +++ b/intern/ghost/intern/GHOST_ContextSDL.cc @@ -134,7 +134,7 @@ GHOST_TSuccess GHOST_ContextSDL::initializeDrawingContext() success = (SDL_GL_MakeCurrent(m_window, m_context) < 0) ? GHOST_kFailure : GHOST_kSuccess; - const char *ghost_vsync_string = getEnvVarVsyncString(); + const char *ghost_vsync_string = getEnvVarVSyncString(); if (ghost_vsync_string) { int swapInterval = atoi(ghost_vsync_string); setSwapInterval(swapInterval); diff --git a/intern/ghost/intern/GHOST_ContextVK.cc b/intern/ghost/intern/GHOST_ContextVK.cc index 0f41ada9652..3f73b7c3969 100644 --- a/intern/ghost/intern/GHOST_ContextVK.cc +++ b/intern/ghost/intern/GHOST_ContextVK.cc @@ -861,7 +861,7 @@ static GHOST_TSuccess selectPresentMode(const char *ghost_vsync_string, } } CLOG_WARN(&LOG, - "Vulkan: Vsync off was requested via BLENDER_VSYNC, but " + "Vulkan: VSync off was requested via BLENDER_VSYNC, but " "VK_PRESENT_MODE_IMMEDIATE_KHR is not " "supported."); } @@ -968,7 +968,7 @@ GHOST_TSuccess GHOST_ContextVK::recreateSwapchain(bool use_hdr_swapchain) } VkPresentModeKHR present_mode; - if (!selectPresentMode(getEnvVarVsyncString(), physical_device, m_surface, &present_mode)) { + if (!selectPresentMode(getEnvVarVSyncString(), physical_device, m_surface, &present_mode)) { return GHOST_kFailure; } diff --git a/intern/ghost/intern/GHOST_ContextWGL.cc b/intern/ghost/intern/GHOST_ContextWGL.cc index f4c60320cb6..c30fe9da87d 100644 --- a/intern/ghost/intern/GHOST_ContextWGL.cc +++ b/intern/ghost/intern/GHOST_ContextWGL.cc @@ -617,7 +617,7 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext() } { - const char *ghost_vsync_string = getEnvVarVsyncString(); + const char *ghost_vsync_string = getEnvVarVSyncString(); if (ghost_vsync_string) { int swapInterval = atoi(ghost_vsync_string); setSwapInterval(swapInterval); diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index f52d597db77..c3090a1e225 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -864,7 +864,7 @@ static void print_help(bArgs *ba, bool all) PRINT( " $BLENDER_CUSTOM_SPLASH_BANNER Full path to an image to overlay on the splash screen.\n"); PRINT( - " $BLENDER_VSYNC Set to 0 to disable Vsync.\n" + " $BLENDER_VSYNC Set to 0 to disable VSync.\n" " With OpenGL, other values set the swap interval.\n"); if (defs.with_opencolorio) {