Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix compilation error of LCG RNG

Browse Source
This commit is contained in:
Sergey Sharybin
2017-03-17 09:58:08 +01:00
parent 439a277aa5
commit e361adbca2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/kernel_random.h
View File

@@ -191,14 +191,14 @@ ccl_device void path_rng_end(KernelGlobals *kg, ccl_global uint *rng_state, RNG
/* Linear Congruential Generator */ /* Linear Congruential Generator */
ccl_device_forceinline float path_rng_1D(KernelGlobals *kg, RNG& rng, int sample, int num_samples, int dimension) ccl_device_forceinline float path_rng_1D(KernelGlobals *kg, RNG *rng, int sample, int num_samples, int dimension)
{ {
/* implicit mod 2^32 */ /* implicit mod 2^32 */
rng = (1103515245*(rng) + 12345); *rng = (1103515245*(*rng) + 12345);
return (float)rng * (1.0f/(float)0xFFFFFFFF); return (float)*rng * (1.0f/(float)0xFFFFFFFF);
} }
ccl_device_inline void path_rng_2D(KernelGlobals *kg, RNG& rng, int sample, int num_samples, int dimension, float *fx, float *fy) ccl_device_inline void path_rng_2D(KernelGlobals *kg, RNG *rng, int sample, int num_samples, int dimension, float *fx, float *fy)
{ {
*fx = path_rng_1D(kg, rng, sample, num_samples, dimension); *fx = path_rng_1D(kg, rng, sample, num_samples, dimension);
*fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1); *fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1);