mewin/glm
1
0
Fork 0
Code Releases Activity

Merged remote master

Browse Source
This commit is contained in:
Groove 2018-07-31 23:11:45 +02:00
commit 269ae64128
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/setup.hpp
View File

@ -597,7 +597,7 @@ namespace glm
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Configure the use of aligned gentypes // Configure the use of aligned gentypes
#if defined(GLM_FORCE_ALIGNED_GENTYPES) && GLM_HAS_ALIGNOF && (GLM_LANG & GLM_LANG_CXXMS_FLAG) #if GLM_HAS_ALIGNOF && (GLM_LANG & GLM_LANG_CXXMS_FLAG)
# define GLM_CONFIG_ALIGNED_GENTYPES GLM_ENABLE # define GLM_CONFIG_ALIGNED_GENTYPES GLM_ENABLE
#else #else
# define GLM_CONFIG_ALIGNED_GENTYPES GLM_DISABLE # define GLM_CONFIG_ALIGNED_GENTYPES GLM_DISABLE

2
glm/gtc/type_aligned.hpp
View File

@ -13,7 +13,7 @@
#pragma once #pragma once
#if !GLM_CONFIG_ANONYMOUS_STRUCT #if !GLM_CONFIG_ANONYMOUS_STRUCT
# error "GLM: Aligned gentypes require to enable C++ language extensions and to define GLM_FORCE_ALIGNED_GENTYPES before including GLM headers." # error "GLM: Aligned gentypes require to enable C++ language extensions."
#endif #endif
#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)

2
manual.md
View File

@ -78,7 +78,7 @@
+ [9.4. Tutorials using GLM](#section9_4) + [9.4. Tutorials using GLM](#section9_4)
+ [9.5. Equivalent for other languages](#section9_5) + [9.5. Equivalent for other languages](#section9_5)
+ [9.6. Alternatives to GLM](#section9_6) + [9.6. Alternatives to GLM](#section9_6)
+ [9.8. Acknowledgements](#section9_8) + [9.7. Acknowledgements](#section9_7)
--- ---
## <a name="section0"></a> Licenses ## <a name="section0"></a> Licenses

2
test/core/core_force_aligned_gentypes.cpp
View File

@ -1,5 +1,3 @@
#define GLM_FORCE_ALIGNED_GENTYPES
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/ext.hpp> #include <glm/ext.hpp>

1
test/gtc/gtc_type_aligned.cpp
View File

@ -1,4 +1,3 @@
#define GLM_FORCE_ALIGNED_GENTYPES
#include <glm/glm.hpp> #include <glm/glm.hpp>
#if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE #if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE

8
test/gtx/gtx_load.cpp
View File

@ -1,13 +1,19 @@
#define GLM_FORCE_ALIGNED_GENTYPES
#define GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL
#include <glm/glm.hpp>
/*
#if GLM_USE_SIMD == GLM_ENABLE && GLM_USE_ALIGNED_GENTYPES == GLM_ENABLE
#include <glm/gtx/common.hpp> #include <glm/gtx/common.hpp>
#include <glm/gtc/integer.hpp> #include <glm/gtc/integer.hpp>
#include <glm/gtc/epsilon.hpp> #include <glm/gtc/epsilon.hpp>
#include <glm/gtc/type_aligned.hpp> #include <glm/gtc/type_aligned.hpp>
#include <glm/ext/vector_relational.hpp> #include <glm/ext/vector_relational.hpp>
<<<<<<< HEAD
#include <glm/glm.hpp> #include <glm/glm.hpp>
/* /*
#if GLM_CONFIG_SIMD == GLM_ENABLE && GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE #if GLM_CONFIG_SIMD == GLM_ENABLE && GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
=======
>>>>>>> b4a2eb14070b391370d94b0165681387ff37dc9c
namespace glm namespace glm
{ {