[Bf-blender-cvs] [a6f750dd414] master: Fix T54455, T56053, T55564: Cycles OpenCL build error after recent changes.

Brecht Van Lommel noreply at git.blender.org
Fri Jul 20 19:14:05 CEST 2018


Commit: a6f750dd4148b1c2549150128ee0c21db30039b6
Author: Brecht Van Lommel
Date:   Fri Jul 20 19:07:35 2018 +0200
Branches: master
https://developer.blender.org/rBa6f750dd4148b1c2549150128ee0c21db30039b6

Fix T54455, T56053, T55564: Cycles OpenCL build error after recent changes.

===================================================================

M	intern/cycles/kernel/svm/svm_voronoi.h
M	intern/cycles/util/util_math_float3.h

===================================================================

diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/svm_voronoi.h
index e5e350bf76a..75af910d940 100644
--- a/intern/cycles/kernel/svm/svm_voronoi.h
+++ b/intern/cycles/kernel/svm/svm_voronoi.h
@@ -52,7 +52,7 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance,
 					case NODE_VORONOI_CHEBYCHEV:
 						d = max3(fabs(vp - p));
 						break;
-					case NODE_VORONOI_MINKOWSKI:
+					case NODE_VORONOI_MINKOWSKI: {
 						float3 n = fabs(vp - p);
 						if(e == 0.5f) {
 							d = sqr(reduce_add(sqrt(n)));
@@ -61,6 +61,7 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance,
 							d = powf(reduce_add(pow3(n, e)), 1.0f/e);
 						}
 						break;
+					}
 				}
 
 				/* To keep the shortest four distances and associated points we have to keep them in sorted order. */
diff --git a/intern/cycles/util/util_math_float3.h b/intern/cycles/util/util_math_float3.h
index ba1c117cdea..75265c1c9a2 100644
--- a/intern/cycles/util/util_math_float3.h
+++ b/intern/cycles/util/util_math_float3.h
@@ -280,11 +280,6 @@ ccl_device_inline float3 sqrt(const float3& a)
 #endif
 }
 
-ccl_device_inline float3 pow3(const float3& a, float e)
-{
-	return make_float3(powf(a.x, e), powf(a.y, e), powf(a.z, e));
-}
-
 ccl_device_inline float3 mix(const float3& a, const float3& b, float t)
 {
 	return a + t*(b - a);
@@ -382,6 +377,11 @@ ccl_device_inline bool isequal_float3(const float3 a, const float3 b)
 #endif
 }
 
+ccl_device_inline float3 pow3(float3 v, float e)
+{
+	return make_float3(powf(v.x, e), powf(v.y, e), powf(v.z, e));
+}
+
 ccl_device_inline float3 exp3(float3 v)
 {
 	return make_float3(expf(v.x), expf(v.y), expf(v.z));



More information about the Bf-blender-cvs mailing list