Fixed build on Mac GCC

This commit is contained in:
Christophe Riccio 2010-12-14 22:34:11 +00:00
parent e346df1889
commit a0b835d2f5
4 changed files with 17 additions and 7 deletions

View File

@ -85,7 +85,7 @@ int main()
glm::mat4x3 p = x * m;
glm::mat4x3 q = m * x;
}
/*
class test
{
private:
@ -101,7 +101,7 @@ int main()
{
TestMap.insert(std::make_pair(3, new test));
}
*/
//{
// glm::mat3x4 m(1.0f);
// glm::vec3 v(1.0f);

View File

@ -164,11 +164,12 @@ inline __m128 _mm_flr_ps(__m128 x)
}
//trunc
/*
inline __m128 _mm_trc_ps(__m128 v)
{
return __m128();
}
*/
//round
inline __m128 _mm_rnd_ps(__m128 x)
{

View File

@ -16,6 +16,7 @@
// Dependency:
#include "../glm.hpp"
#include "../gtx/simd_vec4.hpp"
#include <xmmintrin.h>
#include <emmintrin.h>

View File

@ -21,9 +21,19 @@
namespace glm
{
namespace detail
{
{
static __m128 one;
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};
typedef float value_type;
typedef std::size_t size_type;
@ -32,8 +42,6 @@ namespace glm
typedef fvec4SIMD type;
typedef tvec4<bool> bool_type;
static __m128 one;
__m128 Data;
float Array[4];
struct{float x, y, z, w;};