diff options
Diffstat (limited to 'intern/cycles/kernel/svm/svm_image.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index ce70109392b..2de80d5fc29 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -16,7 +16,8 @@ CCL_NAMESPACE_BEGIN -ccl_device float4 svm_image_texture(const KernelGlobals *kg, int id, float x, float y, uint flags) +ccl_device float4 +svm_image_texture(ccl_global const KernelGlobals *kg, int id, float x, float y, uint flags) { if (id == -1) { return make_float4( @@ -44,8 +45,11 @@ ccl_device_inline float3 texco_remap_square(float3 co) return (co - make_float3(0.5f, 0.5f, 0.5f)) * 2.0f; } -ccl_device_noinline int svm_node_tex_image( - const KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int offset) +ccl_device_noinline int svm_node_tex_image(ccl_global const KernelGlobals *kg, + ccl_private ShaderData *sd, + ccl_private float *stack, + uint4 node, + int offset) { uint co_offset, out_offset, alpha_offset, flags; @@ -117,9 +121,9 @@ ccl_device_noinline int svm_node_tex_image( return offset; } -ccl_device_noinline void svm_node_tex_image_box(const KernelGlobals *kg, - ShaderData *sd, - float *stack, +ccl_device_noinline void svm_node_tex_image_box(ccl_global const KernelGlobals *kg, + ccl_private ShaderData *sd, + ccl_private float *stack, uint4 node) { /* get object space normal */ @@ -219,9 +223,9 @@ ccl_device_noinline void svm_node_tex_image_box(const KernelGlobals *kg, stack_store_float(stack, alpha_offset, f.w); } -ccl_device_noinline void svm_node_tex_environment(const KernelGlobals *kg, - ShaderData *sd, - float *stack, +ccl_device_noinline void svm_node_tex_environment(ccl_global const KernelGlobals *kg, + ccl_private ShaderData *sd, + ccl_private float *stack, uint4 node) { uint id = node.y; |