[Bf-blender-cvs] [e361adbca2] master: Cycles: Fix compilation error of LCG RNG
Sergey Sharybin
noreply at git.blender.org
Fri Mar 17 09:59:53 CET 2017
Commit: e361adbca26bbd7521c31398a90352b7db233199
Author: Sergey Sharybin
Date: Fri Mar 17 09:58:08 2017 +0100
Branches: master
https://developer.blender.org/rBe361adbca26bbd7521c31398a90352b7db233199
Cycles: Fix compilation error of LCG RNG
===================================================================
M intern/cycles/kernel/kernel_random.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h
index e773753396..ad3fa32a80 100644
--- a/intern/cycles/kernel/kernel_random.h
+++ b/intern/cycles/kernel/kernel_random.h
@@ -191,14 +191,14 @@ ccl_device void path_rng_end(KernelGlobals *kg, ccl_global uint *rng_state, RNG
/* 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 */
- rng = (1103515245*(rng) + 12345);
- return (float)rng * (1.0f/(float)0xFFFFFFFF);
+ *rng = (1103515245*(*rng) + 12345);
+ 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);
*fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1);
More information about the Bf-blender-cvs
mailing list