diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-07-11 15:26:21 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 14:01:37 +0100 |
commit | 2d339f752a025325dede17fdaae781f9422aa87f (patch) | |
tree | 6c4810a61ae70a0ec8c455ec68bce5229d15a8ad /meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch | |
parent | 75b147e8a5a474aa8e3846828211d1718587e470 (diff) | |
download | poky-2d339f752a025325dede17fdaae781f9422aa87f.tar.gz |
vulkan-demos: Add recipe
Sascha Willems collection of Vulkan demos is useful as a smoke testing
tool.
* Add patch to install binaries and data.
* Add patch to fix build on X86
* Use a combination of patch and do_install_append to avoid some 3D
models with unclear licensing.
(From OE-Core rev: 88a6fa37e7ec2e68cdb2374f2a5371a6f44b3d67)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch')
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch new file mode 100644 index 0000000000..681b3422d9 --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From b0495efb6c3ea3a530fcbaddac86da57ecce5a66 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Mon, 10 Jul 2017 13:11:12 +0300 | ||
4 | Subject: [PATCH] Fix build on x86 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | | func_common.inl:193:51: error: wrong number of template arguments | ||
10 | | (5, should be 6) struct compute_sign<T, P, vecType, false, Aligned> | ||
11 | |||
12 | The fix is backported from the upstream glm project. | ||
13 | |||
14 | Upstream-Status: Pending [https://github.com/SaschaWillems/Vulkan/issues/356] | ||
15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
16 | --- | ||
17 | external/glm/glm/detail/func_common.inl | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/external/glm/glm/detail/func_common.inl b/external/glm/glm/detail/func_common.inl | ||
21 | index cafaed5..2dd94e1 100644 | ||
22 | --- a/external/glm/glm/detail/func_common.inl | ||
23 | +++ b/external/glm/glm/detail/func_common.inl | ||
24 | @@ -190,12 +190,12 @@ namespace detail | ||
25 | |||
26 | # if GLM_ARCH == GLM_ARCH_X86 | ||
27 | template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned> | ||
28 | - struct compute_sign<T, P, vecType, false, Aligned> | ||
29 | + struct compute_sign<L, T, P, vecType, false, Aligned> | ||
30 | { | ||
31 | GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x) | ||
32 | { | ||
33 | T const Shift(static_cast<T>(sizeof(T) * 8 - 1)); | ||
34 | - vecType<L, T, P> const y(vecType<typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift)); | ||
35 | + vecType<L, T, P> const y(vecType<L, typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift)); | ||
36 | |||
37 | return (x >> Shift) | y; | ||
38 | } | ||
39 | -- | ||
40 | 2.1.4 | ||
41 | |||