diff options
| author | sschirm <[email protected]> | 2017-02-27 16:40:12 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2017-03-01 18:04:26 +0100 |
| commit | 7840347c32755e94a807f978f1cbb558717ac8cf (patch) | |
| tree | 295cd3ca93a45f8fcc43cf3cbf3887c0e0c5526b /PhysX_3.4/Source/LowLevelAABB/src | |
| parent | Pre-release comments marking end of beta. (diff) | |
| download | physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.tar.xz physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.zip | |
PhysX 3.4, APEX 1.4 final release @21757769v3.4.0-rc-2
Diffstat (limited to 'PhysX_3.4/Source/LowLevelAABB/src')
| -rw-r--r-- | PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBPCommon.h | 2 | ||||
| -rw-r--r-- | PhysX_3.4/Source/LowLevelAABB/src/BpSimpleAABBManager.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBPCommon.h b/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBPCommon.h index 4f38b045..0001b1dc 100644 --- a/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBPCommon.h +++ b/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBPCommon.h @@ -43,7 +43,7 @@ namespace Bp #define MBP_USE_SENTINELS // Probably doesn't work with 16bits boxes #define MBP_USE_NO_CMP_OVERLAP //#define MBP_USE_NO_CMP_OVERLAP_3D // Seems slower -#if PX_INTEL_FAMILY +#if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) #define MBP_SIMD_OVERLAP #endif diff --git a/PhysX_3.4/Source/LowLevelAABB/src/BpSimpleAABBManager.cpp b/PhysX_3.4/Source/LowLevelAABB/src/BpSimpleAABBManager.cpp index 5c9cdbdd..1e3cb164 100644 --- a/PhysX_3.4/Source/LowLevelAABB/src/BpSimpleAABBManager.cpp +++ b/PhysX_3.4/Source/LowLevelAABB/src/BpSimpleAABBManager.cpp @@ -91,7 +91,7 @@ static const bool gUseBruteForce = false; //#define EXPERIMENT #define USE_MBP_PAIR_MANAGER #define STORE_SORTED_BOUNDS -#if PX_INTEL_FAMILY +#if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) #define USE_SIMD_BOUNDS #endif @@ -1354,7 +1354,7 @@ void Aggregate::sortBounds() }*/ } -#if PX_INTEL_FAMILY +#if PX_INTEL_FAMILY && !defined(PX_SIMD_DISABLED) #define SSE_CONST4(name, val) static const PX_ALIGN(16, PxU32 name[4]) = { (val), (val), (val), (val) } #define SSE_CONST(name) *(const __m128i *)&name #define SSE_CONSTF(name) *(const __m128 *)&name |