diff options
Diffstat (limited to 'NvCloth/src/neon')
| -rw-r--r-- | NvCloth/src/neon/NeonCollision.cpp | 2 | ||||
| -rw-r--r-- | NvCloth/src/neon/NeonSelfCollision.cpp | 2 | ||||
| -rw-r--r-- | NvCloth/src/neon/NeonSolverKernel.cpp | 11 |
3 files changed, 12 insertions, 3 deletions
diff --git a/NvCloth/src/neon/NeonCollision.cpp b/NvCloth/src/neon/NeonCollision.cpp index fe45778..16269ac 100644 --- a/NvCloth/src/neon/NeonCollision.cpp +++ b/NvCloth/src/neon/NeonCollision.cpp @@ -31,4 +31,4 @@ #error This file needs to be compiled with NEON support! #endif -#include "SwCollision.cpp" +// SwCollision.cpp is compiled already using Neon implementation when Neon macros are found diff --git a/NvCloth/src/neon/NeonSelfCollision.cpp b/NvCloth/src/neon/NeonSelfCollision.cpp index 8faa407..3e7e96d 100644 --- a/NvCloth/src/neon/NeonSelfCollision.cpp +++ b/NvCloth/src/neon/NeonSelfCollision.cpp @@ -31,4 +31,4 @@ #error This file needs to be compiled with NEON support! #endif -#include "SwSelfCollision.cpp" +// SwSelfCollision.cpp is compiled already using Neon implementation when Neon macros are found diff --git a/NvCloth/src/neon/NeonSolverKernel.cpp b/NvCloth/src/neon/NeonSolverKernel.cpp index 6eb26cf..5e8dbd0 100644 --- a/NvCloth/src/neon/NeonSolverKernel.cpp +++ b/NvCloth/src/neon/NeonSolverKernel.cpp @@ -31,14 +31,23 @@ #error This file needs to be compiled with NEON support! #endif -#include "SwSolverKernel.cpp" +// SwSolverKernel.cpp is compiled already using Neon implementation when Neon macros are found +#include "SwSolverKernel.h" +// On Android armeabi-v7a (32-bits) NEON support is not guaranteed, so there must be an additional runtime check. +#if NV_ANDROID && defined __arm__ #include "../ps/android/cpu-features.h" namespace { const bool sNeonSupport = ANDROID_CPU_ARM_FEATURE_NEON & android_getCpuFeatures(); } +#else +namespace +{ + const bool sNeonSupport = true; +} +#endif namespace nv { |