From 29f02d837d4e9902a9efa1f6295e98d042f38341 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Sun, 2 Jun 2024 15:36:33 -0700
Subject: [PATCH] all: remove NVIDIA workarounds

They fixed the driver.
---
 CMakeLists.txt           | 6 ------
 default.nix              | 2 --
 flake.nix                | 2 --
 src/core/proxywindow.cpp | 7 -------
 4 files changed, 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e790ec0c..a386f5a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,6 @@ option(ASAN "Enable ASAN" OFF)
 option(FRAME_POINTERS "Always keep frame pointers" ${ASAN})
 
 option(USE_JEMALLOC "Use jemalloc over the system malloc implementation" ON)
-option(NVIDIA_COMPAT "Workarounds for nvidia gpus" OFF)
 option(SOCKETS "Enable unix socket support" ON)
 option(WAYLAND "Enable wayland support" ON)
 option(WAYLAND_WLR_LAYERSHELL "Support the zwlr_layer_shell_v1 wayland protocol" ON)
@@ -25,7 +24,6 @@ option(SERVICE_MPRIS "Mpris service" ON)
 
 message(STATUS "Quickshell configuration")
 message(STATUS "  Jemalloc: ${USE_JEMALLOC}")
-message(STATUS "  NVIDIA workarounds: ${NVIDIA_COMPAT}")
 message(STATUS "  Build tests: ${BUILD_TESTING}")
 message(STATUS "  Sockets: ${SOCKETS}")
 message(STATUS "  Wayland: ${WAYLAND}")
@@ -134,10 +132,6 @@ function (qs_pch target)
   endif()
 endfunction()
 
-if (NVIDIA_COMPAT)
-	add_compile_definitions(NVIDIA_COMPAT)
-endif()
-
 add_subdirectory(src)
 
 if (USE_JEMALLOC)
diff --git a/default.nix b/default.nix
index 048e181e..d96ff3d1 100644
--- a/default.nix
+++ b/default.nix
@@ -29,7 +29,6 @@
   enableWayland ? true,
   enableX11 ? true,
   enablePipewire ? true,
-  nvidiaCompat ? false,
   withQtSvg ? true, # svg support
   withJemalloc ? true, # masks heap fragmentation
 }: buildStdenv.mkDerivation {
@@ -73,7 +72,6 @@
   ]
   ++ lib.optional (!withJemalloc) "-DUSE_JEMALLOC=OFF"
   ++ lib.optional (!enableWayland) "-DWAYLAND=OFF"
-  ++ lib.optional nvidiaCompat "-DNVIDIA_COMPAT=ON"
   ++ lib.optional (!enablePipewire) "-DSERVICE_PIPEWIRE=OFF";
 
   buildPhase = "ninjaBuildPhase";
diff --git a/flake.nix b/flake.nix
index 5bb5069e..a0bc18d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,10 +12,8 @@
       quickshell = pkgs.callPackage ./default.nix {
         gitRev = self.rev or self.dirtyRev;
       };
-      quickshell-nvidia = quickshell.override { nvidiaCompat = true; };
 
       default = quickshell;
-      nvidia = quickshell-nvidia;
     });
 
     devShells = forEachSystem (system: pkgs: rec {
diff --git a/src/core/proxywindow.cpp b/src/core/proxywindow.cpp
index 50370d9d..c2961c24 100644
--- a/src/core/proxywindow.cpp
+++ b/src/core/proxywindow.cpp
@@ -157,14 +157,7 @@ void ProxyWindowBase::completeWindow() {
 }
 
 bool ProxyWindowBase::deleteOnInvisible() const {
-#ifdef NVIDIA_COMPAT
-	// Nvidia drivers and Qt do not play nice when hiding and showing a window
-	// so for nvidia compatibility we can never reuse windows if they have been
-	// hidden.
-	return true;
-#else
 	return false;
-#endif
 }
 
 QQuickWindow* ProxyWindowBase::backingWindow() const { return this->window; }