summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-11 19:14:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-18 10:18:42 +0100
commitf7792e58a20f0303e324ad5876c21c9924b08da7 (patch)
treed80b0989fe34e72e1007c95f307571dada2661f9
parent48d10a0a91a3f6fa160da3230172fb1a64329d3c (diff)
downloadpoky-f7792e58a20f0303e324ad5876c21c9924b08da7.tar.gz
mesa: remove hardware float patch
We don't need the texture float patches anymore, as the relevant patents have expired so this defaults to on now. (From OE-Core rev: db86b271c98dd50c641374ab6806b47a40ed134b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch52
-rw-r--r--meta/recipes-graphics/mesa/mesa_18.1.3.bb1
2 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch b/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch
deleted file mode 100644
index b676b078a3..0000000000
--- a/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 9bc2dad0257b778faf30edd5bc8f5c19ddf27351 Mon Sep 17 00:00:00 2001
2From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
3Date: Sun, 20 Mar 2016 13:27:04 +0100
4Subject: [PATCH 4/8] hardware gloat
5Organization: O.S. Systems Software LTDA.
6
7Upstream-Status: Inappropriate [not author]
8Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
9---
10 src/gallium/drivers/llvmpipe/lp_screen.c | 7 +++++++
11 src/gallium/drivers/softpipe/sp_screen.c | 7 +++++++
12 2 files changed, 14 insertions(+)
13
14diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
15index 3f5d0327bf..86808e016b 100644
16--- a/src/gallium/drivers/llvmpipe/lp_screen.c
17+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
18@@ -449,6 +449,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
19 if (!format_desc)
20 return FALSE;
21
22+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
23+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
24+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
25+ util_format_is_float(format)) {
26+ return FALSE;
27+ }
28+
29 assert(target == PIPE_BUFFER ||
30 target == PIPE_TEXTURE_1D ||
31 target == PIPE_TEXTURE_1D_ARRAY ||
32diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
33index 25f6f74f36..61629ef2ff 100644
34--- a/src/gallium/drivers/softpipe/sp_screen.c
35+++ b/src/gallium/drivers/softpipe/sp_screen.c
36@@ -397,6 +397,13 @@ softpipe_is_format_supported( struct pipe_screen *screen,
37 if (!format_desc)
38 return FALSE;
39
40+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
41+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
42+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
43+ util_format_is_float(format)) {
44+ return FALSE;
45+ }
46+
47 if (sample_count > 1)
48 return FALSE;
49
50--
512.18.0
52
diff --git a/meta/recipes-graphics/mesa/mesa_18.1.3.bb b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
index 1c76f4b1b1..e4aad1d047 100644
--- a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
@@ -3,7 +3,6 @@ require ${BPN}.inc
3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ 3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
4 file://0002-Simplify-wayland-scanner-lookup.patch \ 4 file://0002-Simplify-wayland-scanner-lookup.patch \
5 file://0003-winsys-svga-drm-Include-sys-types.h.patch \ 5 file://0003-winsys-svga-drm-Include-sys-types.h.patch \
6 file://0004-hardware-gloat.patch \
7 file://0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ 6 file://0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
8 file://0006-Use-Python-3-to-execute-the-scripts.patch \ 7 file://0006-Use-Python-3-to-execute-the-scripts.patch \
9 file://0007-dri-i965-Add-missing-time.h-include.patch \ 8 file://0007-dri-i965-Add-missing-time.h-include.patch \