Drop texture float patch

This commit is contained in:
Adam Jackson 2018-07-06 12:08:07 -04:00
parent 92972ffe7d
commit 25b4e647d4
2 changed files with 13 additions and 55 deletions

View File

@ -1,50 +0,0 @@
From 00bcd599310dc7fce4fe336ffd85902429051a0c Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun, 20 Mar 2016 13:27:04 +0100
Subject: [PATCH 2/4] hardware gloat
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
src/gallium/drivers/llvmpipe/lp_screen.c | 7 +++++++
src/gallium/drivers/softpipe/sp_screen.c | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 4f61de8..3b0ec77 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -411,6 +411,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
if (!format_desc)
return FALSE;
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
+ util_format_is_float(format)) {
+ return FALSE;
+ }
+
assert(target == PIPE_BUFFER ||
target == PIPE_TEXTURE_1D ||
target == PIPE_TEXTURE_1D_ARRAY ||
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 031602b..c279120 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -358,6 +358,13 @@ softpipe_is_format_supported( struct pipe_screen *screen,
if (!format_desc)
return FALSE;
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
+ util_format_is_float(format)) {
+ return FALSE;
+ }
+
if (sample_count > 1)
return FALSE;
--
2.7.4

View File

@ -43,14 +43,14 @@
%define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}
%global sanitize 1
%global sanitize 0
#global rctag rc4
Name: mesa
Summary: Mesa graphics libraries
Version: 18.1.3
Release: 1%{?rctag:.%{rctag}}%{?dist}
Release: 2%{?rctag:.%{rctag}}%{?dist}
License: MIT
URL: http://www.mesa3d.org
@ -65,7 +65,6 @@ Source3: Makefile
Source4: Mesa-MLAA-License-Clarification-Email.txt
Patch1: 0001-llvm-SONAME-without-version.patch
Patch2: 0002-hardware-gloat.patch
Patch3: 0003-evergreen-big-endian.patch
Patch4: 0004-bigendian-assert.patch
@ -355,11 +354,13 @@ Requires: vulkan-devel
Headers for development with the Vulkan API.
%prep
%autosetup -n %{name}-%{version}%{?rctag:-%{rctag}} -p1
%if 0%{sanitize}
%setup -q -n %{name}-%{version}%{?rctag:-%{rctag}}
cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
exit 0
%else
%autosetup -n %{name}-%{version}%{?rctag:-%{rctag}} -p1
cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
%endif
@ -367,6 +368,10 @@ Headers for development with the Vulkan API.
cp %{SOURCE4} docs/
%build
%if !0%{sanitize}
cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
%endif
autoreconf -vfi
%ifarch %{ix86}
@ -659,7 +664,10 @@ popd
%{_includedir}/vulkan/
%changelog
* Sun Jul 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.0.3-1
* Fri Jul 06 2018 Adam Jackson <ajax@redhat.com> - 18.1.3-2
- Drop texture float patch
* Sun Jul 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.1.3-1
- Mesa 18.1.3
* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 18.1.2-3