mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://github.com/mysticbob/glm into linux

Browse Source
This commit is contained in:
Christophe Riccio 2011-02-07 10:20:29 +00:00
commit c2b2467504
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/_detail.hpp
View File

@ -327,7 +327,7 @@ namespace detail
# define GLM_RESTRICT_VAR __restrict # define GLM_RESTRICT_VAR __restrict
#elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC31)) #elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC31))
# define GLM_DEPRECATED __attribute__((__deprecated__)) # define GLM_DEPRECATED __attribute__((__deprecated__))
# define GLM_ALIGN(x) __attribute__(aligned(x)) # define GLM_ALIGN(x) __attribute__((aligned(x)))
# if(GLM_COMPILER >= GLM_COMPILER_GCC33) # if(GLM_COMPILER >= GLM_COMPILER_GCC33)
# define GLM_RESTRICT __restrict__ # define GLM_RESTRICT __restrict__
# define GLM_RESTRICT_VAR __restrict__ # define GLM_RESTRICT_VAR __restrict__

20
test/gtx/gtx-simd-mat4.cpp
View File

@ -28,7 +28,7 @@ std::vector<float> test_detA(std::vector<glm::mat4> const & Data)
Test[i] = glm::determinant(Data[i]); Test[i] = glm::determinant(Data[i]);
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Det A: %d\n", TimeEnd - TimeStart); printf("Det A: %ld\n", TimeEnd - TimeStart);
return Test; return Test;
} }
@ -49,7 +49,7 @@ std::vector<float> test_detB(std::vector<glm::mat4> const & Data)
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Det B: %d\n", TimeEnd - TimeStart); printf("Det B: %ld\n", TimeEnd - TimeStart);
return Test; return Test;
} }
@ -70,7 +70,7 @@ std::vector<float> test_detC(std::vector<glm::mat4> const & Data)
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Det C: %d\n", TimeEnd - TimeStart); printf("Det C: %ld\n", TimeEnd - TimeStart);
return Test; return Test;
} }
@ -91,7 +91,7 @@ std::vector<float> test_detD(std::vector<glm::mat4> const & Data)
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Det D: %d\n", TimeEnd - TimeStart); printf("Det D: %ld\n", TimeEnd - TimeStart);
return Test; return Test;
} }
@ -109,7 +109,7 @@ void test_invA(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Inv A: %d\n", TimeEnd - TimeStart); printf("Inv A: %ld\n", TimeEnd - TimeStart);
} }
void test_invC(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out) void test_invC(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
@ -129,7 +129,7 @@ void test_invC(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Inv C: %d\n", TimeEnd - TimeStart); printf("Inv C: %ld\n", TimeEnd - TimeStart);
} }
void test_invD(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out) void test_invD(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
@ -149,7 +149,7 @@ void test_invD(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Inv D: %d\n", TimeEnd - TimeStart); printf("Inv D: %ld\n", TimeEnd - TimeStart);
} }
void test_mulA(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out) void test_mulA(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
@ -165,7 +165,7 @@ void test_mulA(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Mul A: %d\n", TimeEnd - TimeStart); printf("Mul A: %ld\n", TimeEnd - TimeStart);
} }
void test_mulD(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out) void test_mulD(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out)
@ -183,7 +183,7 @@ void test_mulD(std::vector<glm::mat4> const & Data, std::vector<glm::mat4> & Out
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("Mul D: %d\n", TimeEnd - TimeStart); printf("Mul D: %ld\n", TimeEnd - TimeStart);
} }
int test_compute_glm() int test_compute_glm()
@ -222,7 +222,7 @@ int test_compute_gtx()
} }
std::clock_t TimeEnd = clock(); std::clock_t TimeEnd = clock();
printf("test_compute_gtx: %d\n", TimeEnd - TimeStart); printf("test_compute_gtx: %ld\n", TimeEnd - TimeStart);
return Output.size() != 0; return Output.size() != 0;
} }