Fix ceil function in NEON, add ceil and floor to unit tests

Fix Android build to link std math libraries to use them for the unit tests

premake.lua

@@ -101,6 +101,7 @@ workspace("hlsl++")
 			architecture("arm")
 			vectorextensions("neon")
 			buildoptions { "-Wno-unused-variable" }
+			linkoptions { "-lm" } -- Link against the standard math library
 
 		filter { "platforms:"..Platform360 }
 			system("xbox360")
@@ -159,6 +160,7 @@ project (AndroidProject)
 	removeplatforms("*")
 	platforms { AndroidARM }
 	kind("Packaging") -- This type of project builds the apk
+	architecture("arm")
 	links (UnitTestProject) -- Android needs to link to the main project which was built as a dynamic library
 	androidapplibname(UnitTestProject)
 	files

src/hlsl++_neon.h

@@ -115,7 +115,7 @@ hlslpp_inline float32x4_t vfloorq_f32(float32x4_t x)
 hlslpp_inline float32x4_t vceilq_f32(float32x4_t x)
 {
 	float32x4_t trnc = vcvtq_f32_s32(vcvtq_s32_f32(x));				// Truncate
-	float32x4_t gt = vcgtq_f32(trnc, x);							// Check if truncation was greater or smaller (i.e. was negative or positive number)
+	float32x4_t gt = vcgtq_f32(x, trnc);							// Check if truncation was greater or smaller (i.e. was negative or positive number)
 	uint32x4_t shr = vshrq_n_u32(vreinterpretq_u32_f32(gt), 31);	// Shift to leave a 1 or a 0
 	float32x4_t result = vaddq_f32(trnc, vcvtq_f32_u32(shr));		// Add to truncated value
 	return result;

src/hlsl++_unit_tests.cpp

@@ -835,15 +835,15 @@ void RunUnitTests()
 	float3 vatan_swiz_3 = atan(vfoo3.bgr);
 	float4 vatan_swiz_4 = atan(vfoo4.wwww);
 
-	float1 vceil1 = ceil(vfoo1);
-	float2 vceil2 = ceil(vfoo2);
-	float3 vceil3 = ceil(vfoo3);
-	float4 vceil4 = ceil(vfoo4);
+	float1 vceil1 = ceil(vfoo1);							eq(vceil1, ceil((float)vfoo1.x));
+	float2 vceil2 = ceil(vfoo2);							eq(vceil2, ceil((float)vfoo2.x), ceil((float)vfoo2.y));
+	float3 vceil3 = ceil(vfoo3);							eq(vceil3, ceil((float)vfoo3.x), ceil((float)vfoo3.y), ceil((float)vfoo3.z));
+	float4 vceil4 = ceil(vfoo4);							eq(vceil4, ceil((float)vfoo4.x), ceil((float)vfoo4.y), ceil((float)vfoo4.z), ceil((float)vfoo4.w));
 
-	float1 vceil_swiz_1 = ceil(vfoo1.r);
-	float2 vceil_swiz_2 = ceil(vfoo2.xx);
-	float3 vceil_swiz_3 = ceil(vfoo3.rrg);
-	float4 vceil_swiz_4 = ceil(vfoo4.yzwx);
+	float1 vceil_swiz_1 = ceil(vfoo1.r);					eq(vceil_swiz_1, ceil((float)vfoo1.r));
+	float2 vceil_swiz_2 = ceil(vfoo2.xx);					eq(vceil_swiz_2, ceil((float)vfoo2.x), ceil((float)vfoo2.x));
+	float3 vceil_swiz_3 = ceil(vfoo3.rrg);					eq(vceil_swiz_3, ceil((float)vfoo3.r), ceil((float)vfoo3.r), ceil((float)vfoo3.g));
+	float4 vceil_swiz_4 = ceil(vfoo4.yzwx);					eq(vceil_swiz_4, ceil((float)vfoo4.y), ceil((float)vfoo4.z), ceil((float)vfoo4.w), ceil((float)vfoo4.x));
 
 	float1 vclamp1 = clamp(vfoo1, vbar1, vbaz1);
 	float2 vclamp2 = clamp(vfoo2, vbar2, vbaz2);
@@ -875,7 +875,7 @@ void RunUnitTests()
 	float3 vcosh_swiz_3 = cosh(vfoo3.rrg);
 	float4 vcosh_swiz_4 = cosh(vfoo4.rrbg);
 
-	float3 vcross3			= cross(vfoo3, vbar3);
+	float3 vcross3 = cross(vfoo3, vbar3);
 	float3 vcross_swiz_3_a = cross(vfoo3, vbar3.yyx);
 	float3 vcross_swiz_3_b = cross(vfoo3.xyz, vbar3);
 	float3 vcross_swiz_3_c = cross(vfoo3.yzx, vbar3.yyx);
@@ -895,15 +895,15 @@ void RunUnitTests()
 	float1 vdot4_b	= dot(vfoo4.rrgb, vbar4);
 	float1 vdot4_c	= dot(vfoo4.rrgg, vbar4);
 
-	float1 vfloor1 = floor(vfoo1);
-	float2 vfloor2 = floor(vfoo2);
-	float3 vfloor3 = floor(vfoo3);
-	float4 vfloor4 = floor(vfoo4);
+	float1 vfloor1 = floor(vfoo1);					eq(vfloor1, floor((float)vfoo1.x));
+	float2 vfloor2 = floor(vfoo2);					eq(vfloor2, floor((float)vfoo2.x), floor((float)vfoo2.y));
+	float3 vfloor3 = floor(vfoo3);					eq(vfloor3, floor((float)vfoo3.x), floor((float)vfoo3.y), floor((float)vfoo3.z));
+	float4 vfloor4 = floor(vfoo4);					eq(vfloor4, floor((float)vfoo4.x), floor((float)vfoo4.y), floor((float)vfoo4.z), floor((float)vfoo4.w));
 
-	float1 vfloor_swiz_1 = floor(vfoo1.r);
-	float2 vfloor_swiz_2 = floor(vfoo2.yx);
-	float3 vfloor_swiz_3 = floor(vfoo3.xxy);
-	float4 vfloor_swiz_4 = floor(vfoo4.wwxy);
+	float1 vfloor_swiz_1 = floor(vfoo1.r);			eq(vfloor_swiz_1, floor((float)vfoo1.r));
+	float2 vfloor_swiz_2 = floor(vfoo2.yx);			eq(vfloor_swiz_2, floor((float)vfoo2.y), floor((float)vfoo2.x));
+	float3 vfloor_swiz_3 = floor(vfoo3.xxy);		eq(vfloor_swiz_3, floor((float)vfoo3.x), floor((float)vfoo3.x), floor((float)vfoo3.y));
+	float4 vfloor_swiz_4 = floor(vfoo4.wwxy);		eq(vfloor_swiz_4, floor((float)vfoo4.w), floor((float)vfoo4.w), floor((float)vfoo4.x), floor((float)vfoo4.y));
 
 	float1 vfrac1 = frac(vfoo1);
 	float2 vfrac2 = frac(vfoo2);