Changed the assert to a define so that it removed for CUDA debug compiles

glm/core/type_half.hpp

@@ -1,119 +1,119 @@
-///////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
-/// OpenGL Mathematics (glm.g-truc.net)
+/// OpenGL Mathematics (glm.g-truc.net)
-///
+///
-/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
+/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
-/// Permission is hereby granted, free of charge, to any person obtaining a copy
+/// Permission is hereby granted, free of charge, to any person obtaining a copy
-/// of this software and associated documentation files (the "Software"), to deal
+/// of this software and associated documentation files (the "Software"), to deal
-/// in the Software without restriction, including without limitation the rights
+/// in the Software without restriction, including without limitation the rights
-/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-/// copies of the Software, and to permit persons to whom the Software is
+/// copies of the Software, and to permit persons to whom the Software is
-/// furnished to do so, subject to the following conditions:
+/// furnished to do so, subject to the following conditions:
-/// 
+/// 
-/// The above copyright notice and this permission notice shall be included in
+/// The above copyright notice and this permission notice shall be included in
-/// all copies or substantial portions of the Software.
+/// all copies or substantial portions of the Software.
-/// 
+/// 
-/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-/// THE SOFTWARE.
+/// THE SOFTWARE.
-///
+///
-/// @ref core
+/// @ref core
-/// @file glm/core/type_half.hpp
+/// @file glm/core/type_half.hpp
-/// @date 2008-08-17 / 2011-09-20
+/// @date 2008-08-17 / 2011-09-20
-/// @author Christophe Riccio
+/// @author Christophe Riccio
-///////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////
-
+
-#ifndef glm_core_type_half
+#ifndef glm_core_type_half
-#define glm_core_type_half
+#define glm_core_type_half
-
+
-#include <cstdlib>
+#include <cstdlib>
-
+
-namespace glm{
+namespace glm{
-namespace detail
+namespace detail
-{
+{
-	typedef short hdata;
+	typedef short hdata;
-
+
-	GLM_FUNC_DECL float toFloat32(hdata value);
+	GLM_FUNC_DECL float toFloat32(hdata value);
-	hdata toFloat16(float const & value);
+	hdata toFloat16(float const & value);
-
+
-	/// 16-bit floating point type.
+	/// 16-bit floating point type.
-	/// @ingroup gtc_half_float
+	/// @ingroup gtc_half_float
-	class half
+	class half
-	{
+	{
-	public: 
+	public: 
-		// Constructors
+		// Constructors
-		GLM_FUNC_DECL half();
+		GLM_FUNC_DECL half();
-		GLM_FUNC_DECL half(half const & s);
+		GLM_FUNC_DECL half(half const & s);
-			
+			
-		template <typename U>
+		template <typename U>
-		GLM_FUNC_DECL explicit half(U const & s);
+		GLM_FUNC_DECL explicit half(U const & s);
-
+
-		// Cast
+		// Cast
-		template <typename U>
+		template <typename U>
-		GLM_FUNC_DECL operator U() const;
+		GLM_FUNC_DECL operator U() const;
-
+
-		// Unary updatable operators
+		// Unary updatable operators
-		GLM_FUNC_DECL half& operator= (half const & s);
+		GLM_FUNC_DECL half& operator= (half const & s);
-		GLM_FUNC_DECL half& operator+=(half const & s);
+		GLM_FUNC_DECL half& operator+=(half const & s);
-		GLM_FUNC_DECL half& operator-=(half const & s);
+		GLM_FUNC_DECL half& operator-=(half const & s);
-		GLM_FUNC_DECL half& operator*=(half const & s);
+		GLM_FUNC_DECL half& operator*=(half const & s);
-		GLM_FUNC_DECL half& operator/=(half const & s);
+		GLM_FUNC_DECL half& operator/=(half const & s);
-		GLM_FUNC_DECL half& operator++();
+		GLM_FUNC_DECL half& operator++();
-		GLM_FUNC_DECL half& operator--();
+		GLM_FUNC_DECL half& operator--();
-	
+	
-		GLM_FUNC_DECL float toFloat() const{return toFloat32(data);}
+		GLM_FUNC_DECL float toFloat() const{return toFloat32(data);}
-
+
-		GLM_FUNC_DECL hdata _data() const{return data;}
+		GLM_FUNC_DECL hdata _data() const{return data;}
-
+
-	private:
+	private:
-		hdata data;
+		hdata data;
-	};
+	};
-
+
-	half operator+ (half const & s1, half const & s2);
+	half operator+ (half const & s1, half const & s2);
-
+
-	half operator- (half const & s1, half const & s2);
+	half operator- (half const & s1, half const & s2);
-
+
-	half operator* (half const & s1, half const & s2);
+	half operator* (half const & s1, half const & s2);
-
+
-	half operator/ (half const & s1, half const & s2);
+	half operator/ (half const & s1, half const & s2);
-
+
-	// Unary constant operators
+	// Unary constant operators
-	half operator- (half const & s);
+	half operator- (half const & s);
-
+
-	half operator-- (half const & s, int);
+	half operator-- (half const & s, int);
-
+
-	half operator++ (half const & s, int);
+	half operator++ (half const & s, int);
-
+
-	bool operator==(
+	bool operator==(
-		detail::half const & x, 
+		detail::half const & x, 
-		detail::half const & y);
+		detail::half const & y);
-
+
-	bool operator!=(
+	bool operator!=(
-		detail::half const & x, 
+		detail::half const & x, 
-		detail::half const & y);
+		detail::half const & y);
-
+
-	bool operator<(
+	bool operator<(
-		detail::half const & x, 
+		detail::half const & x, 
-		detail::half const & y);
+		detail::half const & y);
-
+
-	bool operator<=(
+	bool operator<=(
-		detail::half const & x, 
+		detail::half const & x, 
-		detail::half const & y);
+		detail::half const & y);
-
+
-	bool operator>(
+	bool operator>(
-		detail::half const & x, 
+		detail::half const & x, 
-		detail::half const & y);
+		detail::half const & y);
-
+
-	bool operator>=(
+	bool operator>=(
-		detail::half const & x, 
+		detail::half const & x, 
-		detail::half const & y);
+		detail::half const & y);
-
+
-}//namespace detail
+}//namespace detail
-}//namespace glm
+}//namespace glm
-
+
-#include "type_half.inl"
+#include "type_half.inl"
-
+
-#endif//glm_core_type_half
+#endif//glm_core_type_half

glm/core/type_vec3.inl

@@ -45,7 +45,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->length());
+		ASSERT(i < this->length());
 		return (&x)[i];
 	}
 
@@ -56,7 +56,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->length());
+		ASSERT(i < this->length());
 		return (&x)[i];
 	}
 

glm/glm.hpp

@@ -88,6 +88,12 @@
 //#include <type_traits>
 #include "core/setup.hpp"
 
+#if (GLM_COMPILER & GLM_COMPILER_CUDA)
+	#define ASSERT(s)
+#else
+	#define ASSERT(s) assert(s);
+#endif
+
 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED))
 #	define GLM_MESSAGE_CORE_INCLUDED_DISPLAYED
 #	pragma message("GLM: Core library included")