Skip to content

fix c++20 lerp conflict #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PiterLewis wants to merge 1 commit into from
Closed

fix c++20 lerp conflict #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cxx/helper_math.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down