diff options
Diffstat (limited to 'intern/cycles/kernel/geom/geom_shader_data.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_shader_data.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/intern/cycles/kernel/geom/geom_shader_data.h b/intern/cycles/kernel/geom/geom_shader_data.h index f78d194359d..2cf60e263c3 100644 --- a/intern/cycles/kernel/geom/geom_shader_data.h +++ b/intern/cycles/kernel/geom/geom_shader_data.h @@ -25,8 +25,8 @@ CCL_NAMESPACE_BEGIN /* ShaderData setup from incoming ray */ #ifdef __OBJECT_MOTION__ -ccl_device void shader_setup_object_transforms(const KernelGlobals *ccl_restrict kg, - ShaderData *ccl_restrict sd, +ccl_device void shader_setup_object_transforms(ccl_global const KernelGlobals *ccl_restrict kg, + ccl_private ShaderData *ccl_restrict sd, float time) { if (sd->object_flag & SD_OBJECT_MOTION) { @@ -38,10 +38,10 @@ ccl_device void shader_setup_object_transforms(const KernelGlobals *ccl_restrict /* TODO: break this up if it helps reduce register pressure to load data from * global memory as we write it to shader-data. */ -ccl_device_inline void shader_setup_from_ray(const KernelGlobals *ccl_restrict kg, - ShaderData *ccl_restrict sd, - const Ray *ccl_restrict ray, - const Intersection *ccl_restrict isect) +ccl_device_inline void shader_setup_from_ray(ccl_global const KernelGlobals *ccl_restrict kg, + ccl_private ShaderData *ccl_restrict sd, + ccl_private const Ray *ccl_restrict ray, + ccl_private const Intersection *ccl_restrict isect) { /* Read intersection data into shader globals. * @@ -135,8 +135,8 @@ ccl_device_inline void shader_setup_from_ray(const KernelGlobals *ccl_restrict k /* ShaderData setup from position sampled on mesh */ -ccl_device_inline void shader_setup_from_sample(const KernelGlobals *ccl_restrict kg, - ShaderData *ccl_restrict sd, +ccl_device_inline void shader_setup_from_sample(ccl_global const KernelGlobals *ccl_restrict kg, + ccl_private ShaderData *ccl_restrict sd, const float3 P, const float3 Ng, const float3 I, @@ -247,8 +247,8 @@ ccl_device_inline void shader_setup_from_sample(const KernelGlobals *ccl_restric /* ShaderData setup for displacement */ -ccl_device void shader_setup_from_displace(const KernelGlobals *ccl_restrict kg, - ShaderData *ccl_restrict sd, +ccl_device void shader_setup_from_displace(ccl_global const KernelGlobals *ccl_restrict kg, + ccl_private ShaderData *ccl_restrict sd, int object, int prim, float u, @@ -281,8 +281,9 @@ ccl_device void shader_setup_from_displace(const KernelGlobals *ccl_restrict kg, /* ShaderData setup from ray into background */ -ccl_device_inline void shader_setup_from_background(const KernelGlobals *ccl_restrict kg, - ShaderData *ccl_restrict sd, +ccl_device_inline void shader_setup_from_background(ccl_global const KernelGlobals *ccl_restrict + kg, + ccl_private ShaderData *ccl_restrict sd, const float3 ray_P, const float3 ray_D, const float ray_time) @@ -325,9 +326,9 @@ ccl_device_inline void shader_setup_from_background(const KernelGlobals *ccl_res /* ShaderData setup from point inside volume */ #ifdef __VOLUME__ -ccl_device_inline void shader_setup_from_volume(const KernelGlobals *ccl_restrict kg, - ShaderData *ccl_restrict sd, - const Ray *ccl_restrict ray) +ccl_device_inline void shader_setup_from_volume(ccl_global const KernelGlobals *ccl_restrict kg, + ccl_private ShaderData *ccl_restrict sd, + ccl_private const Ray *ccl_restrict ray) { /* vectors */ |