mewin/glm
1
0
Fork 0
Code Releases Activity

Merge 0.9.8 branch

Browse Source
This commit is contained in:
Christophe Riccio
2016-07-17 11:52:15 +02:00
parent 48ab7db993 867f03c5f2
commit ecc91d4361
18 changed files with 138 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/gtc/gtc_type_aligned.cpp
View File

@@ -1,6 +1,16 @@
#define GLM_FORCE_ALIGNED
#define GLM_MESSAGES
#include <glm/glm.hpp>
#if GLM_HAS_ALIGNED_TYPE
#include <glm/gtc/type_aligned.hpp>
GLM_STATIC_ASSERT(glm::detail::is_aligned<glm::aligned_lowp>::value, "aligned_lowp is not aligned");
GLM_STATIC_ASSERT(glm::detail::is_aligned<glm::aligned_mediump>::value, "aligned_mediump is not aligned");
GLM_STATIC_ASSERT(glm::detail::is_aligned<glm::aligned_highp>::value, "aligned_highp is not aligned");
GLM_STATIC_ASSERT(!glm::detail::is_aligned<glm::packed_highp>::value, "packed_highp is aligned");
GLM_STATIC_ASSERT(!glm::detail::is_aligned<glm::packed_mediump>::value, "packed_mediump is aligned");
GLM_STATIC_ASSERT(!glm::detail::is_aligned<glm::packed_lowp>::value, "packed_lowp is aligned");
struct my_vec4_packed
{
glm::uint32 a;
@@ -27,7 +37,6 @@ struct my_dvec4_aligned
glm::uint64 a;
glm::aligned_dvec4 b;
};
//FIXME
//GLM_STATIC_ASSERT(sizeof(my_dvec4_aligned) == sizeof(glm::aligned_dvec4) * 2, "glm::dvec4 aligned is not correct");
struct my_ivec4_packed
@@ -81,7 +90,6 @@ int test_copy()
return Error;
}
int main()
{
int Error = 0;
@@ -99,3 +107,12 @@ int main()
return Error;
}
#else
int main()
{
return 0;
}
#endif//GLM_HAS_ALIGNED_TYPE

8
test/gtx/gtx_io.cpp
View File

@@ -17,9 +17,11 @@ namespace
case glm::highp: os << "uhi"; break;
case glm::mediump: os << "umd"; break;
case glm::lowp: os << "ulo"; break;
case glm::aligned_highp: os << "ahi"; break;
case glm::aligned_mediump: os << "amd"; break;
case glm::aligned_lowp: os << "alo"; break;
# if GLM_HAS_ALIGNED_TYPE
case glm::aligned_highp: os << "ahi"; break;
case glm::aligned_mediump: os << "amd"; break;
case glm::aligned_lowp: os << "alo"; break;
# endif
}
}