From 52c182205791b3899027245c40e67f5c1eebadbe Mon Sep 17 00:00:00 2001 From: Matthew Schwartz Date: Thu, 12 Sep 2024 11:39:21 -0700 Subject: [PATCH] convars, steamcompmgr: clean up descriptions and HDR launch options --- src/main.cpp | 4 ++-- src/steamcompmgr.cpp | 8 ++++---- src/wlserver.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index ca4001249..a9cdaa2e2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -132,7 +132,7 @@ const struct option *gamescope_options = (struct option[]){ { "sdr-gamut-wideness", required_argument, nullptr, 0 }, { "hdr-enabled", no_argument, nullptr, 0 }, { "hdr-sdr-content-nits", required_argument, nullptr, 0 }, - { "hdr-itm-enable", no_argument, nullptr, 0 }, + { "hdr-itm-enabled", no_argument, nullptr, 0 }, { "hdr-itm-sdr-nits", required_argument, nullptr, 0 }, { "hdr-itm-target-nits", required_argument, nullptr, 0 }, { "hdr-debug-force-support", no_argument, nullptr, 0 }, @@ -194,7 +194,7 @@ const char usage[] = " If this is not set, and there is a HDR client, it will be tonemapped SDR.\n" " --sdr-gamut-wideness Set the 'wideness' of the gamut for SDR comment. 0 - 1.\n" " --hdr-sdr-content-nits set the luminance of SDR content in nits. Default: 400 nits.\n" - " --hdr-itm-enable enable SDR->HDR inverse tone mapping. only works for SDR input.\n" + " --hdr-itm-enabled enable SDR->HDR inverse tone mapping. only works for SDR input.\n" " --hdr-itm-sdr-nits set the luminance of SDR content in nits used as the input for the inverse tone mapping process.\n" " Default: 100 nits, Max: 1000 nits\n" " --hdr-itm-target-nits set the target luminace of the inverse tone mapping process.\n" diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp index 411eaca11..8c9920e31 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp @@ -195,7 +195,7 @@ update_runtime_info(); gamescope::ConVar cv_adaptive_sync( "adaptive_sync", false, "Whether or not adaptive sync is enabled if available." ); gamescope::ConVar cv_adaptive_sync_ignore_overlay( "adaptive_sync_ignore_overlay", false, "Whether or not to ignore overlay planes for pushing commits with adaptive sync." ); -gamescope::ConVar cv_adaptive_sync_overlay_cycles( "adaptive_sync_overlay_cycles", 1, "" ); +gamescope::ConVar cv_adaptive_sync_overlay_cycles( "adaptive_sync_overlay_cycles", 1, "Number of vblank cycles to ignore overlay repaints before forcing a commit with adaptive sync." ); uint64_t g_SteamCompMgrLimitedAppRefreshCycle = 16'666'666; uint64_t g_SteamCompMgrAppRefreshCycle = 16'666'666; @@ -6345,7 +6345,7 @@ static TempUpscaleImage_t *GetTempUpscaleImage( uint32_t uWidth, uint32_t uHeigh return ℑ } -gamescope::ConVar cv_surface_update_force_only_current_surface( "surface_update_force_only_current_surface", false ); +gamescope::ConVar cv_surface_update_force_only_current_surface( "surface_update_force_only_current_surface", false, "Force updates to apply only to the current surface, ignoring commits for other surfaces." ); void update_wayland_res(CommitDoneList_t *doneCommits, steamcompmgr_win_t *w, ResListEntry_t& reslistentry) { @@ -7434,13 +7434,13 @@ steamcompmgr_main(int argc, char **argv) g_FadeOutDuration = atoi(optarg); } else if (strcmp(opt_name, "force-windows-fullscreen") == 0) { bForceWindowsFullscreen = true; - } else if (strcmp(opt_name, "hdr-enabled") == 0) { + } else if (strcmp(opt_name, "hdr-enabled") == 0 || strcmp(opt_name, "hdr-enable") == 0) { cv_hdr_enabled = true; } else if (strcmp(opt_name, "hdr-debug-force-support") == 0) { g_bForceHDRSupportDebug = true; } else if (strcmp(opt_name, "hdr-debug-force-output") == 0) { g_bForceHDR10OutputDebug = true; - } else if (strcmp(opt_name, "hdr-itm-enable") == 0) { + } else if (strcmp(opt_name, "hdr-itm-enabled") == 0 || strcmp(opt_name, "hdr-itm-enable") == 0) { g_bHDRItmEnable = true; } else if (strcmp(opt_name, "sdr-gamut-wideness") == 0) { g_ColorMgmt.pending.sdrGamutWideness = atof(optarg); diff --git a/src/wlserver.cpp b/src/wlserver.cpp index 5178c7e4d..670cf6896 100644 --- a/src/wlserver.cpp +++ b/src/wlserver.cpp @@ -123,7 +123,7 @@ std::vector& gamescope_xwayland_server_t::retrieve_commits() return commits; } -gamescope::ConVar cv_drm_debug_syncobj_force_wait_on_commit( "drm_debug_syncobj_force_wait_on_commit", false ); +gamescope::ConVar cv_drm_debug_syncobj_force_wait_on_commit( "drm_debug_syncobj_force_wait_on_commit", false, "Force a wait on DRM sync objects before committing buffers" ); std::optional PrepareCommit( struct wlr_surface *surf, struct wlr_buffer *buf ) {