Update Bullet to the latest commit 126b676

1 files changed, 68 insertions, 72 deletions

diff --git a/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h b/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h
index db6466e76b..6c82eed2a6 100644
--- a/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h
+++ b/thirdparty/bullet/Bullet3OpenCL/Initialize/b3OpenCLUtils.h
@@ -22,42 +22,41 @@ subject to the following restrictions:
 #include "b3OpenCLInclude.h"
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
+	///C API for OpenCL utilities: convenience functions, see below for C++ API
 
-///C API for OpenCL utilities: convenience functions, see below for C++ API
+	/// CL Context optionally takes a GL context. This is a generic type because we don't really want this code
+	/// to have to understand GL types. It is a HGLRC in _WIN32 or a GLXContext otherwise.
+	cl_context b3OpenCLUtils_createContextFromType(cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx, void* pGLDC, int preferredDeviceIndex, int preferredPlatformIndex, cl_platform_id* platformId);
 
-/// CL Context optionally takes a GL context. This is a generic type because we don't really want this code
-/// to have to understand GL types. It is a HGLRC in _WIN32 or a GLXContext otherwise.
-cl_context 	b3OpenCLUtils_createContextFromType(cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx , void* pGLDC , int preferredDeviceIndex , int preferredPlatformIndex, cl_platform_id* platformId);
-	
-int b3OpenCLUtils_getNumDevices(cl_context cxMainContext);
+	int b3OpenCLUtils_getNumDevices(cl_context cxMainContext);
 
-cl_device_id b3OpenCLUtils_getDevice(cl_context cxMainContext, int nr);
+	cl_device_id b3OpenCLUtils_getDevice(cl_context cxMainContext, int nr);
 
-void b3OpenCLUtils_printDeviceInfo(cl_device_id device);
+	void b3OpenCLUtils_printDeviceInfo(cl_device_id device);
 
-cl_kernel b3OpenCLUtils_compileCLKernelFromString( cl_context clContext,cl_device_id device, const char* kernelSource, const char* kernelName, cl_int* pErrNum, cl_program prog,const char* additionalMacros);
+	cl_kernel b3OpenCLUtils_compileCLKernelFromString(cl_context clContext, cl_device_id device, const char* kernelSource, const char* kernelName, cl_int* pErrNum, cl_program prog, const char* additionalMacros);
 
-//optional
-cl_program b3OpenCLUtils_compileCLProgramFromString( cl_context clContext,cl_device_id device, const char* kernelSource, cl_int* pErrNum,const char* additionalMacros  , const char* srcFileNameForCaching, bool disableBinaryCaching);
+	//optional
+	cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_device_id device, const char* kernelSource, cl_int* pErrNum, const char* additionalMacros, const char* srcFileNameForCaching, bool disableBinaryCaching);
 
-//the following optional APIs provide access using specific platform information
-int b3OpenCLUtils_getNumPlatforms(cl_int* pErrNum);
+	//the following optional APIs provide access using specific platform information
+	int b3OpenCLUtils_getNumPlatforms(cl_int* pErrNum);
+
+	///get the nr'th platform, where nr is in the range [0..getNumPlatforms)
+	cl_platform_id b3OpenCLUtils_getPlatform(int nr, cl_int* pErrNum);
 
-///get the nr'th platform, where nr is in the range [0..getNumPlatforms)
-cl_platform_id b3OpenCLUtils_getPlatform(int nr, cl_int* pErrNum);
+	void b3OpenCLUtils_printPlatformInfo(cl_platform_id platform);
 
+	const char* b3OpenCLUtils_getSdkVendorName();
 
-void b3OpenCLUtils_printPlatformInfo(cl_platform_id platform);
+	///set the path (directory/folder) where the compiled OpenCL kernel are stored
+	void b3OpenCLUtils_setCachePath(const char* path);
 
-const char* b3OpenCLUtils_getSdkVendorName();
-	
-///set the path (directory/folder) where the compiled OpenCL kernel are stored
-void b3OpenCLUtils_setCachePath(const char* path);
-	
-cl_context 	b3OpenCLUtils_createContextFromPlatform(cl_platform_id platform, cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx , void* pGLDC ,int preferredDeviceIndex , int preferredPlatformIndex);
+	cl_context b3OpenCLUtils_createContextFromPlatform(cl_platform_id platform, cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx, void* pGLDC, int preferredDeviceIndex, int preferredPlatformIndex);
 
 #ifdef __cplusplus
 }
