chore: update to rtm 2.3 (#496)

nfrechette · Feb 6, 2024 · 30adc76 · 30adc76
2 parents f4640d9 + d73d4b1
commit 30adc76
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/external/README.md b/external/README.md
@@ -4,7 +4,7 @@
 
 ### Realtime Math
 
-[Realtime Math v2.2-develop](https://github.com/nfrechette/rtm) (MIT License) is used for its optimized math.
+[Realtime Math v2.3.0](https://github.com/nfrechette/rtm) (MIT License) is used for its optimized math.
 
 ## Development dependencies
 

diff --git a/external/rtm b/external/rtm
diff --git a/includes/acl/compression/impl/rigid_shell_utils.h b/includes/acl/compression/impl/rigid_shell_utils.h
@@ -129,9 +129,9 @@ namespace acl
 					const rtm::vector4f raw_vtx1 = rtm::qvv_mul_point3(vtx1, raw_transform);
 					const rtm::vector4f raw_vtx2 = rtm::qvv_mul_point3(vtx2, raw_transform);
 
-					const rtm::scalarf vtx0_distance = rtm::vector_length3(raw_vtx0);
-					const rtm::scalarf vtx1_distance = rtm::vector_length3(raw_vtx1);
-					const rtm::scalarf vtx2_distance = rtm::vector_length3(raw_vtx2);
+					const rtm::scalarf vtx0_distance = rtm::vector_length3_as_scalar(raw_vtx0);
+					const rtm::scalarf vtx1_distance = rtm::vector_length3_as_scalar(raw_vtx1);
+					const rtm::scalarf vtx2_distance = rtm::vector_length3_as_scalar(raw_vtx2);
 
 					const rtm::scalarf transform_length = rtm::scalar_max(rtm::scalar_max(vtx0_distance, vtx1_distance), vtx2_distance);
 					parent_shell_distance = rtm::scalar_max(parent_shell_distance, transform_length);
@@ -245,9 +245,9 @@ namespace acl
 					const rtm::vector4f raw_vtx1 = rtm::qvv_mul_point3(vtx1, raw_transform);
 					const rtm::vector4f raw_vtx2 = rtm::qvv_mul_point3(vtx2, raw_transform);
 
-					const rtm::scalarf vtx0_distance = rtm::vector_length3(raw_vtx0);
-					const rtm::scalarf vtx1_distance = rtm::vector_length3(raw_vtx1);
-					const rtm::scalarf vtx2_distance = rtm::vector_length3(raw_vtx2);
+					const rtm::scalarf vtx0_distance = rtm::vector_length3_as_scalar(raw_vtx0);
+					const rtm::scalarf vtx1_distance = rtm::vector_length3_as_scalar(raw_vtx1);
+					const rtm::scalarf vtx2_distance = rtm::vector_length3_as_scalar(raw_vtx2);
 
 					const rtm::scalarf transform_length = rtm::scalar_max(rtm::scalar_max(vtx0_distance, vtx1_distance), vtx2_distance);
 					parent_shell_distance = rtm::scalar_max(parent_shell_distance, transform_length);

diff --git a/includes/acl/compression/impl/track_array.impl.h b/includes/acl/compression/impl/track_array.impl.h
@@ -251,8 +251,8 @@ namespace acl
 				ACL_ASSERT(rounding_policy_ != sample_rounding_policy::per_track, "track_writer::get_rounding_policy() cannot return per_track");
 				const float alpha = interpolation_alpha_per_policy[static_cast<int>(rounding_policy_)];
 
-				const rtm::scalarf value0 = rtm::scalar_load(&track__[key_frame0]);
-				const rtm::scalarf value1 = rtm::scalar_load(&track__[key_frame1]);
+				const rtm::scalarf value0 = rtm::scalar_load_as_scalar(&track__[key_frame0]);
+				const rtm::scalarf value1 = rtm::scalar_load_as_scalar(&track__[key_frame1]);
 				const rtm::scalarf value = rtm::scalar_lerp(value0, value1, rtm::scalar_set(alpha));
 				writer.write_float1(track_index, value);
 			}
@@ -371,8 +371,8 @@ namespace acl
 		{
 			const track_float1f& track__ = track_cast<track_float1f>(track_);
 
-			const rtm::scalarf value0 = rtm::scalar_load(&track__[key_frame0]);
-			const rtm::scalarf value1 = rtm::scalar_load(&track__[key_frame1]);
+			const rtm::scalarf value0 = rtm::scalar_load_as_scalar(&track__[key_frame0]);
+			const rtm::scalarf value1 = rtm::scalar_load_as_scalar(&track__[key_frame1]);
 			const rtm::scalarf value = rtm::scalar_lerp(value0, value1, rtm::scalar_set(interpolation_alpha));
 			writer.write_float1(track_index, value);
 			break;

diff --git a/includes/acl/compression/impl/track_list_context.h b/includes/acl/compression/impl/track_list_context.h
@@ -137,7 +137,7 @@ namespace acl
 					for (uint32_t sample_index = 0; sample_index < num_samples; ++sample_index)
 					{
 						const vector4f sample = vector_load1(&typed_ref_track[sample_index]);
-						are_samples_valid &= scalar_is_finite(scalarf(vector_get_x(sample)));
+						are_samples_valid &= scalar_is_finite(vector_get_x_as_scalar(sample));
 						track[sample_index] = sample;
 					}
 					out_track = std::move(track);

diff --git a/includes/acl/compression/transform_error_metrics.h b/includes/acl/compression/transform_error_metrics.h
@@ -350,9 +350,9 @@ namespace acl
 			const rtm::vector4f lossy_vtx1 = rtm::qvv_mul_point3(vtx1, lossy_transform_);
 			const rtm::vector4f lossy_vtx2 = rtm::qvv_mul_point3(vtx2, lossy_transform_);
 
-			const rtm::scalarf vtx0_error = rtm::vector_distance3(raw_vtx0, lossy_vtx0);
-			const rtm::scalarf vtx1_error = rtm::vector_distance3(raw_vtx1, lossy_vtx1);
-			const rtm::scalarf vtx2_error = rtm::vector_distance3(raw_vtx2, lossy_vtx2);
+			const rtm::scalarf vtx0_error = rtm::vector_distance3_as_scalar(raw_vtx0, lossy_vtx0);
+			const rtm::scalarf vtx1_error = rtm::vector_distance3_as_scalar(raw_vtx1, lossy_vtx1);
+			const rtm::scalarf vtx2_error = rtm::vector_distance3_as_scalar(raw_vtx2, lossy_vtx2);
 
 			return rtm::scalar_max(rtm::scalar_max(vtx0_error, vtx1_error), vtx2_error);
 		}
@@ -371,8 +371,8 @@ namespace acl
 			const rtm::vector4f lossy_vtx0 = rtm::qvv_mul_point3_no_scale(vtx0, lossy_transform_);
 			const rtm::vector4f lossy_vtx1 = rtm::qvv_mul_point3_no_scale(vtx1, lossy_transform_);
 
-			const rtm::scalarf vtx0_error = rtm::vector_distance3(raw_vtx0, lossy_vtx0);
-			const rtm::scalarf vtx1_error = rtm::vector_distance3(raw_vtx1, lossy_vtx1);
+			const rtm::scalarf vtx0_error = rtm::vector_distance3_as_scalar(raw_vtx0, lossy_vtx0);
+			const rtm::scalarf vtx1_error = rtm::vector_distance3_as_scalar(raw_vtx1, lossy_vtx1);
 
 			return rtm::scalar_max(vtx0_error, vtx1_error);
 		}
@@ -453,9 +453,9 @@ namespace acl
 			const rtm::vector4f lossy_vtx1 = rtm::matrix_mul_point3(vtx1, lossy_transform_);
 			const rtm::vector4f lossy_vtx2 = rtm::matrix_mul_point3(vtx2, lossy_transform_);
 
-			const rtm::scalarf vtx0_error = rtm::vector_distance3(raw_vtx0, lossy_vtx0);
-			const rtm::scalarf vtx1_error = rtm::vector_distance3(raw_vtx1, lossy_vtx1);
-			const rtm::scalarf vtx2_error = rtm::vector_distance3(raw_vtx2, lossy_vtx2);
+			const rtm::scalarf vtx0_error = rtm::vector_distance3_as_scalar(raw_vtx0, lossy_vtx0);
+			const rtm::scalarf vtx1_error = rtm::vector_distance3_as_scalar(raw_vtx1, lossy_vtx1);
+			const rtm::scalarf vtx2_error = rtm::vector_distance3_as_scalar(raw_vtx2, lossy_vtx2);
 
 			return rtm::scalar_max(rtm::scalar_max(vtx0_error, vtx1_error), vtx2_error);
 		}

