Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-08-21 00:16:25 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-08-21 00:32:20 +0300
commit1d1ddd48db432eb9ff646297d559756668fe6843 (patch)
tree07a1ed12c686a8089c7ff74015ceaa9075a8fb17 /intern/cycles/kernel/kernel_random.h
parentce0fce2207fa3f5803aa7857419aefbd1c2d714f (diff)
Fix T52470: cycles OpenCL hair rendering not working after recent changes.
Diffstat (limited to 'intern/cycles/kernel/kernel_random.h')
-rw-r--r--intern/cycles/kernel/kernel_random.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h
index 459333f9807..221d92f5de1 100644
--- a/intern/cycles/kernel/kernel_random.h
+++ b/intern/cycles/kernel/kernel_random.h
@@ -307,12 +307,19 @@ ccl_device_inline void path_state_branch(ccl_addr_space PathState *state,
state->num_samples = state->num_samples*num_branches;
}
-ccl_device_inline uint lcg_state_init(ccl_addr_space PathState *state,
+ccl_device_inline uint lcg_state_init(PathState *state,
uint scramble)
{
return lcg_init(state->rng_hash + state->rng_offset + state->sample*scramble);
}
+ccl_device_inline uint lcg_state_init_addrspace(ccl_addr_space PathState *state,
+ uint scramble)
+{
+ return lcg_init(state->rng_hash + state->rng_offset + state->sample*scramble);
+}
+
+
ccl_device float lcg_step_float_addrspace(ccl_addr_space uint *rng)
{
/* Implicit mod 2^32 */