blender
/
blender
134
401
Fork 584
Code Issues 6.3k Pull Requests 762 Projects 19 Wiki Activity

Cleanup: simplify perlin noise function definition 

Ref D5363
This commit is contained in:
Patrick Mours 2019-08-26 14:12:20 +02:00 committed by Brecht Van Lommel
parent 7b150e8767
commit 81e2fdcd1d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/kernel/svm/svm_noise.h
View File

@ -181,9 +181,9 @@ ccl_device_inline ssef scale3_sse(const ssef &result)
}
#endif
#ifndef __KERNEL_SSE2__
ccl_device_noinline_cpu float perlin(float x, float y, float z)
{
#ifndef __KERNEL_SSE2__
int X;
float fx = floorfrac(x, &X);
int Y;
@ -217,10 +217,7 @@ ccl_device_noinline_cpu float perlin(float x, float y, float z)
/* can happen for big coordinates, things even out to 0.0 then anyway */
return (isfinite(r)) ? r : 0.0f;
}
#else
ccl_device_noinline float perlin(float x, float y, float z)
{
ssef xyz = ssef(x, y, z, 0.0f);
ssei XYZ;
@ -258,8 +255,8 @@ ccl_device_noinline float perlin(float x, float y, float z)
ssef rinfmask = ((r & infmask) == infmask).m128; // 0xffffffff if r is inf/-inf/nan else 0
ssef rfinite = andnot(rinfmask, r); // 0 if r is inf/-inf/nan else r
return extract<0>(rfinite);
}
#endif
}
/* perlin noise in range 0..1 */
ccl_device float noise(float3 p)