diff --git a/includes/acl/decompression/impl/decompression.scalar.h b/includes/acl/decompression/impl/decompression.scalar.h
@@ -284,7 +284,7 @@ namespace acl
 					rtm::scalarf value;
 					if (num_bits_per_component == 0)	// Constant bit rate
 					{
-						value = rtm::scalar_load(constant_values);
+						value = rtm::scalar_load_as_scalar(constant_values);
 						constant_values += 1;
 					}
 					else
@@ -301,8 +301,8 @@ namespace acl
 							value0 = unpack_scalarf_uXX_unsafe(num_bits_per_component, animated_values, track_bit_offset0);
 							value1 = unpack_scalarf_uXX_unsafe(num_bits_per_component, animated_values, track_bit_offset1);
 
-							const rtm::scalarf range_min = rtm::scalar_load(range_values);
-							const rtm::scalarf range_extent = rtm::scalar_load(range_values + 1);
+							const rtm::scalarf range_min = rtm::scalar_load_as_scalar(range_values);
+							const rtm::scalarf range_extent = rtm::scalar_load_as_scalar(range_values + 1);
 							value0 = rtm::scalar_mul_add(value0, range_extent, range_min);
 							value1 = rtm::scalar_mul_add(value1, range_extent, range_min);
 							range_values += 2;
