diff --git a/test/core/core_func_integer_find_lsb.cpp b/test/core/core_func_integer_find_lsb.cpp index ddabdf2a..ed096ead 100644 --- a/test/core/core_func_integer_find_lsb.cpp +++ b/test/core/core_func_integer_find_lsb.cpp @@ -319,10 +319,15 @@ int main() printf("ntz4a: %d clocks\n", static_cast(TimestampEnd - TimestampBeg)); TimestampBeg = std::clock(); - for (std::size_t k = 0; k < Count; ++k) - for (i = 0; i < n; i += 2) { - m = test[i+1]; if (m > 8) m = 8; - if (ntz5(test[i]) != m) error(test[i], ntz5(test[i]));} + for(std::size_t k = 0; k < Count; ++k) + for(i = 0; i < n; i += 2) + { + m = test[i+1]; + if(m > 8) + m = 8; + if(ntz5(static_cast(test[i])) != m) + error(test[i], ntz5(static_cast(test[i]))); + } TimestampEnd = std::clock(); printf("ntz5: %d clocks\n", static_cast(TimestampEnd - TimestampBeg)); diff --git a/test/gtc/gtc_type_precision.cpp b/test/gtc/gtc_type_precision.cpp index 94b08706..4fb2967d 100644 --- a/test/gtc/gtc_type_precision.cpp +++ b/test/gtc/gtc_type_precision.cpp @@ -1,7 +1,7 @@ #include #include #include -#if GLM_HAS_OPENMP && 0 +#if GLM_HAS_OPENMP # include #endif @@ -240,7 +240,7 @@ static int test_ivec_precision() int Error(0); { - glm::i8vec2 v1; + glm::i8vec2 v1(0); glm::lowp_i8vec2 v2(v1); glm::mediump_i8vec2 v3(v1); glm::highp_i8vec2 v4(v1); @@ -251,7 +251,7 @@ static int test_ivec_precision() } { - glm::i8vec3 v1; + glm::i8vec3 v1(0); glm::lowp_i8vec3 v2(v1); glm::mediump_i8vec3 v3(v1); glm::highp_i8vec3 v4(v1); @@ -262,7 +262,7 @@ static int test_ivec_precision() } { - glm::i8vec4 v1; + glm::i8vec4 v1(0); glm::lowp_i8vec4 v2(v1); glm::mediump_i8vec4 v3(v1); glm::highp_i8vec4 v4(v1); @@ -273,7 +273,7 @@ static int test_ivec_precision() } { - glm::i16vec2 v1; + glm::i16vec2 v1(0); glm::lowp_i16vec2 v2(v1); glm::mediump_i16vec2 v3(v1); glm::highp_i16vec2 v4(v1); @@ -284,7 +284,7 @@ static int test_ivec_precision() } { - glm::i16vec3 v1; + glm::i16vec3 v1(0); glm::lowp_i16vec3 v2(v1); glm::mediump_i16vec3 v3(v1); glm::highp_i16vec3 v4(v1); @@ -295,7 +295,7 @@ static int test_ivec_precision() } { - glm::i16vec4 v1; + glm::i16vec4 v1(0); glm::lowp_i16vec4 v2(v1); glm::mediump_i16vec4 v3(v1); glm::highp_i16vec4 v4(v1); @@ -306,7 +306,7 @@ static int test_ivec_precision() } { - glm::i32vec2 v1; + glm::i32vec2 v1(0); glm::lowp_i32vec2 v2(v1); glm::mediump_i32vec2 v3(v1); glm::highp_i32vec2 v4(v1); @@ -317,7 +317,7 @@ static int test_ivec_precision() } { - glm::i32vec3 v1; + glm::i32vec3 v1(0); glm::lowp_i32vec3 v2(v1); glm::mediump_i32vec3 v3(v1); glm::highp_i32vec3 v4(v1); @@ -328,7 +328,7 @@ static int test_ivec_precision() } { - glm::i32vec4 v1; + glm::i32vec4 v1(0); glm::lowp_i32vec4 v2(v1); glm::mediump_i32vec4 v3(v1); glm::highp_i32vec4 v4(v1); @@ -339,7 +339,7 @@ static int test_ivec_precision() } { - glm::i64vec2 v1; + glm::i64vec2 v1(0); glm::lowp_i64vec2 v2(v1); glm::mediump_i64vec2 v3(v1); glm::highp_i64vec2 v4(v1); @@ -350,7 +350,7 @@ static int test_ivec_precision() } { - glm::i64vec3 v1; + glm::i64vec3 v1(0); glm::lowp_i64vec3 v2(v1); glm::mediump_i64vec3 v3(v1); glm::highp_i64vec3 v4(v1); @@ -361,7 +361,7 @@ static int test_ivec_precision() } { - glm::i64vec4 v1; + glm::i64vec4 v1(0); glm::lowp_i64vec4 v2(v1); glm::mediump_i64vec4 v3(v1); glm::highp_i64vec4 v4(v1); @@ -436,7 +436,7 @@ static int test_uvec_precision() int Error(0); { - glm::u8vec2 v1; + glm::u8vec2 v1(0); glm::lowp_u8vec2 v2(v1); glm::mediump_u8vec2 v3(v1); glm::highp_u8vec2 v4(v1); @@ -447,7 +447,7 @@ static int test_uvec_precision() } { - glm::u8vec3 v1; + glm::u8vec3 v1(0); glm::lowp_u8vec3 v2(v1); glm::mediump_u8vec3 v3(v1); glm::highp_u8vec3 v4(v1); @@ -458,7 +458,7 @@ static int test_uvec_precision() } { - glm::u8vec4 v1; + glm::u8vec4 v1(0); glm::lowp_u8vec4 v2(v1); glm::mediump_u8vec4 v3(v1); glm::highp_u8vec4 v4(v1); @@ -469,7 +469,7 @@ static int test_uvec_precision() } { - glm::u16vec2 v1; + glm::u16vec2 v1(0); glm::lowp_u16vec2 v2(v1); glm::mediump_u16vec2 v3(v1); glm::highp_u16vec2 v4(v1); @@ -480,7 +480,7 @@ static int test_uvec_precision() } { - glm::u16vec3 v1; + glm::u16vec3 v1(0); glm::lowp_u16vec3 v2(v1); glm::mediump_u16vec3 v3(v1); glm::highp_u16vec3 v4(v1); @@ -491,7 +491,7 @@ static int test_uvec_precision() } { - glm::u16vec4 v1; + glm::u16vec4 v1(0); glm::lowp_u16vec4 v2(v1); glm::mediump_u16vec4 v3(v1); glm::highp_u16vec4 v4(v1); @@ -502,7 +502,7 @@ static int test_uvec_precision() } { - glm::u32vec2 v1; + glm::u32vec2 v1(0); glm::lowp_u32vec2 v2(v1); glm::mediump_u32vec2 v3(v1); glm::highp_u32vec2 v4(v1); @@ -513,7 +513,7 @@ static int test_uvec_precision() } { - glm::u32vec3 v1; + glm::u32vec3 v1(0); glm::lowp_u32vec3 v2(v1); glm::mediump_u32vec3 v3(v1); glm::highp_u32vec3 v4(v1); @@ -524,7 +524,7 @@ static int test_uvec_precision() } { - glm::u32vec4 v1; + glm::u32vec4 v1(0); glm::lowp_u32vec4 v2(v1); glm::mediump_u32vec4 v3(v1); glm::highp_u32vec4 v4(v1); @@ -535,7 +535,7 @@ static int test_uvec_precision() } { - glm::u64vec2 v1; + glm::u64vec2 v1(0); glm::lowp_u64vec2 v2(v1); glm::mediump_u64vec2 v3(v1); glm::highp_u64vec2 v4(v1); @@ -546,7 +546,7 @@ static int test_uvec_precision() } { - glm::u64vec3 v1; + glm::u64vec3 v1(0); glm::lowp_u64vec3 v2(v1); glm::mediump_u64vec3 v3(v1); glm::highp_u64vec3 v4(v1); @@ -557,7 +557,7 @@ static int test_uvec_precision() } { - glm::u64vec4 v1; + glm::u64vec4 v1(0); glm::lowp_u64vec4 v2(v1); glm::mediump_u64vec4 v3(v1); glm::highp_u64vec4 v4(v1); @@ -848,7 +848,7 @@ static int test_fvec_conversion() return Error; } -#if GLM_HAS_OPENMP && 0 +#if GLM_HAS_OPENMP static int test_openmp() { std::vector VectorA(1000); @@ -875,26 +875,27 @@ int main() { int Error = 0; +# if GLM_HAS_OPENMP + Error += test_openmp(); +# endif// + Error += test_scalar_size(); Error += test_fvec_size(); - return Error; - Error += test_fvec_precision(); Error += test_fvec_conversion(); + Error += test_dvec_precision(); - Error += test_ivec_size(); - Error += test_ivec_precision(); + Error += test_uvec_size(); Error += test_uvec_precision(); + Error += test_ivec_size(); + Error += test_ivec_precision(); + Error += test_fmat_size(); Error += test_dmat_size(); Error += test_quat_size(); Error += test_quat_precision(); -# if GLM_HAS_OPENMP && 0 - Error += test_openmp(); -# endif// - return Error; }