upgrade to latest glm

This reverts commit 46e53c0360a38f620cf8c86fd0a3dc46c8238e0e.

Reason for revert: intermittent failure was due to a missing fix in etonyek

Change-Id: I1ddaafc821cd494092ab66309386464c6e2c33c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88118
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 23 insertions, 93 deletions

diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk
index 940d12372b94..934621eac841 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -16,9 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,glm,$(if $(filter MSC,$(COM)),--
 $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,glm, \
-    external/glm/Wshadow-patch-fix.patch \
-    external/glm/Wsign-compare.patch.0 \
-    external/glm/Wunused-parameter.patch \
     external/glm/clang-cl.patch.0 \
     external/glm/c++20.patch.0 \
 ))
diff --git a/external/glm/Wshadow-patch-fix.patch b/external/glm/Wshadow-patch-fix.patch
deleted file mode 100644
index 3c25f40bda51..000000000000
--- a/external/glm/Wshadow-patch-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/glm/core/type_vec4.hpp
-+++ b/glm/core/type_vec4.hpp
-@@ -185,7 +185,7 @@
- 		template <int E0, int E1>

- 		GLM_FUNC_DECL tvec4(T const & x_, glm::detail::swizzle<2, T, tvec2<T>, E0, E1, -1, -2> const & v, T const & w_)

- 		{

--			*this = tvec4<T>(x_, v(), w);

-+			*this = tvec4<T>(x_, v(), w_);

- 		}

- 

- 		template <int E0, int E1>

diff --git a/external/glm/Wsign-compare.patch.0 b/external/glm/Wsign-compare.patch.0
deleted file mode 100644
index ef97121ff97f..000000000000
--- a/external/glm/Wsign-compare.patch.0
+++ /dev/null
@@ -1,20 +0,0 @@
---- glm/gtx/bit.inl
-+++ glm/gtx/bit.inl
-@@ -576,7 +576,7 @@
- 		assert(ToBit <= sizeof(genIUType) * std::size_t(8));

- 

- 		genIUType Result = Value;

--		for(std::size_t i = 0; i <= ToBit; ++i)

-+		for(int i = 0; i <= ToBit; ++i)

- 			Result |= (1 << i);

- 		return Result;

- 	}

-@@ -593,7 +593,7 @@
- 		assert(ToBit <= sizeof(genIUType) * std::size_t(8));

- 

- 		genIUType Result = Value;

--		for(std::size_t i = 0; i <= ToBit; ++i)

-+		for(int i = 0; i <= ToBit; ++i)

- 			Result &= ~(1 << i);

- 		return Result;

- 	}

diff --git a/external/glm/Wunused-parameter.patch b/external/glm/Wunused-parameter.patch
deleted file mode 100644
index de1239702679..000000000000
--- a/external/glm/Wunused-parameter.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- glm/glm/gtx/bit.inl
-+++ glm/glm/gtx/bit.inl
-@@ -572,6 +572,7 @@
- 		int const & ToBit

- 	)

- 	{

-+		(void) FromBit;

- 		assert(FromBit <= ToBit);

- 		assert(ToBit <= sizeof(genIUType) * std::size_t(8));

- 

-@@ -589,6 +589,7 @@
- 		int const & ToBit

- 	)

- 	{

-+		(void) FromBit;

- 		assert(FromBit <= ToBit);

- 		assert(ToBit <= sizeof(genIUType) * std::size_t(8));

- 

diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0
index 559adde48946..34a40b5ef4c6 100644
--- a/external/glm/c++20.patch.0
+++ b/external/glm/c++20.patch.0
@@ -1,11 +1,11 @@
---- glm/core/type_half.inl
-+++ glm/core/type_half.inl
-@@ -40,7 +40,7 @@
- 		volatile float f = 1e10;

- 

- 		for(int i = 0; i < 10; ++i)	

--			f *= f;             // this will overflow before

-+			f = f * f;          // this will overflow before

- 								// the for­loop terminates

- 		return f;

- 	}

+--- glm/detail/type_half.inl
++++ glm/detail/type_half.inl
+@@ -6,7 +6,7 @@
+ 		volatile float f = 1e10;
+ 
+ 		for(int i = 0; i < 10; ++i)
+-			f *= f; // this will overflow before the for loop terminates
++			f = f * f; // this will overflow before the for loop terminates
+ 		return f;
+ 	}
+ 
diff --git a/external/glm/clang-cl.patch.0 b/external/glm/clang-cl.patch.0
index edbc30b2408b..44713a1968c5 100644
--- a/external/glm/clang-cl.patch.0
+++ b/external/glm/clang-cl.patch.0
@@ -1,32 +1,14 @@
 # "#pragma intrinsic" not (yet?) handled in the "if (LangOpts.MicrosoftExt)"
 # block in Preprocessor::RegisterBuiltinPragmas in Clang's lib/Lex/Pragma.cpp:
---- glm/core/func_integer.inl
-+++ glm/core/func_integer.inl
-@@ -29,7 +29,9 @@
- #if(GLM_ARCH != GLM_ARCH_PURE)

- #if(GLM_COMPILER & GLM_COMPILER_VC)

- #	include <intrin.h>

-+#if !defined __clang__

- #	pragma intrinsic(_BitScanReverse)

-+#endif

- #endif//(GLM_COMPILER & GLM_COMPILER_VC)

- #endif//(GLM_ARCH != GLM_ARCH_PURE)

- 

-
-# Fix check for availability of C++11 static_assert (it apparently should be
-# conditional on GLM_LANG_CXX11 instead of GLM_LANG_CXX0X, but just don't care
-# to try to fix that mess, and use __cplusplus value instead; unconditionally
-# using C++11 static_assert would fail in external/libgltf, which uses
-# external/glm but does not -std=c++11); falling back to BOOST_STATIC_ASSERT
-# would cause unnecessary warnings with clang-cl:
---- glm/core/setup.hpp
-+++ glm/core/setup.hpp
-@@ -628,7 +628,7 @@
- ///////////////////////////////////////////////////////////////////////////////////////////////////

- // Static assert

- 

--#if(GLM_LANG == GLM_LANG_CXX0X)

-+#if __cplusplus >= 201103L

- #	define GLM_STATIC_ASSERT(x, message) static_assert(x, message)

- #elif(defined(BOOST_STATIC_ASSERT))

- #	define GLM_STATIC_ASSERT(x, message) BOOST_STATIC_ASSERT(x)

+--- glm/detail/func_integer.inl
++++ glm/detail/func_integer.inl
+@@ -3,7 +3,9 @@
+ #include "_vectorize.hpp"
+ #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ #	include <intrin.h>
++#if !defined __clang__^M
+ #	pragma intrinsic(_BitScanReverse)
++#endif
+ #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ #include <limits>
+