forked from bartvdbraak/blender
Cycles: Fix compilation error with OpenCL split kernel
This commit is contained in:
parent
a850d74312
commit
6798a061b7
@ -25,6 +25,9 @@ typedef struct VolumeState {
|
|||||||
} VolumeState;
|
} VolumeState;
|
||||||
|
|
||||||
/* Get PathState ready for use for volume stack evaluation. */
|
/* 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(
|
ccl_device_inline PathState *shadow_blocked_volume_path_state(
|
||||||
KernelGlobals *kg,
|
KernelGlobals *kg,
|
||||||
VolumeState *volume_state,
|
VolumeState *volume_state,
|
||||||
@ -190,6 +193,9 @@ ccl_device bool shadow_blocked_transparent_all_loop(KernelGlobals *kg,
|
|||||||
int bounce = state->transparent_bounce;
|
int bounce = state->transparent_bounce;
|
||||||
Intersection *isect = hits;
|
Intersection *isect = hits;
|
||||||
# ifdef __VOLUME__
|
# ifdef __VOLUME__
|
||||||
|
# ifdef __SPLIT_KERNEL__
|
||||||
|
ccl_addr_space
|
||||||
|
# endif
|
||||||
PathState *ps = shadow_blocked_volume_path_state(kg,
|
PathState *ps = shadow_blocked_volume_path_state(kg,
|
||||||
&volume_state,
|
&volume_state,
|
||||||
state,
|
state,
|
||||||
@ -240,6 +246,9 @@ ccl_device bool shadow_blocked_transparent_all_loop(KernelGlobals *kg,
|
|||||||
# ifdef __VOLUME__
|
# ifdef __VOLUME__
|
||||||
if(!blocked && state->volume_stack[0].shader != SHADER_NONE) {
|
if(!blocked && state->volume_stack[0].shader != SHADER_NONE) {
|
||||||
/* Apply attenuation from current volume shader. */
|
/* Apply attenuation from current volume shader. */
|
||||||
|
# ifdef __SPLIT_KERNEL__
|
||||||
|
ccl_addr_space
|
||||||
|
# endif
|
||||||
PathState *ps = shadow_blocked_volume_path_state(kg,
|
PathState *ps = shadow_blocked_volume_path_state(kg,
|
||||||
&volume_state,
|
&volume_state,
|
||||||
state,
|
state,
|
||||||
@ -335,6 +344,9 @@ ccl_device bool shadow_blocked_transparent_stepped_loop(
|
|||||||
float3 Pend = ray->P + ray->D*ray->t;
|
float3 Pend = ray->P + ray->D*ray->t;
|
||||||
int bounce = state->transparent_bounce;
|
int bounce = state->transparent_bounce;
|
||||||
# ifdef __VOLUME__
|
# ifdef __VOLUME__
|
||||||
|
# ifdef __SPLIT_KERNEL__
|
||||||
|
ccl_addr_space
|
||||||
|
# endif
|
||||||
PathState *ps = shadow_blocked_volume_path_state(kg,
|
PathState *ps = shadow_blocked_volume_path_state(kg,
|
||||||
&volume_state,
|
&volume_state,
|
||||||
state,
|
state,
|
||||||
@ -389,6 +401,9 @@ ccl_device bool shadow_blocked_transparent_stepped_loop(
|
|||||||
# ifdef __VOLUME__
|
# ifdef __VOLUME__
|
||||||
if(!blocked && state->volume_stack[0].shader != SHADER_NONE) {
|
if(!blocked && state->volume_stack[0].shader != SHADER_NONE) {
|
||||||
/* Apply attenuation from current volume shader. */
|
/* Apply attenuation from current volume shader. */
|
||||||
|
# ifdef __SPLIT_KERNEL__
|
||||||
|
ccl_addr_space
|
||||||
|
# endif
|
||||||
PathState *ps = shadow_blocked_volume_path_state(kg,
|
PathState *ps = shadow_blocked_volume_path_state(kg,
|
||||||
&volume_state,
|
&volume_state,
|
||||||
state,
|
state,
|
||||||
|
Loading…
Reference in New Issue
Block a user