mewin/glm
1
0
Fork 0
Code Releases Activity

Improved pure code path

Browse Source
This commit is contained in:
Christophe Riccio
2011-10-18 11:21:34 +01:00
parent 911df15e8a
commit b056a22498
4 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtx/simd_mat4.hpp
View File

@@ -41,6 +41,8 @@
// Dependency: // Dependency:
#include "../glm.hpp" #include "../glm.hpp"
#if(GLM_ARCH != GLM_ARCH_PURE)
#if(GLM_ARCH & GLM_ARCH_SSE2) #if(GLM_ARCH & GLM_ARCH_SSE2)
# include "../core/intrinsic_matrix.hpp" # include "../core/intrinsic_matrix.hpp"
# include "../gtx/simd_vec4.hpp" # include "../gtx/simd_vec4.hpp"
@@ -197,4 +199,6 @@ namespace detail
#include "simd_mat4.inl" #include "simd_mat4.inl"
#endif//(GLM_ARCH != GLM_ARCH_PURE)
#endif//GLM_GTX_simd_mat4 #endif//GLM_GTX_simd_mat4

4
glm/gtx/simd_vec4.hpp
View File

@@ -41,6 +41,8 @@
// Dependency: // Dependency:
#include "../glm.hpp" #include "../glm.hpp"
#if(GLM_ARCH != GLM_ARCH_PURE)
#if(GLM_ARCH & GLM_ARCH_SSE2) #if(GLM_ARCH & GLM_ARCH_SSE2)
# include "../core/intrinsic_common.hpp" # include "../core/intrinsic_common.hpp"
# include "../core/intrinsic_geometric.hpp" # include "../core/intrinsic_geometric.hpp"
@@ -488,4 +490,6 @@ namespace detail
#include "simd_vec4.inl" #include "simd_vec4.inl"
#endif//(GLM_ARCH != GLM_ARCH_PURE)
#endif//GLM_GTX_simd_vec4 #endif//GLM_GTX_simd_vec4

12
test/gtx/gtx_simd_mat4.cpp
View File

@@ -18,6 +18,8 @@
#include <ctime> #include <ctime>
#include <vector> #include <vector>
#if(GLM_ARCH != GLM_ARCH_PURE)
std::vector<float> test_detA(std::vector<glm::mat4> const & Data) std::vector<float> test_detA(std::vector<glm::mat4> const & Data)
{ {
std::vector<float> Test(Data.size()); std::vector<float> Test(Data.size());
@@ -288,3 +290,13 @@ int main()
return Error; return Error;
} }
#else
int main()
{
int Error = 0;
return Error;
}
#endif//(GLM_ARCH != GLM_ARCH_PURE)

13
test/gtx/gtx_simd_vec4.cpp
View File

@@ -11,6 +11,8 @@
#include <glm/gtx/simd_vec4.hpp> #include <glm/gtx/simd_vec4.hpp>
#include <cstdio> #include <cstdio>
#if(GLM_ARCH != GLM_ARCH_PURE)
int main() int main()
{ {
glm::simdVec4 A1(0.0f, 0.1f, 0.2f, 0.3f); glm::simdVec4 A1(0.0f, 0.1f, 0.2f, 0.3f);
@@ -28,3 +30,14 @@ int main()
return 0; return 0;
} }
#else
int main()
{
int Error = 0;
return Error;
}
#endif//(GLM_ARCH != GLM_ARCH_PURE)