mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed build on QT Creqtor

Browse Source
This commit is contained in:
Christophe Riccio 2010-12-15 00:03:47 +00:00
parent 35aaedb95c
commit 47f1d6e5cc
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glm/glm.hpp
View File

@ -108,16 +108,15 @@ namespace glm
#if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC)) #if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC))
# define GLM_DEPRECATED __declspec(deprecated) # define GLM_DEPRECATED __declspec(deprecated)
# define GLM_RESTRICT __restrict # define GLM_RESTRICT __restrict
# define GLM_ALIGN(x) __declspec(align(x)) # define GLM_ALIGNED(keyword, x) __declspec(align(x)) keyword
//# define aligned(x) __declspec(align(x)) struct
#elif(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_GCC)) #elif(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_GCC))
# define GLM_DEPRECATED deprecated # define GLM_DEPRECATED /*deprecated*/
# define GLM_RESTRICT # define GLM_RESTRICT
# define GLM_ALIGN(x) __attribute__(aligned(x)) # define GLM_ALIGNED(keyword, x) keyword __attribute__(aligned(x))
#else #else
# define GLM_DEPRECATED # define GLM_DEPRECATED
# define GLM_RESTRICT # define GLM_RESTRICT
# define GLM_ALIGN(x) # define GLM_ALIGN_UNION(x) union
#endif//GLM_COMPILER #endif//GLM_COMPILER
//////////////////// ////////////////////

2
glm/gtx/simd_mat4.hpp
View File

@ -24,7 +24,7 @@ namespace glm
{ {
namespace detail namespace detail
{ {
GLM_ALIGN(16) struct fmat4x4SIMD GLM_ALIGNED(struct, 16) fmat4x4SIMD
{ {
static __m128 one; static __m128 one;

12
glm/gtx/simd_vec4.hpp
View File

@ -22,18 +22,8 @@ namespace glm
{ {
namespace detail namespace detail
{ {
static __m128 one; GLM_ALIGNED(union, 4) fvec4SIMD
GLM_ALIGN(4) union fvec4SIMD
{ {
enum ctor{null};
typedef T value_type;
typedef std::size_t size_type;
static size_type value_size();
typedef tvec4<T> type;
typedef tvec4<bool> bool_type;
enum ctor{null}; enum ctor{null};
typedef float value_type; typedef float value_type;
typedef std::size_t size_type; typedef std::size_t size_type;

2
glm/gtx/simd_vec4.inl
View File

@ -11,7 +11,7 @@ namespace glm
{ {
namespace detail namespace detail
{ {
__m128 fvec4SIMD::one = _mm_set_ps1(1.f); //__m128 fvec4SIMD::one = _mm_set_ps1(1.f);
////////////////////////////////////// //////////////////////////////////////
// Implicit basic constructors // Implicit basic constructors