poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

all: remove NVIDIA workarounds

Browse source 
They fixed the driver.
This commit is contained in:
outfoxxed 2024-06-02 15:36:33 -07:00
parent 7d20b472dd
commit 29f02d837d
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
4 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -10,7 +10,6 @@ option(ASAN "Enable ASAN" OFF)
option(FRAME_POINTERS "Always keep frame pointers" ${ASAN}) option(FRAME_POINTERS "Always keep frame pointers" ${ASAN})
option(USE_JEMALLOC "Use jemalloc over the system malloc implementation" ON) 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(SOCKETS "Enable unix socket support" ON)
option(WAYLAND "Enable wayland support" ON) option(WAYLAND "Enable wayland support" ON)
option(WAYLAND_WLR_LAYERSHELL "Support the zwlr_layer_shell_v1 wayland protocol" 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 "Quickshell configuration")
message(STATUS " Jemalloc: ${USE_JEMALLOC}") message(STATUS " Jemalloc: ${USE_JEMALLOC}")
message(STATUS " NVIDIA workarounds: ${NVIDIA_COMPAT}")
message(STATUS " Build tests: ${BUILD_TESTING}") message(STATUS " Build tests: ${BUILD_TESTING}")
message(STATUS " Sockets: ${SOCKETS}") message(STATUS " Sockets: ${SOCKETS}")
message(STATUS " Wayland: ${WAYLAND}") message(STATUS " Wayland: ${WAYLAND}")
@ -134,10 +132,6 @@ function (qs_pch target)
endif() endif()
endfunction() endfunction()
if (NVIDIA_COMPAT)
add_compile_definitions(NVIDIA_COMPAT)
endif()
add_subdirectory(src) add_subdirectory(src)
if (USE_JEMALLOC) if (USE_JEMALLOC)

2
default.nix
View file

@ -29,7 +29,6 @@
enableWayland ? true, enableWayland ? true,
enableX11 ? true, enableX11 ? true,
enablePipewire ? true, enablePipewire ? true,
nvidiaCompat ? false,
withQtSvg ? true, # svg support withQtSvg ? true, # svg support
withJemalloc ? true, # masks heap fragmentation withJemalloc ? true, # masks heap fragmentation
}: buildStdenv.mkDerivation { }: buildStdenv.mkDerivation {
@ -73,7 +72,6 @@
] ]
++ lib.optional (!withJemalloc) "-DUSE_JEMALLOC=OFF" ++ lib.optional (!withJemalloc) "-DUSE_JEMALLOC=OFF"
++ lib.optional (!enableWayland) "-DWAYLAND=OFF" ++ lib.optional (!enableWayland) "-DWAYLAND=OFF"
++ lib.optional nvidiaCompat "-DNVIDIA_COMPAT=ON"
++ lib.optional (!enablePipewire) "-DSERVICE_PIPEWIRE=OFF"; ++ lib.optional (!enablePipewire) "-DSERVICE_PIPEWIRE=OFF";
buildPhase = "ninjaBuildPhase"; buildPhase = "ninjaBuildPhase";

2
flake.nix
View file

@ -12,10 +12,8 @@
quickshell = pkgs.callPackage ./default.nix { quickshell = pkgs.callPackage ./default.nix {
gitRev = self.rev or self.dirtyRev; gitRev = self.rev or self.dirtyRev;
}; };
quickshell-nvidia = quickshell.override { nvidiaCompat = true; };
default = quickshell; default = quickshell;
nvidia = quickshell-nvidia;
}); });
devShells = forEachSystem (system: pkgs: rec { devShells = forEachSystem (system: pkgs: rec {

7
src/core/proxywindow.cpp
View file

@ -157,14 +157,7 @@ void ProxyWindowBase::completeWindow() {
} }
bool ProxyWindowBase::deleteOnInvisible() const { 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; return false;
#endif
} }
QQuickWindow* ProxyWindowBase::backingWindow() const { return this->window; } QQuickWindow* ProxyWindowBase::backingWindow() const { return this->window; }