@@ -548,7 +548,7 @@ namespace acl
 			{
 				rtm::scalarf value;
 				if (num_bits_per_component == 0)	// Constant bit rate
-					value = rtm::scalar_load(constant_values);
+					value = rtm::scalar_load_as_scalar(constant_values);
 				else
 				{
 					rtm::scalarf value0;
@@ -563,8 +563,8 @@ namespace acl
 						value0 = unpack_scalarf_uXX_unsafe(num_bits_per_component, animated_values, context.key_frame_bit_offsets[0] + track_bit_offset);
 						value1 = unpack_scalarf_uXX_unsafe(num_bits_per_component, animated_values, context.key_frame_bit_offsets[1] + track_bit_offset);
 
-						const rtm::scalarf range_min = rtm::scalar_load(range_values);
-						const rtm::scalarf range_extent = rtm::scalar_load(range_values + num_element_components);
+						const rtm::scalarf range_min = rtm::scalar_load_as_scalar(range_values);
+						const rtm::scalarf range_extent = rtm::scalar_load_as_scalar(range_values + num_element_components);
 						value0 = rtm::scalar_mul_add(value0, range_extent, range_min);
 						value1 = rtm::scalar_mul_add(value1, range_extent, range_min);
 					}
+17 −0		CHANGELOG.md
+1 −1		appveyor.yml
+249 −0		includes/rtm/camera_utilsd.h
+249 −0		includes/rtm/camera_utilsf.h
+14 −11		includes/rtm/impl/error.h
+37 −0		includes/rtm/impl/macros.matrix.impl.h
+10 −0		includes/rtm/impl/macros.vector4.impl.h
+12 −12		includes/rtm/impl/matrix_affine_common.h
+3 −3		includes/rtm/impl/matrix_common.h
+1 −1		includes/rtm/impl/qv_common.h
+2 −2		includes/rtm/impl/qvs_common.h
+1 −1		includes/rtm/impl/qvv_common.h
+26 −0		includes/rtm/impl/scalar_common.h
+9 −480		includes/rtm/impl/type_args.h
+195 −0		includes/rtm/impl/type_args.neon.impl.h
+197 −0		includes/rtm/impl/type_args.neon64.impl.h
+189 −0		includes/rtm/impl/type_args.other.impl.h
+194 −0		includes/rtm/impl/type_args.vectorcall.impl.h
+200 −0		includes/rtm/impl/type_args.x64_clang.impl.h
+195 −0		includes/rtm/impl/type_args.x64_gcc.impl.h
+96 −9		includes/rtm/impl/vector_common.h
+19 −19		includes/rtm/mask4d.h
+19 −19		includes/rtm/mask4q.h
+103 −23		includes/rtm/matrix3x3d.h
+88 −6		includes/rtm/matrix3x3f.h
+129 −37		includes/rtm/matrix3x4d.h
+103 −9		includes/rtm/matrix3x4f.h
+114 −15		includes/rtm/matrix4x4d.h
+103 −4		includes/rtm/matrix4x4f.h
+176 −75		includes/rtm/quatd.h
+118 −15		includes/rtm/quatf.h
+195 −11		includes/rtm/qvd.h
+185 −1		includes/rtm/qvf.h
+206 −20		includes/rtm/qvsd.h
+186 −0		includes/rtm/qvsf.h
+276 −17		includes/rtm/qvvd.h
+259 −0		includes/rtm/qvvf.h
+77 −73		includes/rtm/scalard.h
+26 −44		includes/rtm/scalarf.h
+125 −3		includes/rtm/type_traits.h
+19 −0		includes/rtm/types.h
+757 −239		includes/rtm/vector4d.h
+652 −45		includes/rtm/vector4f.h
+2 −2		includes/rtm/version.h
+1 −1		sonar-project.properties
+1 −0		tests/CMakeLists.txt
+92 −31		tests/sources/test_matrix3x3_impl.h
+113 −36		tests/sources/test_matrix3x4.cpp
+167 −44		tests/sources/test_matrix4x4.cpp
+2 −2		tests/sources/test_packing_quat.cpp
+14 −16		tests/sources/test_quat.cpp
+20 −1		tests/sources/test_qv.cpp
+66 −3		tests/sources/test_qvs.cpp
+173 −1		tests/sources/test_qvv.cpp
+2 −2		tests/sources/test_scalar.cpp
+149 −48		tests/sources/test_vector4_impl.h
+42 −0		tests/validate_includes/CMakeLists.txt
+27 −0		tests/validate_includes/dummy.cpp
+25 −0		tests/validate_includes/single_include.cpp.in
+4 −4		tools/bench/sources/bench_vector_abs.cpp
+4 −4		tools/bench/sources/bench_vector_acos.cpp
+4 −4		tools/bench/sources/bench_vector_asin.cpp
+4 −4		tools/bench/sources/bench_vector_atan.cpp
+4 −4		tools/bench/sources/bench_vector_atan2.cpp
+4 −4		tools/bench/sources/bench_vector_ceil.cpp
+4 −4		tools/bench/sources/bench_vector_cos.cpp
+4 −4		tools/bench/sources/bench_vector_floor.cpp
+4 −4		tools/bench/sources/bench_vector_round_bankers.cpp
+4 −4		tools/bench/sources/bench_vector_sin.cpp