@@ -71,37 +70,35 @@ typedef struct
 	char m_driverVersion[B3_MAX_STRING_LENGTH];
 	char m_deviceExtensions[B3_MAX_STRING_LENGTH];
 
-	cl_device_type		m_deviceType;
-	cl_uint 				m_computeUnits;
-	size_t 					m_workitemDims;
-	size_t 					m_workItemSize[3];
-	size_t 					m_image2dMaxWidth;
-	size_t 					m_image2dMaxHeight;
-	size_t 					m_image3dMaxWidth;
-	size_t 					m_image3dMaxHeight;
-	size_t 					m_image3dMaxDepth;
-	size_t 					m_workgroupSize;
-	cl_uint 				m_clockFrequency;
-	cl_ulong				m_constantBufferSize;
-	cl_ulong				m_localMemSize;
-	cl_ulong				m_globalMemSize;
-    cl_bool					m_errorCorrectionSupport;
+	cl_device_type m_deviceType;
+	cl_uint m_computeUnits;
+	size_t m_workitemDims;
+	size_t m_workItemSize[3];
+	size_t m_image2dMaxWidth;
+	size_t m_image2dMaxHeight;
+	size_t m_image3dMaxWidth;
+	size_t m_image3dMaxHeight;
+	size_t m_image3dMaxDepth;
+	size_t m_workgroupSize;
+	cl_uint m_clockFrequency;
+	cl_ulong m_constantBufferSize;
+	cl_ulong m_localMemSize;
+	cl_ulong m_globalMemSize;
+	cl_bool m_errorCorrectionSupport;
 	cl_device_local_mem_type m_localMemType;
-	cl_uint					m_maxReadImageArgs;
-	cl_uint					m_maxWriteImageArgs;
+	cl_uint m_maxReadImageArgs;
+	cl_uint m_maxWriteImageArgs;
 
-
-
-	cl_uint 				m_addressBits;
-	cl_ulong				m_maxMemAllocSize;
+	cl_uint m_addressBits;
+	cl_ulong m_maxMemAllocSize;
 	cl_command_queue_properties m_queueProperties;
-	cl_bool					m_imageSupport;
-	cl_uint					m_vecWidthChar;
-	cl_uint					m_vecWidthShort;
-	cl_uint					m_vecWidthInt;
-	cl_uint					m_vecWidthLong;
-	cl_uint					m_vecWidthFloat;
-	cl_uint					m_vecWidthDouble;
+	cl_bool m_imageSupport;
+	cl_uint m_vecWidthChar;
+	cl_uint m_vecWidthShort;
+	cl_uint m_vecWidthInt;
+	cl_uint m_vecWidthLong;
+	cl_uint m_vecWidthFloat;
+	cl_uint m_vecWidthDouble;
 
 } b3OpenCLDeviceInfo;
 
@@ -110,33 +107,32 @@ struct b3OpenCLPlatformInfo
 	char m_platformVendor[B3_MAX_STRING_LENGTH];
 	char m_platformName[B3_MAX_STRING_LENGTH];
 	char m_platformVersion[B3_MAX_STRING_LENGTH];
-	
+
 	b3OpenCLPlatformInfo()
 	{
-		m_platformVendor[0]=0;
-		m_platformName[0]=0;
-		m_platformVersion[0]=0;
+		m_platformVendor[0] = 0;
+		m_platformName[0] = 0;
+		m_platformVersion[0] = 0;
 	}
 };
 
-
 ///C++ API for OpenCL utilities: convenience functions
 struct b3OpenCLUtils
 {
 	/// CL Context optionally takes a GL context. This is a generic type because we don't really want this code
 	/// to have to understand GL types. It is a HGLRC in _WIN32 or a GLXContext otherwise.
-	static inline cl_context 	createContextFromType(cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx = 0, void* pGLDC = 0, int preferredDeviceIndex = -1, int preferredPlatformIndex= - 1, cl_platform_id* platformId=0)
+	static inline cl_context createContextFromType(cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx = 0, void* pGLDC = 0, int preferredDeviceIndex = -1, int preferredPlatformIndex = -1, cl_platform_id* platformId = 0)
 	{
-		return b3OpenCLUtils_createContextFromType(deviceType, pErrNum, pGLCtx , pGLDC , preferredDeviceIndex, preferredPlatformIndex, platformId);
+		return b3OpenCLUtils_createContextFromType(deviceType, pErrNum, pGLCtx, pGLDC, preferredDeviceIndex, preferredPlatformIndex, platformId);
 	}
-	
+
 	static inline int getNumDevices(cl_context cxMainContext)
 	{
 		return b3OpenCLUtils_getNumDevices(cxMainContext);
 	}
 	static inline cl_device_id getDevice(cl_context cxMainContext, int nr)
 	{
-		return b3OpenCLUtils_getDevice(cxMainContext,nr);
+		return b3OpenCLUtils_getDevice(cxMainContext, nr);
 	}
 
 	static void getDeviceInfo(cl_device_id device, b3OpenCLDeviceInfo* info);
@@ -146,28 +142,28 @@ struct b3OpenCLUtils
 		b3OpenCLUtils_printDeviceInfo(device);
 	}
 
