Version: 17.1.4

i965_ignore_anisotropic_filtering_in_nearest_mode.patch applied upstream

diff --git a/Mesa.spec b/Mesa.spec
index 02ee1d649ff2be738c4f0fc177cc4899148c0a08..a9326619ce1470ecdfde786ec0c5ab2b97c43ee0 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -63,14 +63,13 @@
 Summary:       Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
-Version:       17.1.3
+Version:       17.1.4
 Release:       1
 License:       MIT (core) and others - see license.html file
 Group:         X11/Libraries
 Source0:       ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
-# Source0-md5: 1946a93d543bc219427e2bebe2ac4752
+# Source0-md5: be2ef7c9edec23b07f74f6512a6a6fa5
 Patch0:                %{name}-link.patch
-Patch1:                i965_ignore_anisotropic_filtering_in_nearest_mode.patch
 URL:           http://www.mesa3d.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -1268,7 +1267,6 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 %prep
 %setup -q -n mesa-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}

diff --git a/i965_ignore_anisotropic_filtering_in_nearest_mode.patch b/i965_ignore_anisotropic_filtering_in_nearest_mode.patch
deleted file mode 100644 (file)
index 2a9482b..0000000
--- a/i965_ignore_anisotropic_filtering_in_nearest_mode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' mesa-17.1.2.orig/src/mesa/drivers/dri/i965/brw_sampler_state.c mesa-17.1.2/src/mesa/drivers/dri/i965/brw_sampler_state.c
---- mesa-17.1.2.orig/src/mesa/drivers/dri/i965/brw_sampler_state.c     2017-06-05 23:09:09.000000000 +0200
-+++ mesa-17.1.2/src/mesa/drivers/dri/i965/brw_sampler_state.c  2017-06-17 16:01:16.890619847 +0200
-@@ -450,8 +450,10 @@
-    /* Enable anisotropic filtering if desired. */
-    unsigned max_anisotropy = BRW_ANISORATIO_2;
-    if (sampler->MaxAnisotropy > 1.0f) {
--      min_filter = BRW_MAPFILTER_ANISOTROPIC;
--      mag_filter = BRW_MAPFILTER_ANISOTROPIC;
-+      if (min_filter == BRW_MAPFILTER_LINEAR)
-+         min_filter = BRW_MAPFILTER_ANISOTROPIC;
-+      if (mag_filter == BRW_MAPFILTER_LINEAR)
-+         mag_filter = BRW_MAPFILTER_ANISOTROPIC;
- 
-       if (sampler->MaxAnisotropy > 2.0f) {
-        max_anisotropy =