mewin/glm
1
0
Fork 0
Code Releases Activity

Improved aligned types support

Browse Source
This commit is contained in:
Christophe Riccio
2016-07-17 03:06:58 +02:00
parent eb20cdc6ae
commit b3d57f2cc9
8 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/setup.hpp
View File

@@ -647,6 +647,10 @@
# define GLM_EXPLICIT
#endif
///////////////////////////////////////////////////////////////////////////////////
#define GLM_HAS_ALIGNED_TYPE GLM_HAS_UNRESTRICTED_UNIONS
///////////////////////////////////////////////////////////////////////////////////
// Length type

29
glm/detail/type_vec.hpp
View File

@@ -16,7 +16,7 @@ namespace detail
uint8 data[size];
} type;
};
/*
template <typename T, std::size_t size>
struct storage<T, size, true>
{
@@ -24,7 +24,7 @@ namespace detail
uint8 data[size];
} type;
};
*/
# if GLM_ARCH & GLM_ARCH_SSE2_BIT
template <>
struct storage<float, 16, true>
@@ -43,6 +43,31 @@ namespace detail
{
typedef glm_uvec4 type;
};
/*
# else
typedef union __declspec(align(16)) glm_128
{
unsigned __int8 data[16];
} glm_128;
template <>
struct storage<float, 16, true>
{
typedef glm_128 type;
};
template <>
struct storage<int, 16, true>
{
typedef glm_128 type;
};
template <>
struct storage<unsigned int, 16, true>
{
typedef glm_128 type;
};
*/
# endif
# if (GLM_ARCH & GLM_ARCH_AVX_BIT)

2
glm/detail/type_vec1.hpp
View File

@@ -27,7 +27,7 @@ namespace glm
// -- Data --
# if GLM_HAS_UNRESTRICTED_UNIONS && (defined(GLM_SWIZZLE) || (GLM_ARCH & (GLM_ARCH_SSE2_BIT | GLM_ARCH_NEON_BIT)))
# if GLM_HAS_ALIGNED_TYPE
# if GLM_COMPILER & GLM_COMPILER_GCC
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wpedantic"

2
glm/detail/type_vec2.hpp
View File

@@ -26,7 +26,7 @@ namespace glm
// -- Data --
# if GLM_HAS_UNRESTRICTED_UNIONS && (defined(GLM_SWIZZLE) || (GLM_ARCH & (GLM_ARCH_SSE2_BIT | GLM_ARCH_NEON_BIT)))
# if GLM_HAS_ALIGNED_TYPE
# if GLM_COMPILER & GLM_COMPILER_GCC
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wpedantic"

2
glm/detail/type_vec3.hpp
View File

@@ -26,7 +26,7 @@ namespace glm
// -- Data --
# if GLM_HAS_UNRESTRICTED_UNIONS && (defined(GLM_SWIZZLE) || (GLM_ARCH & (GLM_ARCH_SSE2_BIT | GLM_ARCH_NEON_BIT)))
# if GLM_HAS_ALIGNED_TYPE
# if GLM_COMPILER & GLM_COMPILER_GCC
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wpedantic"

2
glm/detail/type_vec4.hpp
View File

@@ -27,7 +27,7 @@ namespace glm
// -- Data --
# if GLM_HAS_UNRESTRICTED_UNIONS && (defined(GLM_SWIZZLE) || (GLM_ARCH & (GLM_ARCH_SSE2_BIT | GLM_ARCH_NEON_BIT)))
# if GLM_HAS_ALIGNED_TYPE
# if GLM_COMPILER & GLM_COMPILER_GCC
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wpedantic"

2
glm/gtc/quaternion.hpp
View File

@@ -40,7 +40,7 @@ namespace glm
// -- Data --
# if GLM_HAS_UNRESTRICTED_UNIONS && (defined(GLM_SWIZZLE) || (GLM_ARCH & (GLM_ARCH_SSE2_BIT | GLM_ARCH_NEON_BIT)))
# if GLM_HAS_ALIGNED_TYPE
# if GLM_COMPILER & GLM_COMPILER_GCC
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wpedantic"