diff options
| author | sschirm <[email protected]> | 2016-12-23 14:20:36 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2016-12-23 14:56:17 +0100 |
| commit | ef6937e69e8ee3f409cf9d460d5ad300a65d5924 (patch) | |
| tree | 710426e8daa605551ce3f34b581897011101c30f /APEX_1.4/common/include | |
| parent | Initial commit: (diff) | |
| download | physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.tar.xz physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.zip | |
PhysX 3.4 / APEX 1.4 release candidate @21506124
Diffstat (limited to 'APEX_1.4/common/include')
| -rw-r--r-- | APEX_1.4/common/include/ApexMirrored.h | 15 | ||||
| -rw-r--r-- | APEX_1.4/common/include/P4Info.h | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/APEX_1.4/common/include/ApexMirrored.h b/APEX_1.4/common/include/ApexMirrored.h index 3ae808f7..c232d261 100644 --- a/APEX_1.4/common/include/ApexMirrored.h +++ b/APEX_1.4/common/include/ApexMirrored.h @@ -20,18 +20,21 @@ #include "PxTaskManager.h" #include "PxGpuDispatcher.h" -#include "PxGpuCopyDesc.h" -#include "PxGpuCopyDescQueue.h" -#include "PxCudaContextManager.h" -#include "PxCudaMemoryManager.h" -//#include <cuda.h> #if defined(__CUDACC__) #error "Mirrored arrays should not be visible to CUDA code. Send device pointers to CUDA kernels." #endif -#if !PX_SUPPORT_GPU_PHYSX +#if APEX_CUDA_SUPPORT + +#include "PxGpuCopyDesc.h" +#include "PxGpuCopyDescQueue.h" +#include "PxCudaContextManager.h" +#include "PxCudaMemoryManager.h" + //#include <cuda.h> +#else + #define PX_ALLOC_INFO(name, ID) __FILE__, __LINE__, name, physx::PxAllocId::ID #define PX_ALLOC_INFO_PARAMS_DECL(p0, p1, p2, p3) const char* file = p0, int line = p1, const char* allocName = p2, physx::PxAllocId::Enum allocId = physx::PxAllocId::p3 #define PX_ALLOC_INFO_PARAMS_DEF() const char* file, int line, const char* allocName, physx::PxAllocId::Enum allocId diff --git a/APEX_1.4/common/include/P4Info.h b/APEX_1.4/common/include/P4Info.h index 16ad7efb..5f89a15a 100644 --- a/APEX_1.4/common/include/P4Info.h +++ b/APEX_1.4/common/include/P4Info.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2013 NVIDIA Corporation. All rights reserved. #ifndef P4_INFO_H #define P4_INFO_H @@ -36,7 +36,7 @@ #define P4_APEX_BRANCH "trunk" -#define P4_BUILD_TIME "12:20:57, Fri Oct 21, 2016" +#define P4_BUILD_TIME "14:04:28, Thu Aug 6, 2015" #define AUTHOR_DISTRO "empty" |