summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch51
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa_17.1.1.bb1
3 files changed, 53 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch b/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch
new file mode 100644
index 0000000000..0e014dcc80
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch
@@ -0,0 +1,51 @@
1From 00bcd599310dc7fce4fe336ffd85902429051a0c 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 2/4] hardware gloat
5
6Upstream-Status: Inappropriate [not author]
7Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
8---
9 src/gallium/drivers/llvmpipe/lp_screen.c | 7 +++++++
10 src/gallium/drivers/softpipe/sp_screen.c | 7 +++++++
11 2 files changed, 14 insertions(+)
12
13diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
14index 4f61de8..3b0ec77 100644
15--- a/src/gallium/drivers/llvmpipe/lp_screen.c
16+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
17@@ -411,6 +411,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
18 if (!format_desc)
19 return FALSE;
20
21+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
22+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
23+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
24+ util_format_is_float(format)) {
25+ return FALSE;
26+ }
27+
28 assert(target == PIPE_BUFFER ||
29 target == PIPE_TEXTURE_1D ||
30 target == PIPE_TEXTURE_1D_ARRAY ||
31diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
32index 031602b..c279120 100644
33--- a/src/gallium/drivers/softpipe/sp_screen.c
34+++ b/src/gallium/drivers/softpipe/sp_screen.c
35@@ -358,6 +358,13 @@ softpipe_is_format_supported( struct pipe_screen *screen,
36 if (!format_desc)
37 return FALSE;
38
39+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
40+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
41+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
42+ util_format_is_float(format)) {
43+ return FALSE;
44+ }
45+
46 if (sample_count > 1)
47 return FALSE;
48
49--
502.7.4
51
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 014044f381..04285f209a 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -64,7 +64,7 @@ GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALL
64GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 64GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
65GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 65GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
66# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers 66# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
67PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" 67PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
68MESA_LLVM_RELEASE ?= "3.3" 68MESA_LLVM_RELEASE ?= "3.3"
69PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ 69PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \
70 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" 70 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
diff --git a/meta/recipes-graphics/mesa/mesa_17.1.1.bb b/meta/recipes-graphics/mesa/mesa_17.1.1.bb
index 060a279015..ff84015aee 100644
--- a/meta/recipes-graphics/mesa/mesa_17.1.1.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.1.1.bb
@@ -5,6 +5,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \
5 file://disable-asm-on-non-gcc.patch \ 5 file://disable-asm-on-non-gcc.patch \
6 file://0001-Use-wayland-scanner-in-the-path.patch \ 6 file://0001-Use-wayland-scanner-in-the-path.patch \
7 file://0001-util-rand_xor-add-missing-include-statements.patch \ 7 file://0001-util-rand_xor-add-missing-include-statements.patch \
8 file://0002-hardware-gloat.patch \
8" 9"
9 10
10SRC_URI[md5sum] = "a4844bc6052578574f9629458bcbb749" 11SRC_URI[md5sum] = "a4844bc6052578574f9629458bcbb749"