mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.3' into 0.9.4

Browse Source
This commit is contained in:
Christophe Riccio
2012-03-16 21:55:54 +00:00
parent f267b6ea18 cca0dfa3b9
commit 81efafa976
354 changed files with 37 additions and 50010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
glm/core/setup.hpp
View File

@@ -263,21 +263,21 @@
// Clang
#elif defined(__clang__)
# if(CLANG_VERSION_MAJOR == 2) && (CLANG_VERSION_MINOR == 6)
# if(__clang_major__ == 2) && (__clang_minor__ == 6)
# define GLM_COMPILER GLM_COMPILER_CLANG26
# elif(CLANG_VERSION_MAJOR == 2) && (CLANG_VERSION_MINOR == 7)
# elif(__clang_major__ == 2) && (__clang_minor__ == 7)
# define GLM_COMPILER GLM_COMPILER_CLANG27
# elif(CLANG_VERSION_MAJOR == 2) && (CLANG_VERSION_MINOR == 8)
# elif(__clang_major__ == 2) && (__clang_minor__ == 8)
# define GLM_COMPILER GLM_COMPILER_CLANG28
# elif(CLANG_VERSION_MAJOR == 2) && (CLANG_VERSION_MINOR == 9)
# elif(__clang_major__ == 2) && (__clang_minor__ == 9)
# define GLM_COMPILER GLM_COMPILER_CLANG29
# elif(CLANG_VERSION_MAJOR == 3) && (CLANG_VERSION_MINOR == 0)
# elif(__clang_major__ == 3) && (__clang_minor__ == 0)
# define GLM_COMPILER GLM_COMPILER_CLANG30
# elif(CLANG_VERSION_MAJOR == 3) && (CLANG_VERSION_MINOR == 1)
# elif(__clang_major__ == 3) && (__clang_minor__ == 1)
# define GLM_COMPILER GLM_COMPILER_CLANG31
# elif(CLANG_VERSION_MAJOR == 3) && (CLANG_VERSION_MINOR == 2)
# elif(__clang_major__ == 3) && (__clang_minor__ == 2)
# define GLM_COMPILER GLM_COMPILER_CLANG32
# elif(CLANG_VERSION_MAJOR == 3) && (CLANG_VERSION_MINOR == 3)
# elif(__clang_major__ == 3) && (__clang_minor__ == 3)
# define GLM_COMPILER GLM_COMPILER_CLANG33
# else
# define GLM_COMPILER GLM_COMPILER_CLANG

2
glm/gtx/simd_mat4.inl
View File

@@ -157,7 +157,7 @@ GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator/=
)
{
__m128 Inv[4];
sse_inverse_ps(&this->Data[0].Data, Inv);
sse_inverse_ps(&m.Data[0].Data, Inv);
sse_mul_ps(&this->Data[0].Data, Inv, &this->Data[0].Data);
return *this;
}