summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorAnton-Latukha <anton.latukha@gmail.com>2018-07-11 20:40:16 +0300
committerAnton-Latukha <anton.latukha@gmail.com>2018-07-22 21:41:40 +0300
commitc56dd53092ab5774e81de0f478812203dd2e113b (patch)
tree84861a8367b61e9a104588a713a34504fe8e4c99 /pkgs/development
parent5d3f5bb61e792ae96c45ac5d2efb5f779ffe0401 (diff)
downloadnixlib-c56dd53092ab5774e81de0f478812203dd2e113b.tar
nixlib-c56dd53092ab5774e81de0f478812203dd2e113b.tar.gz
nixlib-c56dd53092ab5774e81de0f478812203dd2e113b.tar.bz2
nixlib-c56dd53092ab5774e81de0f478812203dd2e113b.tar.lz
nixlib-c56dd53092ab5774e81de0f478812203dd2e113b.tar.xz
nixlib-c56dd53092ab5774e81de0f478812203dd2e113b.tar.zst
nixlib-c56dd53092ab5774e81de0f478812203dd2e113b.zip
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
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/mesa-darwin/default.nix6
-rw-r--r--pkgs/development/libraries/mesa/default.nix4
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix
index f18c1e693cbc..2bfdb679156c 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 480afcf607a6..2dfa6275a415 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