From c56dd53092ab5774e81de0f478812203dd2e113b Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Wed, 11 Jul 2018 20:40:16 +0300 Subject: [PATCH] mesa, mesa-darwin: free up floating point textures (patents expired) https://cgit.freedesktop.org/mesa/mesa/commit/?id=66673bef941af344314fe9c91cad8cd330b245eb https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed --- pkgs/development/libraries/mesa-darwin/default.nix | 6 ++++++ pkgs/development/libraries/mesa/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index f18c1e693cb..2bfdb679156 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -50,6 +50,12 @@ let configurePhase = ":"; + configureFlags = [ + # NOTE: Patents expired on June 17 2018. + # For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed + "texture-float" + ]; + makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 480afcf607a..2dfa6275a41 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,9 +6,6 @@ , libglvnd , grsecEnabled ? false , enableRadv ? true -# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. -# It's overridden for mesa_drivers. -, enableTextureFloats ? false , galliumDrivers ? null , driDrivers ? null , vulkanDrivers ? null @@ -115,7 +112,6 @@ let self = stdenv.mkDerivation { ("--with-vulkan-drivers=" + builtins.concatStringsSep "," vulkanDrivers)) ++ [ - (enableFeature enableTextureFloats "texture-float") (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index add4e0f4e23..cb15b0d9f34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10962,7 +10962,6 @@ with pkgs; mesa_drivers = let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; - enableTextureFloats = true; }; in mo.drivers;