From 6798a061b7620a188c0a6bb5594fe721b6b0cb9c Mon Sep 17 00:00:00 2001 From: Hristo Gueorguiev Date: Sat, 16 Sep 2017 12:33:03 +0200 Subject: Cycles: Fix compilation error with OpenCL split kernel --- intern/cycles/kernel/kernel_shadow.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/intern/cycles/kernel/kernel_shadow.h b/intern/cycles/kernel/kernel_shadow.h index 3a534bbb6be..e02494ec1b0 100644 --- a/intern/cycles/kernel/kernel_shadow.h +++ b/intern/cycles/kernel/kernel_shadow.h @@ -25,6 +25,9 @@ typedef struct VolumeState { } VolumeState; /* Get PathState ready for use for volume stack evaluation. */ +# ifdef __SPLIT_KERNEL__ +ccl_addr_space +# endif ccl_device_inline PathState *shadow_blocked_volume_path_state( KernelGlobals *kg, VolumeState *volume_state, @@ -190,6 +193,9 @@ ccl_device bool shadow_blocked_transparent_all_loop(KernelGlobals *kg, int bounce = state->transparent_bounce; Intersection *isect = hits; # ifdef __VOLUME__ +# ifdef __SPLIT_KERNEL__ + ccl_addr_space +# endif PathState *ps = shadow_blocked_volume_path_state(kg, &volume_state, state, @@ -240,6 +246,9 @@ ccl_device bool shadow_blocked_transparent_all_loop(KernelGlobals *kg, # ifdef __VOLUME__ if(!blocked && state->volume_stack[0].shader != SHADER_NONE) { /* Apply attenuation from current volume shader. */ +# ifdef __SPLIT_KERNEL__ + ccl_addr_space +# endif PathState *ps = shadow_blocked_volume_path_state(kg, &volume_state, state, @@ -335,6 +344,9 @@ ccl_device bool shadow_blocked_transparent_stepped_loop( float3 Pend = ray->P + ray->D*ray->t; int bounce = state->transparent_bounce; # ifdef __VOLUME__ +# ifdef __SPLIT_KERNEL__ + ccl_addr_space +# endif PathState *ps = shadow_blocked_volume_path_state(kg, &volume_state, state, @@ -389,6 +401,9 @@ ccl_device bool shadow_blocked_transparent_stepped_loop( # ifdef __VOLUME__ if(!blocked && state->volume_stack[0].shader != SHADER_NONE) { /* Apply attenuation from current volume shader. */ +# ifdef __SPLIT_KERNEL__ + ccl_addr_space +# endif PathState *ps = shadow_blocked_volume_path_state(kg, &volume_state, state, -- cgit v1.2.3