fix(mask): remove hack for VS2019 bug now that it is fixed

Fixes #34
nfrechette · Nov 29, 2019 · 448a328 · 448a328
1 parent f40abab
commit 448a328
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 25 deletions.
diff --git a/includes/rtm/impl/mask_common.h b/includes/rtm/impl/mask_common.h
@@ -43,29 +43,13 @@ namespace rtm
 		{
 			inline RTM_SIMD_CALL operator mask4q() const RTM_NO_EXCEPT
 			{
-
-
 #if defined(RTM_SSE2_INTRINSICS)
-#if defined(_MSC_VER) && _MSC_VER >= 1920 && defined(_M_IX86)
-				// _mm_set_epi64x sets both doublewords to the same value when compiled for x86 with Visual Studio 2019 with optimizations turned on.
-				// An alternative instruction avoids this problem.  Note the high and low words are equal because mask components can only equal ~0 or 0.
-				const uint32_t x_mask = x ? 0xFFFFFFFFU : 0;
-				const uint32_t y_mask = y ? 0xFFFFFFFFU : 0;
-				const uint32_t z_mask = z ? 0xFFFFFFFFU : 0;
-				const uint32_t w_mask = w ? 0xFFFFFFFFU : 0;
-
-				return mask4q{
-					_mm_castsi128_pd(_mm_set_epi32(y_mask, y_mask, x_mask, x_mask)),
-					_mm_castsi128_pd(_mm_set_epi32(w_mask, w_mask, z_mask, z_mask))
-				};
-#else
 				const uint64_t x_mask = x ? 0xFFFFFFFFFFFFFFFFULL : 0;
 				const uint64_t y_mask = y ? 0xFFFFFFFFFFFFFFFFULL : 0;
 				const uint64_t z_mask = z ? 0xFFFFFFFFFFFFFFFFULL : 0;
 				const uint64_t w_mask = w ? 0xFFFFFFFFFFFFFFFFULL : 0;
 
 				return mask4q{ _mm_castsi128_pd(_mm_set_epi64x(y_mask, x_mask)), _mm_castsi128_pd(_mm_set_epi64x(w_mask, z_mask)) };
-#endif
 #else
 				const uint64_t x_mask = x ? 0xFFFFFFFFFFFFFFFFULL : 0;
 				const uint64_t y_mask = y ? 0xFFFFFFFFFFFFFFFFULL : 0;

diff --git a/includes/rtm/mask4q.h b/includes/rtm/mask4q.h
@@ -38,16 +38,7 @@ namespace rtm
 	inline mask4q RTM_SIMD_CALL mask_set(uint64_t x, uint64_t y, uint64_t z, uint64_t w) RTM_NO_EXCEPT
 	{
 #if defined(RTM_SSE2_INTRINSICS)
-#if defined(_MSC_VER) && _MSC_VER >= 1920 && defined(_M_IX86)
-		// _mm_set_epi64x sets both doublewords to the same value when compiled for x86 with Visual Studio 2019 with optimizations turned on.
-		// An alternative instruction avoids this problem.  Note the high and low words are equal because mask components can only equal ~0 or 0.
-		return mask4q{
-			_mm_castsi128_pd(_mm_set_epi32(static_cast<uint32_t>(y), static_cast<uint32_t>(y), static_cast<uint32_t>(x), static_cast<uint32_t>(x))),
-			_mm_castsi128_pd(_mm_set_epi32(static_cast<uint32_t>(w), static_cast<uint32_t>(w), static_cast<uint32_t>(z), static_cast<uint32_t>(z)))
-		};
-#else
 		return mask4q{ _mm_castsi128_pd(_mm_set_epi64x(y, x)), _mm_castsi128_pd(_mm_set_epi64x(w, z)) };
-#endif
 #else
 		return mask4q{ x, y, z, w };
 #endif