From a6f750dd4148b1c2549150128ee0c21db30039b6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 20 Jul 2018 19:07:35 +0200 Subject: Fix T54455, T56053, T55564: Cycles OpenCL build error after recent changes. --- intern/cycles/util/util_math_float3.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'intern/cycles/util') 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)); -- cgit v1.2.3