Merge pull request #818 from hkr/bitfieldInsert

Fix bitfieldInsert according to GLSL spec #818
g-truc · Oct 8, 2018 · 6f6f4d3 · 6f6f4d3
2 parents 77ce9b5 + d0ae3f9
commit 6f6f4d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl
@@ -269,7 +269,7 @@ namespace detail
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldInsert' only accept integer values");
 
 		T const Mask = static_cast<T>(detail::mask(Bits) << Offset);
-		return (Base & ~Mask) | (Insert & Mask);
+		return (Base & ~Mask) | ((Insert << static_cast<T>(Offset)) & Mask);
 	}
 
 	// bitfieldReverse

diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp
@@ -41,9 +41,9 @@ namespace bitfieldInsert
 		{0x00000000, 0xffffffff,  0, 32, 0xffffffff},
 		{0x00000000, 0xffffffff,  0, 31, 0x7fffffff},
 		{0x00000000, 0xffffffff,  0,  0, 0x00000000},
-		{0xff000000, 0x0000ff00,  8,  8, 0xff00ff00},
-		{0xffff0000, 0x0000ffff, 16, 16, 0x00000000},
-		{0x0000ffff, 0xffff0000, 16, 16, 0xffffffff}
+		{0xff000000, 0x000000ff,  8,  8, 0xff00ff00},
+		{0xffff0000, 0xffff0000, 16, 16, 0x00000000},
+		{0x0000ffff, 0x0000ffff, 16, 16, 0xffffffff}
 	};
 
 	static int test()