From 3cc1861221d761b7f0301b9b61de4e1aa18c09f4 Mon Sep 17 00:00:00 2001 From: Sheikh Dawood Abdul Ajees Date: Mon, 20 Nov 2017 11:35:52 -0600 Subject: PhysX 3.4.1, APEX 1.4.1 Release @23131702 --- PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp') diff --git a/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp b/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp index 88d0d516..0ed04ce4 100644 --- a/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp +++ b/PhysX_3.4/Source/PhysX/src/gpu/PxPhysXGpuModuleLoader.cpp @@ -35,9 +35,12 @@ #include "PxGpu.h" #include "cudamanager/PxCudaContextManager.h" -#if PX_WINDOWS -#include "../../../Common/src/CmPhysXCommon.h" -#endif + +namespace physx +{ + // alias shared foundation to something usable + namespace Ps = shdfnd; +} #define STRINGIFY(x) #x #define GETSTRING(x) STRINGIFY(x) @@ -165,6 +168,12 @@ namespace physx *reinterpret_cast(&g_PxCreateCudaContextManager_Func) = dlsym(s_library, "PxCreateCudaContextManager"); *reinterpret_cast(&g_PxGetSuggestedCudaDeviceOrdinal_Func) = dlsym(s_library, "PxGetSuggestedCudaDeviceOrdinal"); } + + // Check for errors + if (s_library == NULL) + Ps::getFoundation().error(PxErrorCode::eINTERNAL_ERROR, __FILE__, __LINE__, "Failed to load PhysXGpu so!"); + if (g_PxCreatePhysXGpu_Func == NULL || g_PxCreateCudaContextManager_Func == NULL || g_PxGetSuggestedCudaDeviceOrdinal_Func == NULL) + Ps::getFoundation().error(PxErrorCode::eINTERNAL_ERROR, __FILE__, __LINE__, "PhysXGpu so is incompatible with this version of PhysX!"); } #endif // PX_LINUX -- cgit v1.2.3