blob: 681b3422d907d7d15029c96f102f1a95a9b08dd2 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From b0495efb6c3ea3a530fcbaddac86da57ecce5a66 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 10 Jul 2017 13:11:12 +0300
4Subject: [PATCH] Fix build on x86
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9func_common.inl:193:51: error: wrong number of template arguments
10| (5, should be 6) struct compute_sign<T, P, vecType, false, Aligned>
11
12The fix is backported from the upstream glm project.
13
14Upstream-Status: Pending [https://github.com/SaschaWillems/Vulkan/issues/356]
15Signed-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
20diff --git a/external/glm/glm/detail/func_common.inl b/external/glm/glm/detail/func_common.inl
21index 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--
402.1.4
41