diff options
| author | Patrick Mours <pmours@nvidia.com> | 2019-08-21 13:04:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-26 11:10:35 +0300 |
| commit | b05e7ea7197ca4b66f74359a8e43e6a0b419de2d (patch) | |
| tree | 0ac9437bd4a2f8d27ccf29a8eedcbb2080825399 /intern/cycles/kernel/svm | |
| parent | 7a15b938bde587aa12290413d6be61619b51fe2e (diff) | |
Cycles: fixes for building kernel without certain features
Ref D5363
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_ao.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_bevel.h | 12 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/intern/cycles/kernel/svm/svm_ao.h b/intern/cycles/kernel/svm/svm_ao.h index 62413979201..59260de1199 100644 --- a/intern/cycles/kernel/svm/svm_ao.h +++ b/intern/cycles/kernel/svm/svm_ao.h @@ -16,6 +16,8 @@ CCL_NAMESPACE_BEGIN +#ifdef __SHADER_RAYTRACE__ + ccl_device_noinline float svm_ao(KernelGlobals *kg, ShaderData *sd, float3 N, @@ -102,4 +104,6 @@ ccl_device void svm_node_ao( } } +#endif /* __SHADER_RAYTRACE__ */ + CCL_NAMESPACE_END diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/svm_bevel.h index fcf28e96e98..58b5d2a8131 100644 --- a/intern/cycles/kernel/svm/svm_bevel.h +++ b/intern/cycles/kernel/svm/svm_bevel.h @@ -16,6 +16,8 @@ CCL_NAMESPACE_BEGIN +#ifdef __SHADER_RAYTRACE__ + /* Bevel shader averaging normals from nearby surfaces. * * Sampling strategy from: BSSRDF Importance Sampling, SIGGRAPH 2013 @@ -120,14 +122,14 @@ ccl_device_noinline float3 svm_bevel(KernelGlobals *kg, if (sd->type & PRIMITIVE_TRIANGLE) { hit_P = triangle_refine_local(kg, sd, &isect.hits[hit], ray); } -#ifdef __OBJECT_MOTION__ +# ifdef __OBJECT_MOTION__ else if (sd->type & PRIMITIVE_MOTION_TRIANGLE) { float3 verts[3]; motion_triangle_vertices( kg, sd->object, kernel_tex_fetch(__prim_index, isect.hits[hit].prim), sd->time, verts); hit_P = motion_triangle_refine_local(kg, sd, &isect.hits[hit], ray, verts); } -#endif /* __OBJECT_MOTION__ */ +# endif /* __OBJECT_MOTION__ */ /* Get geometric normal. */ float3 hit_Ng = isect.Ng[hit]; @@ -151,11 +153,11 @@ ccl_device_noinline float3 svm_bevel(KernelGlobals *kg, if (sd->type & PRIMITIVE_TRIANGLE) { N = triangle_smooth_normal(kg, N, prim, u, v); } -#ifdef __OBJECT_MOTION__ +# ifdef __OBJECT_MOTION__ else if (sd->type & PRIMITIVE_MOTION_TRIANGLE) { N = motion_triangle_smooth_normal(kg, N, sd->object, prim, u, v, sd->time); } -#endif /* __OBJECT_MOTION__ */ +# endif /* __OBJECT_MOTION__ */ } /* Transform normals to world space. */ @@ -214,4 +216,6 @@ ccl_device void svm_node_bevel( stack_store_float3(stack, out_offset, bevel_N); } +#endif /* __SHADER_RAYTRACE__ */ + CCL_NAMESPACE_END diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index 2ef64662d0e..2f1f82b9a2e 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -16,6 +16,8 @@ CCL_NAMESPACE_BEGIN +#ifdef __TEXTURES__ + ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint flags) { float4 r = kernel_tex_image_interp(kg, id, x, y); @@ -199,4 +201,6 @@ ccl_device void svm_node_tex_environment(KernelGlobals *kg, stack_store_float(stack, alpha_offset, f.w); } +#endif /* __TEXTURES__ */ + CCL_NAMESPACE_END |