From 12af958c722a6ab205ad4ead677d087903196ebb Mon Sep 17 00:00:00 2001 From: PiterLewis Date: Fri, 2 Oct 2026 16:35:01 +0200 Subject: [PATCH] fix c++20 lerp conflict --- cxx/helper_math.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cxx/helper_math.h b/cxx/helper_math.h index 0fdfada..91e22d1 100644 --- a/cxx/helper_math.h +++ b/cxx/helper_math.h @@ -874,16 +874,16 @@ inline __host__ __device__ uint4 max(uint4 a, uint4 b) { // - linear interpolation between a and b, based on value t in [0, 1] range //////////////////////////////////////////////////////////////////////////////// -inline __device__ __host__ float lerp(float a, float b, float t) { +inline __device__ __host__ float mc_lerp(float a, float b, float t) { return a + t * (b - a); } -inline __device__ __host__ float2 lerp(float2 a, float2 b, float t) { +inline __device__ __host__ float2 mc_lerp(float2 a, float2 b, float t) { return a + t * (b - a); } -inline __device__ __host__ float3 lerp(float3 a, float3 b, float t) { +inline __device__ __host__ float3 mc_lerp(float3 a, float3 b, float t) { return a + t * (b - a); } -inline __device__ __host__ float4 lerp(float4 a, float4 b, float t) { +inline __device__ __host__ float4 mc_lerp(float4 a, float4 b, float t) { return a + t * (b - a); }