config: nuke explicit_sync settings

were not used anymore, explicit is on by default

5 files changed, 5 insertions, 67 deletions

diff --git a/src/config/ConfigDescriptions.hpp b/src/config/ConfigDescriptions.hpp
index 57dea74b..d9e023f1 100644
--- a/src/config/ConfigDescriptions.hpp
+++ b/src/config/ConfigDescriptions.hpp
@@ -1440,18 +1440,6 @@ inline static const std::vector<SConfigOptionDescription> CONFIG_OPTIONS = {
      */
 
     SConfigOptionDescription{
-        .value       = "render:explicit_sync",
-        .description = "Whether to enable explicit sync support. Requires a hyprland restart. 0 - no, 1 - yes, 2 - auto based on the gpu driver",
-        .type        = CONFIG_OPTION_INT,
-        .data        = SConfigOptionDescription::SRangeData{2, 0, 2},
-    },
-    SConfigOptionDescription{
-        .value       = "render:explicit_sync_kms",
-        .description = "Whether to enable explicit sync support for the KMS layer. Requires explicit_sync to be enabled. 0 - no, 1 - yes, 2 - auto based on the gpu driver",
-        .type        = CONFIG_OPTION_INT,
-        .data        = SConfigOptionDescription::SRangeData{2, 0, 2},
-    },
-    SConfigOptionDescription{
         .value       = "render:direct_scanout",
         .description = "Enables direct scanout. Direct scanout attempts to reduce lag when there is only one fullscreen application on a screen (e.g. game). It is also "
                        "recommended to set this to false if the fullscreen application shows graphical glitches. 0 - off, 1 - on, 2 - auto (on with content type 'game')",
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 0e8ce8c9..0c481149 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -741,8 +741,6 @@ CConfigManager::CConfigManager() {
     registerConfigVar("group:groupbar:col.locked_active", Hyprlang::CConfigCustomValueType{&configHandleGradientSet, configHandleGradientDestroy, "0x66ff5500"});
     registerConfigVar("group:groupbar:col.locked_inactive", Hyprlang::CConfigCustomValueType{&configHandleGradientSet, configHandleGradientDestroy, "0x66775500"});
 
-    registerConfigVar("render:explicit_sync", Hyprlang::INT{2});
-    registerConfigVar("render:explicit_sync_kms", Hyprlang::INT{2});
     registerConfigVar("render:direct_scanout", Hyprlang::INT{0});
     registerConfigVar("render:expand_undersized_textures", Hyprlang::INT{1});
     registerConfigVar("render:xp_mode", Hyprlang::INT{0});
@@ -1124,9 +1122,6 @@ Hyprlang::CParseResult CConfigManager::handleMonitorv2() {
 }
 
 void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) {
-    static const auto PENABLEEXPLICIT     = CConfigValue<Hyprlang::INT>("render:explicit_sync");
-    static int        prevEnabledExplicit = *PENABLEEXPLICIT;
-
     updateWatcher();
 
     for (auto const& w : g_pCompositor->m_windows) {
@@ -1162,8 +1157,6 @@ void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) {
             "Warning: You're using an autogenerated config! Edit the config file to get rid of this message. (config file: " + getMainConfigPath() +
                 " )\nSUPER+Q -> kitty (if it doesn't launch, make sure it's installed or choose a different terminal in the config)\nSUPER+M -> exit Hyprland",
             CHyprColor(1.0, 1.0, 70.0 / 255.0, 1.0));
-    else if (*PENABLEEXPLICIT != prevEnabledExplicit)
-        g_pHyprError->queueCreate("Warning: You changed the render:explicit_sync option, this requires you to restart Hyprland.", CHyprColor(0.9, 0.76, 0.221, 1.0));
     else
         g_pHyprError->destroy();
 
@@ -1267,10 +1260,7 @@ void CConfigManager::init() {
 }
 
 std::string CConfigManager::parseKeyword(const std::string& COMMAND, const std::string& VALUE) {
-    static const auto PENABLEEXPLICIT     = CConfigValue<Hyprlang::INT>("render:explicit_sync");
-    static int        prevEnabledExplicit = *PENABLEEXPLICIT;
-
-    const auto        RET = m_config->parseDynamic(COMMAND.c_str(), VALUE.c_str());
+    const auto RET = m_config->parseDynamic(COMMAND.c_str(), VALUE.c_str());
 
     // invalidate layouts if they changed
     if (COMMAND == "monitor" || COMMAND.contains("gaps_") || COMMAND.starts_with("dwindle:") || COMMAND.starts_with("master:")) {
@@ -1278,13 +1268,6 @@ std::string CConfigManager::parseKeyword(const std::string& COMMAND, const std::
             g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m->m_id);
     }
 
-    if (COMMAND.contains("explicit")) {
-        if (*PENABLEEXPLICIT != prevEnabledExplicit)
-            g_pHyprError->queueCreate("Warning: You changed the render:explicit_sync option, this requires you to restart Hyprland.", CHyprColor(0.9, 0.76, 0.221, 1.0));
-        else
-            g_pHyprError->destroy();
-    }
-
     // Update window border colors
     g_pCompositor->updateAllWindowsAnimatedDecorationValues();
 
diff --git a/src/managers/ProtocolManager.cpp b/src/managers/ProtocolManager.cpp
index 3427bf3e..f6b94592 100644
--- a/src/managers/ProtocolManager.cpp
+++ b/src/managers/ProtocolManager.cpp
@@ -100,10 +100,9 @@ void CProtocolManager::onMonitorModeChange(PHLMONITOR pMonitor) {
 
 CProtocolManager::CProtocolManager() {
 
-    static const auto PENABLEEXPLICIT = CConfigValue<Hyprlang::INT>("render:explicit_sync");
-    static const auto PENABLECM       = CConfigValue<Hyprlang::INT>("render:cm_enabled");
-    static const auto PENABLEXXCM     = CConfigValue<Hyprlang::INT>("experimental:xx_color_management_v4");
-    static const auto PDEBUGCM        = CConfigValue<Hyprlang::INT>("debug:full_cm_proto");
+    static const auto PENABLECM   = CConfigValue<Hyprlang::INT>("render:cm_enabled");
+    static const auto PENABLEXXCM = CConfigValue<Hyprlang::INT>("experimental:xx_color_management_v4");
+    static const auto PDEBUGCM    = CConfigValue<Hyprlang::INT>("debug:full_cm_proto");
 
     // Outputs are a bit dumb, we have to agree.
     static auto P = g_pHookSystem->hookDynamic("monitorAdded", [this](void* self, SCallbackInfo& info, std::any param) {
@@ -209,7 +208,7 @@ CProtocolManager::CProtocolManager() {
         else
             lease.reset();
 
-        if (*PENABLEEXPLICIT && !PROTO::sync)
+        if (!PROTO::sync)
             PROTO::sync = makeUnique<CDRMSyncobjProtocol>(&wp_linux_drm_syncobj_manager_v1_interface, 1, "DRMSyncobj");
     }
 
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index f828deb4..419ebd74 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -2347,33 +2347,6 @@ bool CHyprRenderer::isNvidia() {
     return m_nvidia;
 }
 
-SExplicitSyncSettings CHyprRenderer::getExplicitSyncSettings(SP<Aquamarine::IOutput> output) {
-    static auto           PENABLEEXPLICIT    = CConfigValue<Hyprlang::INT>("render:explicit_sync");
-    static auto           PENABLEEXPLICITKMS = CConfigValue<Hyprlang::INT>("render:explicit_sync_kms");
-
-    SExplicitSyncSettings settings;
-    settings.explicitEnabled    = *PENABLEEXPLICIT;
-    settings.explicitKMSEnabled = *PENABLEEXPLICITKMS;
-
-    if (!output->supportsExplicit) {
-        settings.explicitEnabled    = false;
-        settings.explicitKMSEnabled = false;
-
-        return settings;
-    }
-
-    if (*PENABLEEXPLICIT == 2 /* auto */)
-        settings.explicitEnabled = true;
-    if (*PENABLEEXPLICITKMS == 2 /* auto */) {
-        if (!m_nvidia)
-            settings.explicitKMSEnabled = true;
-        else {
-            settings.explicitKMSEnabled = isNvidiaDriverVersionAtLeast(560);
-        }
-    }
-    return settings;
-}
-
 void CHyprRenderer::addWindowToRenderUnfocused(PHLWINDOW window) {
     static auto PFPS = CConfigValue<Hyprlang::INT>("misc:render_unfocused_fps");
 
diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp
index 33a93afd..2fac401a 100644
--- a/src/render/Renderer.hpp
+++ b/src/render/Renderer.hpp
@@ -41,10 +41,6 @@ class CToplevelExportProtocolManager;
 class CInputManager;
 struct SSessionLockSurface;
 
-struct SExplicitSyncSettings {
-    bool explicitEnabled = false, explicitKMSEnabled = false;
-};
-
 struct SRenderWorkspaceUntilData {
     PHLLS     ls;
     PHLWINDOW w;
@@ -81,7 +77,6 @@ class CHyprRenderer {
     bool                            isNvidia();
     void                            makeEGLCurrent();
     void                            unsetEGL();
-    SExplicitSyncSettings           getExplicitSyncSettings(SP<Aquamarine::IOutput> output);
     void                            addWindowToRenderUnfocused(PHLWINDOW window);
     void                            makeSnapshot(PHLWINDOW);
     void                            makeSnapshot(PHLLS);