-	static inline cl_kernel compileCLKernelFromString( cl_context clContext,cl_device_id device, const char* kernelSource, const char* kernelName, cl_int* pErrNum=0, cl_program prog=0,const char* additionalMacros = "" )
+	static inline cl_kernel compileCLKernelFromString(cl_context clContext, cl_device_id device, const char* kernelSource, const char* kernelName, cl_int* pErrNum = 0, cl_program prog = 0, const char* additionalMacros = "")
 	{
-		return b3OpenCLUtils_compileCLKernelFromString(clContext,device, kernelSource,  kernelName, pErrNum, prog,additionalMacros);
+		return b3OpenCLUtils_compileCLKernelFromString(clContext, device, kernelSource, kernelName, pErrNum, prog, additionalMacros);
 	}
 
 	//optional
-	static inline cl_program compileCLProgramFromString( cl_context clContext,cl_device_id device, const char* kernelSource, cl_int* pErrNum=0,const char* additionalMacros = "" , const char* srcFileNameForCaching=0, bool disableBinaryCaching=false)
+	static inline cl_program compileCLProgramFromString(cl_context clContext, cl_device_id device, const char* kernelSource, cl_int* pErrNum = 0, const char* additionalMacros = "", const char* srcFileNameForCaching = 0, bool disableBinaryCaching = false)
 	{
-		return b3OpenCLUtils_compileCLProgramFromString(clContext,device, kernelSource, pErrNum,additionalMacros, srcFileNameForCaching, disableBinaryCaching);
+		return b3OpenCLUtils_compileCLProgramFromString(clContext, device, kernelSource, pErrNum, additionalMacros, srcFileNameForCaching, disableBinaryCaching);
 	}
 
 	//the following optional APIs provide access using specific platform information
-	static inline int getNumPlatforms(cl_int* pErrNum=0)
+	static inline int getNumPlatforms(cl_int* pErrNum = 0)
 	{
 		return b3OpenCLUtils_getNumPlatforms(pErrNum);
 	}
 	///get the nr'th platform, where nr is in the range [0..getNumPlatforms)
-	static inline cl_platform_id getPlatform(int nr, cl_int* pErrNum=0)
+	static inline cl_platform_id getPlatform(int nr, cl_int* pErrNum = 0)
 	{
-		return b3OpenCLUtils_getPlatform(nr,pErrNum);
+		return b3OpenCLUtils_getPlatform(nr, pErrNum);
 	}
-	
+
 	static void getPlatformInfo(cl_platform_id platform, b3OpenCLPlatformInfo* platformInfo);
 
 	static inline void printPlatformInfo(cl_platform_id platform)
@@ -179,9 +175,9 @@ struct b3OpenCLUtils
 	{
 		return b3OpenCLUtils_getSdkVendorName();
 	}
-	static inline cl_context 	createContextFromPlatform(cl_platform_id platform, cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx = 0, void* pGLDC = 0,int preferredDeviceIndex = -1, int preferredPlatformIndex= -1)
+	static inline cl_context createContextFromPlatform(cl_platform_id platform, cl_device_type deviceType, cl_int* pErrNum, void* pGLCtx = 0, void* pGLDC = 0, int preferredDeviceIndex = -1, int preferredPlatformIndex = -1)
 	{
-		return b3OpenCLUtils_createContextFromPlatform(platform, deviceType, pErrNum, pGLCtx,pGLDC,preferredDeviceIndex, preferredPlatformIndex);
+		return b3OpenCLUtils_createContextFromPlatform(platform, deviceType, pErrNum, pGLCtx, pGLDC, preferredDeviceIndex, preferredPlatformIndex);
 	}
 	static void setCachePath(const char* path)
 	{
@@ -189,6 +185,6 @@ struct b3OpenCLUtils
 	}
 };
 
-#endif //__cplusplus
+#endif  //__cplusplus
 
-#endif // B3_OPENCL_UTILS_H
+#endif  // B3_OPENCL_UTILS_H