mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed missing std:: namespace #898

Browse Source
This commit is contained in:
Christophe Riccio
2019-09-07 13:41:08 +02:00
parent 823125a6cd
commit 61b2a73e21
17 changed files with 238 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/gtc/gtc_bitfield.cpp
View File

@@ -103,11 +103,11 @@ namespace mask
std::clock_t TimeZero = Timestamp5 - Timestamp4;
std::clock_t TimeHalf = Timestamp6 - Timestamp5;
printf("mask[mix]: %d\n", static_cast<unsigned int>(TimeMix));
printf("mask[loop]: %d\n", static_cast<unsigned int>(TimeLoop));
printf("mask[default]: %d\n", static_cast<unsigned int>(TimeDefault));
printf("mask[zero]: %d\n", static_cast<unsigned int>(TimeZero));
printf("mask[half]: %d\n", static_cast<unsigned int>(TimeHalf));
std::printf("mask[mix]: %d\n", static_cast<unsigned int>(TimeMix));
std::printf("mask[loop]: %d\n", static_cast<unsigned int>(TimeLoop));
std::printf("mask[default]: %d\n", static_cast<unsigned int>(TimeDefault));
std::printf("mask[zero]: %d\n", static_cast<unsigned int>(TimeZero));
std::printf("mask[half]: %d\n", static_cast<unsigned int>(TimeHalf));
return TimeDefault < TimeLoop ? 0 : 1;
}

14
test/gtc/gtc_integer.cpp
View File

@@ -68,7 +68,7 @@ namespace log2_
std::clock_t End = clock();
printf("glm::log2<int>: %d clocks\n", static_cast<int>(End - Begin));
std::printf("glm::log2<int>: %d clocks\n", static_cast<int>(End - Begin));
}
{
@@ -82,7 +82,7 @@ namespace log2_
std::clock_t End = clock();
printf("glm::log2<ivec4>: %d clocks\n", static_cast<int>(End - Begin));
std::printf("glm::log2<ivec4>: %d clocks\n", static_cast<int>(End - Begin));
}
# if GLM_HAS_BITSCAN_WINDOWS
@@ -104,7 +104,7 @@ namespace log2_
std::clock_t End = clock();
printf("glm::log2<ivec4> inlined: %d clocks\n", static_cast<int>(End - Begin));
std::printf("glm::log2<ivec4> inlined: %d clocks\n", static_cast<int>(End - Begin));
}
@@ -124,7 +124,7 @@ namespace log2_
std::clock_t End = clock();
printf("glm::log2<ivec4> inlined no cast: %d clocks\n", static_cast<int>(End - Begin));
std::printf("glm::log2<ivec4> inlined no cast: %d clocks\n", static_cast<int>(End - Begin));
}
@@ -144,7 +144,7 @@ namespace log2_
std::clock_t End = clock();
printf("glm::log2<ivec4> reinterpret: %d clocks\n", static_cast<int>(End - Begin));
std::printf("glm::log2<ivec4> reinterpret: %d clocks\n", static_cast<int>(End - Begin));
}
# endif//GLM_HAS_BITSCAN_WINDOWS
@@ -159,7 +159,7 @@ namespace log2_
std::clock_t End = clock();
printf("glm::log2<float>: %d clocks\n", static_cast<int>(End - Begin));
std::printf("glm::log2<float>: %d clocks\n", static_cast<int>(End - Begin));
}
{
@@ -173,7 +173,7 @@ namespace log2_
std::clock_t End = clock();
printf("glm::log2<vec4>: %d clocks\n", static_cast<int>(End - Begin));
std::printf("glm::log2<vec4>: %d clocks\n", static_cast<int>(End - Begin));
}
return Error;

26
test/gtc/gtc_packing.cpp
View File

@@ -15,46 +15,46 @@ void print_bits(float const& s)
uif.f = s;
printf("f32: ");
std::printf("f32: ");
for(std::size_t j = sizeof(s) * 8; j > 0; --j)
{
if(j == 23 || j == 31)
printf(" ");
printf("%d", (uif.i & (1 << (j - 1))) ? 1 : 0);
std::printf(" ");
std::printf("%d", (uif.i & (1 << (j - 1))) ? 1 : 0);
}
}
void print_10bits(glm::uint const& s)
{
printf("10b: ");
std::printf("10b: ");
for(std::size_t j = 10; j > 0; --j)
{
if(j == 5)
printf(" ");
printf("%d", (s & (1 << (j - 1))) ? 1 : 0);
std::printf(" ");
std::printf("%d", (s & (1 << (j - 1))) ? 1 : 0);
}
}
void print_11bits(glm::uint const& s)
{
printf("11b: ");
std::printf("11b: ");
for(std::size_t j = 11; j > 0; --j)
{
if(j == 6)
printf(" ");
printf("%d", (s & (1 << (j - 1))) ? 1 : 0);
std::printf(" ");
std::printf("%d", (s & (1 << (j - 1))) ? 1 : 0);
}
}
void print_value(float const& s)
{
printf("%2.5f, ", static_cast<double>(s));
std::printf("%2.5f, ", static_cast<double>(s));
print_bits(s);
printf(", ");
std::printf(", ");
// print_11bits(detail::floatTo11bit(s));
// printf(", ");
// std::printf(", ");
// print_10bits(detail::floatTo10bit(s));
printf("\n");
std::printf("\n");
}
int test_Half1x16()