Browse Source

Merge branch '0.9.8'

Christophe Riccio 9 years ago
parent
commit
e671d50e05
1 changed files with 7 additions and 1 deletions
  1. 7 1
      glm/detail/func_common.inl

+ 7 - 1
glm/detail/func_common.inl

@@ -439,7 +439,13 @@ namespace detail
 	template <typename genType>
 	template <typename genType>
 	GLM_FUNC_QUALIFIER genType mod(genType x, genType y)
 	GLM_FUNC_QUALIFIER genType mod(genType x, genType y)
 	{
 	{
-		return mod(tvec1<genType>(x), y).x;
+#		if GLM_COMPILER & GLM_COMPILER_CUDA
+			// Another Cuda compiler bug https://github.com/g-truc/glm/issues/530
+			tvec1<genType, defaultp> Result(mod(tvec1<genType, defaultp>(x), y));
+			return Result.x;
+#		else
+			return mod(tvec1<genType, defaultp>(x), y).x;
+#		endif
 	}
 	}
 
 
 	template <typename T, precision P, template <typename, precision> class vecType>
 	template <typename T, precision P, template <typename, precision> class vecType>