0001-Fix-build-on-x86.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  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. | func_common.inl:193:51: error: wrong number of template arguments
  9. | (5, should be 6) struct compute_sign<T, P, vecType, false, Aligned>
  10. The fix is backported from the upstream glm project.
  11. Upstream-Status: Pending [https://github.com/SaschaWillems/Vulkan/issues/356]
  12. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  13. ---
  14. external/glm/glm/detail/func_common.inl | 4 ++--
  15. 1 file changed, 2 insertions(+), 2 deletions(-)
  16. diff --git a/external/glm/glm/detail/func_common.inl b/external/glm/glm/detail/func_common.inl
  17. index cafaed5..2dd94e1 100644
  18. --- a/external/glm/glm/detail/func_common.inl
  19. +++ b/external/glm/glm/detail/func_common.inl
  20. @@ -190,12 +190,12 @@ namespace detail
  21. # if GLM_ARCH == GLM_ARCH_X86
  22. template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
  23. - struct compute_sign<T, P, vecType, false, Aligned>
  24. + struct compute_sign<L, T, P, vecType, false, Aligned>
  25. {
  26. GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
  27. {
  28. T const Shift(static_cast<T>(sizeof(T) * 8 - 1));
  29. - vecType<L, T, P> const y(vecType<typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift));
  30. + vecType<L, T, P> const y(vecType<L, typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift));
  31. return (x >> Shift) | y;
  32. }
  33. --
  34. 2.1.4